Changeset 12047 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java

Timestamp:

2017-05-03T14:42:49+02:00 (8 years ago)

Author:

michael2402

Message:

Make TagMerger use the row based layout. Make merge buttons higher and easier to hit."

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractMergePanel.java

@@ -7 +7 @@
 import java.util.List;
 
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -152 +154 @@
     }
 
+    /**
+     * Add the undecide button to the middle of the merged row.
+     */
+    protected abstract static class AbstractUndecideRow extends AbstractMergePanel.MergeRow {
+        @Override
+        protected JComponent merged() {
+            AbstractAction actUndecide = createAction();
+            JButton button = new JButton(actUndecide);
+            button.setName(getButtonName());
+            return button;
+        }
+
+        protected abstract AbstractAction createAction();
+
+        protected abstract String getButtonName();
+
+        @Override
+        protected void addConstraints(GBC constraints, int columnIndex) {
+            super.addConstraints(constraints, columnIndex);
+            constraints.fill(GBC.NONE);
+        }
+    }
+
+    /**
+     * The current row counter. Used when adding new rows.
+     */
     protected int currentRow = 0;