Changeset 7254 in josm for trunk

Timestamp:

2014-06-19T11:09:04+02:00 (10 years ago)

Author:

simon04

Message:

see #9844 - RelationChecker: add unit tests, fix detected problem concerning role counts

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy (added)

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -70 +70 @@
     /**
      * Reads the presets data.
-     *
      */
-    public void initializePresets() {
+    public static synchronized void initializePresets() {
+        if (!relationpresets.isEmpty()) {
+            // the presets have already been initialized
+            return;
+        }
         for (TaggingPreset p : TaggingPresets.getTaggingPresets()) {
             for (TaggingPresetItem i : p.data) {

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -170 +170 @@
 
         public boolean required = false;
-        public long count = 0;
+        private long count = 0;
 
         public void setType(String types) throws SAXException {
@@ -191 +191 @@
         }
 
-        /* return either argument, the highest possible value or the lowest
-           allowed value */
-        public long getValidCount(long c)
-        {
-            if(count > 0 && !required)
+        public void setCount(String count) {
+            this.count = Long.parseLong(count);
+        }
+
+        /**
+         * Return either argument, the highest possible value or the lowest allowed value
+         */
+        public long getValidCount(long c) {
+            if (count > 0 && !required)
                 return c != 0 ? count : 0;
-            else if(count > 0)
+            else if (count > 0)
                 return count;
-            else if(!required)
-                return c != 0  ? c : 0;
+            else if (!required)
+                return c != 0 ? c : 0;
             else
-                return c != 0  ? c : 1;
-        }
+                return c != 0 ? c : 1;
+        }
+
         public boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
             String cstring;