Revision 11208

View differences:

trunk/libraries/libGPE/src/org/gvsig/gpe/GPEDefaults.java
48 48
 *
49 49
 * $Id$
50 50
 * $Log$
51
 * Revision 1.2  2007-04-12 17:06:42  jorpiell
51
 * Revision 1.3  2007-04-14 16:06:13  jorpiell
52
 * The writer handler has been updated
53
 *
54
 * Revision 1.2  2007/04/12 17:06:42  jorpiell
52 55
 * First GML writing tests
53 56
 *
54 57
 * Revision 1.1  2007/04/12 11:39:20  jorpiell
......
70 73
	public static final String NAMESPACE_URI= "namespaceURI";
71 74
	public static final String XML_VERSION = "xmlVersion";
72 75
	public static final String XML_ENCODING = "xmlEncoding";
76
	public static final String DEFAULT_FILE_NAME = "defaultFileName";
73 77
	
74 78
	static{
75 79
		properties.put(DECIMAL, ".");
......
79 83
		properties.put(NAMESPACE_URI, "http://www.gvsig.com/cit");
80 84
		properties.put(XML_VERSION, "1.0");
81 85
		properties.put(XML_ENCODING, "UTF-8");
86
		properties.put(DEFAULT_FILE_NAME, "output");
82 87
	}
83 88
	
84 89
	/**
trunk/libraries/libGPE/src/org/gvsig/gpe/GPEContentHandler.java
43 43
 *
44 44
 * $Id$
45 45
 * $Log$
46
 * Revision 1.4  2007-04-13 13:14:55  jorpiell
46
 * Revision 1.5  2007-04-14 16:06:13  jorpiell
47
 * The writer handler has been updated
48
 *
49
 * Revision 1.4  2007/04/13 13:14:55  jorpiell
47 50
 * Created the base tests and add some methods to the content handler
48 51
 *
49 52
 * Revision 1.3  2007/04/12 17:06:42  jorpiell
......
62 65
 */
