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

Timestamp:

2009-05-26T21:44:31+02:00 (15 years ago)

Author:

Gubaer

Message:

first version of extended conflict resolution dialog.

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/TagConflictResolveCommand.java (added)
• command/VersionConflictResolveCommand.java (added)
• command/WayNodesConflictResolverCommand.java (added)
• gui/conflict (added)
• gui/conflict/ConflictResolver.java (added)
• gui/conflict/nodes (added)
• gui/conflict/nodes/NodeListColumnModel.java (added)
• gui/conflict/nodes/NodeListMergeModel.java (added)
• gui/conflict/nodes/NodeListMerger.java (added)
• gui/conflict/nodes/NodeListTableCellRenderer.java (added)
• gui/conflict/tags (added)
• gui/conflict/tags/MergeDecisionType.java (added)
• gui/conflict/tags/MineTableCellRenderer.java (added)
• gui/conflict/tags/TagMergeColumnModel.java (added)
• gui/conflict/tags/TagMergeItem.java (added)
• gui/conflict/tags/TagMergeModel.java (added)
• gui/conflict/tags/TagMergeTableCellRenderer.java (added)
• gui/conflict/tags/TagMerger.java (added)
• gui/conflict/tags/TheirTableCellRenderer.java (added)
• gui/conflict/tags/UndecidedTableCellRenderer.java (added)
• gui/dialogs/ConflictDialog.java (modified) (3 diffs)
• gui/dialogs/ConflictResolutionDialog.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -107 +107 @@
 
     private final void resolve() {
+        String method = Main.pref.get("conflict.resolution", "traditional");
+        method = method.trim().toLowerCase();
+        if (method.equals("traditional")) {
+            resolveTraditional();            
+        } else if (method.equals("extended")) {
+            resolveExtended();
+        } else {
+            System.out.println(tr("WARNING: unexpected value for preference conflict.resolution, got " + method));
+            resolveTraditional();
+        }
+    }
+    
+    
+    private final void resolveExtended() {
+        if(model.size() == 1)
+            displaylist.setSelectedIndex(0);
+        
+        if (displaylist.getSelectedIndex() == -1)
+            return;
+        
+        int [] selectedRows = displaylist.getSelectedIndices();
+        if (selectedRows == null || selectedRows.length == 0) {
+            return; 
+        }
+        int row = selectedRows[0];
+        OsmPrimitive my = (OsmPrimitive)model.get(row);
+        OsmPrimitive their = conflicts.get(my);
+        ConflictResolutionDialog dialog = new ConflictResolutionDialog(Main.parent);      
+        dialog.getConflictResolver().populate(my, their);
+        dialog.setVisible(true);
+        Main.map.mapView.repaint();
+    }
+    
+    
+    private final void resolveTraditional() {
         if(model.size() == 1)
             displaylist.setSelectedIndex(0);
@@ -133 +168 @@
     public final void rebuildList() {
         model.removeAllElements();
-        for (OsmPrimitive osm : this.conflicts.keySet())
-            if (osm instanceof Node)
-                model.addElement(osm);
-        for (OsmPrimitive osm : this.conflicts.keySet())
-            if (osm instanceof Way)
-                model.addElement(osm);
-        for (OsmPrimitive osm : this.conflicts.keySet())
-            if (osm instanceof Relation)
-                model.addElement(osm);
-
+        for (OsmPrimitive osm : this.conflicts.keySet()) {
+            model.addElement(osm);
+        }
+        
         if(model.size() != 0) {
             setTitle(tr("Conflicts: {0}", model.size()), true);
@@ -197 +226 @@
             }
         };
-        for (Object o : displaylist.getSelectedValues())
+        for (Object o : displaylist.getSelectedValues()) {
+            if (conflicts.get(o) == null) {
+                continue;
+            }
             conflicts.get(o).visit(conflictPainter);
+        }
     }
 }