Changeset 2626 in josm for trunk/src/org/openstreetmap/josm/gui/conflict
- Timestamp:
- 2009-12-13T11:48:12+01:00 (14 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/conflict
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
r2512 r2626 20 20 import java.util.Observable; 21 21 import java.util.Observer; 22 import java.util.logging.Logger;23 22 24 23 import javax.swing.AbstractAction; … … 774 773 mergedEntriesTable.getSelectionModel().clearSelection(); 775 774 mergedEntriesTable.setEnabled(!newValue); 776 if (freezeAction != null) { 777 freezeAction.putValue(FreezeActionProperties.PROP_SELECTED, newValue); 778 } 775 freezeAction.putValue(FreezeActionProperties.PROP_SELECTED, newValue); 779 776 if (newValue) { 780 777 lblFrozenState.setText( -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
r2512 r2626 307 307 * 308 308 */ 309 class AdjustmentSynchronizer implements AdjustmentListener {309 static class AdjustmentSynchronizer implements AdjustmentListener { 310 310 private final ArrayList<Adjustable> synchronizedAdjustables; 311 311 -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
r2512 r2626 1 1 package org.openstreetmap.josm.gui.conflict.tags; 2 2 3 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 3 4 import static org.openstreetmap.josm.tools.I18n.tr; 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;5 5 6 6 import java.awt.BorderLayout; … … 399 399 } 400 400 401 class AutoAdjustingSplitPane extends JSplitPane implements PropertyChangeListener, HierarchyBoundsListener {401 static class AutoAdjustingSplitPane extends JSplitPane implements PropertyChangeListener, HierarchyBoundsListener { 402 402 private double dividerLocation; 403 403 -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
r2565 r2626 160 160 references = references == null ? new LinkedList<RelationToChildReference>() : references; 161 161 decisions.clear(); 162 if (references.isEmpty()) { 163 this.relations = new HashSet<Relation>(references.size()); 164 } else { 165 this.relations = new HashSet<Relation>(references.size()); 166 } 162 this.relations = new HashSet<Relation>(references.size()); 167 163 for (RelationToChildReference reference: references) { 168 164 decisions.add(new RelationMemberConflictDecision(reference.getParent(), reference.getPosition()));
Note:
See TracChangeset
for help on using the changeset viewer.