Changeset 5681 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2013-01-27T20:07:53+01:00 (11 years ago)

Author:

bastiK

Message:

some simple refactoring

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• gpx/GpxConstants.java (added)
• gpx/GpxData.java (modified) (1 diff)
• gpx/GpxTrack.java (modified) (1 diff)
• gpx/IWithAttributes.java (copied) (copied from trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java ) (3 diffs)
• gpx/ImmutableGpxTrack.java (modified) (4 diffs)
• gpx/WithAttributes.java (modified) (4 diffs)
• validation/PaintVisitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -18 +18 @@
  */
 public class GpxData extends WithAttributes {
-
-    public static final String META_PREFIX = "meta.";
-    public static final String META_AUTHOR_NAME = META_PREFIX + "author.name";
-    public static final String META_AUTHOR_EMAIL = META_PREFIX + "author.email";
-    public static final String META_AUTHOR_LINK = META_PREFIX + "author.link";
-    public static final String META_COPYRIGHT_AUTHOR = META_PREFIX + "copyright.author";
-    public static final String META_COPYRIGHT_LICENSE = META_PREFIX + "copyright.license";
-    public static final String META_COPYRIGHT_YEAR = META_PREFIX + "copyright.year";
-    public static final String META_DESC = META_PREFIX + "desc";
-    public static final String META_KEYWORDS = META_PREFIX + "keywords";
-    public static final String META_LINKS = META_PREFIX + "links";
-    public static final String META_NAME = META_PREFIX + "name";
-    public static final String META_TIME = META_PREFIX + "time";
-    public static final String META_EXTENSIONS = META_PREFIX + "extensions";
-
-    public static final String JOSM_EXTENSIONS_NAMESPACE_URI = "http://josm.openstreetmap.de/gpx-extensions";
 
     public File storageFile;

trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java

@@ -15 +15 @@
  */
 
-public interface GpxTrack {
+public interface GpxTrack extends IWithAttributes {
 
     Collection<GpxTrackSegment> getSegments();

trunk/src/org/openstreetmap/josm/data/gpx/IWithAttributes.java

@@ -1 @@
-// License: GPL.
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.gpx;
 
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
- * Base class for various classes in the GPX model.
- *
- * @author Frederik Ramm <frederik@remote.org>
- * @since 444
+ * Object with attributes.
  */
-public class WithAttributes {
-
-    /**
-     * The "attr" hash is used to store the XML payload (not only XML attributes!)
-     */
-    public Map<String, Object> attr = new HashMap<String, Object>(0);
+public interface IWithAttributes {
 
     /**
@@ -27 +17 @@
      *         or {@code null} if this map contains no String mapping for the key
      */
-    public String getString(String key) {
-        Object value = attr.get(key);
-        return (value instanceof String) ? (String)value : null;
-    }
+    String getString(String key);
     
     /**
@@ -41 +28 @@
      * @since 5502
      */
-    public Collection<?> getCollection(String key) {
-        Object value = attr.get(key);
-        return (value instanceof Collection<?>) ? (Collection<?>)value : null;
-    }
+    Collection<?> getCollection(String key);
 }

trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrack.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.Bounds;
 
-public class ImmutableGpxTrack implements GpxTrack {
+public class ImmutableGpxTrack extends WithAttributes implements GpxTrack {
 
-    private final Map<String, Object> attributes;
     private final Collection<GpxTrackSegment> segments;
     private final double length;
@@ -25 +24 @@
             }
         }
-        this.attributes = Collections.unmodifiableMap(new HashMap<String, Object>(attributes));
+        this.attr = Collections.unmodifiableMap(new HashMap<String, Object>(attributes));
         this.segments = Collections.unmodifiableCollection(newSegments);
         this.length = calculateLength();
@@ -55 +54 @@
     }
 
+    @Override
     public Map<String, Object> getAttributes() {
-        return attributes;
+        return attr;
     }
 
+    @Override
     public Bounds getBounds() {
         if (bounds == null)
@@ -66 +67 @@
     }
 
+    @Override
     public double length() {
         return length;
     }
 
+    @Override
     public Collection<GpxTrackSegment> getSegments() {
         return segments;
     }
 
+    @Override
     public int getUpdateCount() {
         return 0;

trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java

@@ -1 @@
-// License: GPL.
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.gpx;
 
@@ -7 +7 @@
 
 /**
+ * Default implementation for IWithAttributes.
+ *
  * Base class for various classes in the GPX model.
  *
@@ -12 +14 @@
  * @since 444
  */
-public class WithAttributes {
+public class WithAttributes implements IWithAttributes, GpxConstants {
 
     /**
@@ -20 +22 @@
 
     /**
-     * Returns the String value to which the specified key is mapped, 
+     * Returns the String value to which the specified key is mapped,
      * or {@code null} if this map contains no String mapping for the key.
-     *  
+     *
      * @param key the key whose associated value is to be returned
-     * @return the String value to which the specified key is mapped, 
+     * @return the String value to which the specified key is mapped,
      *         or {@code null} if this map contains no String mapping for the key
      */
+    @Override
     public String getString(String key) {
         Object value = attr.get(key);
         return (value instanceof String) ? (String)value : null;
     }
-    
+
     /**
-     * Returns the Collection value to which the specified key is mapped, 
+     * Returns the Collection value to which the specified key is mapped,
      * or {@code null} if this map contains no Collection mapping for the key.
-     *  
+     *
      * @param key the key whose associated value is to be returned
-     * @return the Collection value to which the specified key is mapped, 
+     * @return the Collection value to which the specified key is mapped,
      *         or {@code null} if this map contains no Collection mapping for the key
      * @since 5502
      */
+    @Override
     public Collection<?> getCollection(String key) {
         Object value = attr.get(key);

trunk/src/org/openstreetmap/josm/data/validation/PaintVisitor.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.validation;