Changeset 5481 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

Timestamp:

2012-08-28T00:16:35+02:00 (12 years ago)

Author:

stoecker

Message:

some cleanup, mainly javadoc

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -17 +17 @@
 import javax.swing.Icon;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
@@ -108 +109 @@
                     cache.put(key, result);
                 } catch (ParseError e) {
-                    System.out.println(String.format("Unable to parse template engine pattern '%s' for property %s", defaultValue, key));
+                    Main.warn("Unable to parse template engine pattern ''{0}'' for property {1}", defaultValue, key);
                 }
             }
@@ -127 +128 @@
                     cache.put(key, result);
                 } catch (ParseError e) {
-                    System.out.println(String.format("Unable to parse template engine pattern '%s' for property %s", defaultValue, key));
+                    Main.warn("Unable to parse template engine pattern ''{0}'' for property {1}", defaultValue, key);
                 }
             }
@@ -147 +148 @@
                 return new TemplateParser(s).parse();
             } catch (ParseError e) {
-                System.out.println(String.format("Unable to parse template engine pattern '%s' for property %s. Using default ('%s') instead",
-                        s, getKey(), super.getDefaultValueAsString()));
+                Main.warn("Unable to parse template engine pattern ''{0}'' for property {1}. Using default (''{2}'') instead",
+                        s, getKey(), super.getDefaultValueAsString());
                 return getDefaultValue();
             }
@@ -177 +178 @@
     public static final List<MarkerProducers> markerProducers = new LinkedList<MarkerProducers>();
 
-    // Add one Maker specifying the default behaviour.
+    // Add one Marker specifying the default behaviour.
     static {
         Marker.markerProducers.add(new MarkerProducers() {
@@ -203 +204 @@
                                 url = new File(relativePath.getParentFile(), uri).toURI().toURL();
                             } catch (MalformedURLException e1) {
-                                System.err.println("Unable to convert uri " + uri + " to URL: "  + e1.getMessage());
+                                Main.warn("Unable to convert uri {0} to URL: {1}", uri, e1.getMessage());
                             }
                         }
@@ -217 +218 @@
                     return new Marker(wpt.getCoor(), wpt, symbolName, parentLayer, time, offset);
                 }
-                else if (url.toString().endsWith(".wav"))
+                else if (url.toString().endsWith(".wav")) {
                     return new AudioMarker(wpt.getCoor(), wpt, url, parentLayer, time, offset);
-                else if (url.toString().endsWith(".png") || url.toString().endsWith(".jpg") || url.toString().endsWith(".jpeg") || url.toString().endsWith(".gif"))
+                } else if (url.toString().endsWith(".png") || url.toString().endsWith(".jpg") || url.toString().endsWith(".jpeg") || url.toString().endsWith(".gif")) {
                     return new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset);
-                else
+                } else {
                     return new WebMarker(wpt.getCoor(), url, parentLayer, time, offset);
+                }
             }
         });
@@ -366 +368 @@
     /**
      * Returns the Text which should be displayed, depending on chosen preference
-     * @return Text
+     * @return Text of the label
      */
     public String getText() {