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

Timestamp:

2020-01-19T12:11:15+01:00 (5 years ago)

Author:

simon04

Message:

fix #18026 - Relation member conflict: render decision as radio buttons

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• RelationMemberConflictDecisionEditor.java (deleted)
• RelationMemberConflictDecisionRenderer.java (deleted)
• RelationMemberConflictDecisionType.java (modified) (2 diffs)
• RelationMemberConflictResolverColumnModel.java (modified) (4 diffs)
• RelationMemberConflictResolverModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-
-import javax.swing.JLabel;
 
 /**
@@ -26 +24 @@
     UNDECIDED;
 
-    /**
-     * Sets the label according to the current decision.
-     * @param decision The decision
-     * @param label The label to set
-     */
-    public static void prepareLabel(RelationMemberConflictDecisionType decision, JLabel label) {
-        switch(decision) {
-        case REMOVE:
-            label.setText(tr("Remove"));
-            label.setToolTipText(tr("Remove this relation member from the relation"));
-            break;
-        case KEEP:
-            label.setText(tr("Keep"));
-            label.setToolTipText(tr("Keep this relation member for the target object"));
-            break;
-        case UNDECIDED:
-            label.setText(tr("Undecided"));
-            label.setToolTipText(tr("Not decided yet"));
-            break;
+    String getLabelText() {
+        switch (this) {
+            case REMOVE:
+                return tr("Remove");
+            case KEEP:
+                return tr("Keep");
+            case UNDECIDED:
+            default:
+                return tr("Undecided");
+        }
+    }
+
+    String getLabelToolTipText() {
+        switch (this) {
+            case REMOVE:
+                return tr("Remove this relation member from the relation");
+            case KEEP:
+                return tr("Keep this relation member for the target object");
+            case UNDECIDED:
+            default:
+                return tr("Not decided yet");
         }
     }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java

@@ -5 +5 @@
 
 import java.awt.Component;
+import java.util.EnumSet;
 
 import javax.swing.JTable;
@@ -15 +16 @@
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
 import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberTable;
+import org.openstreetmap.josm.gui.history.VersionTable;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 
@@ -73 +75 @@
 
         AutoCompletingTextField roleEditor = new AutoCompletingTextField(0, false);
-        RelationMemberConflictDecisionRenderer decisionRenderer = new RelationMemberConflictDecisionRenderer();
-        RelationMemberConflictDecisionEditor decisionEditor = new RelationMemberConflictDecisionEditor();
 
         // column 0 - Relation
@@ -114 +114 @@
         addColumn(col);
 
-        // column 4 - New Way
-        col = new TableColumn(4);
-        col.setHeaderValue(tr("Decision"));
-        col.setResizable(true);
-        col.setCellRenderer(decisionRenderer);
-        col.setCellEditor(decisionEditor);
-        col.setWidth(100);
-        col.setPreferredWidth(100);
-        col.setMaxWidth(100);
-        addColumn(col);
+        // column 4 - decision keep
+        // column 5 - decision remove
+        int index = 4;
+        for (RelationMemberConflictDecisionType type : EnumSet.of(
+                RelationMemberConflictDecisionType.KEEP, RelationMemberConflictDecisionType.REMOVE)) {
+            col = new TableColumn(index);
+            col.setHeaderValue(type.getLabelText());
+            col.setResizable(true);
+            final VersionTable.RadioButtonRenderer renderer = new VersionTable.RadioButtonRenderer();
+            renderer.setToolTipText(type.getLabelToolTipText());
+            col.setCellRenderer(renderer);
+            col.setCellEditor(new VersionTable.RadioButtonEditor());
+            col.setWidth(50);
+            col.setPreferredWidth(50);
+            col.setMaxWidth(50);
+            addColumn(col);
+            index++;
+        }
     }
 }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -115 +115 @@
         case 2: /* role */ return d.getRole();
         case 3: /* original */ return d.getOriginalPrimitive();
-        case 4: /* decision */ return d.getDecision();
+        case 4: /* decision keep */ return RelationMemberConflictDecisionType.KEEP.equals(d.getDecision());
+        case 5: /* decision remove */ return RelationMemberConflictDecisionType.REMOVE.equals(d.getDecision());
         }
         return null;
@@ -127 +128 @@
             d.setRole((String) value);
             break;
-        case 4: /* decision */
-            d.decide((RelationMemberConflictDecisionType) value);
-            refresh(false);
+        case 4: /* decision keep */
+            if (Boolean.TRUE.equals(value)) {
+                d.decide(RelationMemberConflictDecisionType.KEEP);
+                refresh(false);
+            }
+            break;
+        case 5: /* decision remove */
+            if (Boolean.TRUE.equals(value)) {
+                d.decide(RelationMemberConflictDecisionType.REMOVE);
+                refresh(false);
+            }
             break;
         default: // Do nothing