Changeset 16383 in osm for applications

Timestamp:

2009-07-08T16:40:06+02:00 (15 years ago)

Author:

stoecker

Message:

fix for 1742

Location:

applications/editors/josm/plugins/colorscheme

Files:

• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java (modified) (10 diffs)

applications/editors/josm/plugins/colorscheme/build.xml

@@ -27 +27 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but true :-)" />
-                <attribute name="Plugin-Mainversion" value="1180"/>
+                <attribute name="Plugin-Mainversion" value="1742"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java

@@ -40 +40 @@
     private List<String>colorKeys;
     private ColorPreference colorPreference;
-    
+
     /**
-     * Default Constructor 
+     * Default Constructor
      */
     public ColorSchemePreference() {
     }
-    
+
 
     /* (non-Javadoc)
@@ -58 +58 @@
         schemesList = new JList(listModel);
         String schemes = Main.pref.get(PREF_KEY_SCHEMES_NAMES);
-        StringTokenizer st = new StringTokenizer(schemes, ";");        
+        StringTokenizer st = new StringTokenizer(schemes, ";");
         String schemeName;
         while (st.hasMoreTokens()) {
@@ -72 +72 @@
                 else {
                     String schemeName = (String) listModel.get(schemesList.getSelectedIndex());
-                    getColorPreference().setColorModel(getColorMap(schemeName));
+                    getColorPreference(gui).setColorModel(getColorMap(schemeName));
                 }
             }
@@ -83 +83 @@
                     return;
                 schemeName = schemeName.replaceAll("\\.", "_");
-                setColorScheme(schemeName, getColorPreference().getColorModel());
+                setColorScheme(schemeName, getColorPreference(gui).getColorModel());
                 listModel.addElement(schemeName);
                 saveSchemeNamesToPref();
@@ -118 +118 @@
         buttonPanel.add(deleteScheme, GBC.std().insets(0,5,5,0));
     }
-    
+
     /**
-     * Saves the names of the schemes to the preferences. 
+     * Saves the names of the schemes to the preferences.
      */
     public void saveSchemeNamesToPref() {
@@ -129 +129 @@
             Main.pref.put(PREF_KEY_SCHEMES_NAMES, sb.toString().substring(1));
         } else
-            Main.pref.put(PREF_KEY_SCHEMES_NAMES, null);        
+            Main.pref.put(PREF_KEY_SCHEMES_NAMES, null);
     }
 
@@ -135 +135 @@
         return false;// nothing to do
     }
-    
+
     /**
      * Remove all color entries for the given scheme from the preferences.
@@ -145 +145 @@
         for(String key : colors.keySet()) {
             Main.pref.put(key, null);
-        }       
+        }
     }
-    
+
     /**
      * Copy all color entries from the given map to entries in preferences with the scheme name.
@@ -160 +160 @@
         }
     }
-    
+
     /**
-     * Reads all colors for a scheme and returns them in a map (key = color key without prefix, 
+     * Reads all colors for a scheme and returns them in a map (key = color key without prefix,
      * value = html color code).
      * @param schemeName the name of the scheme.
@@ -177 +177 @@
     }
 
-    public ColorPreference getColorPreference() {
+    public ColorPreference getColorPreference(PreferenceDialog gui) {
         if(colorPreference == null) {
-            for(PreferenceSetting setting : PreferenceDialog.settings) {
+            for(PreferenceSetting setting : gui.getSettings()) {
                 if(setting instanceof ColorPreference) {
                     colorPreference = (ColorPreference) setting;