Changeset 7109 in josm for trunk/src/org

Timestamp:

2014-05-12T00:40:09+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8671 - some code refactoring done in an unsuccessful attempt to reproduce error, but worth keeping

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (6 diffs)
• tools/CompositeList.java (added)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -25 +25 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -71 +70 @@
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
 import org.openstreetmap.josm.gui.mappaint.TextElement;
+import org.openstreetmap.josm.tools.CompositeList;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
@@ -237 +237 @@
 
             return Float.compare(this.style.object_z_index, other.style.object_z_index);
-        }
-    }
-
-    /**
-     * Joined List build from two Lists (read-only).
-     *
-     * Extremely simple single-purpose implementation.
-     * @param <T>
-     */
-    public static class CompositeList<T> extends AbstractList<T> {
-        List<? extends T> a,b;
-
-        /**
-         * Constructs a new {@code CompositeList} from two lists.
-         * @param a First list
-         * @param b Second list
-         */
-        public CompositeList(List<? extends T> a, List<? extends T> b) {
-            this.a = a;
-            this.b = b;
-        }
-
-        @Override
-        public T get(int index) {
-            return index < a.size() ? a.get(index) : b.get(index - a.size());
-        }
-
-        @Override
-        public int size() {
-            return a.size() + b.size();
         }
     }
@@ -1360 +1330 @@
 
         /**
-         * Constructor for CreateStyleRecordsWorker.
+         * Constructs a new {@code ComputeStyleListWorker}.
          * @param input the primitives to process
          * @param from first index of <code>input</code> to use
          * @param to last index + 1
+         * @param output the list of styles to which styles will be added
+         * @param data the data set
          */
         public ComputeStyleListWorker(final List<? extends OsmPrimitive> input, int from, int to, List<StyleRecord> output, DataSet data) {
@@ -1516 +1488 @@
             List<Way> ways = data.searchWays(bbox);
             List<Relation> relations = data.searchRelations(bbox);
-
+    
             final List<StyleRecord> allStyleElems = new ArrayList<>(nodes.size()+ways.size()+relations.size());
-
+    
             ConcurrentTasksHelper helper = new ConcurrentTasksHelper(allStyleElems, data);
 
@@ -1545 +1517 @@
                 );
             }
-
+    
             if (Main.isTraceEnabled()) {
                 timeFinished = System.currentTimeMillis();
                 System.err.println("; phase 2 (draw): " + (timeFinished - timePhase1) + " ms; total: " + (timeFinished - timeStart) + " ms");
             }
-
+    
             drawVirtualNodes(data, bbox);
         } finally {