Changeset 5297 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

Timestamp:

2012-06-24T19:14:38+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #4493, fix #7750: conflict dialog, nodes and members tab: allow selection via double-click, allow zoom via contexual menu, plus various fix in EDT violations

File:

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

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

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.widgets.OsmPrimitivesTableModel;
 
 /**
@@ -69 +70 @@
     protected HashMap<ListRole, ArrayList<T>> entries;
 
-    protected DefaultTableModel myEntriesTableModel;
-    protected DefaultTableModel theirEntriesTableModel;
-    protected DefaultTableModel mergedEntriesTableModel;
+    protected EntriesTableModel myEntriesTableModel;
+    protected EntriesTableModel theirEntriesTableModel;
+    protected EntriesTableModel mergedEntriesTableModel;
 
     protected EntriesSelectionModel myEntriesSelectionModel;
@@ -210 +211 @@
     }
 
-    public TableModel getMyTableModel() {
+    public OsmPrimitivesTableModel getMyTableModel() {
         return myEntriesTableModel;
     }
 
-    public TableModel getTheirTableModel() {
+    public OsmPrimitivesTableModel getTheirTableModel() {
         return theirEntriesTableModel;
     }
 
-    public TableModel getMergedTableModel() {
+    public OsmPrimitivesTableModel getMergedTableModel() {
         return mergedEntriesTableModel;
     }
@@ -535 +536 @@
     protected boolean myAndTheirEntriesEqual() {
 
-        if (getMyEntries().size() != getTheirEntries().size())
+        if (getMyEntriesSize() != getTheirEntriesSize())
             return false;
-        for (int i=0; i < getMyEntries().size(); i++) {
+        for (int i=0; i < getMyEntriesSize(); i++) {
             if (! isEqualEntry(getMyEntries().get(i), getTheirEntries().get(i)))
                 return false;
@@ -555 +556 @@
      * @see ListMergeModel#getMergedTableModel()
      */
-    public class EntriesTableModel extends DefaultTableModel {
+    public class EntriesTableModel extends DefaultTableModel implements OsmPrimitivesTableModel {
         private final ListRole role;
 
@@ -675 +676 @@
             return role;
         }
+
+        @Override
+        public OsmPrimitive getReferredPrimitive(int idx) {
+            return (OsmPrimitive) getValueAt(idx, 1);
+        }
     }