Revision: 5031
http://sourceforge.net/p/jump-pilot/code/5031
Author: michaudm
Date: 2016-09-25 22:42:47 +0000 (Sun, 25 Sep 2016)
Log Message:
-----------
Fixes on H2 Writer
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/datastore/spatialdatabases/AbstractSpatialDatabasesDSDriver.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/h2/H2DataStoreDataSource.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/h2/H2SaveDataSourceQueryChooser.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2016-09-25 11:03:56 UTC (rev 5030)
+++ core/trunk/ChangeLog 2016-09-25 22:42:47 UTC (rev 5031)
@@ -3,6 +3,9 @@
# 2. make sure that lines break at 80 chars for constricted display situations
#<-------------------------------- 80 chars
---------------------------------->#
+2016-09-25 mmichaud <[email protected]>
+ * Fix in H2 Database Writer
+
2016-09-22 mmichaud <[email protected]>
* Add getAttributeNames() to FeatureSchema
Modified:
core/trunk/src/com/vividsolutions/jump/datastore/spatialdatabases/AbstractSpatialDatabasesDSDriver.java
===================================================================
---
core/trunk/src/com/vividsolutions/jump/datastore/spatialdatabases/AbstractSpatialDatabasesDSDriver.java
2016-09-25 11:03:56 UTC (rev 5030)
+++
core/trunk/src/com/vividsolutions/jump/datastore/spatialdatabases/AbstractSpatialDatabasesDSDriver.java
2016-09-25 22:42:47 UTC (rev 5031)
@@ -166,6 +166,7 @@
Properties connProps) throws Exception {
String url = createJdbcUrl(params);
+ Logger.info("Target database URL : " + url);
// only register once per driver
if (jdbcDriver == null)
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/h2/H2DataStoreDataSource.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/h2/H2DataStoreDataSource.java
2016-09-25 11:03:56 UTC (rev 5030)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/h2/H2DataStoreDataSource.java
2016-09-25 22:42:47 UTC (rev 5031)
@@ -5,6 +5,7 @@
import com.vividsolutions.jump.datastore.SQLUtil;
import com.vividsolutions.jump.datastore.h2.H2DSConnection;
import com.vividsolutions.jump.datastore.h2.H2DataStoreDriver;
+import com.vividsolutions.jump.datastore.h2.H2ServerDataStoreDriver;
import
com.vividsolutions.jump.datastore.spatialdatabases.SpatialDatabasesDSConnection;
import com.vividsolutions.jump.feature.Feature;
import com.vividsolutions.jump.feature.FeatureCollection;
@@ -59,10 +60,21 @@
ConnectionDescriptor connectionDescriptor =
(ConnectionDescriptor)getProperties().get(CONNECTION_DESCRIPTOR_KEY);
- H2DSConnection h2Connection =
- (H2DSConnection)new H2DataStoreDriver()
-
.createConnection(connectionDescriptor.getParameterList());
+ H2DSConnection h2Connection;
+ if (connectionDescriptor.getDataStoreDriverClassName()
+
.equals(com.vividsolutions.jump.datastore.h2.H2DataStoreDriver.class.getName()))
{
+ h2Connection = (H2DSConnection)new H2DataStoreDriver()
+ .createConnection(connectionDescriptor.getParameterList());
+ } else if (connectionDescriptor.getDataStoreDriverClassName()
+
.equals(com.vividsolutions.jump.datastore.h2.H2ServerDataStoreDriver.class.getName()))
{
+ h2Connection = (H2DSConnection)new H2ServerDataStoreDriver()
+ .createConnection(connectionDescriptor.getParameterList());
+ } else {
+ throw new IllegalArgumentException("The connection does not use a
H2 Driver");
+ }
+
+
boolean hasPK = getProperties().get(EXTERNAL_PK_KEY) != null;
String PK = (String)getProperties().get(EXTERNAL_PK_KEY);
String query = buildQueryString(h2Connection);
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/h2/H2SaveDataSourceQueryChooser.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/h2/H2SaveDataSourceQueryChooser.java
2016-09-25 11:03:56 UTC (rev 5030)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/h2/H2SaveDataSourceQueryChooser.java
2016-09-25 22:42:47 UTC (rev 5031)
@@ -10,7 +10,6 @@
import org.openjump.core.ccordsys.srid.SRIDStyle;
import org.openjump.core.ui.plugin.datastore.SaveToDataStoreDataSourceQuery;
import org.openjump.core.ui.plugin.datastore.WritableDataStoreDataSource;
-import org.openjump.core.ui.plugin.datastore.postgis2.PostGISSaveDriverPanel;
import javax.swing.*;
import java.awt.*;
@@ -96,7 +95,10 @@
}
else if (!panel.getConnectionDescriptor()
.getDataStoreDriverClassName()
-
.equals(com.vividsolutions.jump.datastore.h2.H2DataStoreDriver.class.getName()))
{
+
.equals(com.vividsolutions.jump.datastore.h2.H2DataStoreDriver.class.getName())
&&
+ !panel.getConnectionDescriptor()
+ .getDataStoreDriverClassName()
+
.equals(com.vividsolutions.jump.datastore.h2.H2ServerDataStoreDriver.class.getName()))
{
JOptionPane.showMessageDialog(null,
CONNECTION_IS_NOT_H2,
ERROR, JOptionPane.ERROR_MESSAGE );
------------------------------------------------------------------------------
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
