Changeset 1642 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2009-06-06T16:25:25+02:00 (16 years ago)

Author:

Gubaer

Message:

added row numbers and synchronized scrolling in conflict resolution dialog
fixed bugs in conflict resolution

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• TagConflictResolveCommand.java (modified) (7 diffs)
• VersionConflictResolveCommand.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

@@ -25 +25 @@
  */
 public class TagConflictResolveCommand extends Command {
-    
+
     /** my primitive (in the local dataset). merge decisions are applied to this
      *  primitive
      */
-    private OsmPrimitive my;
-    /** their primitive (in the server dataset) */ 
-    private OsmPrimitive their;
-    
+    private final OsmPrimitive my;
+    /** their primitive (in the server dataset) */
+    private final OsmPrimitive their;
+
     /** the list of merge decisions, represented as {@see TagMergeItem}s */
-    private List<TagMergeItem> mergeItems; 
-    
+    private final List<TagMergeItem> mergeItems;
+
     /**
      * replies the number of decided conflicts
      * 
-     * @return the number of decided conflicts 
+     * @return the number of decided conflicts
      */
     public int getNumDecidedConflicts() {
@@ -45 +45 @@
         for (TagMergeItem item: mergeItems) {
             if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
-                n++; 
+                n++;
             }
         }
         return n;
     }
-    
+
     /**
      * replies a (localized) display name for the type of an OSM primitive
@@ -63 +63 @@
         return "";
     }
-    
+
     /**
-     * constructor 
+     * constructor
      * 
      * @param my  my primitive
-     * @param their  their primitive 
+     * @param their  their primitive
      * @param mergeItems the list of merge decisions, represented as {@see TagMergeItem}s
      */
@@ -76 +76 @@
         this.mergeItems = mergeItems;
     }
-    
-    
+
+
     @Override
-    public MutableTreeNode description() {                
+    public MutableTreeNode description() {
         return new DefaultMutableTreeNode(
-          new JLabel(
-             tr("Resolve {0} tag conflicts in {1} {2}",getNumDecidedConflicts(), getPrimitiveTypeAsString(my), my.id), 
-             ImageProvider.get("data", "object"), 
-             JLabel.HORIZONTAL
-          )
-       );
+                new JLabel(
+                        tr("Resolve {0} tag conflicts in {1} {2}",getNumDecidedConflicts(), getPrimitiveTypeAsString(my), my.id),
+                        ImageProvider.get("data", "object"),
+                        JLabel.HORIZONTAL
+                )
+        );
     }
 
@@ -95 +95 @@
         //
         super.executeCommand();
-        
+
         // apply the merge decisions to OSM primitive 'my'
         //
         for (TagMergeItem item: mergeItems) {
-            item.applyToMyPrimitive(my);
+            if (! item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
+                item.applyToMyPrimitive(my);
+            }
         }
         return true;
@@ -115 +117 @@
         //
         super.undoCommand();
-        
+
         // restore a conflict if necessary
         //
@@ -123 +125 @@
     }
 
-    
+
 }

trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java

@@ -24 +24 @@
 public class VersionConflictResolveCommand extends Command {
 
-    private OsmPrimitive my;
-    private OsmPrimitive their;
-    
+    private final OsmPrimitive my;
+    private final OsmPrimitive their;
+
     /**
-     * constructor 
-     * @param my  my primitive (i.e. the primitive from the local dataset) 
-     * @param their their primitive (i.e. the primitive from the server) 
+     * constructor
+     * @param my  my primitive (i.e. the primitive from the local dataset)
+     * @param their their primitive (i.e. the primitive from the server)
      */
     public VersionConflictResolveCommand(OsmPrimitive my, OsmPrimitive their) {
-      this.my = my;
-      this.their = their; 
+        this.my = my;
+        this.their = their;
     }
-    
+
     //FIXME copied from TagConflictResolveCommand -> refactor
     /**
@@ -50 +50 @@
         return "";
     }
-    
+
     @Override
     public MutableTreeNode description() {
         return new DefaultMutableTreeNode(
-            new JLabel(
-               tr("Resolve version conflicts for {0} {1}",getPrimitiveTypeAsString(my), my.id), 
-               ImageProvider.get("data", "object"), 
-               JLabel.HORIZONTAL
-            )
-         );
+                new JLabel(
+                        tr("Resolve version conflicts for {0} {1}",getPrimitiveTypeAsString(my), my.id),
+                        ImageProvider.get("data", "object"),
+                        JLabel.HORIZONTAL
+                )
+        );
     }
 
@@ -66 +66 @@
         super.executeCommand();
         my.version = Math.max(my.version, their.version);
-        Main.map.conflictDialog.conflicts.remove(my);
+        Main.map.conflictDialog.removeConflictForPrimitive(my);
         return true;
     }
@@ -79 +79 @@
     public void undoCommand() {
         super.undoCommand();
-        
+
         // restore a conflict if necessary
         //
         if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-            Main.map.conflictDialog.conflicts.put(my,their);
+            Main.map.conflictDialog.addConflict(my, their);
         }
     }
 
-    
+
 }