Changeset 3779 in josm for trunk/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java

Timestamp:

2011-01-08T01:04:23+01:00 (13 years ago)

Author:

Upliner

Message:

Identify projections in offset bookmarks by EPSG codes, bugfixes in getPreferencesFromCode() functions as they're critical now.

File:

• trunk/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java

@@ -9 +9 @@
 
 import java.awt.GridBagLayout;
+import java.awt.event.ActionListener;
 import java.util.Collection;
 import java.util.Collections;
@@ -410 +411 @@
     }
 
-    public void setupPreferencePanel(JPanel p) {
+    @Override
+    public void setupPreferencePanel(JPanel p, ActionListener listener) {
         JComboBox prefcb = new JComboBox(utmGeodesicsNames);
 
@@ -419 +421 @@
         p.add(prefcb, GBC.eop().fill(GBC.HORIZONTAL));
         p.add(GBC.glue(1, 1), GBC.eol().fill(GBC.BOTH));
+        if (listener != null) {
+            prefcb.addActionListener(listener);
+        }
     }
 
@@ -430 +435 @@
     }
 
+    @Override
+    public String[] allCodes() {
+        return utmEPSGs;
+    }
+
     public Collection<String> getPreferencesFromCode(String code) {
         for (int i=0; i < utmEPSGs.length; i++ )
             if (utmEPSGs[i].endsWith(code))
-                return Collections.singleton(Integer.toString(i));
+                return Collections.singleton(Integer.toString(i+1));
         return null;
     }
@@ -444 +454 @@
                 {
                     currentGeodesic = Integer.parseInt(s)-1;
-                    if(currentGeodesic < 0 || currentGeodesic > 4) {
+                    if(currentGeodesic < 0 || currentGeodesic >= utmEPSGs.length) {
                         currentGeodesic = DEFAULT_GEODESIC;
                     }