Changeset 34497 in osm for applications/editors/josm

Timestamp:

2018-08-18T03:15:04+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

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

@@ -5 +5 @@
     <property name="commit.message" value="Uses new constructor for Plugin"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12987"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <property name="plugin.author" value="Christof Dallermassl"/>

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

@@ -26 +26 @@
 import javax.swing.JScrollPane;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.preferences.ColorInfo;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
@@ -33 +34 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.display.ColorPreference;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -56 +58 @@
         panel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
 
-        Map<String, String> colorMap = Main.pref.getAllPrefix(PREF_KEY_COLOR_PREFIX);
+        Map<String, String> colorMap = Preferences.main().getAllPrefix(PREF_KEY_COLOR_PREFIX);
         colorKeys = new ArrayList<>(colorMap.keySet());
         Collections.sort(colorKeys);
         listModel = new DefaultListModel<>();
         schemesList = new JList<>(listModel);
-        String schemes = Main.pref.get(PREF_KEY_SCHEMES_NAMES);
+        String schemes = Config.getPref().get(PREF_KEY_SCHEMES_NAMES);
         StringTokenizer st = new StringTokenizer(schemes, ";");
         String schemeName;
@@ -72 +74 @@
         useScheme.addActionListener(e -> {
             if (schemesList.getSelectedIndex() == -1)
-                JOptionPane.showMessageDialog(Main.parent, tr("Please select a scheme to use."));
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Please select a scheme to use."));
             else {
                 String schemeName1 = (String) listModel.get(schemesList.getSelectedIndex());
@@ -80 +82 @@
         JButton addScheme = new JButton(tr("Add"));
         addScheme.addActionListener(e -> {
-            String schemeName1 = JOptionPane.showInputDialog(Main.parent, tr("Color Scheme"));
+            String schemeName1 = JOptionPane.showInputDialog(MainApplication.getMainFrame(), tr("Color Scheme"));
             if (schemeName1 == null)
                 return;
@@ -92 +94 @@
         deleteScheme.addActionListener(e -> {
             if (schemesList.getSelectedIndex() == -1)
-                JOptionPane.showMessageDialog(Main.parent, tr("Please select the scheme to delete."));
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Please select the scheme to delete."));
             else {
                 String schemeName1 = (String) listModel.get(schemesList.getSelectedIndex());
@@ -133 +135 @@
             for (int i = 0; i < schemesList.getModel().getSize(); ++i)
                 sb.append(";"+schemesList.getModel().getElementAt(i));
-            Main.pref.put(PREF_KEY_SCHEMES_NAMES, sb.toString().substring(1));
+            Config.getPref().put(PREF_KEY_SCHEMES_NAMES, sb.toString().substring(1));
         } else
-            Main.pref.put(PREF_KEY_SCHEMES_NAMES, null);
+            Config.getPref().put(PREF_KEY_SCHEMES_NAMES, null);
     }
 
@@ -154 +156 @@
     public void removeColorSchemeFromPreferences(String schemeName) {
         // delete color entries for scheme in preferences:
-        Map<String, String> colors = Main.pref.getAllPrefix(PREF_KEY_SCHEMES_PREFIX + schemeName + ".");
+        Map<String, String> colors = Preferences.main().getAllPrefix(PREF_KEY_SCHEMES_PREFIX + schemeName + ".");
         for(String key : colors.keySet()) {
-            Main.pref.put(key, null);
+            Config.getPref().put(key, null);
         }
     }
@@ -169 +171 @@
         for(String colorKey : colorMap.keySet()) {
             key = PREF_KEY_SCHEMES_PREFIX + schemeName + "." + PREF_KEY_COLOR_PREFIX + colorKey;
-            Main.pref.put(key, ColorHelper.color2html(colorMap.get(colorKey).getValue()));
+            Config.getPref().put(key, ColorHelper.color2html(colorMap.get(colorKey).getValue()));
         }
     }
@@ -183 +185 @@
         String prefix = PREF_KEY_SCHEMES_PREFIX + schemeName + "." + PREF_KEY_COLOR_PREFIX;
         Map<String, ColorInfo> colorMap = new HashMap<>();
-        for(String schemeColorKey : Main.pref.getAllPrefix(prefix).keySet()) {
+        for(String schemeColorKey : Preferences.main().getAllPrefix(prefix).keySet()) {
             colorKey = schemeColorKey.substring(prefix.length());
             colorMap.put(colorKey, ColorInfo.fromPref(Arrays.asList(
                     // FIXME: does not work, corrupts the color table ? See #16110
-                    Main.pref.get(schemeColorKey), "", "", ""), false));
+                    Config.getPref().get(schemeColorKey), "", "", ""), false));
         }
         return colorMap;