Revision 11928 branches/v10/libraries/libFMap/src/com/iver/cit/gvsig/fmap/layers/FLayers.java
| FLayers.java | ||
|---|---|---|
| 68 | 68 |
import com.iver.cit.gvsig.fmap.MapControl; |
| 69 | 69 |
import com.iver.cit.gvsig.fmap.ViewPort; |
| 70 | 70 |
import com.iver.cit.gvsig.fmap.crs.CRSFactory; |
| 71 |
import com.iver.cit.gvsig.fmap.drivers.DefaultDBDriver;
|
|
| 71 |
import com.iver.cit.gvsig.fmap.drivers.DefaultJDBCDriver;
|
|
| 72 | 72 |
import com.iver.cit.gvsig.fmap.drivers.DriverIOException; |
| 73 |
import com.iver.cit.gvsig.fmap.drivers.VectorialDatabaseDriver; |
|
| 73 |
import com.iver.cit.gvsig.fmap.drivers.IVectorialDatabaseDriver;
|
|
| 74 | 74 |
import com.iver.cit.gvsig.fmap.drivers.VectorialDriver; |
| 75 | 75 |
import com.iver.cit.gvsig.fmap.drivers.VectorialFileDriver; |
| 76 | 76 |
import com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer; |
| ... | ... | |
| 1219 | 1219 |
if (xml.contains("db")) {
|
| 1220 | 1220 |
|
| 1221 | 1221 |
String driverName = xml.getStringProperty("db");
|
| 1222 |
VectorialDatabaseDriver driver; |
|
| 1222 |
IVectorialDatabaseDriver driver;
|
|
| 1223 | 1223 |
try {
|
| 1224 |
driver = (VectorialDatabaseDriver) LayerFactory.getDM().getDriver(driverName); |
|
| 1224 |
driver = (IVectorialDatabaseDriver) LayerFactory.getDM().getDriver(driverName);
|
|
| 1225 | 1225 |
//Hay que separar la carga de los datos del XMLEntity del load. |
| 1226 | 1226 |
driver.setXMLEntity(xml.getChild(2)); |
| 1227 | 1227 |
|
| 1228 | 1228 |
boolean loadOk = false; |
| 1229 |
if (driver instanceof DefaultDBDriver) {
|
|
| 1229 |
// if (driver instanceof DefaultJDBCDriver) {
|
|
| 1230 | 1230 |
try {
|
| 1231 |
((DefaultDBDriver) driver).load();
|
|
| 1232 |
if (((DefaultDBDriver) driver)
|
|
| 1231 |
((IVectorialDatabaseDriver) driver).load();
|
|
| 1232 |
if (((IVectorialDatabaseDriver) driver)
|
|
| 1233 | 1233 |
.getConnection() != null) {
|
| 1234 | 1234 |
loadOk = true; |
| 1235 | 1235 |
} |
| ... | ... | |
| 1237 | 1237 |
e.printStackTrace(); |
| 1238 | 1238 |
loadOk = false; |
| 1239 | 1239 |
} |
| 1240 |
} else {
|
|
| 1241 |
try{
|
|
| 1242 |
((VectorialDatabaseDriver)driver).load();
|
|
| 1243 |
loadOk=true; |
|
| 1244 |
}catch (Exception e) {
|
|
| 1245 |
loadOk=false; |
|
| 1246 |
} |
|
| 1247 |
} |
|
| 1240 |
// } else {
|
|
| 1241 |
// try{
|
|
| 1242 |
// ((IVectorialDatabaseDriver)driver).load();
|
|
| 1243 |
// loadOk=true;
|
|
| 1244 |
// }catch (Exception e) {
|
|
| 1245 |
// loadOk=false;
|
|
| 1246 |
// }
|
|
| 1247 |
// }
|
|
| 1248 | 1248 |
|
| 1249 | 1249 |
layer = LayerFactory.createDBLayer(driver, name, proj); |
| 1250 | 1250 |
if (!loadOk) {
|
Also available in: Unified diff