Changeset 13332 in josm for trunk

Timestamp:

2018-01-16T01:35:35+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15782 - add debug logs

Location:

trunk/src/org/openstreetmap/josm/gui/tagging/presets

Files:

• TaggingPresetReader.java (modified) (5 diffs)
• items/PresetLink.java (modified) (1 diff)
• items/Roles.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java

@@ -70 +70 @@
         /** The chunk id, can be referenced later */
         public String id;
+
+        @Override
+        public String toString() {
+            return "Chunk [id=" + id + ']';
+        }
     }
 
@@ -78 +83 @@
         /** Reference matching a chunk id defined earlier **/
         public String ref;
+
+        @Override
+        public String toString() {
+            return "Reference [ref=" + ref + ']';
+        }
     }
 
@@ -182 +192 @@
                 o = parser.next();
             }
+            Logging.trace("Preset object: {0}", o);
             if (o instanceof Chunk) {
                 if (!lastIds.isEmpty() && ((Chunk) o).id.equals(lastIds.peek())) {
@@ -323 +334 @@
             throws SAXException, IOException {
         Collection<TaggingPreset> tp;
+        Logging.debug("Reading presets from {0}", source);
+        long startTime = System.currentTimeMillis();
         try (
             CachedFile cf = new CachedFile(source).setHttpAccept(PRESET_MIME_TYPES);
@@ -334 +347 @@
                 tp = readAll(new BufferedReader(r), validate, all);
             }
+        }
+        if (Logging.isDebugEnabled()) {
+            Logging.debug("Presets read in {0}", Utils.getDurationString(System.currentTimeMillis() - startTime));
         }
         return tp;

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/PresetLink.java

@@ -58 +58 @@
         // Do nothing
     }
+
+    @Override
+    public String toString() {
+        return "PresetLink [preset_name=" + preset_name + ']';
+    }
 }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java

@@ -36 +36 @@
     /**
      * The <code>role</code> element in tagging preset definition.
-     * 
+     *
      * Information on a certain role, which is expected for the relation members.
      */
@@ -117 +117 @@
         public boolean isRole(String role) {
             if (regexp && role != null) { // pass null through, it will anyway fail
-                
                 return role.matches(this.key);
             }
@@ -149 +148 @@
             return true;
         }
+
+        @Override
+        public String toString() {
+            return "Role [key=" + key + ", text=" + text + ']';
+        }
     }
 
+    /**
+     * List of {@link Role} elements.
+     */
     public final List<Role> roles = new LinkedList<>();
 
@@ -173 +180 @@
     public void addCommands(List<Tag> changedTags) {
     }
+
+    @Override
+    public String toString() {
+        return "Roles [roles=" + roles + ']';
+    }
 }