Changeset 1666 in josm

Timestamp:

Jun 13, 2009 7:26:19 AM (4 years ago)

Author:

Gubaer

Message:

bug fix: wrong merge state

Location:

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

Files:

• PropertiesMergeModel.java (modified) (10 diffs)
• PropertiesMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java

@@ -19 +19 @@
 
 /**
- * This is the model for resolving conflicts in the values of same properties of
- * {@see OsmPrimitive}. In particular, it represents conflicts in the coordiates of {@see Node}s and
+ * This is the model for resolving conflicts in the properties of thw
+ * {@see OsmPrimitive}s. In particular, it represents conflicts in the coordiates of {@see Node}s and
  * the deleted state of {@see OsmPrimitive}s.
  * 
@@ -69 +69 @@
 
     /**
-     * replies true if there is a coordiate conflict and if this conflict is
+     * replies true if there is a coordinate conflict and if this conflict is
      * resolved
      * 
-     * @return true if there is a coordiate conflict and if this conflict is
+     * @return true if there is a coordinate conflict and if this conflict is
      * resolved; false, otherwise
      */
@@ -91 +91 @@
 
     /**
-     * replies true if the current decision for the coordiate conflict is <code>decision</code>
-     * 
-     * @return true if the current decision for the coordiate conflict is <code>decision</code>;
+     * replies true if the current decision for the coordinate conflict is <code>decision</code>
+     * 
+     * @return true if the current decision for the coordinate conflict is <code>decision</code>;
      *  false, otherwise
      */
@@ -136 +136 @@
 
 
+    /**
+     * replies the coordinates of my {@see OsmPrimitive}. null, if my primitive hasn't
+     * coordinates (i.e. because it is a {@see Way}).
+     * 
+     * @return the coordinates of my {@see OsmPrimitive}. null, if my primitive hasn't
+     *  coordinates (i.e. because it is a {@see Way}).
+     */
     public LatLon getMyCoords() {
         return myCoords;
     }
 
+    /**
+     * replies the coordinates of their {@see OsmPrimitive}. null, if their primitive hasn't
+     * coordinates (i.e. because it is a {@see Way}).
+     * 
+     * @return the coordinates of my {@see OsmPrimitive}. null, if my primitive hasn't
+     * coordinates (i.e. because it is a {@see Way}).
+     */
     public LatLon getTheirCoords() {
         return theirCoords;
     }
 
+    /**
+     * replies the coordinates of the merged {@see OsmPrimitive}. null, if the current primitives
+     * have no coordinates or if the conflict is yet {@see MergeDecisionType#UNDECIDED}
+     * 
+     * @return the coordinates of the merged {@see OsmPrimitive}. null, if the current primitives
+     * have no coordinates or if the conflict is yet {@see MergeDecisionType#UNDECIDED}
+     */
     public LatLon getMergedCoords() {
         switch(coordMergeDecision) {
@@ -154 +175 @@
     }
 
+    /**
+     * decides a conflict between my and their coordinates
+     * 
+     * @param decision the decision
+     */
     public void decideCoordsConflict(MergeDecisionType decision) {
         coordMergeDecision = decision;
@@ -161 +187 @@
     }
 
+    /**
+     * replies my deleted state,
+     * @return
+     */
     public Boolean getMyDeletedState() {
         return myDeletedState;
@@ -186 +216 @@
     }
 
+    /**
+     * replies true if my and their primitive have a conflict between
+     * their coordinate values
+     * 
+     * @return true if my and their primitive have a conflict between
+     * their coordinate values; false otherwise
+     */
     public boolean hasCoordConflict() {
         if (myCoords == null && theirCoords != null) return true;
@@ -193 +230 @@
     }
 
+    /**
+     * replies true if my and their primitive have a conflict between
+     * their deleted states
+     * 
+     * @return true if my and their primitive have a conflict between
+     * their deleted states
+     */
     public boolean hasDeletedStateConflict() {
         return myDeletedState != theirDeletedState;
     }
 
+    /**
+     * replies true if all conflict in this model are resolved
+     * 
+     * @return true if all conflict in this model are resolved; false otherwise
+     */
     public boolean isResolvedCompletely() {
         boolean ret = true;
@@ -208 +257 @@
     }
 
+    /**
+     * builds the command(s) to apply the conflict resolutions to my primitive
+     * 
+     * @param my  my primitive
+     * @param their their primitive
+     * @return the list of commands
+     */
     public List<Command> buildResolveCommand(OsmPrimitive my, OsmPrimitive their) {
         ArrayList<Command> cmds = new ArrayList<Command>();
@@ -214 +270 @@
         }
         if (hasDeletedStateConflict() && isDecidedDeletedState()) {
-            cmds.add(new DeletedStateConflictResolveCommand(my, their, coordMergeDecision));
+            cmds.add(new DeletedStateConflictResolveCommand(my, their, deletedMergeDecision));
         }
         return cmds;

trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java

@@ -21 +21 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
 import org.openstreetmap.josm.tools.ImageProvider;