Changeset 7049 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-05-02T02:54:23+02:00 (10 years ago)

Author:

Don-vip

Message:

sonar - Don't call static DateFormat

File:

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

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

@@ -257 +257 @@
     }
 
-    private static final DateFormat timeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-    static {
-         TimeZone tz = TimeZone.getTimeZone("UTC");
-         timeFormatter.setTimeZone(tz);
-    }
-
     public static final String MARKER_OFFSET = "waypointOffset";
     public static final String MARKER_FORMATTED_OFFSET = "formattedWaypointOffset";
@@ -270 +264 @@
     public static final String LABEL_PATTERN_DESC = "{desc}";
 
+    private final DateFormat timeFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
     private final TemplateEngineDataProvider dataProvider;
     private final String text;
@@ -288 +283 @@
 
     public Marker(LatLon ll, TemplateEngineDataProvider dataProvider, String iconName, MarkerLayer parentLayer, double time, double offset) {
+        this(ll, dataProvider, null, iconName, parentLayer, time, offset);
+    }
+
+    public Marker(LatLon ll, String text, String iconName, MarkerLayer parentLayer, double time, double offset) {
+        this(ll, null, text, iconName, parentLayer, time, offset);
+    }
+
+    private Marker(LatLon ll, TemplateEngineDataProvider dataProvider, String text, String iconName, MarkerLayer parentLayer, double time, double offset) {
+        timeFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
         setCoor(ll);
 
@@ -296 +300 @@
 
         this.dataProvider = dataProvider;
-        this.text = null;
-    }
-
-    public Marker(LatLon ll, String text, String iconName, MarkerLayer parentLayer, double time, double offset) {
-        setCoor(ll);
-
-        this.offset = offset;
-        this.time = time;
-        this.symbol = iconName != null ? ImageProvider.getIfAvailable("markers",iconName) : null;
-        this.parentLayer = parentLayer;
-
-        this.dataProvider = null;
         this.text = text;
     }