Changeset 30714 in osm for applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java
- Timestamp:
- 2014-10-12T12:37:13+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java
r30712 r30714 43 43 import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecision; 44 44 import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType; 45 import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolver; 46 import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolverModel; 45 47 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction; 46 48 import org.openstreetmap.josm.gui.help.HelpUtil; … … 95 97 96 98 private AutoAdjustingSplitPane spTagConflictTypes; 97 private MyTagConflictResolver pnlTagConflictResolver;99 private TagConflictResolver pnlTagConflictResolver; 98 100 private MyRelationMemberConflictResolver pnlRelationMemberConflictResolver; 99 101 private boolean cancelled; … … 162 164 163 165 protected JPanel buildTagConflictResolverPanel() { 164 pnlTagConflictResolver = new MyTagConflictResolver();166 pnlTagConflictResolver = new TagConflictResolver(); 165 167 return pnlTagConflictResolver; 166 168 } … … 199 201 } 200 202 201 public MyTagConflictResolverModel getTagConflictResolverModel() {203 public TagConflictResolverModel getTagConflictResolverModel() { 202 204 return pnlTagConflictResolver.getModel(); 203 205 } … … 208 210 209 211 protected List<Command> buildTagChangeCommand(OsmPrimitive primitive, TagCollection tc) { 210 LinkedList<Command> cmds = new LinkedList< Command>();212 LinkedList<Command> cmds = new LinkedList<>(); 211 213 for (String key : tc.getKeys()) { 212 214 if (tc.hasUniqueEmptyValue(key)) { … … 225 227 226 228 public List<Command> buildWayResolutionCommands() { 227 List<Command> cmds = new LinkedList< Command>();229 List<Command> cmds = new LinkedList<>(); 228 230 229 231 TagCollection allResolutions = getTagConflictResolverModel().getAllResolutions(); … … 248 250 249 251 protected void prepareDefaultTagDecisions() { 250 MyTagConflictResolverModel model = getTagConflictResolverModel();252 TagConflictResolverModel model = getTagConflictResolverModel(); 251 253 for (int i = 0; i < model.getRowCount(); i++) { 252 254 MultiValueResolutionDecision decision = model.getDecision(i); … … 264 266 protected void prepareDefaultRelationDecisions() { 265 267 MyRelationMemberConflictResolverModel model = getRelationMemberConflictResolverModel(); 266 Set<Relation> relations = new HashSet< Relation>();268 Set<Relation> relations = new HashSet<>(); 267 269 for (int i = 0; i < model.getNumDecisions(); i++) { 268 270 RelationMemberConflictDecision decision = model.getDecision(i); … … 291 293 protected void prepareGUIBeforeConflictResolutionStarts() { 292 294 MyRelationMemberConflictResolverModel relModel = getRelationMemberConflictResolverModel(); 293 MyTagConflictResolverModel tagModel = getTagConflictResolverModel();295 TagConflictResolverModel tagModel = getTagConflictResolverModel(); 294 296 getContentPane().removeAll(); 295 297 … … 382 384 @Override 383 385 public void propertyChange(PropertyChangeEvent evt) { 384 if (evt.getPropertyName().equals( MyTagConflictResolverModel.NUM_CONFLICTS_PROP)) {386 if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) { 385 387 updateEnabledState(); 386 388 }
Note:
See TracChangeset
for help on using the changeset viewer.