Changeset 3246 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-05-15T10:13:14+02:00 (15 years ago)

Author:

jttt

Message:

Add simple wrapper for preferences, add projection changed event (will be used later to replace CachedLatLon)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/preferences (added)
• data/preferences/BooleanProperty.java (added)
• data/preferences/CollectionProperty.java (added)
• data/preferences/IntegerProperty.java (added)
• data/preferences/ParametrizedCollectionProperty.java (added)
• data/preferences/StringProperty.java (added)
• gui/preferences/ProjectionPreference.java (modified) (8 diffs)

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

@@ -8 +8 @@
 import java.awt.event.ActionListener;
 import java.util.Collection;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.BorderFactory;
@@ -19 +20 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
+import org.openstreetmap.josm.data.preferences.CollectionProperty;
+import org.openstreetmap.josm.data.preferences.ParametrizedCollectionProperty;
+import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -32 +36 @@
     }
 
+    public interface ProjectionChangedListener {
+        void projectionChanged();
+    }
+
+    private static final StringProperty PROP_PROJECTION = new StringProperty("projection", Mercator.class.getName());
+    private static final StringProperty PROP_COORDINATES = new StringProperty("coordinates", null);
+    private static final CollectionProperty PROP_SUB_PROJECTION = new CollectionProperty("projection.sub", null);
+    private static final ParametrizedCollectionProperty PROP_PROJECTION_SUBPROJECTION = new ParametrizedCollectionProperty(null) {
+        @Override
+        protected String getKey(String... params) {
+            String name = params[0];
+            String sname = name.substring(name.lastIndexOf(".")+1);
+            return "projection.sub."+sname;
+        }
+    };
+
+    //TODO This is not nice place for a listener code but probably only Dataset will want to listen for projection changes so it's acceptable
+    private static CopyOnWriteArrayList<ProjectionChangedListener> listeners = new CopyOnWriteArrayList<ProjectionChangedListener>();
+
+    public static void addProjectionChangedListener(ProjectionChangedListener listener) {
+        listeners.addIfAbsent(listener);
+    }
+
+    public static void removeProjectionChangedListener(ProjectionChangedListener listener) {
+        listeners.remove(listener);
+    }
+
+    private static void fireProjectionChanged() {
+        for (ProjectionChangedListener listener: listeners) {
+            listener.projectionChanged();
+        }
+    }
+
+
     /**
      * Combobox with all projections available
@@ -68 +106 @@
 
         for (int i = 0; i < coordinatesCombo.getItemCount(); ++i) {
-            if (((CoordinateFormat)coordinatesCombo.getItemAt(i)).name().equals(Main.pref.get("coordinates"))) {
+            if (((CoordinateFormat)coordinatesCombo.getItemAt(i)).name().equals(PROP_COORDINATES.get())) {
                 coordinatesCombo.setSelectedIndex(i);
                 break;
@@ -113 +151 @@
         }
 
-        Main.pref.put("projection", projname);
+        PROP_PROJECTION.put(projname);
         setProjection(projname, prefs);
 
-        if(Main.pref.put("coordinates",
-                ((CoordinateFormat)coordinatesCombo.getSelectedItem()).name())) {
+        if(PROP_COORDINATES.put(((CoordinateFormat)coordinatesCombo.getSelectedItem()).name())) {
             CoordinateFormat.setCoordinateFormat((CoordinateFormat)coordinatesCombo.getSelectedItem());
         }
@@ -126 +163 @@
     static public void setProjection()
     {
-        setProjection(Main.pref.get("projection", Mercator.class.getName()),
-                Main.pref.getCollection("projection.sub", null));
+        setProjection(PROP_PROJECTION.get(), PROP_SUB_PROJECTION.get());
     }
 
@@ -148 +184 @@
             name = Main.proj.getClass().getName();
         }
-        Main.pref.putCollection("projection.sub", coll);
-        String sname = name.substring(name.lastIndexOf(".")+1);
-        Main.pref.putCollection("projection.sub."+sname, coll);
+        PROP_SUB_PROJECTION.put(coll);
+        PROP_PROJECTION_SUBPROJECTION.put(coll, name);
         if(Main.proj instanceof ProjectionSubPrefs) {
             ((ProjectionSubPrefs) Main.proj).setPreferences(coll);
         }
+        fireProjectionChanged(); // This should be probably called from the if bellow, but hashCode condition doesn't look sure enough
         if(b != null && (!Main.proj.getClass().getName().equals(oldProj.getClass().getName()) || Main.proj.hashCode() != oldProj.hashCode()))
         {
@@ -212 +248 @@
             Projection proj = (Projection)projectionCombo.getItemAt(i);
             String name = proj.getClass().getName();
-            String sname = name.substring(name.lastIndexOf(".")+1);
             if(proj instanceof ProjectionSubPrefs) {
-                ((ProjectionSubPrefs) proj).setPreferences(Main.pref.getCollection("projection.sub."+sname, null));
-            }
-            if (name.equals(Main.pref.get("projection", Mercator.class.getName()))) {
+                ((ProjectionSubPrefs) proj).setPreferences(PROP_PROJECTION_SUBPROJECTION.get(name));
+            }
+            if (name.equals(PROP_PROJECTION.get())) {
                 projectionCombo.setSelectedIndex(i);
                 selectedProjectionChanged(proj);