Changeset 30532 in osm for applications/editors/josm/plugins/utilsplugin2/src/org

Timestamp:

2014-07-14T04:18:06+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix compilation warnings

Location:

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2

Files:

• customurl/ChooseURLAction.java (modified) (1 diff)
• replacegeometry/ReplaceGeometryUtils.java (modified) (8 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/ChooseURLAction.java

@@ -54 +54 @@
         }
         final JLabel label1=new JLabel(tr("Please select one of custom URLs (configured in Preferences)"));
-        final JList list1=new JList(names);
+        final JList<String> list1=new JList<>(names);
         final JTextField editField=new JTextField();
         final JCheckBox check1=new JCheckBox(tr("Ask every time"));

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -8 +8 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -13 +14 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.swing.JOptionPane;
@@ -24 +24 @@
 import org.openstreetmap.josm.command.DeleteCommand;
 import org.openstreetmap.josm.command.MoveCommand;
+import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -29 +30 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.RelationToChildReference;
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
-import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil;
 
 import edu.princeton.cs.algs4.AssignmentProblem;
-import org.openstreetmap.josm.gui.Notification;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -45 +43 @@
  */
 public final class ReplaceGeometryUtils {
-    private static final String TITLE = tr("Replace Geometry");
     /**
      * Replace new or uploaded object with new object
@@ -168 +165 @@
 
         // merge tags
-        Collection<Command> tagResolutionCommands = getTagConflictResolutionCommands(subjectNode, referenceObject);
-        if (tagResolutionCommands == null) {
+        try {
+            commands.addAll(getTagConflictResolutionCommands(subjectNode, referenceObject));
+        } catch (UserCancelException e) {
             // user canceled tag merge dialog
             return null;
         }
-        commands.addAll(tagResolutionCommands);
 
         // replace sacrificial node in way with node that is being upgraded
@@ -254 +251 @@
                 
         // merge tags
-        Collection<Command> tagResolutionCommands = getTagConflictResolutionCommands(referenceWay, subjectWay);
-        if (tagResolutionCommands == null) {
+        try {
+            commands.addAll(getTagConflictResolutionCommands(referenceWay, subjectWay));
+        } catch (UserCancelException e) {
             // user canceled tag merge dialog
             return null;
         }
-        commands.addAll(tagResolutionCommands);
         
         // Prepare a list of nodes that are not used anywhere except in the way
@@ -452 +449 @@
      * @param source object tags are merged from
      * @param target object tags are merged to
-     * @return
-     */
-    protected static List<Command> getTagConflictResolutionCommands(OsmPrimitive source, OsmPrimitive target) {
-        // determine if the same key in each object has different values
-        boolean keysWithMultipleValues;
-        Set<OsmPrimitive> set = new HashSet<OsmPrimitive>();
-        set.add(source);
-        set.add(target);
-        TagCollection tagCol = TagCollection.unionOfAllPrimitives(set);
-        Set<String> keys = tagCol.getKeysWithMultipleValues();
-        keysWithMultipleValues = !keys.isEmpty();
-            
+     * @return The list of {@link Command commands} needed to apply resolution actions.
+     * @throws UserCancelException If the user cancelled a dialog.
+     */
+    protected static List<Command> getTagConflictResolutionCommands(OsmPrimitive source, OsmPrimitive target) throws UserCancelException {
         Collection<OsmPrimitive> primitives = Arrays.asList(source, target);
-        
-        Set<RelationToChildReference> relationToNodeReferences = RelationToChildReference.getRelationToChildReferences(primitives);
-
-        // build the tag collection
-        TagCollection tags = TagCollection.unionOfAllPrimitives(primitives);
-        TagConflictResolutionUtil.combineTigerTags(tags);
-        TagConflictResolutionUtil.normalizeTagCollectionBeforeEditing(tags, primitives);
-        TagCollection tagsToEdit = new TagCollection(tags);
-        TagConflictResolutionUtil.completeTagCollectionForEditing(tagsToEdit);
-
         // launch a conflict resolution dialog, if necessary
-        CombinePrimitiveResolverDialog dialog = CombinePrimitiveResolverDialog.getInstance();
-        dialog.getTagConflictResolverModel().populate(tagsToEdit, tags.getKeysWithMultipleValues());
-        dialog.getRelationMemberConflictResolverModel().populate(relationToNodeReferences);
-        dialog.setTargetPrimitive(target);
-        dialog.prepareDefaultDecisions();
-
-        // conflict resolution is necessary if there are conflicts in the merged tags
-        // or if both objects have relation memberships
-        if (keysWithMultipleValues || 
-                (!RelationToChildReference.getRelationToChildReferences(source).isEmpty() &&
-                 !RelationToChildReference.getRelationToChildReferences(target).isEmpty())) {
-            dialog.setVisible(true);
-            if (dialog.isCanceled()) {
-                return null;
-            }
-        }
-        return dialog.buildResolutionCommands();
-    }
-
+        return CombinePrimitiveResolverDialog.launchIfNecessary(
+                TagCollection.unionOfAllPrimitives(primitives), primitives, Collections.singleton(target));
+    }
     
     /**