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

Timestamp:

2009-07-11T09:32:42+02:00 (16 years ago)

Author:

Gubaer

Message:

added: improved tag editor grid in relation editor (borrowed code from tag editor plugin)
removed: realEqual() on OsmPrimitive, Node, etc.

File:

• trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java (modified) (6 diffs)

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

@@ -44 +44 @@
         public String apply(String text) {
             Matcher m = startPattern.matcher(text);
-            if (!m.lookingAt())
+            if (!m.lookingAt()) {
                 m = endPattern.matcher(text);
+            }
 
             if (m.lookingAt()) {
@@ -62 +63 @@
 
     private static PrefixSuffixSwitcher[] prefixSuffixSwitchers =
-            new PrefixSuffixSwitcher[] {
-                new PrefixSuffixSwitcher("left", "right"),
-                new PrefixSuffixSwitcher("forward", "backward"),
-                new PrefixSuffixSwitcher("forwards", "backwards")
-            };
+        new PrefixSuffixSwitcher[] {
+        new PrefixSuffixSwitcher("left", "right"),
+        new PrefixSuffixSwitcher("forward", "backward"),
+        new PrefixSuffixSwitcher("forwards", "backwards")
+    };
 
     @Override
     public Collection<Command> execute(Way oldway, Way way) throws UserCancelException {
         Map<OsmPrimitive, List<TagCorrection>> tagCorrectionsMap =
-                new HashMap<OsmPrimitive, List<TagCorrection>>();
+            new HashMap<OsmPrimitive, List<TagCorrection>>();
 
         ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
@@ -86 +87 @@
 
                 if (key.equals("oneway")) {
-                    if (value.equals("-1"))
+                    if (value.equals("-1")) {
                         newValue = OsmUtils.trueval;
-                    else {
+                    } else {
                         Boolean boolValue = OsmUtils.getOsmBoolean(value);
                         if (boolValue != null && boolValue.booleanValue()) {
@@ -97 +98 @@
                     for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
                         newKey = prefixSuffixSwitcher.apply(key);
-                        if (!key.equals(newKey))
+                        if (!key.equals(newKey)) {
                             break;
+                        }
                     }
                 }
 
-                if (!key.equals(newKey) || !value.equals(newValue))
+                if (!key.equals(newKey) || !value.equals(newValue)) {
                     tagCorrectionsMap.get(primitive).add(
                             new TagCorrection(key, value, newKey, newValue));
+                }
             }
         }
 
         Map<OsmPrimitive, List<RoleCorrection>> roleCorrectionMap =
-                new HashMap<OsmPrimitive, List<RoleCorrection>>();
+            new HashMap<OsmPrimitive, List<RoleCorrection>>();
         roleCorrectionMap.put(way, new ArrayList<RoleCorrection>());
 
@@ -115 +118 @@
             int position = 0;
             for (RelationMember member : relation.members) {
-                if (!member.member.realEqual(oldway, true)
+                if (!member.member.hasEqualSemanticAttributes(oldway)
                         || member.role.length() == 0) {
                     position++;
@@ -131 +134 @@
                 }
 
-                if (found)
+                if (found) {
                     roleCorrectionMap.get(way).add(
                             new RoleCorrection(relation, position, member, newRole));
+                }
 
                 position++;