Revision: 5511
          http://sourceforge.net/p/jump-pilot/code/5511
Author:   michaudm
Date:     2017-10-07 13:29:06 +0000 (Sat, 07 Oct 2017)
Log Message:
-----------
Clean and fix some problems in cts plugin

Modified Paths:
--------------
    core/trunk/src/org/openjump/core/ui/plugin/cts/CTSPlugIn.java

Modified: core/trunk/src/org/openjump/core/ui/plugin/cts/CTSPlugIn.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/cts/CTSPlugIn.java       
2017-10-07 13:15:32 UTC (rev 5510)
+++ core/trunk/src/org/openjump/core/ui/plugin/cts/CTSPlugIn.java       
2017-10-07 13:29:06 UTC (rev 5511)
@@ -76,7 +76,6 @@
 
         final String SOURCE = "source";
         final String TARGET = "target";
-        System.out.println("!!!!!!!!!");
         MultiInputDialog dialog = new 
MultiInputDialog(context.getWorkbenchFrame(), getName(), true);
 
         // Try to get the srid (epsg) of selected layers
@@ -93,7 +92,7 @@
         }
 
         final JComboBox<String> registry_cb =
-                dialog.addComboBox(REGISTRY, registry, Arrays.asList("EPSG", 
"IGNF"),"");
+                dialog.addComboBox(REGISTRY, registry, Arrays.asList(EPSG, 
IGNF),"");
 
         codes.clear();
         codes.putAll(getAvailableCRS(context, 
(String)registry_cb.getSelectedItem()));
@@ -367,11 +366,10 @@
                                     return HETEROGEN_SRC;
                                 if (cs != CoordinateSystem.UNSPECIFIED && csi 
== CoordinateSystem.UNSPECIFIED)
                                     return HETEROGEN_SRC;
-                                //try {
-                                    if (cs != null && cs.getEPSGCode() != 
csi.getEPSGCode())
+                                if (cs != null && cs != 
CoordinateSystem.UNSPECIFIED &&
+                                        csi != CoordinateSystem.UNSPECIFIED &&
+                                        cs.getEPSGCode() != csi.getEPSGCode())
                                         return HETEROGEN_SRC;
-                                //} catch (UnsupportedOperationException e) {
-                                //}
                                 if (srid != null && sridi != null && 
srid.getSRID() != sridi.getSRID())
                                     return HETEROGEN_SRC;
                             }


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel

Reply via email to