Revision: 4918
          http://sourceforge.net/p/jump-pilot/code/4918
Author:   michaudm
Date:     2016-05-21 08:50:20 +0000 (Sat, 21 May 2016)
Log Message:
-----------
Fix bugs in WritableDataStoreDataSource

Modified Paths:
--------------
    core/trunk/ChangeLog
    
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
    
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISSaveDataSourceQueryChooser.java

Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog        2016-05-20 23:13:19 UTC (rev 4917)
+++ core/trunk/ChangeLog        2016-05-21 08:50:20 UTC (rev 4918)
@@ -3,10 +3,13 @@
 # 2. make sure that lines break at 80 chars for constricted display situations
 #<-------------------------------- 80 chars 
---------------------------------->#
 
+2016-05-21 mmichaud <[email protected]>
+  * Fix bugs in WritableDataStoreDataSource
+
 2016-05-20 Giuseppe Aruta  <[email protected]>
   * Add an improved version of Layer Properties plugin
 
-2016-05-20 mmichaud
+2016-05-20 mmichaud <[email protected]>
   * Rename LineSimplifyJTS15AlgorithmPlugIn to SimplifyWithJTSAlgorithm
     Now works for every kind of geometry and always use PreserveTopology 
version
   * SpatialDatabase : small patch to avoid trying to read wkt as wkb

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
===================================================================
--- 
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
       2016-05-20 23:13:19 UTC (rev 4917)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
       2016-05-21 08:50:20 UTC (rev 4918)
@@ -215,7 +215,7 @@
                         // if createPrimaryKey=false, old gid will be 
considered as a normal attribute
                         
featureCollection.getFeatureSchema().removeExternalPrimaryKey();
                         createAndPopulateTable(conn,
-                                featureCollection, srid, geometryColumn, dim, 
normalizedColumnNames);
+                                featureCollection, srid, "GEOMETRY", dim, 
normalizedColumnNames);
                         if (createPrimaryKey) {
                             addDBPrimaryKey(conn, DEFAULT_PK_NAME);
                             // @TODO reload part is kept out of the 
transaction because it uses

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
        2016-05-20 23:13:19 UTC (rev 4917)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISSaveDataSourceQueryChooser.java
        2016-05-21 08:50:20 UTC (rev 4918)
@@ -108,7 +108,7 @@
             Layer[] layers = 
context.getWorkbenchContext().getLayerNamePanel().getSelectedLayers();
             if (layers.length == 1) {
                 FeatureSchema schema = 
layers[0].getFeatureCollectionWrapper().getFeatureSchema();
-                if (schema.hasAttribute("gid")) {
+                if (schema.hasAttribute("gid") && 
panel.isCreatePrimaryKeyColumnSelected()) {
                     JOptionPane.showMessageDialog(panel,
                             GID_ALREADY_EXISTS,
                             ERROR, JOptionPane.ERROR_MESSAGE );


------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel

Reply via email to