63 66
public abstract class GPEContentHandler implements IGPEContentHandler {
64 67

  
68
	/*
69
	 * (non-Javadoc)
70
	 * @see org.gvsig.gpe.IGPEContentHandler#startLayer(java.lang.Object, java.lang.Object, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
71
	 */
65 72
	public Object startLayer(Object parent, Object bBox, String id,
66 73
			String name, String description,String srs) {
67 74
		// TODO Ap?ndice de m?todo generado autom?ticamente
68 75
		return null;
69 76
	}
70 77

  
78
	/*
79
	 * (non-Javadoc)
80
	 * @see org.gvsig.gpe.IGPEContentHandler#endLayer(java.lang.Object)
81
	 */
71 82
	public void endLayer(Object layer) {
72 83
		// TODO Ap?ndice de m?todo generado autom?ticamente
73 84

  
74 85
	}
75 86
	
87
	/*
88
	 * (non-Javadoc)
89
	 * @see org.gvsig.gpe.IGPEContentHandler#addNameToLayer(java.lang.Object, java.lang.String)
90
	 */
76 91
	public void addNameToLayer(Object layer,String name){
77 92
		
78 93
	}
79 94
	
95
	/*
96
	 * (non-Javadoc)
97
	 * @see org.gvsig.gpe.IGPEContentHandler#addDescriptionToLayer(java.lang.Object, java.lang.String)
98
	 */
80 99
	public void addDescriptionToLayer(Object layer,String description){
81 100
		
82 101
	}
83 102

  
103
	/*
104
	 * (non-Javadoc)
105
	 * @see org.gvsig.gpe.IGPEContentHandler#startElement(java.lang.Object, java.lang.String, java.lang.Object, java.lang.Object)
106
	 */
84 107
	public Object startElement(Object parent, String name, Object value,
85 108
			Object type) {
86 109
		// TODO Ap?ndice de m?todo generado autom?ticamente
87 110
		return null;
88 111
	}
89 112

  
113
	/*
114
	 * (non-Javadoc)
115
	 * @see org.gvsig.gpe.IGPEContentHandler#endElement(java.lang.Object)
116
	 */
90 117
	public void endElement(Object element) {
91 118
		// TODO Ap?ndice de m?todo generado autom?ticamente
92 119

  
93 120
	}
94 121

  
122
	/*
123
	 * (non-Javadoc)
124
	 * @see org.gvsig.gpe.IGPEContentHandler#startBbox(double[], double[], double[], java.lang.String, java.lang.String)
125
	 */
95 126
	public Object startBbox(double[] x, double[] y, double[] z, String id,
96 127
			String srs) {
97 128
		// TODO Ap?ndice de m?todo generado autom?ticamente
98 129
		return null;
99 130
	}
100 131

  
132
	/*
133
	 * (non-Javadoc)
134
	 * @see org.gvsig.gpe.IGPEContentHandler#endBbox(java.lang.Object)
135
	 */
101 136
	public void endBbox(Object bbox) {
102 137
		// TODO Ap?ndice de m?todo generado autom?ticamente
103 138

  
104 139
	}
105 140

  
141
	/*
142
	 * (non-Javadoc)
143
	 * @see org.gvsig.gpe.IGPEContentHandler#startPoint(double, double, double, java.lang.String, java.lang.String)
144
	 */
106 145
	public Object startPoint(double x, double y, double z, String id, String srs) {
107 146
		// TODO Ap?ndice de m?todo generado autom?ticamente
108 147
		return null;
109 148
	}
110 149

  
150
	/*
151
	 * (non-Javadoc)
152
	 * @see org.gvsig.gpe.IGPEContentHandler#endPoint(java.lang.Object)
153
	 */
111 154
	public void endPoint(Object point) {
112 155
		// TODO Ap?ndice de m?todo generado autom?ticamente
113 156

  
114 157
	}
115 158

  
159
	/*
160
	 * (non-Javadoc)
161
	 * @see org.gvsig.gpe.IGPEContentHandler#startLineString(double[], double[], double[], java.lang.String, java.lang.String)
162
	 */
116 163
	public Object startLineString(double[] x, double[] y, double[] z, String id,
117 164
			String srs) {
118 165
		// TODO Ap?ndice de m?todo generado autom?ticamente
119 166
		return null;
120 167
	}
121 168

  
169
	/*
170
	 * (non-Javadoc)
171
	 * @see org.gvsig.gpe.IGPEContentHandler#endLineString(java.lang.Object)
172
	 */
122 173
	public void endLineString(Object line) {
123 174
		// TODO Ap?ndice de m?todo generado autom?ticamente
124 175

  
125 176
	}
126 177

  
178
	/*
179
	 * (non-Javadoc)
180
	 * @see org.gvsig.gpe.IGPEContentHandler#startLinearRing(double[], double[], double[], java.lang.String, java.lang.String)
181
	 */
127 182
	public Object startLinearRing(double[] x, double[] y, double[] z, String id,
128 183
			String srs) {
129 184
		// TODO Ap?ndice de m?todo generado autom?ticamente
130 185
		return null;
131 186
	}
132 187

  
188
	/*
189
	 * (non-Javadoc)
190
	 * @see org.gvsig.gpe.IGPEContentHandler#endLinearRing(java.lang.Object)
191
	 */
133 192
	public void endLinearRing(Object linearRing) {
134 193
		// TODO Ap?ndice de m?todo generado autom?ticamente
135 194

  
136 195
	}
137 196

  
197
	/*
198
	 * (non-Javadoc)
199
	 * @see org.gvsig.gpe.IGPEContentHandler#startPolygon(double[], double[], double[], java.lang.String, java.lang.String)
200
	 */
138 201
	public Object startPolygon(double[] x, double[] y, double[] z, String id,
139 202
			String srs) {
140 203
		// TODO Ap?ndice de m?todo generado autom?ticamente
141 204
		return null;
142 205
	}
143 206

  
207
	/*
208
	 * (non-Javadoc)
209
	 * @see org.gvsig.gpe.IGPEContentHandler#endPolygon(java.lang.Object)
210
	 */
144 211
	public void endPolygon(Object polygon) {
145 212
		// TODO Ap?ndice de m?todo generado autom?ticamente
146 213

  
147 214
	}
148

  
149
	public void addInnerBoundary(Object polygon, Object linearRing) {
150
		// TODO Ap?ndice de m?todo generado autom?ticamente
151

  
215
	
216
	/*
217
	 * (non-Javadoc)
218
	 * @see org.gvsig.gpe.IGPEContentHandler#startInnerPolygon(java.lang.Object, double[], double[], double[], java.lang.String, java.lang.String)
219
	 */
220
	public Object startInnerPolygon(Object polygon, double[] x, double[] y, double[] z, String id, String srs){
221
		return null;
152 222
	}
153

  
154
	public void addOuterBoundary(Object polygon, Object linearRing) {
155
		// TODO Ap?ndice de m?todo generado autom?ticamente
156

  
223
	
224
	/*
225
	 * (non-Javadoc)
226
	 * @see org.gvsig.gpe.IGPEContentHandler#endInnerPolygon(java.lang.Object)
227
	 */
228
	public void endInnerPolygon(Object polygon){
229
		
157 230
	}
158 231

  
232
	/*
233
	 * (non-Javadoc)
234
	 * @see org.gvsig.gpe.IGPEContentHandler#isViewInBox(java.lang.Object, java.lang.Object)
235
	 */
159 236
	public boolean isViewInBox(Object bbox, Object view) {
160 237
		// TODO Ap?ndice de m?todo generado autom?ticamente
161 238
		return false;
162 239
	}
163 240

  
241
	/*
242
	 * (non-Javadoc)
243
	 * @see org.gvsig.gpe.IGPEContentHandler#isGeometryInBox(java.lang.Object, java.lang.Object)
244
	 */
164 245
	public boolean isGeometryInBox(Object bbox, Object geometry) {
165 246
		// TODO Ap?ndice de m?todo generado autom?ticamente
166 247
		return false;
167 248
	}
168 249

  
169
	public void addFeature(Object layer, Object feature) {
170
		// TODO Ap?ndice de m?todo generado autom?ticamente
171

  
172
	}
173

  
174
	public void addBbox(Object item, Object bbox) {
175
		// TODO Ap?ndice de m?todo generado autom?ticamente
176

  
177
	}
178

  
179
	public void addElement(Object feature, Object element) {
180
		// TODO Ap?ndice de m?todo generado autom?ticamente
181

  
182
	}
183

  
184
	public void addGeometry(Object feature, Object geometry) {
185
		// TODO Ap?ndice de m?todo generado autom?ticamente
186

  
187
	}
188

  
250
	/*
251
	 * (non-Javadoc)
252
	 * @see org.gvsig.gpe.IGPEContentHandler#startFeature(java.lang.String, java.lang.String)
253
	 */
189 254
	public Object startFeature(String name, String id) {
190 255
		// TODO Auto-generated method stub
191 256
		return null;
192 257
	}
193 258
	
259
	/*
260
	 * (non-Javadoc)
261
	 * @see org.gvsig.gpe.IGPEContentHandler#addNameToFeature(java.lang.Object, java.lang.String)
262
	 */
194 263
	public void addNameToFeature(Object feature, String name){
195 264
		
196 265
	}
197 266
	
267
	/*
268
	 * (non-Javadoc)
269
	 * @see org.gvsig.gpe.IGPEContentHandler#endFeature(java.lang.Object)
270
	 */
198 271
	public void endFeature(Object feature) {
199 272
		// TODO Auto-generated method stub
200 273
		
trunk/libraries/libGPE/src/org/gvsig/gpe/GPEParser.java
50 50
 *
51 51
 * $Id$
52 52
 * $Log$
53
 * Revision 1.6  2007-04-13 07:17:54  jorpiell
53
 * Revision 1.7  2007-04-14 16:06:13  jorpiell
54
 * The writer handler has been updated
55
 *
56
 * Revision 1.6  2007/04/13 07:17:54  jorpiell
54 57
 * Add the writting tests for the simple geometries
55 58
 *
56 59
 * Revision 1.5  2007/04/12 17:06:42  jorpiell
......
168 171
	 * application to create the outputformat
169 172
	 * @param format
170 173
	 * Format to create the file
171
	 * @param file
172
	 * Output file
173 174
	 * @throws FileNotFoundException
174 175
	 * If the file doesn't exist
175 176
	 */
176
	public abstract GPEWriterHandler getWriter(String format,File file) throws IOException ;
177
	public abstract GPEWriterHandler getWriter(String format);
177 178
	
178 179
	/**
179 180
	 * @return the contentHandler
trunk/libraries/libGPE/src/org/gvsig/gpe/IGPEContentHandler.java
45 45
 *
46 46
 * $Id$
47 47
 * $Log$
48
 * Revision 1.6  2007-04-13 13:14:55  jorpiell
48
 * Revision 1.7  2007-04-14 16:06:13  jorpiell
49
 * The writer handler has been updated
50
 *
51
 * Revision 1.6  2007/04/13 13:14:55  jorpiell
49 52
 * Created the base tests and add some methods to the content handler
50 53
 *
51 54
 * Revision 1.5  2007/04/12 17:06:42  jorpiell
......
70 73
 */
71 74
public interface IGPEContentHandler {
72 75
	
76
	//Layer
73 77
	public Object startLayer(Object parent, Object bBox, String id, String name, String description, String srs);
74 78

  
75 79
	public void endLayer(Object layer);
......
78 82
	
79 83
	public void addDescriptionToLayer(Object layer,String description);
80 84
	
85
	//Feature
81 86
	public Object startFeature(String name, String id);
82 87
	
83 88
	public void endFeature(Object feature);
84 89
	
85 90
	public void addNameToFeature(Object feature, String name);
86 91
	
92
	//Element
87 93
	public Object startElement(Object parent, String name, Object value, Object type);
88 94
		
89 95
	public void endElement(Object element);
90 96
	
97
	//Bbox
91 98
	public Object startBbox(double[] x, double[] y, double[] z, String id, String srs);
92 99
	
93 100
	public void endBbox(Object bbox);
94 101
	
102
	//Geometries
95 103
	public Object startPoint(double x, double y, double z, String id, String srs);
96 104
	
97 105
	public void endPoint(Object point);
......
106 114
	
107 115
	public Object startPolygon(double[] x, double[] y, double[] z, String id, String srs);
108 116
	
109
	public void endPolygon(Object polygon);
117
	public void endPolygon(Object polygon);	
110 118
	
111
	public void addInnerBoundary(Object polygon,Object linearRing);
119
	public Object startInnerPolygon(Object polygon, double[] x, double[] y, double[] z, String id, String srs);
112 120
	
113
	public void addOuterBoundary(Object polygon,Object linearRing);
121
	public void endInnerPolygon(Object polygon);	
114 122
	
115
	public void addFeature(Object layer,Object feature);
116
	
117
	public void addBbox(Object item,Object bbox);
118
	
119
	public void addElement(Object feature,Object element);
120
	
121
	public void addGeometry(Object feature, Object geometry);
122
	
123
	//Utilities
123 124
	public boolean isViewInBox(Object bbox, Object view);
124 125
	
125 126
	public boolean isGeometryInBox(Object bbox, Object geometry);
trunk/libraries/libGPE/src/org/gvsig/gpe/writers/GPEWriterHandler.java
2 2

  
3 3
import java.io.File;
4 4

  
5
import org.gvsig.gpe.GPEDefaults;
5 6
import org.gvsig.gpe.GPEErrorHandler;
6 7
import org.gvsig.gpe.IGPEContentHandler;
7 8
import org.xml.sax.ErrorHandler;
......
50 51
 *
51 52
 * $Id$
52 53
 * $Log$
53
 * Revision 1.2  2007-04-13 13:14:55  jorpiell
54
 * Revision 1.3  2007-04-14 16:06:13  jorpiell
55
 * The writer handler has been updated
56
 *
57
 * Revision 1.2  2007/04/13 13:14:55  jorpiell
54 58
 * Created the base tests and add some methods to the content handler
55 59
 *
56 60
 * Revision 1.1  2007/04/13 07:17:54  jorpiell
......
69 73
 */
70 74
public abstract class GPEWriterHandler implements IGPEWriterHandler{
71 75
	private String format = null;
76
	private String fileName = null;
72 77
	private File file = null;
73 78
	private GPEErrorHandler errorHandler = null;
74
	
75
	public GPEWriterHandler(String format,File file,GPEErrorHandler errorHandler){
79
		
80
	public GPEWriterHandler(String format, GPEErrorHandler errorHandler){
76 81
		this.format = format;
77
		this.file = file;
78 82
		this.errorHandler = errorHandler;
79 83
	}	
80

  
84
	
81 85
	/**
82 86
	 * @return the errorHandler
83 87
	 */
......
189 193
	 * @return the file
190 194
	 */
191 195
	public File getFile() {
196
		if (file == null){
197
			if (fileName == null){
198
				fileName = GPEDefaults.getProperty(GPEDefaults.DEFAULT_FILE_NAME);
199
			}
200
			file = new File(fileName + "." + getFormat().toLowerCase());
201
		}
192 202
		return file;
193 203
	}
194 204

  
......
227 237
	public void startMultiPolygon(String id, String srs) {
228 238
		// TODO Auto-generated method stub
229 239
		
240
	}
241

  
242
	/**
243
	 * @param file the file to set
244
	 */
245
	public void setFileName(String fileName) {
246
		this.fileName = fileName;
230 247
	}	
231 248

  
232 249
}
trunk/libraries/libGPE/src/org/gvsig/gpe/GPERegister.java
4 4
import java.lang.reflect.InvocationTargetException;
5 5
import java.util.ArrayList;
6 6

  
7
import org.gvsig.gpe.writers.GPEWriterHandler;
8

  
7 9
/* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
8 10
 *
9 11
 * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
......
48 50
 *
49 51
 * $Id$
50 52
 * $Log$
51
 * Revision 1.4  2007-04-12 17:06:42  jorpiell
53
 * Revision 1.5  2007-04-14 16:06:13  jorpiell
54
 * The writer handler has been updated
55
 *
56
 * Revision 1.4  2007/04/12 17:06:42  jorpiell
52 57
 * First GML writing tests
53 58
 *
54 59
 * Revision 1.3  2007/04/11 11:10:27  jorpiell
......
147 152
		return null;
148 153
	}
149 154
	
155
	/**
156
	 * Gets the writer that is used to write the file
157
	 * @param format
158
	 * File format
159
	 * @return
160
	 * Null if the writer doesn't exist
161
	 */
162
	public static GPEWriterHandler getWriter(String format){
163
		for (int i=0 ; i<parsers.size() ; i++){
164
			GPEParser parser = (GPEParser)parsers.get(i);
165
			String[] formats = parser.getFormats();
166
			for (int j=0 ; j<formats.length ; j++){
167
				if (formats[i].toUpperCase().equals(format.toUpperCase())){
168
					return parser.getWriter(format);
169
				}
170
			}
171
		}
172
		return null;
173
	}
174
	
150 175
}

Also available in: Unified diff