Changeset 6823 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2014-02-07T01:34:02+01:00 (10 years ago)

Author:

bastiK

Message:

#8902 Small performance enhancements / coding style (patch by shinigami, parts)

patterns.diff: precompiled patterns
(only those parts applied, where performance may be relevant)

File:

• trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java

@@ -16 +16 @@
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.regex.Pattern;
+
 import org.openstreetmap.josm.tools.Utils;
 
 /**
  * TagCollection is a collection of tags which can be used to manipulate
- * tags managed by {@link OsmPrimitive}s.
+ * tags managed by {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s.
  *
  * A TagCollection can be created:
  * <ul>
- *  <li>from the tags managed by a specific {@link OsmPrimitive} with {@link #from(Tagged)}</li>
- *  <li>from the union of all tags managed by a collection of {@link OsmPrimitive}s with {@link #unionOfAllPrimitives(Collection)}</li>
- *  <li>from the union of all tags managed by a {@link DataSet} with {@link #unionOfAllPrimitives(DataSet)}</li>
- *  <li>from the intersection of all tags managed by a collection of primitives with {@link #commonToAllPrimitives(Collection)}</li>
+ *  <li>from the tags managed by a specific {@link org.openstreetmap.josm.data.osm.OsmPrimitive} with {@link #from(org.openstreetmap.josm.data.osm.Tagged)}</li>
+ *  <li>from the union of all tags managed by a collection of {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s with {@link #unionOfAllPrimitives(java.util.Collection)}</li>
+ *  <li>from the union of all tags managed by a {@link org.openstreetmap.josm.data.osm.DataSet} with {@link #unionOfAllPrimitives(org.openstreetmap.josm.data.osm.DataSet)}</li>
+ *  <li>from the intersection of all tags managed by a collection of primitives with {@link #commonToAllPrimitives(java.util.Collection)}</li>
  * </ul>
  *
@@ -33 +35 @@
  *
  * Basic set operations allow to create the union, the intersection and  the difference
- * of tag collections, see {@link #union(TagCollection)}, {@link #intersect(TagCollection)},
- * and {@link #minus(TagCollection)}.
+ * of tag collections, see {@link #union(org.openstreetmap.josm.data.osm.TagCollection)}, {@link #intersect(org.openstreetmap.josm.data.osm.TagCollection)},
+ * and {@link #minus(org.openstreetmap.josm.data.osm.TagCollection)}.
  *
  *
@@ -42 +44 @@
     /**
      * Creates a tag collection from the tags managed by a specific
-     * {@link OsmPrimitive}. If <code>primitive</code> is null, replies
+     * {@link org.openstreetmap.josm.data.osm.OsmPrimitive}. If <code>primitive</code> is null, replies
      * an empty tag collection.
      *
      * @param primitive  the primitive
      * @return a tag collection with the tags managed by a specific
-     * {@link OsmPrimitive}
+     * {@link org.openstreetmap.josm.data.osm.OsmPrimitive}
      */
     public static TagCollection from(Tagged primitive) {
@@ -590 +592 @@
 
     /**
-     * Applies this tag collection to an {@link OsmPrimitive}. Does nothing if
+     * Applies this tag collection to an {@link org.openstreetmap.josm.data.osm.OsmPrimitive}. Does nothing if
      * primitive is null
      *
@@ -611 +613 @@
 
     /**
-     * Applies this tag collection to a collection of {@link OsmPrimitive}s. Does nothing if
+     * Applies this tag collection to a collection of {@link org.openstreetmap.josm.data.osm.OsmPrimitive}s. Does nothing if
      * primitives is null
      *
@@ -628 +630 @@
 
     /**
-     * Replaces the tags of an {@link OsmPrimitive} by the tags in this collection . Does nothing if
+     * Replaces the tags of an {@link org.openstreetmap.josm.data.osm.OsmPrimitive} by the tags in this collection . Does nothing if
      * primitive is null
      *
@@ -646 +648 @@
 
     /**
-     * Replaces the tags of a collection of{@link OsmPrimitive}s by the tags in this collection.
+     * Replaces the tags of a collection of{@link org.openstreetmap.josm.data.osm.OsmPrimitive}s by the tags in this collection.
      * Does nothing if primitives is null
      *
@@ -716 +718 @@
     }
 
+    private static final Pattern SPLIT_VALUES_PATTERN = Pattern.compile(";\\s*");
+
     /**
      * Replies the concatenation of all tag values (concatenated by a semicolon)
@@ -732 +736 @@
         Map<String, Collection<String>> originalSplitValues = new LinkedHashMap<String, Collection<String>>();
         for (String v : originalValues) {
-            List<String> vs = Arrays.asList(v.split(";\\s*"));
+            List<String> vs = Arrays.asList(SPLIT_VALUES_PATTERN.split(v));
             originalSplitValues.put(v, vs);
             values.addAll(vs);