Changeset 9482 in josm for trunk/src


Ignore:
Timestamp:
2016-01-16T10:43:07+01:00 (4 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

    r9440 r9482  
    261261    }
    262262
     263    /**
     264     * {@link JTabbedPane#setSelectedIndex(int) Selects} the first tab with conflicts
     265     */
    263266    public void selectFirstTabWithConflicts() {
    264267        for (int i = 0; i < tabbedPane.getTabCount(); i++) {
     
    343346    }
    344347
     348    /**
     349     * Removes all registered listeners by this conflict resolver
     350     */
    345351    public void unregisterListeners() {
    346352        nodeListMerger.unlinkAsListener();
     
    348354    }
    349355
     356    /**
     357     * {@link PropertiesMerger#decideRemaining(MergeDecisionType) Decides/resolves} undecided conflicts to the given decision type
     358     * @param decision the decision to take for undecided conflicts
     359     * @throws AssertionError if {@link #isResolvedCompletely()} does not hold after applying the decision
     360     */
    350361    public void decideRemaining(MergeDecisionType decision) {
    351362        propertiesMerger.decideRemaining(decision);
     
    358369        updateResolvedCompletely();
    359370        if (!isResolvedCompletely()) {
    360             throw new AssertionError();
     371            throw new AssertionError("The conflict could not be resolved completely!");
    361372        }
    362373    }
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

    r9440 r9482  
    921921        if (!model.isFrozen()) {
    922922            model.copyAll(MergeDecisionType.KEEP_MINE.equals(decision) ? ListRole.MY_ENTRIES : ListRole.THEIR_ENTRIES);
     923            model.setFrozen(true);
    923924        }
    924925    }
Note: See TracChangeset for help on using the changeset viewer.