Changeset 28703 in osm for applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/BoundaryFixer.java

Timestamp:

2012-09-11T09:55:54+02:00 (14 years ago)

Author:

larry0ua

Message:

'RelToolbox: added warning messages to the warning icon hint'

File:

• applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/BoundaryFixer.java (modified) (3 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/BoundaryFixer.java

@@ -1 +1 @@
 package relcontext.relationfix;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -15 +17 @@
 
         public BoundaryFixer() {
-                super(new String[]{"boundary", "multipolygon"});
+                super("boundary", "multipolygon");
         }
-        
+
         /**
-         * For boundary relations both "boundary" and "multipolygon" types are applicable, but 
+         * For boundary relations both "boundary" and "multipolygon" types are applicable, but
          * it should also have key boundary=administrative to be fully boundary.
          * @see http://wiki.openstreetmap.org/wiki/Relation:boundary
@@ -27 +29 @@
                 return super.isFixerApplicable(rel) && "administrative".equals(rel.get("boundary"));
         }
-        
+
         @Override
         public boolean isRelationGood(Relation rel) {
                 for( RelationMember m : rel.getMembers() ) {
-            if (m.getType().equals(OsmPrimitiveType.RELATION) && !"subarea".equals(m.getRole()))
+            if (m.getType().equals(OsmPrimitiveType.RELATION) && !"subarea".equals(m.getRole())) {
+                setWarningMessage(tr("Relation without 'subarea' role found"));
                 return false;
-            if (m.getType().equals(OsmPrimitiveType.NODE) && !("label".equals(m.getRole()) || "admin_centre".equals(m.getRole())))
+            }
+            if (m.getType().equals(OsmPrimitiveType.NODE) && !("label".equals(m.getRole()) || "admin_centre".equals(m.getRole()))) {
+                setWarningMessage(tr("Node without 'label' or 'admin_centre' role found"));
                 return false;
-            if (m.getType().equals(OsmPrimitiveType.WAY) && !("outer".equals(m.getRole()) || "inner".equals(m.getRole())))
+            }
+            if (m.getType().equals(OsmPrimitiveType.WAY) && !("outer".equals(m.getRole()) || "inner".equals(m.getRole()))) {
+                setWarningMessage(tr("Way without 'inner' or 'outer' role found"));
                                 return false;
+            }
         }
+                clearWarningMessage();
                 return true;
         }