Revision 1774 trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/project/ProjectWindow.java
ProjectWindow.java | ||
---|---|---|
63 | 63 |
import com.iver.andami.ui.mdiManager.ViewInfo; |
64 | 64 |
import com.iver.cit.gvsig.ProjectExtension; |
65 | 65 |
import com.iver.cit.gvsig.fmap.drivers.GeorreferencedRasterDriver; |
66 |
import com.iver.cit.gvsig.fmap.layers.LayerFactory; |
|
66 | 67 |
import com.iver.cit.gvsig.fmap.layers.SelectableDataSource; |
67 | 68 |
import com.iver.cit.gvsig.gui.DataBaseOpenDialog; |
68 | 69 |
import com.iver.cit.gvsig.gui.FOpenDialog; |
... | ... | |
274 | 275 |
String[] driverNames = fod.getDriverNames(); |
275 | 276 |
for (int i = 0; i < files.length; i++) { |
276 | 277 |
String name = files[i].getName(); |
277 |
DataSourceFactory.addFileDataSource(driverNames[i], name, files[i].getAbsolutePath(), files[i].getAbsolutePath());
|
|
278 |
LayerFactory.getDataSourceFactory().addFileDataSource(driverNames[i], name, files[i].getAbsolutePath(), files[i].getAbsolutePath());
|
|
278 | 279 |
|
279 |
DataSource dataSource = DataSourceFactory.createRandomDataSource(name);
|
|
280 |
DataSource dataSource = LayerFactory.getDataSourceFactory().createRandomDataSource(name);
|
|
280 | 281 |
SelectableDataSource sds = new SelectableDataSource(dataSource); |
281 | 282 |
ProjectExtension ext = (ProjectExtension) PluginServices.getExtension(ProjectExtension.class); |
282 | 283 |
ProjectTable projectTable = ProjectFactory.createTable(null, sds); |
... | ... | |
311 | 312 |
password = null; |
312 | 313 |
} |
313 | 314 |
|
314 |
DataSourceFactory.addDBDataSource(name, dbod.getHost(),
|
|
315 |
LayerFactory.getDataSourceFactory().addDBDataSource(name, dbod.getHost(),
|
|
315 | 316 |
port, user, password, dbod.getDataBase(), |
316 |
dbod.getTable(), driverName); |
|
317 |
dbod.getTable(), null, driverName);
|
|
317 | 318 |
|
318 |
DataSource dataSource = DataSourceFactory.createRandomDataSource(name);
|
|
319 |
DataSource dataSource = LayerFactory.getDataSourceFactory().createRandomDataSource(name);
|
|
319 | 320 |
SelectableDataSource sds = new SelectableDataSource(dataSource); |
320 | 321 |
|
321 | 322 |
ProjectExtension ext = (ProjectExtension) PluginServices.getExtension(ProjectExtension.class); |
Also available in: Unified diff