Changeset 34091 in osm for applications/editors/josm

Timestamp:

2018-03-20T01:44:41+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12987. The plugin does not work and needs further corrections, see #josm16110

Location:

applications/editors/josm/plugins/colorscheme

Files:

• GPL-v2.0.txt (deleted)
• build.xml (modified) (1 diff)
• src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePlugin.java (modified) (3 diffs)
• src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java (modified) (6 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="10580"/>
+    <property name="plugin.main.version" value="12987"/>
 
     <property name="plugin.author" value="Christof Dallermassl"/>

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

@@ -12 +12 @@
  * ColorScheme Plugin for JOSM.
  * @author cdaller
- *
  */
 public class ColorSchemePlugin extends Plugin {
@@ -18 +17 @@
     /**
      * Default Constructor
+     * @param info plugin information
      */
     public ColorSchemePlugin(PluginInformation info) {
@@ -27 +27 @@
         return new ColorSchemePreference();
     }
-
-
-
 }

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

@@ -8 +8 @@
 
 import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -28 +27 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.ColorInfo;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
@@ -33 +33 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.display.ColorPreference;
+import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -69 +70 @@
 
         JButton useScheme = new JButton(tr("Use"));
-        useScheme.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (schemesList.getSelectedIndex() == -1)
-                    JOptionPane.showMessageDialog(Main.parent, tr("Please select a scheme to use."));
-                else {
-                    String schemeName = (String) listModel.get(schemesList.getSelectedIndex());
-                    getColorPreference(gui).setColorModel(getColorMap(schemeName));
-                }
+        useScheme.addActionListener(e -> {
+            if (schemesList.getSelectedIndex() == -1)
+                JOptionPane.showMessageDialog(Main.parent, tr("Please select a scheme to use."));
+            else {
+                String schemeName1 = (String) listModel.get(schemesList.getSelectedIndex());
+                getColorPreference(gui).setColors(getColorMap(schemeName1));
             }
         });
         JButton addScheme = new JButton(tr("Add"));
-        addScheme.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                String schemeName = JOptionPane.showInputDialog(Main.parent, tr("Color Scheme"));
-                if (schemeName == null)
-                    return;
-                schemeName = schemeName.replaceAll("\\.", "_");
-                setColorScheme(schemeName, getColorPreference(gui).getColorModel());
-                listModel.addElement(schemeName);
+        addScheme.addActionListener(e -> {
+            String schemeName1 = JOptionPane.showInputDialog(Main.parent, tr("Color Scheme"));
+            if (schemeName1 == null)
+                return;
+            schemeName1 = schemeName1.replaceAll("\\.", "_");
+            setColorScheme(schemeName1, getColorPreference(gui).getColors());
+            listModel.addElement(schemeName1);
+            saveSchemeNamesToPref();
+        });
+
+        JButton deleteScheme = new JButton(tr("Delete"));
+        deleteScheme.addActionListener(e -> {
+            if (schemesList.getSelectedIndex() == -1)
+                JOptionPane.showMessageDialog(Main.parent, tr("Please select the scheme to delete."));
+            else {
+                String schemeName1 = (String) listModel.get(schemesList.getSelectedIndex());
+                removeColorSchemeFromPreferences(schemeName1);
+                listModel.remove(schemesList.getSelectedIndex());
                 saveSchemeNamesToPref();
-            }
-        });
-
-        JButton deleteScheme = new JButton(tr("Delete"));
-        deleteScheme.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
-                if (schemesList.getSelectedIndex() == -1)
-                    JOptionPane.showMessageDialog(Main.parent, tr("Please select the scheme to delete."));
-                else {
-                    String schemeName = (String) listModel.get(schemesList.getSelectedIndex());
-                    removeColorSchemeFromPreferences(schemeName);
-                    listModel.remove(schemesList.getSelectedIndex());
-                    saveSchemeNamesToPref();
-                }
             }
         });
@@ -169 +164 @@
      * Copy all color entries from the given map to entries in preferences with the scheme name.
      * @param schemeName the name of the scheme.
-     * @param the map containing the color key (without prefix) and the html color values.
-     */
-    public void setColorScheme(String schemeName, Map<String, String> colorMap) {
+     * @param colorMap the map containing the color key (without prefix) and the html color values.
+     */
+    public void setColorScheme(String schemeName, Map<String, ColorInfo> colorMap) {
         String key;
         for(String colorKey : colorMap.keySet()) {
             key = PREF_KEY_SCHEMES_PREFIX + schemeName + "." + PREF_KEY_COLOR_PREFIX + colorKey;
-            Main.pref.put(key, colorMap.get(colorKey));
+            Main.pref.put(key, ColorHelper.color2html(colorMap.get(colorKey).getValue()));
         }
     }
@@ -183 +178 @@
      * value = html color code).
      * @param schemeName the name of the scheme.
-     */
-    public Map<String, String> getColorMap(String schemeName) {
+     * @return color map for the given scheme name 
+     */
+    public Map<String, ColorInfo> getColorMap(String schemeName) {
         String colorKey;
         String prefix = PREF_KEY_SCHEMES_PREFIX + schemeName + "." + PREF_KEY_COLOR_PREFIX;
-        Map<String, String>colorMap = new HashMap<>();
+        Map<String, ColorInfo> colorMap = new HashMap<>();
         for(String schemeColorKey : Main.pref.getAllPrefix(prefix).keySet()) {
             colorKey = schemeColorKey.substring(prefix.length());
-            colorMap.put(colorKey, Main.pref.get(schemeColorKey));
+            colorMap.put(colorKey, ColorInfo.fromPref(Arrays.asList(
+                    // FIXME: does not work, corrupts the color table ? See #16110
+                    Main.pref.get(schemeColorKey), "", "", ""), false));
         }
         return colorMap;