Changeset 3779 in josm for trunk/src/org/openstreetmap/josm/gui

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.

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• ImageryPreference.java (modified) (1 diff)
• ProjectionPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java

@@ -708 +708 @@
                 switch (column) {
                 case 0:
+                    if (info.proj == null) return "";
                     return info.proj.toString();
                 case 1:

trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java

@@ -228 +228 @@
     }
 
-    private class SBPanel extends JPanel
-    {
-        private Projection p;
-        public SBPanel(Projection pr)
+    private class SBPanel extends JPanel implements ActionListener
+    {
+        private ProjectionSubPrefs p;
+        public SBPanel(ProjectionSubPrefs pr)
         {
             super();
             p = pr;
         }
+
         @Override
-        public void paint(java.awt.Graphics g)
-        {
-            super.paint(g);
-            ((ProjectionSubPrefs) p).setPreferences(((ProjectionSubPrefs) p).getPreferences(this));
+        public void actionPerformed(ActionEvent e) {
+            p.setPreferences(p.getPreferences(this));
             updateMeta(p);
         }
@@ -255 +254 @@
         } else {
             ProjectionSubPrefs projPref = (ProjectionSubPrefs) proj;
-            projSubPrefPanel = new SBPanel(proj);
-            projPref.setupPreferencePanel(projSubPrefPanel);
+            projSubPrefPanel = new SBPanel(projPref);
+            projPref.setupPreferencePanel(projSubPrefPanel, (SBPanel)projSubPrefPanel);
         }