Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/corrector

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

Location:

trunk/src/org/openstreetmap/josm/corrector

Files:

• ReverseWayTagCorrector.java (modified) (1 diff)
• RoleCorrectionTableModel.java (modified) (2 diffs)
• TagCorrector.java (modified) (12 diffs)

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -115 +115 @@
         roleCorrectionMap.put(way, new ArrayList<RoleCorrection>());
 
-        for (Relation relation : Main.ds.relations) {
+        for (Relation relation : Main.main.getCurrentDataSet().relations) {
             int position = 0;
             for (RelationMember member : relation.members) {

trunk/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java

@@ -6 +6 @@
 import java.util.List;
 
-import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
+import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
 
 public class RoleCorrectionTableModel extends
-        CorrectionTableModel<RoleCorrection> {
-
-    private static NameVisitor nameVisitor = new NameVisitor();
+CorrectionTableModel<RoleCorrection> {
+    private static final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
 
     public RoleCorrectionTableModel(List<RoleCorrection> roleCorrections) {
@@ -41 +40 @@
         switch (colIndex) {
         case 0:
-            roleCorrection.relation.visit(nameVisitor);
-            return nameVisitor.name;
+            return NAME_FORMATTER.getName(roleCorrection.relation);
         case 1:
             return roleCorrection.member.role;

trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
 import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 public abstract class TagCorrector<P extends OsmPrimitive> {
+    private static final PrimitiveNameFormatter NAME_FORMATTER = new PrimitiveNameFormatter();
 
     public abstract Collection<Command> execute(P primitive, P oldprimitive)
-        throws UserCancelException;
+    throws UserCancelException;
 
     private String[] applicationOptions = new String[] {
-        tr("Apply selected changes"),
-        tr("Don't apply changes"),
-        tr("Cancel")
+            tr("Apply selected changes"),
+            tr("Don't apply changes"),
+            tr("Cancel")
     };
 
@@ -56 +58 @@
         }
 
-        if (!hasCorrections)
+        if (!hasCorrections) {
             for (List<RoleCorrection> roleCorrectionList : roleCorrectionMap
                     .values()) {
@@ -64 +66 @@
                 }
             }
+        }
 
         if (hasCorrections) {
@@ -72 +75 @@
                 new HashMap<OsmPrimitive, RoleCorrectionTable>();
 
-            NameVisitor nameVisitor = new NameVisitor();
+            //NameVisitor nameVisitor = new NameVisitor();
 
             final JPanel p = new JPanel(new GridBagLayout());
@@ -87 +90 @@
             for (OsmPrimitive primitive : tagCorrectionsMap.keySet()) {
                 final List<TagCorrection> tagCorrections = tagCorrectionsMap
-                        .get(primitive);
-
-                if (tagCorrections.isEmpty())
+                .get(primitive);
+
+                if (tagCorrections.isEmpty()) {
                     continue;
-
-                primitive.visit(nameVisitor);
+                }
 
                 final JLabel propertiesLabel = new JLabel(tr("Properties of "));
@@ -98 +100 @@
 
                 final JLabel primitiveLabel = new JLabel(
-                        nameVisitor.name + ":", nameVisitor.icon, JLabel.LEFT);
+                        NAME_FORMATTER.getName(primitive) + ":",
+                        ImageProvider.get(OsmPrimitiveType.from(primitive)),
+                        JLabel.LEFT
+                );
                 p.add(primitiveLabel, GBC.eol());
 
@@ -111 +116 @@
             for (OsmPrimitive primitive : roleCorrectionMap.keySet()) {
                 final List<RoleCorrection> roleCorrections = roleCorrectionMap
-                        .get(primitive);
-                if (roleCorrections.isEmpty())
+                .get(primitive);
+                if (roleCorrections.isEmpty()) {
                     continue;
-
-                primitive.visit(nameVisitor);
+                }
 
                 final JLabel rolesLabel = new JLabel(
@@ -122 +126 @@
 
                 final JLabel primitiveLabel = new JLabel(
-                        nameVisitor.name + ":", nameVisitor.icon, JLabel.LEFT);
+                        NAME_FORMATTER.getName(primitive),
+                        ImageProvider.get(OsmPrimitiveType.from(primitive)),
+                        JLabel.LEFT
+                );
                 p.add(primitiveLabel, GBC.eol());
 
@@ -145 +152 @@
                     // create the clone
                     OsmPrimitive clone = null;
-                    if (primitive instanceof Way) clone = new Way((Way)primitive);
-                    else if (primitive instanceof Node) clone = new Node((Node)primitive);
-                    else if (primitive instanceof Relation) clone = new Relation((Relation)primitive);
+                    if (primitive instanceof Way) {
+                        clone = new Way((Way)primitive);
+                    } else if (primitive instanceof Node) {
+                        clone = new Node((Node)primitive);
+                    } else if (primitive instanceof Relation) {
+                        clone = new Relation((Relation)primitive);
+                    }
 
                     // use this structure to remember keys that have been set already so that
@@ -157 +168 @@
                         if (tagTableMap.get(primitive).getCorrectionTableModel().getApply(i)) {
                             TagCorrection tagCorrection = tagCorrections.get(i);
-                            if (tagCorrection.isKeyChanged() && !keysChanged.contains(tagCorrection.oldKey)) clone.remove(tagCorrection.oldKey);
+                            if (tagCorrection.isKeyChanged() && !keysChanged.contains(tagCorrection.oldKey)) {
+                                clone.remove(tagCorrection.oldKey);
+                            }
                             clone.put(tagCorrection.newKey, tagCorrection.newValue);
                             keysChanged.add(tagCorrection.newKey);
@@ -164 +177 @@
 
                     // save the clone
-                    if (!keysChanged.isEmpty()) commands.add(new ChangeCommand(primitive, clone));
+                    if (!keysChanged.isEmpty()) {
+                        commands.add(new ChangeCommand(primitive, clone));
+                    }
                 }
                 for (OsmPrimitive primitive : roleCorrectionMap.keySet()) {
                     List<RoleCorrection> roleCorrections = roleCorrectionMap
-                            .get(primitive);
+                    .get(primitive);
 
                     for (int i = 0; i < roleCorrections.size(); i++) {
@@ -177 +192 @@
                     }
                 }
-            } else if (answer != JOptionPane.NO_OPTION) {
+            } else if (answer != JOptionPane.NO_OPTION)
                 throw new UserCancelException();
-            }
             return commands;
         }