Changeset 9482 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2016-01-16T10:43:07+01:00 (8 years ago)

Author:

simon04

Message:

see #12338 fix #12381 - AssertionError on "Resolve to their versions"

Location:

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

Files:

• ConflictResolver.java (modified) (4 diffs)
• ListMerger.java (modified) (1 diff)

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

@@ -261 +261 @@
     }
 
+    /**
+     * {@link JTabbedPane#setSelectedIndex(int) Selects} the first tab with conflicts
+     */
     public void selectFirstTabWithConflicts() {
         for (int i = 0; i < tabbedPane.getTabCount(); i++) {
@@ -343 +346 @@
     }
 
+    /**
+     * Removes all registered listeners by this conflict resolver
+     */
     public void unregisterListeners() {
         nodeListMerger.unlinkAsListener();
@@ -348 +354 @@
     }
 
+    /**
+     * {@link PropertiesMerger#decideRemaining(MergeDecisionType) Decides/resolves} undecided conflicts to the given decision type
+     * @param decision the decision to take for undecided conflicts
+     * @throws AssertionError if {@link #isResolvedCompletely()} does not hold after applying the decision
+     */
     public void decideRemaining(MergeDecisionType decision) {
         propertiesMerger.decideRemaining(decision);
@@ -358 +369 @@
         updateResolvedCompletely();
         if (!isResolvedCompletely()) {
-            throw new AssertionError();
+            throw new AssertionError("The conflict could not be resolved completely!");
         }
     }

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

@@ -921 +921 @@
         if (!model.isFrozen()) {
             model.copyAll(MergeDecisionType.KEEP_MINE.equals(decision) ? ListRole.MY_ENTRIES : ListRole.THEIR_ENTRIES);
+            model.setFrozen(true);
         }
     }