Changeset 3583 in josm for trunk

Timestamp:

2010-10-03T14:39:11+02:00 (14 years ago)

Author:

stoecker

Message:

fix #4041 - toolbar preferences separator dragging broken

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (10 diffs)

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

@@ -69 +69 @@
 
     public static class ActionDefinition {
-
-        public static ActionDefinition SEPARATOR = new ActionDefinition(null);
-
         private final Action action;
         private final Map<String, Object> parameters = new HashMap<String, Object>();
@@ -94 +91 @@
         }
 
+        public boolean isSeparator() {
+            return action == null;
+        }
+
+        public static ActionDefinition getSeparator() {
+            return new ActionDefinition(null);
+        }
     }
 
@@ -207 +211 @@
     private static class ActionParametersTableModel extends AbstractTableModel {
 
-        private ActionDefinition currentAction = ActionDefinition.SEPARATOR;
+        private ActionDefinition currentAction = ActionDefinition.getSeparator();
 
         public int getColumnCount() {
@@ -214 +218 @@
 
         public int getRowCount() {
-            if (currentAction == ActionDefinition.SEPARATOR || !(currentAction.getAction() instanceof ParameterizedAction))
+            if (currentAction.isSeparator() || !(currentAction.getAction() instanceof ParameterizedAction))
                 return 0;
             ParameterizedAction pa = (ParameterizedAction)currentAction.getAction();
@@ -286 +290 @@
                         DefaultMutableTreeNode node = (DefaultMutableTreeNode) selectedAction.getLastPathComponent();
                         if (node.getUserObject() == null) {
-                            selected.add(leadItem++, ActionDefinition.SEPARATOR);
+                            selected.add(leadItem++, ActionDefinition.getSeparator());
                         } else if (node.getUserObject() instanceof Action) {
                             selected.add(leadItem++, new ActionDefinition((Action)node.getUserObject()));
@@ -410 +414 @@
                     String s;
                     Icon i;
-                    if (value != ActionDefinition.SEPARATOR) {
-                        ActionDefinition action = (ActionDefinition)value;
+                    ActionDefinition action = (ActionDefinition)value;
+                    if (!action.isSeparator()) {
                         s = (String) action.getAction().getValue(Action.NAME);
                         i = (Icon) action.getAction().getValue(Action.SMALL_ICON);
@@ -561 +565 @@
                         Object obj = node.getUserObject();
                         if (obj == null) {
-                            dragActions.add(ActionDefinition.SEPARATOR);
+                            dragActions.add(ActionDefinition.getSeparator());
                         }
                         else if (obj instanceof Action) {
@@ -642 +646 @@
             ActionParser parser = new ActionParser(null);
             for (int i = 0; i < selected.size(); ++i) {
-                if (selected.get(i) == ActionDefinition.SEPARATOR) {
-
+                ActionDefinition action = (ActionDefinition)selected.get(i);
+                if (action.isSeparator()) {
                     t.add("|");
-
                 } else {
-                    t.add(parser.saveAction((ActionDefinition)(selected.get(i))));
+                    t.add(parser.saveAction(action));
                 }
             }
@@ -731 +734 @@
         for (String s : getToolString()) {
             if (s.equals("|")) {
-                result.add(ActionDefinition.SEPARATOR);
+                result.add(ActionDefinition.getSeparator());
             } else {
                 ActionDefinition a = actionParser.loadAction(s);
@@ -761 +764 @@
 
         for (ActionDefinition action : getDefinedActions()) {
-            if (action == ActionDefinition.SEPARATOR) {
+            if (action.isSeparator()) {
                 control.addSeparator();
-
             } else {
                 Action a = action.getParametrizedAction();