Revision: 4705
http://sourceforge.net/p/jump-pilot/code/4705
Author: edso
Date: 2015-12-27 18:50:54 +0000 (Sun, 27 Dec 2015)
Log Message:
-----------
replaced more occurences of renamed postgisdatastoredriver string instances
with class.getName() references
Modified Paths:
--------------
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionDescriptorPanel.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/DataStoreDataSourceFactory.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis/PostGISSaveDataSourceQueryChooser.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis/SaveToPostGISDataSource.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISSaveDataSourceQueryChooser.java
Modified:
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionDescriptorPanel.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionDescriptorPanel.java
2015-12-27 18:32:34 UTC (rev 4704)
+++
core/trunk/src/com/vividsolutions/jump/workbench/ui/plugin/datastore/ConnectionDescriptorPanel.java
2015-12-27 18:50:54 UTC (rev 4705)
@@ -419,7 +419,7 @@
frame.getContentPane().add(
new ConnectionDescriptorPanel(new Registry().createEntry(
DataStoreDriver.REGISTRY_CLASSIFICATION,
- new PostgisDataStoreDriver()),null));
+ new PostgisDSDriver()),null));
frame.pack();
frame.setVisible(true);
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/DataStoreDataSourceFactory.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/DataStoreDataSourceFactory.java
2015-12-27 18:32:34 UTC (rev 4704)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/DataStoreDataSourceFactory.java
2015-12-27 18:50:54 UTC (rev 4705)
@@ -22,7 +22,7 @@
boolean tableAlreadyCreated) throws Exception {
WritableDataStoreDataSource source;
String driverName = connectionDescriptor.getDataStoreDriverClassName();
- if
(driverName.equals("com.vividsolutions.jump.datastore.postgis.PostgisDataStoreDriver"))
{
+ if
(driverName.equals(com.vividsolutions.jump.datastore.postgis.PostgisDSDriver.class.getName()))
{
source = new PostGISDataStoreDataSource(
connectionDescriptor, datasetName, geometryAttributeName,
externalPKName);
source.setTableAlreadyCreated(tableAlreadyCreated);
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis/PostGISSaveDataSourceQueryChooser.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis/PostGISSaveDataSourceQueryChooser.java
2015-12-27 18:32:34 UTC (rev 4704)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis/PostGISSaveDataSourceQueryChooser.java
2015-12-27 18:50:54 UTC (rev 4705)
@@ -98,7 +98,7 @@
}
else if (!panel.getConnectionDescriptor()
.getDataStoreDriverClassName()
-
.equals("com.vividsolutions.jump.datastore.postgis.PostgisDataStoreDriver")) {
+
.equals(com.vividsolutions.jump.datastore.postgis.PostgisDSDriver.class.getName()))
{
JOptionPane.showMessageDialog(null,
CONNECTION_IS_NOT_POSTGIS,
ERROR, JOptionPane.ERROR_MESSAGE );
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis/SaveToPostGISDataSource.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis/SaveToPostGISDataSource.java
2015-12-27 18:32:34 UTC (rev 4704)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis/SaveToPostGISDataSource.java
2015-12-27 18:50:54 UTC (rev 4705)
@@ -125,7 +125,7 @@
// Check that Connection descriptor connects to a PostGIS
database
// @TODO the connection panel should show only PostGIS
connection
// Error message move to
PostGISSaveDataSourceQueryChooser.isInputValid
- // if
(!connectionDescriptor.getDataStoreDriverClassName().equals("com.vividsolutions.jump.datastore.postgis.PostgisDataStoreDriver"))
{
+ // if
(!connectionDescriptor.getDataStoreDriverClassName().equals(com.vividsolutions.jump.datastore.postgis.PostgisDSDriver.class.getName()))
{
// JOptionPane.showMessageDialog(null,
// "The selected Connection is not a PostGIS
connection!",
// "Error!", JOptionPane.ERROR_MESSAGE );
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISSaveDataSourceQueryChooser.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISSaveDataSourceQueryChooser.java
2015-12-27 18:32:34 UTC (rev 4704)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISSaveDataSourceQueryChooser.java
2015-12-27 18:50:54 UTC (rev 4705)
@@ -91,7 +91,7 @@
}
else if (!panel.getConnectionDescriptor()
.getDataStoreDriverClassName()
-
.equals("com.vividsolutions.jump.datastore.postgis.PostgisDataStoreDriver")) {
+
.equals(com.vividsolutions.jump.datastore.postgis.PostgisDSDriver.class.getName()))
{
JOptionPane.showMessageDialog(null,
CONNECTION_IS_NOT_POSTGIS,
ERROR, JOptionPane.ERROR_MESSAGE );
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
