Revision 1828
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/demo/ImageFrame.java | ||
---|---|---|
52 | 52 |
import org.cresques.cts.IProjection; |
53 | 53 |
import org.cresques.cts.ProjectionPool; |
54 | 54 |
|
55 |
import com.hardcode.driverManager.DriverLoadException; |
|
55 | 56 |
import com.iver.cit.gvsig.fmap.DriverException; |
56 | 57 |
import com.iver.cit.gvsig.fmap.FMap; |
57 | 58 |
import com.iver.cit.gvsig.fmap.MapControl; |
58 | 59 |
import com.iver.cit.gvsig.fmap.ViewPort; |
60 |
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver; |
|
59 | 61 |
import com.iver.cit.gvsig.fmap.layers.FLayer; |
60 | 62 |
import com.iver.cit.gvsig.fmap.layers.LayerFactory; |
61 | 63 |
|
... | ... | |
90 | 92 |
LayerFactory.setDriversPath( |
91 | 93 |
"d:/java/eclipse30/eclipse/workspace/Andami/gvSIG/extensiones/com.iver.cit.gvsig/drivers"); |
92 | 94 |
|
93 |
l = LayerFactory.createLayer("Provin", "gvSIG shp driver", |
|
95 |
l = LayerFactory.createLayer("Provin", |
|
96 |
(VectorialFileDriver) LayerFactory.getDM().getDriver("gvSIG shp driver"), |
|
94 | 97 |
new File("C:/Documents and Settings/fjp/Mis documentos/provin.shp"), |
95 | 98 |
ProjectionPool.get("EPSG:23030")); |
96 | 99 |
|
... | ... | |
107 | 110 |
getJContentPane().add(lbl, java.awt.BorderLayout.CENTER); |
108 | 111 |
} catch (DriverException e) { |
109 | 112 |
e.printStackTrace(); |
113 |
} catch (DriverLoadException e) { |
|
114 |
e.printStackTrace(); |
|
110 | 115 |
} |
111 | 116 |
|
112 | 117 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/demo/MapImage.java | ||
---|---|---|
50 | 50 |
|
51 | 51 |
import org.cresques.cts.ProjectionPool; |
52 | 52 |
|
53 |
|
|
53 |
import com.hardcode.driverManager.DriverLoadException; |
|
54 | 54 |
import com.iver.cit.gvsig.fmap.DriverException; |
55 | 55 |
import com.iver.cit.gvsig.fmap.MapControl; |
56 |
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver; |
|
56 | 57 |
import com.iver.cit.gvsig.fmap.layers.FLayer; |
57 | 58 |
import com.iver.cit.gvsig.fmap.layers.LayerFactory; |
58 | 59 |
import com.iver.cit.gvsig.fmap.tools.ZoomInListenerImpl; |
... | ... | |
104 | 105 |
"C:\\eclipse3\\workspace\\Andami\\gvSIG\\extensiones\\com.iver.cit.gvsig\\drivers"); |
105 | 106 |
|
106 | 107 |
try { |
107 |
FLayer l = LayerFactory.createLayer("Vias", "gvSIG shp driver", |
|
108 |
FLayer l = LayerFactory.createLayer("Vias", |
|
109 |
(VectorialFileDriver) LayerFactory.getDM().getDriver("gvSIG shp driver"), |
|
108 | 110 |
new File("C:/Documents and Settings/fernando/Mis documentos/vias.shp"), |
109 | 111 |
ProjectionPool.get("EPSG:23030")); |
110 | 112 |
newMapControl.getMapContext().getLayers().addLayer(l); |
... | ... | |
112 | 114 |
newMapControl.setTool("zoom"); |
113 | 115 |
} catch (DriverException e) { |
114 | 116 |
e.printStackTrace(); |
117 |
} catch (DriverLoadException e) { |
|
118 |
e.printStackTrace(); |
|
115 | 119 |
} |
116 | 120 |
|
117 | 121 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrRaster.java | ||
---|---|---|
184 | 184 |
} |
185 | 185 |
|
186 | 186 |
/** |
187 |
* @throws XMLException |
|
187 | 188 |
* @see com.iver.cit.gvsig.fmap.layers.FLayer#getProperties() |
188 | 189 |
*/ |
189 |
public XMLEntity getXMLEntity() { |
|
190 |
public XMLEntity getXMLEntity() throws XMLException {
|
|
190 | 191 |
XMLEntity xml = super.getXMLEntity(); |
191 | 192 |
|
192 | 193 |
if (source instanceof RasterFileAdapter) { |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrMemory.java | ||
---|---|---|
117 | 117 |
/** |
118 | 118 |
* @see com.iver.cit.gvsig.fmap.layers.VectorialAdapter#getRecordset() |
119 | 119 |
*/ |
120 |
public DataSource getRecordset(String name) {
|
|
120 |
public DataSource getRecordset() { |
|
121 | 121 |
return null; |
122 | 122 |
} |
123 | 123 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrDefault.java | ||
---|---|---|
190 | 190 |
* Devuelve el XMLEntity a partir del objeto. |
191 | 191 |
* |
192 | 192 |
* @return XMLEntity. |
193 |
* @throws XMLException |
|
193 | 194 |
*/ |
194 |
public XMLEntity getXMLEntity() { |
|
195 |
public XMLEntity getXMLEntity() throws XMLException {
|
|
195 | 196 |
XMLEntity xml = new XMLEntity(); |
196 | 197 |
xml.putProperty("className",this.getClass().getName()); |
197 | 198 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLayer.java | ||
---|---|---|
65 | 65 |
* Obtiene una representaci?n de la colecci?n de capas de forma recursiva |
66 | 66 |
* |
67 | 67 |
* @return XMLEntity. |
68 |
* @throws XMLException |
|
68 | 69 |
*/ |
69 |
XMLEntity getXMLEntity(); |
|
70 |
XMLEntity getXMLEntity() throws XMLException;
|
|
70 | 71 |
|
71 | 72 |
/** |
72 | 73 |
* Inserta las propiedades del XMLEntity al objeto actual. |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrComplexRaster.java | ||
---|---|---|
187 | 187 |
} |
188 | 188 |
|
189 | 189 |
/** |
190 |
* @throws XMLException |
|
190 | 191 |
* @see com.iver.cit.gvsig.fmap.layers.FLayer#getProperties() |
191 | 192 |
*/ |
192 |
public XMLEntity getProperties() { |
|
193 |
public XMLEntity getProperties() throws XMLException {
|
|
193 | 194 |
XMLEntity xml = super.getXMLEntity(); |
194 | 195 |
|
195 | 196 |
//TODO falta el complexRaster |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/VectorialAdapter.java | ||
---|---|---|
132 | 132 |
/** |
133 | 133 |
* Devuelve el DataSource a pasrtir del nombre. |
134 | 134 |
* |
135 |
* @param name Nombre. |
|
136 |
* |
|
137 | 135 |
* @return DataSource. |
138 | 136 |
* |
139 | 137 |
* @throws DriverLoadException |
140 | 138 |
*/ |
141 |
public abstract DataSource getRecordset(String name)
|
|
139 |
public abstract DataSource getRecordset() |
|
142 | 140 |
throws DriverLoadException; |
143 | 141 |
|
144 | 142 |
/** |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/VectorialFileAdapter.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.layers; |
42 | 42 |
|
43 |
import com.hardcode.driverManager.DriverLoadException; |
|
43 |
import java.awt.geom.Rectangle2D; |
|
44 |
import java.io.File; |
|
45 |
import java.io.IOException; |
|
44 | 46 |
|
47 |
import com.hardcode.driverManager.DriverLoadException; |
|
45 | 48 |
import com.hardcode.gdbms.engine.data.DataSource; |
46 | 49 |
import com.hardcode.gdbms.engine.data.DataSourceFactory; |
47 |
import com.hardcode.gdbms.engine.data.FileDriver; |
|
48 | 50 |
import com.hardcode.gdbms.engine.data.NoSuchTableException; |
49 |
import com.hardcode.gdbms.engine.data.ReadDriver; |
|
50 |
|
|
51 |
import com.iver.cit.gvsig.fmap.DriverException; |
|
51 |
import com.hardcode.gdbms.engine.data.driver.ObjectDriver; |
|
52 | 52 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
53 | 53 |
import com.iver.cit.gvsig.fmap.drivers.DriverIOException; |
54 | 54 |
import com.iver.cit.gvsig.fmap.drivers.ExternalData; |
... | ... | |
57 | 57 |
import com.iver.cit.gvsig.fmap.rendering.indexes.IndexNotExistsException; |
58 | 58 |
import com.iver.cit.gvsig.fmap.write.FileWriterDriver; |
59 | 59 |
|
60 |
import java.awt.geom.Rectangle2D; |
|
61 | 60 |
|
62 |
import java.io.File; |
|
63 |
import java.io.IOException; |
|
64 |
|
|
65 |
|
|
66 | 61 |
/** |
67 | 62 |
* Adapta un driver de fichero vectorial a la interfaz vectorial, manteniendo |
68 | 63 |
* adem?s el estado necesario por una capa vectorial de fichero (el nombre del |
... | ... | |
199 | 194 |
/** |
200 | 195 |
* @see com.iver.cit.gvsig.fmap.layers.VectorialAdapter#getRecordset() |
201 | 196 |
*/ |
202 |
public DataSource getRecordset(String name) throws DriverLoadException {
|
|
197 |
public DataSource getRecordset() throws DriverLoadException { |
|
203 | 198 |
try { |
204 | 199 |
if (ds == null) { |
205 | 200 |
VectorialFileDriver driver = (VectorialFileDriver) getDriver(); |
... | ... | |
209 | 204 |
File dataFile = ed.getDataFile(file); |
210 | 205 |
String driverName = ed.getDataDriverName(); |
211 | 206 |
|
212 |
LayerFactory.getDataSourceFactory().addFileDataSource(driverName, name,
|
|
213 |
dataFile.getAbsolutePath(), file.getAbsolutePath()); |
|
214 |
ds = LayerFactory.getDataSourceFactory().createRandomDataSource(name); |
|
215 |
} else if (driver instanceof ReadDriver) {
|
|
216 |
LayerFactory.getDataSourceFactory().addDataSource((ReadDriver)driver, name);
|
|
217 |
ds = LayerFactory.getDataSourceFactory().createRandomDataSource(name); |
|
207 |
String name = LayerFactory.getDataSourceFactory().addFileDataSource(driverName,
|
|
208 |
dataFile.getAbsolutePath(), file.getAbsolutePath(), null);
|
|
209 |
ds = LayerFactory.getDataSourceFactory().createRandomDataSource(name, DataSourceFactory.AUTOMATIC_MODE);
|
|
210 |
} else if (driver instanceof ObjectDriver) {
|
|
211 |
String name = LayerFactory.getDataSourceFactory().addDataSource((ObjectDriver)driver, null);
|
|
212 |
ds = LayerFactory.getDataSourceFactory().createRandomDataSource(name, DataSourceFactory.AUTOMATIC_MODE);
|
|
218 | 213 |
} else { |
219 | 214 |
return null; |
220 | 215 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrVect.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.layers; |
42 | 42 |
|
43 |
import java.awt.Graphics2D; |
|
44 |
import java.awt.geom.Point2D; |
|
45 |
import java.awt.geom.Rectangle2D; |
|
46 |
import java.awt.image.BufferedImage; |
|
47 |
import java.util.ArrayList; |
|
48 |
import java.util.BitSet; |
|
49 |
|
|
50 |
import org.apache.log4j.Logger; |
|
51 |
import org.cresques.cts.ICoordTrans; |
|
52 |
|
|
43 | 53 |
import com.hardcode.driverManager.DriverLoadException; |
44 |
|
|
45 | 54 |
import com.hardcode.gdbms.engine.data.DataSource; |
55 |
import com.hardcode.gdbms.engine.data.NoSuchTableException; |
|
46 | 56 |
import com.hardcode.gdbms.engine.instruction.FieldNotFoundException; |
47 | 57 |
import com.hardcode.gdbms.engine.values.DoubleValue; |
48 | 58 |
import com.hardcode.gdbms.engine.values.FloatValue; |
49 | 59 |
import com.hardcode.gdbms.engine.values.NullValue; |
50 | 60 |
import com.hardcode.gdbms.engine.values.Value; |
51 |
|
|
52 | 61 |
import com.iver.cit.gvsig.fmap.DriverException; |
53 | 62 |
import com.iver.cit.gvsig.fmap.ViewPort; |
54 | 63 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
... | ... | |
72 | 81 |
import com.iver.cit.gvsig.fmap.rendering.LegendChangedEvent; |
73 | 82 |
import com.iver.cit.gvsig.fmap.rendering.LegendFactory; |
74 | 83 |
import com.iver.cit.gvsig.fmap.rendering.VectorialLegend; |
75 |
|
|
76 | 84 |
import com.iver.utiles.XMLEntity; |
77 | 85 |
|
78 |
import org.apache.log4j.Logger; |
|
79 | 86 |
|
80 |
import org.cresques.cts.ICoordTrans; |
|
81 |
|
|
82 |
import java.awt.Graphics2D; |
|
83 |
import java.awt.geom.Point2D; |
|
84 |
import java.awt.geom.Rectangle2D; |
|
85 |
import java.awt.image.BufferedImage; |
|
86 |
|
|
87 |
import java.util.ArrayList; |
|
88 |
import java.util.BitSet; |
|
89 |
|
|
90 |
|
|
91 | 87 |
/** |
92 | 88 |
* Capa b?sica Vectorial. |
93 | 89 |
* |
... | ... | |
310 | 306 |
e.printStackTrace(); |
311 | 307 |
} catch (DriverException e) { |
312 | 308 |
e.printStackTrace(); |
313 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
309 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
314 | 310 |
// TODO Auto-generated catch block |
315 | 311 |
e.printStackTrace(); |
316 | 312 |
} |
... | ... | |
403 | 399 |
} |
404 | 400 |
|
405 | 401 |
/** |
402 |
* @throws DriverException |
|
406 | 403 |
* @see com.iver.cit.gvsig.fmap.layers.CommonOperations#getRecordset() |
407 | 404 |
*/ |
408 | 405 |
public SelectableDataSource getRecordset() throws DriverException { |
409 |
if (sds == null) { |
|
410 |
//Nombre en el GDBMS de la tabla |
|
411 |
String name = this.toString(); |
|
412 |
|
|
406 |
if (sds == null){ |
|
413 | 407 |
try { |
414 |
DataSource ds = source.getRecordset(name);
|
|
408 |
DataSource ds = source.getRecordset(); |
|
415 | 409 |
|
416 | 410 |
if (ds == null) { |
417 | 411 |
return null; |
... | ... | |
419 | 413 |
|
420 | 414 |
sds = new SelectableDataSource(ds); |
421 | 415 |
sds.setSelectionSupport(selectionSupport); |
416 |
|
|
417 |
return sds; |
|
422 | 418 |
} catch (DriverLoadException e) { |
423 | 419 |
throw new DriverException(e); |
424 | 420 |
} |
425 | 421 |
} |
426 |
|
|
427 | 422 |
return sds; |
428 | 423 |
} |
429 | 424 |
|
... | ... | |
452 | 447 |
} catch (FieldNotFoundException e) { |
453 | 448 |
// TODO Auto-generated catch block |
454 | 449 |
e.printStackTrace(); |
455 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
450 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
456 | 451 |
throw new DriverException(e); |
457 | 452 |
} |
458 | 453 |
|
... | ... | |
493 | 488 |
} |
494 | 489 |
|
495 | 490 |
/** |
491 |
* @throws XMLException |
|
496 | 492 |
* @see com.iver.cit.gvsig.fmap.layers.FLayer#getProperties() |
497 | 493 |
*/ |
498 |
public XMLEntity getXMLEntity() { |
|
494 |
public XMLEntity getXMLEntity() throws XMLException {
|
|
499 | 495 |
XMLEntity xml = super.getXMLEntity(); |
500 | 496 |
xml.addChild(legend.getXMLEntity()); |
501 | 497 |
xml.addChild(selectionSupport.getXMLEntity()); |
502 | 498 |
|
503 | 499 |
if (source instanceof VectorialFileAdapter) { |
500 |
xml.putProperty("type", "vectorial"); |
|
504 | 501 |
xml.putProperty("file", ((VectorialFileAdapter) source).getFile()); |
502 |
try { |
|
503 |
xml.putProperty("recordset-name", getRecordset().getName()); |
|
504 |
} catch (DriverException e) { |
|
505 |
throw new XMLException(e); |
|
506 |
} |
|
505 | 507 |
} else if (source instanceof VectorialDBAdapter) { |
506 | 508 |
} else if (source instanceof WFSAdapter) { |
507 | 509 |
} |
... | ... | |
528 | 530 |
} catch (DriverException e) { |
529 | 531 |
throw new XMLException(e); |
530 | 532 |
} |
533 |
|
|
534 |
selectionSupport.setXMLEntity(xml.getChild(1)); |
|
531 | 535 |
|
532 |
selectionSupport.setXMLEntity(xml.getChild(1)); |
|
536 |
String recordsetName = xml.getStringProperty("recordset-name"); |
|
537 |
try { |
|
538 |
LayerFactory.getDataSourceFactory().changeDataSourceName( |
|
539 |
getRecordset().getName(), |
|
540 |
recordsetName); |
|
541 |
} catch (NoSuchTableException e1) { |
|
542 |
throw new XMLException(e1); |
|
543 |
} catch (DriverException e1) { |
|
544 |
throw new XMLException(e1); |
|
545 |
} |
|
533 | 546 |
} |
534 | 547 |
|
535 | 548 |
/** |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/VectorialDBAdapter.java | ||
---|---|---|
46 | 46 |
import java.sql.SQLException; |
47 | 47 |
import java.sql.Statement; |
48 | 48 |
|
49 |
import org.postgis.Geometry; |
|
50 |
import org.postgis.PGbox3d; |
|
51 |
import org.postgis.Point; |
|
52 |
|
|
53 | 49 |
import com.hardcode.driverManager.DriverLoadException; |
54 | 50 |
import com.hardcode.gdbms.engine.data.DataSource; |
55 | 51 |
import com.hardcode.gdbms.engine.data.DataSourceFactory; |
56 | 52 |
import com.hardcode.gdbms.engine.data.NoSuchTableException; |
57 |
import com.hardcode.gdbms.engine.data.ReadDriver;
|
|
53 |
import com.hardcode.gdbms.engine.data.driver.ObjectDriver;
|
|
58 | 54 |
import com.iver.cit.gvsig.fmap.DriverException; |
59 | 55 |
import com.iver.cit.gvsig.fmap.core.FShape; |
60 | 56 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
61 | 57 |
import com.iver.cit.gvsig.fmap.drivers.DriverIOException; |
62 | 58 |
import com.iver.cit.gvsig.fmap.drivers.VectorialDatabaseDriver; |
63 | 59 |
import com.iver.cit.gvsig.fmap.drivers.jdbc.GeometryIterator; |
64 |
import com.iver.cit.gvsig.fmap.drivers.jdbc.postgis.WKTParser; |
|
65 |
import com.vividsolutions.jts.io.ParseException; |
|
66 | 60 |
|
67 | 61 |
|
68 | 62 |
|
... | ... | |
170 | 164 |
/** |
171 | 165 |
* @see com.iver.cit.gvsig.fmap.layers.VectorialAdapter#getRecordset() |
172 | 166 |
*/ |
173 |
public DataSource getRecordset(String name) throws DriverLoadException {
|
|
174 |
if (driver instanceof ReadDriver)
|
|
167 |
public DataSource getRecordset() throws DriverLoadException { |
|
168 |
if (driver instanceof ObjectDriver)
|
|
175 | 169 |
{ |
176 |
LayerFactory.getDataSourceFactory().addDataSource((ReadDriver)driver, name);
|
|
170 |
String name = LayerFactory.getDataSourceFactory().addDataSource((ObjectDriver)driver, null);
|
|
177 | 171 |
try { |
178 |
ds = LayerFactory.getDataSourceFactory().createRandomDataSource(name); |
|
172 |
ds = LayerFactory.getDataSourceFactory().createRandomDataSource(name, DataSourceFactory.AUTOMATIC_MODE);
|
|
179 | 173 |
} catch (NoSuchTableException e) { |
180 | 174 |
throw new DriverLoadException(e); |
181 | 175 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/WFSAdapter.java | ||
---|---|---|
132 | 132 |
/** |
133 | 133 |
* @see com.iver.cit.gvsig.fmap.layers.VectorialAdapter#getRecordset() |
134 | 134 |
*/ |
135 |
public DataSource getRecordset(String name) {
|
|
135 |
public DataSource getRecordset() { |
|
136 | 136 |
return null; |
137 | 137 |
} |
138 | 138 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLyrWMS.java | ||
---|---|---|
145 | 145 |
* capa. |
146 | 146 |
* |
147 | 147 |
* @return XMLEntity. |
148 |
* @throws XMLException |
|
148 | 149 |
*/ |
149 |
public XMLEntity getXMLEntity() { |
|
150 |
public XMLEntity getXMLEntity() throws XMLException {
|
|
150 | 151 |
XMLEntity xml = super.getXMLEntity(); |
151 | 152 |
|
152 | 153 |
xml.putProperty("fullExtent", StringUtilities.rect2String(fullExtent)); |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/LayerFactory.java | ||
---|---|---|
44 | 44 |
import com.hardcode.driverManager.DriverLoadException; |
45 | 45 |
import com.hardcode.driverManager.DriverManager; |
46 | 46 |
|
47 |
import com.hardcode.gdbms.engine.customQuery.QueryManager; |
|
47 | 48 |
import com.hardcode.gdbms.engine.data.DataSourceFactory; |
48 | 49 |
import com.hardcode.gdbms.engine.instruction.FieldNotFoundException; |
49 | 50 |
|
... | ... | |
55 | 56 |
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver; |
56 | 57 |
import com.iver.cit.gvsig.fmap.drivers.WithDefaultLegend; |
57 | 58 |
import com.iver.cit.gvsig.fmap.drivers.wfs.WFSDriver; |
59 |
import com.iver.cit.gvsig.fmap.layers.layerOperations.AlphanumericData; |
|
60 |
import com.iver.cit.gvsig.fmap.operations.arcview.ArcJoin; |
|
58 | 61 |
import com.iver.cit.gvsig.fmap.rendering.LegendFactory; |
59 | 62 |
import com.iver.cit.gvsig.fmap.rendering.VectorialLegend; |
60 | 63 |
|
... | ... | |
85 | 88 |
private static String driversPath = "../FMap 03/drivers"; |
86 | 89 |
private static DriverManager driverManager; |
87 | 90 |
|
88 |
private static DataSourceFactory dataSourceFactory = new DataSourceFactory();
|
|
91 |
private static DataSourceFactory dataSourceFactory; |
|
89 | 92 |
|
90 | 93 |
/** |
91 | 94 |
* Map en el que se guarda para cada fuente de datos a?adida al sistema, el |
... | ... | |
97 | 100 |
*/ |
98 | 101 |
private static TreeMap sourceAdapter; |
99 | 102 |
|
100 |
/**
|
|
103 |
/* |
|
101 | 104 |
* Crea un RandomVectorialFile con el driver que se le pasa como par?metro |
102 | 105 |
* y guard?ndose el nombre del fichero para realizar los accesos, la capa |
103 | 106 |
* tendr? asociada la proyecci?n que se pasa como parametro tambi?n |
... | ... | |
112 | 115 |
* |
113 | 116 |
* @throws DriverException |
114 | 117 |
* @throws DriverIOException |
115 |
*/
|
|
118 |
* |
|
116 | 119 |
public static FLayer createLayer(String layerName, String driverName, |
117 | 120 |
File f, IProjection proj) throws DriverException { |
118 | 121 |
//Se obtiene el driver que lee |
... | ... | |
132 | 135 |
|
133 | 136 |
return null; |
134 | 137 |
} |
135 |
|
|
138 |
*/ |
|
136 | 139 |
/** |
137 | 140 |
* Crea un RandomVectorialFile con el driver que se le pasa como par?metro |
138 | 141 |
* y guard?ndose el nombre del fichero para realizar los accesos, la capa |
... | ... | |
164 | 167 |
} |
165 | 168 |
|
166 | 169 |
try { |
170 |
|
|
167 | 171 |
// Le asignamos tambi?n una legenda por defecto acorde con |
168 | 172 |
// el tipo de shape que tenga. Tampoco s? si es aqu? el |
169 | 173 |
// sitio adecuado, pero en fin.... |
... | ... | |
385 | 389 |
logger.error(failures[i]); |
386 | 390 |
} |
387 | 391 |
|
388 |
dataSourceFactory.setDriverManager(driverManager); |
|
392 |
getDataSourceFactory().setDriverManager(driverManager); |
|
393 |
QueryManager.registerQuery("arcjoin", new ArcJoin()); |
|
389 | 394 |
} |
390 | 395 |
} |
391 | 396 |
|
... | ... | |
403 | 408 |
* @return Returns the dataSourceFactory. |
404 | 409 |
*/ |
405 | 410 |
public static DataSourceFactory getDataSourceFactory() { |
411 |
if (dataSourceFactory == null){ |
|
412 |
dataSourceFactory = new DataSourceFactory(); |
|
413 |
} |
|
406 | 414 |
return dataSourceFactory; |
407 | 415 |
} |
408 | 416 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLayers.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.layers; |
42 | 42 |
|
43 |
import com.hardcode.driverManager.Driver; |
|
44 |
import com.hardcode.driverManager.DriverLoadException; |
|
43 | 45 |
import com.iver.cit.gvsig.fmap.DriverException; |
44 | 46 |
import com.iver.cit.gvsig.fmap.FMap; |
45 | 47 |
import com.iver.cit.gvsig.fmap.ViewPort; |
46 | 48 |
import com.iver.cit.gvsig.fmap.drivers.DriverIOException; |
49 |
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver; |
|
47 | 50 |
import com.iver.cit.gvsig.fmap.layers.layerOperations.LayerCollection; |
48 | 51 |
import com.iver.cit.gvsig.fmap.layers.layerOperations.VectorialData; |
49 | 52 |
import com.iver.cit.gvsig.fmap.operations.Cancellable; |
... | ... | |
418 | 421 |
} |
419 | 422 |
|
420 | 423 |
/** |
424 |
* @throws XMLException |
|
421 | 425 |
* @see com.iver.cit.gvsig.fmap.layers.FLayer#getProperties() |
422 | 426 |
*/ |
423 |
public XMLEntity getXMLEntity() { |
|
427 |
public XMLEntity getXMLEntity() throws XMLException {
|
|
424 | 428 |
XMLEntity xml = super.getXMLEntity(); |
425 | 429 |
xml.putProperty("numLayers", layers.size()); |
426 | 430 |
|
... | ... | |
461 | 465 |
String className = xml.getChild(i).getStringProperty("className"); |
462 | 466 |
|
463 | 467 |
if (className.equals(FLyrVect.class.getName())) { |
464 |
if (xml.getChild(i).contains("file")) { |
|
468 |
String type = xml.getChild(i).getStringProperty("type"); |
|
469 |
if ("vectorial".equals(type)){ |
|
470 |
String recordsetName = xml.getChild(i).getStringProperty("recordset-name"); |
|
471 |
if (xml.getChild(i).contains("file")) { |
|
472 |
Driver d; |
|
473 |
try { |
|
474 |
d = LayerFactory.getDM().getDriver(xml.getChild(i).getStringProperty("driverName")); |
|
475 |
} catch (DriverLoadException e1) { |
|
476 |
throw new XMLException(e1); |
|
477 |
} |
|
478 |
layer = LayerFactory.createLayer(s[i], (VectorialFileDriver) d, |
|
479 |
new File(xml.getChild(i).getStringProperty("file")), |
|
480 |
this.getFMap().getViewPort().getProjection()); |
|
481 |
|
|
482 |
} |
|
483 |
} else if ("raster".equals(type)) { |
|
484 |
/* if (xml.getChild(i).contains("file")) { |
|
485 |
Driver d = LayerFactory.getDM().getDriver(xml.getChild(i).getStringProperty("driverName")); |
|
486 |
layer = LayerFactory.createLayer(s[i], |
|
487 |
, |
|
488 |
new File(xml.getChild(i).getStringProperty("file")), |
|
489 |
this.getFMap().getViewPort().getProjection()); |
|
490 |
|
|
491 |
} |
|
492 |
*/ } |
|
465 | 493 |
|
466 |
layer = LayerFactory.createLayer(s[i], |
|
467 |
xml.getChild(i).getStringProperty("driverName"), |
|
468 |
new File(xml.getChild(i).getStringProperty("file")), |
|
469 |
this.getFMap().getViewPort().getProjection()); |
|
470 |
|
|
471 |
} else if (true) { |
|
472 |
//TODO falta por implementar |
|
473 |
} else if (true) { |
|
474 |
//TODO falta por implementar |
|
475 |
} |
|
476 |
|
|
477 | 494 |
layer.setXMLEntity(xml.getChild(i)); |
478 | 495 |
// Comprobar que la proyecci?n es la misma que la de FMap |
479 | 496 |
// Si no lo es, es una capa que est? reproyectada al vuelo |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/MemoryLabelAdapter.java | ||
---|---|---|
87 | 87 |
/* (non-Javadoc) |
88 | 88 |
* @see com.iver.cit.gvsig.fmap.layers.VectorialAdapter#getRecordset(java.lang.String) |
89 | 89 |
*/ |
90 |
public DataSource getRecordset(String name) throws DriverLoadException {
|
|
90 |
public DataSource getRecordset() throws DriverLoadException { |
|
91 | 91 |
return ds; |
92 | 92 |
} |
93 | 93 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/SelectableDataSource.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.layers; |
42 | 42 |
|
43 |
import java.io.IOException; |
|
44 |
|
|
45 |
import org.apache.log4j.Logger; |
|
46 |
|
|
47 |
import com.hardcode.driverManager.DriverLoadException; |
|
43 | 48 |
import com.hardcode.gdbms.engine.data.DataSource; |
44 | 49 |
import com.hardcode.gdbms.engine.data.DataSourceFactory; |
45 |
import com.hardcode.gdbms.engine.data.DriverException; |
|
50 |
import com.hardcode.gdbms.engine.data.DataSourceLayerMemento; |
|
51 |
import com.hardcode.gdbms.engine.data.Memento; |
|
52 |
import com.hardcode.gdbms.engine.data.MementoException; |
|
46 | 53 |
import com.hardcode.gdbms.engine.data.NoSuchTableException; |
47 |
import com.hardcode.gdbms.engine.data.ReadDriver; |
|
54 |
import com.hardcode.gdbms.engine.data.OperationLayerMemento; |
|
55 |
import com.hardcode.gdbms.engine.data.driver.DriverException; |
|
56 |
import com.hardcode.gdbms.engine.data.driver.DriverInfo; |
|
48 | 57 |
import com.hardcode.gdbms.engine.instruction.FieldNotFoundException; |
58 |
import com.hardcode.gdbms.engine.instruction.SemanticException; |
|
49 | 59 |
import com.hardcode.gdbms.engine.values.Value; |
50 |
|
|
60 |
import com.hardcode.gdbms.parser.ParseException; |
|
51 | 61 |
import com.iver.utiles.XMLEntity; |
52 | 62 |
|
53 |
import org.apache.log4j.Logger; |
|
54 | 63 |
|
55 |
import java.io.IOException; |
|
56 |
|
|
57 |
|
|
58 | 64 |
/** |
59 | 65 |
* DataSource seleccionable. |
60 | 66 |
* |
... | ... | |
75 | 81 |
dataSource = ds; |
76 | 82 |
} |
77 | 83 |
|
84 |
public static SelectableDataSource createSelectableDataSource(XMLEntity xml) throws NoSuchTableException, ParseException, DriverLoadException, DriverException, SemanticException, IOException{ |
|
85 |
|
|
86 |
SelectionSupport ss = new SelectionSupport(); |
|
87 |
ss.setXMLEntity(xml.getChild(0)); |
|
88 |
XMLEntity xmlDS = xml.getChild(1); |
|
89 |
DataSource dataSource = null; |
|
90 |
if (xmlDS.contains("tableName")){ |
|
91 |
dataSource = LayerFactory.getDataSourceFactory().createRandomDataSource( |
|
92 |
xmlDS.getStringProperty("tableName"), |
|
93 |
xmlDS.getStringProperty("tableAlias"), DataSourceFactory.AUTOMATIC_MODE); |
|
94 |
}else if (xmlDS.contains("sql")){ |
|
95 |
dataSource = LayerFactory.getDataSourceFactory().executeSQL(xmlDS.getStringProperty("sql"), DataSourceFactory.AUTOMATIC_MODE); |
|
96 |
} |
|
97 |
|
|
98 |
SelectableDataSource ret = new SelectableDataSource(dataSource); |
|
99 |
ret.selectionSupport = ss; |
|
100 |
|
|
101 |
return ret; |
|
102 |
} |
|
103 |
|
|
104 |
public Memento getMemento() throws MementoException { |
|
105 |
return dataSource.getMemento(); |
|
106 |
} |
|
107 |
public void setDataSourceFactory(DataSourceFactory dsf) { |
|
108 |
dataSource.setDataSourceFactory(dsf); |
|
109 |
} |
|
110 |
public void setSourceInfo(DriverInfo sourceInfo) { |
|
111 |
dataSource.setSourceInfo(sourceInfo); |
|
112 |
} |
|
78 | 113 |
/** |
79 | 114 |
* A?ade el soporte para la selecci?n. |
80 | 115 |
* |
... | ... | |
274 | 309 |
} |
275 | 310 |
} |
276 | 311 |
|
312 |
private void putMemento(XMLEntity xml) throws XMLException { |
|
313 |
try { |
|
314 |
XMLEntity child = new XMLEntity(); |
|
315 |
Memento memento = getMemento(); |
|
316 |
if (memento instanceof DataSourceLayerMemento){ |
|
317 |
DataSourceLayerMemento m = (DataSourceLayerMemento) memento; |
|
318 |
child.putProperty("tableAlias", m.getTableAlias()); |
|
319 |
child.putProperty("tableName", m.getTableName()); |
|
320 |
}else if (memento instanceof OperationLayerMemento){ |
|
321 |
OperationLayerMemento m = (OperationLayerMemento) memento; |
|
322 |
child.putProperty("sql", m.getSql()); |
|
323 |
}else{ |
|
324 |
throw new RuntimeException("Tipo de dataSource no contemplado"); |
|
325 |
} |
|
326 |
|
|
327 |
xml.addChild(child); |
|
328 |
} catch (MementoException e) { |
|
329 |
throw new XMLException(e); |
|
330 |
} |
|
331 |
} |
|
332 |
|
|
277 | 333 |
/** |
278 | 334 |
* Devuelve el XMLEntity con la informaci?n necesaria para reproducir el |
279 | 335 |
* DataSource. |
280 | 336 |
* |
281 | 337 |
* @return XMLEntity. |
338 |
* @throws XMLException |
|
282 | 339 |
*/ |
283 |
public XMLEntity getXMLEntity() { |
|
340 |
public XMLEntity getXMLEntity() throws XMLException {
|
|
284 | 341 |
XMLEntity xml = new XMLEntity(); |
285 | 342 |
xml.putProperty("className",this.getClass().getName()); |
286 | 343 |
xml.addChild(selectionSupport.getXMLEntity()); |
344 |
putMemento(xml); |
|
287 | 345 |
|
288 | 346 |
return xml; |
289 | 347 |
} |
290 | 348 |
|
291 | 349 |
/** |
292 |
* A partir del XMLEntity se rellenan los atributos del DataSource. |
|
293 |
* |
|
294 |
* @param child |
|
295 |
*/ |
|
296 |
public void setXMLEntity(XMLEntity child) { |
|
297 |
selectionSupport.setXMLEntity(child.getChild(0)); |
|
298 |
} |
|
299 |
|
|
300 |
/** |
|
301 | 350 |
* @see com.hardcode.gdbms.engine.data.DataSource#getWhereFilter() |
302 | 351 |
*/ |
303 | 352 |
public long[] getWhereFilter() throws IOException { |
... | ... | |
310 | 359 |
public int getFieldType(int i) throws DriverException { |
311 | 360 |
return dataSource.getFieldType(i); |
312 | 361 |
} |
362 |
|
|
363 |
/** |
|
364 |
* @see com.hardcode.gdbms.engine.data.DataSource#getDataSourceFactory() |
|
365 |
*/ |
|
366 |
public DataSourceFactory getDataSourceFactory() { |
|
367 |
return dataSource.getDataSourceFactory(); |
|
368 |
} |
|
369 |
|
|
370 |
/** |
|
371 |
* @see com.hardcode.gdbms.engine.data.HasProperties#getProperty(java.lang.String) |
|
372 |
*/ |
|
373 |
public String getProperty(String propertyName) { |
|
374 |
return dataSource.getProperty(propertyName); |
|
375 |
} |
|
376 |
|
|
377 |
/** |
|
378 |
* @see com.hardcode.gdbms.engine.data.DataSource#getAsString() |
|
379 |
*/ |
|
380 |
public String getAsString() throws DriverException { |
|
381 |
return dataSource.getAsString(); |
|
382 |
} |
|
313 | 383 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/FMap.java | ||
---|---|---|
514 | 514 |
* Devuelve el XMLEntity. |
515 | 515 |
* |
516 | 516 |
* @return XMLEntity. |
517 |
* @throws XMLException |
|
517 | 518 |
*/ |
518 |
public XMLEntity getXMLEntity() { |
|
519 |
public XMLEntity getXMLEntity() throws XMLException {
|
|
519 | 520 |
XMLEntity xml = new XMLEntity(); |
520 | 521 |
xml.putProperty("className",this.getClass().getName()); |
521 | 522 |
xml.addChild(viewPort.getXMLEntity()); |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/VectorialIntervalLegend.java | ||
---|---|---|
162 | 162 |
} else { |
163 | 163 |
return getDefaultSymbol(); |
164 | 164 |
} |
165 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
165 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
166 | 166 |
throw new DriverException(e); |
167 | 167 |
} |
168 | 168 |
} |
... | ... | |
395 | 395 |
ds.start(); |
396 | 396 |
fieldId = ds.getFieldIndexByName(fieldName); |
397 | 397 |
ds.stop(); |
398 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
398 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
399 | 399 |
throw new DriverException(e); |
400 | 400 |
} |
401 | 401 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/LegendFactory.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.rendering; |
42 | 42 |
|
43 |
import com.hardcode.gdbms.engine.data.DriverException; |
|
43 |
import com.hardcode.gdbms.engine.data.driver.DriverException;
|
|
44 | 44 |
|
45 | 45 |
import com.iver.cit.gvsig.fmap.core.FShape; |
46 | 46 |
import com.iver.cit.gvsig.fmap.core.v02.FConstant; |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/rendering/VectorialUniqueValueLegend.java | ||
---|---|---|
300 | 300 |
} else { |
301 | 301 |
return getDefaultSymbol(); |
302 | 302 |
} |
303 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
303 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
304 | 304 |
throw new DriverException(e); |
305 | 305 |
} |
306 | 306 |
} |
... | ... | |
420 | 420 |
ds.start(); |
421 | 421 |
fieldId = ds.getFieldIndexByName(fieldName); |
422 | 422 |
ds.stop(); |
423 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
423 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
424 | 424 |
throw new DriverException(e); |
425 | 425 |
} |
426 | 426 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/WMSDriver.java | ||
---|---|---|
41 | 41 |
package com.iver.cit.gvsig.fmap.drivers; |
42 | 42 |
|
43 | 43 |
import java.awt.Image; |
44 |
|
|
45 | 44 |
import java.io.IOException; |
46 |
|
|
47 | 45 |
import java.net.ProtocolException; |
48 | 46 |
import java.net.URL; |
49 | 47 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/MemoryDriver.java | ||
---|---|---|
55 | 55 |
|
56 | 56 |
import javax.swing.table.DefaultTableModel; |
57 | 57 |
|
58 |
import com.hardcode.gdbms.engine.data.DriverException; |
|
59 |
import com.hardcode.gdbms.engine.data.ReadDriver;
|
|
58 |
import com.hardcode.gdbms.engine.data.driver.DriverException;
|
|
59 |
import com.hardcode.gdbms.engine.data.driver.ObjectDriver;
|
|
60 | 60 |
import com.hardcode.gdbms.engine.values.Value; |
61 | 61 |
import com.iver.cit.gvsig.fmap.core.FShape; |
62 | 62 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
... | ... | |
69 | 69 |
* |
70 | 70 |
* @author FJP |
71 | 71 |
*/ |
72 |
public abstract class MemoryDriver implements VectorialFileDriver, ReadDriver,
|
|
72 |
public abstract class MemoryDriver implements VectorialFileDriver, ObjectDriver,
|
|
73 | 73 |
BoundedShapes { |
74 | 74 |
private MemoryShapeInfo memShapeInfo = new MemoryShapeInfo(); |
75 | 75 |
private ArrayList arrayGeometries = new ArrayList(); |
... | ... | |
218 | 218 |
if (m_TableModel.getColumnClass(i) == Date.class) |
219 | 219 |
return Types.DATE; |
220 | 220 |
|
221 |
|
|
221 |
return Types.VARCHAR; |
|
222 | 222 |
// return m_TableModel.getColumnClass(i); |
223 |
throw new DriverException("Tipo no soportado: " + m_TableModel.getColumnClass(i).getName()); |
|
223 |
// throw new DriverException("Tipo no soportado: " + m_TableModel.getColumnClass(i).getName());
|
|
224 | 224 |
} |
225 | 225 |
/* (non-Javadoc) |
226 | 226 |
* @see com.hardcode.gdbms.engine.data.ReadDriver#getFieldValue(long, int) |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/dgn/DgnMemoryDriver.java | ||
---|---|---|
50 | 50 |
*/ |
51 | 51 |
package com.iver.cit.gvsig.fmap.drivers.dgn; |
52 | 52 |
|
53 |
import com.hardcode.gdbms.engine.data.DriverException; |
|
54 |
import com.hardcode.gdbms.engine.data.ReadDriver; |
|
53 |
import java.awt.Color; |
|
54 |
import java.awt.Font; |
|
55 |
import java.awt.geom.AffineTransform; |
|
56 |
import java.awt.geom.Arc2D; |
|
57 |
import java.io.File; |
|
58 |
import java.io.IOException; |
|
59 |
import java.util.ArrayList; |
|
60 |
|
|
61 |
import com.hardcode.gdbms.engine.data.driver.DriverException; |
|
62 |
import com.hardcode.gdbms.engine.data.driver.ObjectDriver; |
|
55 | 63 |
import com.hardcode.gdbms.engine.values.IntValue; |
56 | 64 |
import com.hardcode.gdbms.engine.values.Value; |
57 | 65 |
import com.hardcode.gdbms.engine.values.ValueFactory; |
58 |
|
|
59 | 66 |
import com.iver.cit.gvsig.fmap.core.FPoint2D; |
60 | 67 |
import com.iver.cit.gvsig.fmap.core.FPoint3D; |
61 | 68 |
import com.iver.cit.gvsig.fmap.core.FPolygon2D; |
... | ... | |
70 | 77 |
import com.iver.cit.gvsig.fmap.rendering.Legend; |
71 | 78 |
import com.iver.cit.gvsig.fmap.rendering.LegendFactory; |
72 | 79 |
import com.iver.cit.gvsig.fmap.rendering.VectorialUniqueValueLegend; |
73 |
import com.iver.cit.gvsig.fmap.rendering.styling.FStyle2D; |
|
74 | 80 |
|
75 |
import java.awt.BasicStroke; |
|
76 |
import java.awt.Color; |
|
77 |
import java.awt.Font; |
|
78 |
import java.awt.Graphics2D; |
|
79 |
import java.awt.Paint; |
|
80 |
import java.awt.Rectangle; |
|
81 |
import java.awt.TexturePaint; |
|
82 |
import java.awt.geom.AffineTransform; |
|
83 |
import java.awt.geom.Arc2D; |
|
84 |
import java.awt.geom.Rectangle2D; |
|
85 |
import java.awt.image.BufferedImage; |
|
86 | 81 |
|
87 |
import java.io.File; |
|
88 |
import java.io.IOException; |
|
89 |
|
|
90 |
import java.util.ArrayList; |
|
91 |
|
|
92 |
|
|
93 | 82 |
/** |
94 | 83 |
* Driver DGN que trabaja directamente cargando el fichero en memoria. |
95 | 84 |
* |
... | ... | |
528 | 517 |
defaultLegend.setLabelHeightField("HeightText"); |
529 | 518 |
defaultLegend.setLabelRotationField("RotationText"); |
530 | 519 |
|
531 |
ReadDriver rs = this;
|
|
520 |
ObjectDriver rs = this;
|
|
532 | 521 |
IntValue clave; |
533 | 522 |
FSymbol theSymbol = null; |
534 | 523 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/dgn/DGNDriver.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.drivers.dgn; |
42 | 42 |
|
43 |
import com.hardcode.gdbms.engine.data.DriverException; |
|
44 |
import com.hardcode.gdbms.engine.data.FileDriver; |
|
45 |
import com.hardcode.gdbms.engine.values.Value; |
|
46 |
|
|
47 |
import com.iver.cit.gvsig.fmap.core.GeneralPathX; |
|
48 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
|
49 |
import com.iver.cit.gvsig.fmap.core.ShapeFactory; |
|
50 |
import com.iver.cit.gvsig.fmap.drivers.DriverAttributes; |
|
51 |
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver; |
|
52 |
|
|
53 | 43 |
import java.awt.geom.AffineTransform; |
54 | 44 |
import java.awt.geom.Arc2D; |
55 | 45 |
import java.awt.geom.Rectangle2D; |
56 |
|
|
57 | 46 |
import java.io.File; |
58 | 47 |
import java.io.IOException; |
59 |
|
|
60 | 48 |
import java.util.ArrayList; |
61 | 49 |
|
50 |
import com.hardcode.gdbms.engine.data.driver.DriverException; |
|
51 |
import com.hardcode.gdbms.engine.data.driver.FileDriver; |
|
52 |
import com.hardcode.gdbms.engine.values.Value; |
|
53 |
import com.iver.cit.gvsig.fmap.core.GeneralPathX; |
|
54 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
|
55 |
import com.iver.cit.gvsig.fmap.core.ShapeFactory; |
|
56 |
import com.iver.cit.gvsig.fmap.drivers.DriverAttributes; |
|
57 |
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver; |
|
62 | 58 |
|
59 |
|
|
63 | 60 |
/** |
64 | 61 |
* Driver DGN. |
65 | 62 |
* |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/dxf/DXFDriver.java | ||
---|---|---|
63 | 63 |
import org.cresques.px.gml.Point; |
64 | 64 |
import org.cresques.px.gml.Polygon; |
65 | 65 |
|
66 |
import com.hardcode.gdbms.engine.data.DriverException; |
|
67 |
import com.hardcode.gdbms.engine.data.FileDriver; |
|
66 |
import com.hardcode.gdbms.engine.data.driver.DriverException;
|
|
67 |
import com.hardcode.gdbms.engine.data.driver.FileDriver;
|
|
68 | 68 |
import com.hardcode.gdbms.engine.values.Value; |
69 | 69 |
import com.iver.cit.gvsig.fmap.core.FShape; |
70 | 70 |
import com.iver.cit.gvsig.fmap.core.GeneralPathX; |
... | ... | |
73 | 73 |
import com.iver.cit.gvsig.fmap.drivers.BoundedShapes; |
74 | 74 |
import com.iver.cit.gvsig.fmap.drivers.DriverAttributes; |
75 | 75 |
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver; |
76 |
import com.iver.cit.gvsig.fmap.drivers.shp.SHP; |
|
77 | 76 |
|
78 | 77 |
/** |
79 | 78 |
* @author jmorell (jose.morell@gmail.com) |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/dxf/DXFMemoryDriver.java | ||
---|---|---|
47 | 47 |
|
48 | 48 |
import java.awt.Color; |
49 | 49 |
import java.awt.Font; |
50 |
import java.awt.Graphics2D; |
|
51 |
import java.awt.Paint; |
|
52 |
import java.awt.Rectangle; |
|
53 |
import java.awt.TexturePaint; |
|
54 | 50 |
import java.awt.geom.Point2D; |
55 |
import java.awt.geom.Rectangle2D; |
|
56 |
import java.awt.image.BufferedImage; |
|
57 | 51 |
import java.io.File; |
58 | 52 |
import java.io.IOException; |
59 | 53 |
import java.util.ArrayList; |
... | ... | |
64 | 58 |
import org.cresques.px.IObjList; |
65 | 59 |
import org.cresques.px.dxf.AcadColor; |
66 | 60 |
import org.cresques.px.dxf.DxfFeatureMaker; |
67 |
import org.cresques.px.dxf.DxfHeaderManager; |
|
68 | 61 |
import org.cresques.px.gml.Feature; |
69 | 62 |
import org.cresques.px.gml.InsPoint; |
70 | 63 |
import org.cresques.px.gml.LineString; |
71 | 64 |
import org.cresques.px.gml.Point; |
72 | 65 |
import org.cresques.px.gml.Polygon; |
73 | 66 |
|
74 |
import com.hardcode.gdbms.engine.data.DriverException; |
|
75 |
import com.hardcode.gdbms.engine.data.ReadDriver;
|
|
67 |
import com.hardcode.gdbms.engine.data.driver.DriverException;
|
|
68 |
import com.hardcode.gdbms.engine.data.driver.ObjectDriver;
|
|
76 | 69 |
import com.hardcode.gdbms.engine.values.IntValue; |
77 | 70 |
import com.hardcode.gdbms.engine.values.Value; |
78 | 71 |
import com.hardcode.gdbms.engine.values.ValueFactory; |
... | ... | |
331 | 324 |
defaultLegend.setLabelHeightField("HeightText"); |
332 | 325 |
defaultLegend.setLabelRotationField("RotationText"); |
333 | 326 |
|
334 |
ReadDriver rs = this;
|
|
327 |
ObjectDriver rs = this;
|
|
335 | 328 |
IntValue clave; |
336 | 329 |
FSymbol theSymbol = null; |
337 | 330 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/VectorialDriver.java | ||
---|---|---|
44 | 44 |
import java.io.IOException; |
45 | 45 |
|
46 | 46 |
import com.hardcode.driverManager.Driver; |
47 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
|
48 | 47 |
|
49 | 48 |
|
50 | 49 |
/** |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/VectorialFileDriver.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.drivers; |
42 | 42 |
|
43 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
|
44 |
|
|
45 |
import java.awt.geom.Rectangle2D; |
|
46 |
|
|
47 | 43 |
import java.io.File; |
48 | 44 |
import java.io.IOException; |
49 | 45 |
|
46 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
|
50 | 47 |
|
48 |
|
|
51 | 49 |
/** |
52 | 50 |
* Interfaz a implementar por los drivers. El constructor no ha de tener |
53 | 51 |
* par?metros y ha de ser r?pido, para las tareas de inicializaci?n de la capa |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/DefaultDBDriver.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.drivers; |
42 | 42 |
|
43 |
import java.awt.geom.Rectangle2D; |
|
44 | 43 |
import java.io.IOException; |
45 | 44 |
import java.sql.Connection; |
46 | 45 |
import java.sql.ResultSet; |
... | ... | |
48 | 47 |
import java.sql.SQLException; |
49 | 48 |
import java.sql.Statement; |
50 | 49 |
import java.sql.Types; |
51 |
import java.util.Date; |
|
52 | 50 |
|
53 |
import org.postgis.Geometry; |
|
54 |
import org.postgis.PGbox3d; |
|
55 |
import org.postgis.Point; |
|
56 |
|
|
57 |
import com.hardcode.gdbms.engine.data.DataSource; |
|
58 |
import com.hardcode.gdbms.engine.data.ReadDriver; |
|
51 |
import com.hardcode.gdbms.engine.data.driver.ObjectDriver; |
|
59 | 52 |
import com.hardcode.gdbms.engine.values.Value; |
60 | 53 |
import com.hardcode.gdbms.engine.values.ValueFactory; |
61 | 54 |
import com.iver.cit.gvsig.fmap.DriverException; |
62 | 55 |
import com.iver.cit.gvsig.fmap.core.FShape; |
63 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
|
64 |
import com.iver.cit.gvsig.fmap.drivers.jdbc.postgis.WKTParser; |
|
65 |
import com.vividsolutions.jts.io.ParseException; |
|
66 | 56 |
|
67 | 57 |
|
68 | 58 |
|
69 | 59 |
/** |
70 | 60 |
* Clase abstracta qu |
71 | 61 |
*/ |
72 |
public abstract class DefaultDBDriver implements VectorialDatabaseDriver, ReadDriver {
|
|
62 |
public abstract class DefaultDBDriver implements VectorialDatabaseDriver, ObjectDriver {
|
|
73 | 63 |
/** |
74 | 64 |
* |
75 | 65 |
*/ |
... | ... | |
143 | 133 |
return FShape.MULTI; |
144 | 134 |
} |
145 | 135 |
|
146 |
public int getFieldType(int idField) throws com.hardcode.gdbms.engine.data.DriverException |
|
136 |
public int getFieldType(int idField) throws com.hardcode.gdbms.engine.data.driver.DriverException
|
|
147 | 137 |
{ |
148 | 138 |
String str = ""; |
149 | 139 |
try { |
... | ... | |
165 | 155 |
if (metaData.getColumnType(i) == Types.DATE) |
166 | 156 |
return Types.DATE; |
167 | 157 |
} catch (SQLException e) { |
168 |
throw new com.hardcode.gdbms.engine.data.DriverException(e); |
|
158 |
throw new com.hardcode.gdbms.engine.data.driver.DriverException(e);
|
|
169 | 159 |
} |
170 |
throw new com.hardcode.gdbms.engine.data.DriverException("Tipo no soportado: " + str); |
|
160 |
throw new com.hardcode.gdbms.engine.data.driver.DriverException("Tipo no soportado: " + str);
|
|
171 | 161 |
} |
172 | 162 |
/** |
173 | 163 |
* Obtiene el valor que se encuentra en la fila y columna indicada |
... | ... | |
183 | 173 |
* @throws DriverException Si se produce un error accediendo al DataSource |
184 | 174 |
*/ |
185 | 175 |
public Value getFieldValue(long rowIndex, int idField) |
186 |
throws com.hardcode.gdbms.engine.data.DriverException |
|
176 |
throws com.hardcode.gdbms.engine.data.driver.DriverException
|
|
187 | 177 |
{ |
188 | 178 |
int i = (int) (rowIndex + 1); |
189 | 179 |
int fieldId = idField+2; |
... | ... | |
204 | 194 |
if (metaData.getColumnType(fieldId) == Types.DATE) |
205 | 195 |
return ValueFactory.createValue(rs.getDate(fieldId)); |
206 | 196 |
} catch (SQLException e) { |
207 |
throw new com.hardcode.gdbms.engine.data.DriverException("Tipo no soportado: columna " + fieldId ); |
|
197 |
throw new com.hardcode.gdbms.engine.data.driver.DriverException("Tipo no soportado: columna " + fieldId );
|
|
208 | 198 |
} |
209 | 199 |
return null; |
210 | 200 |
|
... | ... | |
219 | 209 |
* @throws DriverException Si se produce alg?n error accediendo al |
220 | 210 |
* DataSource |
221 | 211 |
*/ |
222 |
public int getFieldCount() throws com.hardcode.gdbms.engine.data.DriverException |
|
212 |
public int getFieldCount() throws com.hardcode.gdbms.engine.data.driver.DriverException
|
|
223 | 213 |
{ |
224 | 214 |
try { |
225 | 215 |
// Suponemos que el primer campo es el de las geometries, y no lo |
226 | 216 |
// contamos |
227 | 217 |
return rs.getMetaData().getColumnCount()-1; |
228 | 218 |
} catch (SQLException e) { |
229 |
throw new com.hardcode.gdbms.engine.data.DriverException(e); |
|
219 |
throw new com.hardcode.gdbms.engine.data.driver.DriverException(e);
|
|
230 | 220 |
} |
231 | 221 |
|
232 | 222 |
} |
... | ... | |
237 | 227 |
* @param fieldId ?ndice del campo cuyo nombre se quiere obtener |
238 | 228 |
* |
239 | 229 |
* @return |
240 |
* @throws com.hardcode.gdbms.engine.data.DriverException |
|
230 |
* @throws com.hardcode.gdbms.engine.data.driver.DriverException
|
|
241 | 231 |
* |
242 | 232 |
* @throws DriverException Si se produce alg?n error accediendo al |
243 | 233 |
* DataSource |
244 | 234 |
*/ |
245 |
public String getFieldName(int fieldId) throws com.hardcode.gdbms.engine.data.DriverException |
|
235 |
public String getFieldName(int fieldId) throws com.hardcode.gdbms.engine.data.driver.DriverException
|
|
246 | 236 |
{ |
247 | 237 |
try { |
248 | 238 |
return rs.getMetaData().getColumnName(fieldId+2); |
249 | 239 |
} catch (SQLException e) { |
250 |
throw new com.hardcode.gdbms.engine.data.DriverException(e); |
|
240 |
throw new com.hardcode.gdbms.engine.data.driver.DriverException(e);
|
|
251 | 241 |
} |
252 | 242 |
} |
253 | 243 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/shp/DBFFromGeometries.java | ||
---|---|---|
114 | 114 |
|
115 | 115 |
///} catch (DriverException e1) { |
116 | 116 |
// e1.printStackTrace(); |
117 |
} catch (com.hardcode.gdbms.engine.data.DriverException e2) { |
|
117 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e2) {
|
|
118 | 118 |
e2.printStackTrace(); |
119 | 119 |
} |
120 | 120 |
|
... | ... | |
151 | 151 |
dbfWrite.write(record); |
152 | 152 |
} |
153 | 153 |
} |
154 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
154 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
155 | 155 |
e.printStackTrace(); |
156 | 156 |
} catch (IOException e1) { |
157 | 157 |
e1.printStackTrace(); |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/shp/SHP.java | ||
---|---|---|
151 | 151 |
dbf.createdbf(visitor.getBitSet()); |
152 | 152 |
dbf.stop(); |
153 | 153 |
visitor.getSDS().stop(); |
154 |
} catch (com.hardcode.gdbms.engine.data.DriverException e2) { |
|
154 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e2) {
|
|
155 | 155 |
e2.printStackTrace(); |
156 | 156 |
} |
157 | 157 |
|
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/shp/write/DBFFromSelected.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.drivers.shp.write; |
42 | 42 |
|
43 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
|
44 |
import com.iver.cit.gvsig.fmap.drivers.shp.DbaseFileHeaderNIO; |
|
45 |
import com.iver.cit.gvsig.fmap.drivers.shp.DbaseFileWriterNIO; |
|
46 |
import com.iver.cit.gvsig.fmap.layers.FBitSet; |
|
47 |
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource; |
|
48 |
|
|
49 | 43 |
import java.io.File; |
50 | 44 |
import java.io.IOException; |
51 |
import java.io.OutputStream; |
|
52 | 45 |
import java.io.RandomAccessFile; |
53 |
|
|
54 |
import java.net.MalformedURLException; |
|
55 |
import java.net.URL; |
|
56 |
|
|
57 |
import java.nio.channels.Channels; |
|
58 | 46 |
import java.nio.channels.FileChannel; |
59 | 47 |
import java.nio.channels.WritableByteChannel; |
60 | 48 |
|
49 |
import com.hardcode.gdbms.engine.data.driver.DriverException; |
|
50 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
|
51 |
import com.iver.cit.gvsig.fmap.drivers.shp.DbaseFileHeaderNIO; |
|
52 |
import com.iver.cit.gvsig.fmap.drivers.shp.DbaseFileWriterNIO; |
|
53 |
import com.iver.cit.gvsig.fmap.layers.FBitSet; |
|
54 |
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource; |
|
61 | 55 |
|
56 |
|
|
62 | 57 |
/** |
63 | 58 |
* Visitor de zoom a lo seleccionado. |
64 | 59 |
* |
... | ... | |
137 | 132 |
|
138 | 133 |
///} catch (DriverException e1) { |
139 | 134 |
// e1.printStackTrace(); |
140 |
} catch (com.hardcode.gdbms.engine.data.DriverException e2) {
|
|
141 |
e2.printStackTrace();
|
|
135 |
} catch (DriverException e) {
|
|
136 |
e.printStackTrace(); |
|
142 | 137 |
} |
143 | 138 |
|
144 | 139 |
//return true; |
... | ... | |
174 | 169 |
|
175 | 170 |
dbfWrite.write(record); |
176 | 171 |
} |
177 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
178 |
e.printStackTrace(); |
|
179 | 172 |
} catch (IOException e1) { |
180 | 173 |
e1.printStackTrace(); |
174 |
} catch (DriverException e) { |
|
175 |
e.printStackTrace(); |
|
181 | 176 |
} |
182 | 177 |
} |
183 | 178 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/drivers/shp/DbaseFileHeaderNIO.java | ||
---|---|---|
62 | 62 |
*/ |
63 | 63 |
package com.iver.cit.gvsig.fmap.drivers.shp; |
64 | 64 |
|
65 |
import com.hardcode.gdbms.engine.data.DriverException; |
|
66 |
import com.hardcode.gdbms.engine.instruction.SemanticException; |
|
67 |
import com.hardcode.gdbms.engine.values.Value; |
|
68 |
|
|
69 |
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource; |
|
70 |
|
|
71 |
import com.vividsolutions.jts.geom.Geometry; |
|
72 |
|
|
73 | 65 |
import java.io.EOFException; |
74 | 66 |
import java.io.IOException; |
75 |
|
|
76 | 67 |
import java.nio.ByteBuffer; |
77 | 68 |
import java.nio.ByteOrder; |
78 | 69 |
import java.nio.channels.ReadableByteChannel; |
79 | 70 |
import java.nio.channels.WritableByteChannel; |
80 |
|
|
81 | 71 |
import java.sql.Types; |
82 | 72 |
import java.util.Calendar; |
83 | 73 |
import java.util.Date; |
84 | 74 |
import java.util.logging.Level; |
85 | 75 |
import java.util.logging.Logger; |
86 | 76 |
|
77 |
import com.hardcode.gdbms.engine.data.driver.DriverException; |
|
78 |
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource; |
|
79 |
import com.vividsolutions.jts.geom.Geometry; |
|
87 | 80 |
|
81 |
|
|
88 | 82 |
/** |
89 | 83 |
* Class to represent the header of a Dbase III file. Creation date: (5/15/2001 |
90 | 84 |
* 5:15:30 PM) |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/ShpStrategy.java | ||
---|---|---|
228 | 228 |
System.out.println(t2 - t1); |
229 | 229 |
} catch (DriverIOException e) { |
230 | 230 |
throw new DriverException(e); |
231 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
231 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
232 | 232 |
throw new DriverException(e); |
233 | 233 |
} catch (DriverException e) { |
234 | 234 |
throw new DriverException(e); |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/SelectedShapeVisitor.java | ||
---|---|---|
43 | 43 |
import java.util.ArrayList; |
44 | 44 |
import java.util.BitSet; |
45 | 45 |
|
46 |
import com.iver.cit.gvsig.fmap.DriverException; |
|
46 | 47 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
47 | 48 |
import com.iver.cit.gvsig.fmap.layers.FLayer; |
48 | 49 |
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource; |
... | ... | |
81 | 82 |
if (layer instanceof AlphanumericData && layer instanceof Selectable) { |
82 | 83 |
try { |
83 | 84 |
sds = ((AlphanumericData) layer).getRecordset(); |
84 |
bitset = ((Selectable) layer).getSelection(); |
|
85 |
} catch (com.iver.cit.gvsig.fmap.DriverException e) { |
|
85 |
} catch (DriverException e) { |
|
86 | 86 |
e.printStackTrace(); |
87 | 87 |
} |
88 |
bitset = ((Selectable) layer).getSelection(); |
|
88 | 89 |
|
89 | 90 |
return true; |
90 | 91 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/OptimiceStrategy.java | ||
---|---|---|
129 | 129 |
System.out.println(t2 - t1); |
130 | 130 |
} catch (DriverIOException e) { |
131 | 131 |
throw new DriverException(e); |
132 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
132 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
133 | 133 |
throw new DriverException(e); |
134 | 134 |
} |
135 | 135 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/DefaultStrategy.java | ||
---|---|---|
40 | 40 |
*/ |
41 | 41 |
package com.iver.cit.gvsig.fmap.operations.strategies; |
42 | 42 |
|
43 |
import java.awt.Graphics2D; |
|
44 |
import java.awt.geom.AffineTransform; |
|
45 |
import java.awt.geom.Point2D; |
|
46 |
import java.awt.geom.Rectangle2D; |
|
47 |
import java.awt.image.BufferedImage; |
|
48 |
import java.util.BitSet; |
|
49 |
|
|
50 |
import org.apache.log4j.Logger; |
|
51 |
import org.cresques.cts.ICoordTrans; |
|
52 |
|
|
43 | 53 |
import com.iver.cit.gvsig.fmap.DriverException; |
44 | 54 |
import com.iver.cit.gvsig.fmap.ViewPort; |
45 | 55 |
import com.iver.cit.gvsig.fmap.core.IGeometry; |
46 | 56 |
import com.iver.cit.gvsig.fmap.core.v02.FSymbol; |
47 | 57 |
import com.iver.cit.gvsig.fmap.drivers.DriverAttributes; |
48 | 58 |
import com.iver.cit.gvsig.fmap.drivers.DriverIOException; |
49 |
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver; |
|
50 | 59 |
import com.iver.cit.gvsig.fmap.layers.FLayer; |
51 | 60 |
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource; |
52 | 61 |
import com.iver.cit.gvsig.fmap.layers.VectorialAdapter; |
... | ... | |
57 | 66 |
import com.iver.cit.gvsig.fmap.rendering.VectorialLegend; |
58 | 67 |
import com.iver.cit.gvsig.fmap.rendering.styling.FStyle2D; |
59 | 68 |
|
60 |
import org.apache.log4j.Logger; |
|
61 | 69 |
|
62 |
import org.cresques.cts.ICoordTrans; |
|
63 |
|
|
64 |
import java.awt.Graphics2D; |
|
65 |
import java.awt.geom.AffineTransform; |
|
66 |
import java.awt.geom.Point2D; |
|
67 |
import java.awt.geom.Rectangle2D; |
|
68 |
import java.awt.image.BufferedImage; |
|
69 |
|
|
70 |
import java.util.BitSet; |
|
71 |
|
|
72 |
|
|
73 | 70 |
/** |
74 | 71 |
* Implementa la Strategy por defecto. Los m?todos que tendr?n en com?n la |
75 | 72 |
* mayor parte de las estrategias |
... | ... | |
224 | 221 |
System.out.println(t2 - t1); |
225 | 222 |
} catch (DriverIOException e) { |
226 | 223 |
throw new DriverException(e); |
227 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
224 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
228 | 225 |
throw new DriverException(e); |
229 | 226 |
} catch (DriverException e) { |
230 | 227 |
throw new DriverException(e); |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/strategies/FirstStrategy.java | ||
---|---|---|
137 | 137 |
System.out.println(t2 - t1); |
138 | 138 |
} catch (DriverIOException e) { |
139 | 139 |
throw new DriverException(e); |
140 |
} catch (com.hardcode.gdbms.engine.data.DriverException e) { |
|
140 |
} catch (com.hardcode.gdbms.engine.data.driver.DriverException e) {
|
|
141 | 141 |
throw new DriverException(e); |
142 | 142 |
} |
143 | 143 |
} |
trunk/libraries/libFMap/src/com/iver/cit/gvsig/fmap/operations/arcview/ArcJoinDataSource.java | ||
---|---|---|
1 |
package com.iver.cit.gvsig.fmap.operations.arcview; |
|
2 |
|
|
3 |
import com.hardcode.gdbms.engine.data.DataSource; |
|
4 |
import com.hardcode.gdbms.engine.data.driver.DriverException; |
|
5 |
import com.hardcode.gdbms.engine.strategies.OperationDataSource; |
|
6 |
import com.hardcode.gdbms.engine.values.Value; |
|
7 |
|
Also available in: Unified diff