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

Timestamp:

2014-05-09T04:49:54+02:00 (10 years ago)

Author:

Don-vip

Message:

fixes for unit tests

File:

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

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

@@ -80 +80 @@
     final public static int noThreads;
     final public static ExecutorService styleCreatorPool;
-    
+
     static {
         noThreads = Main.pref.getInteger(
@@ -330 +330 @@
     private boolean leftHandTraffic;
 
+    /**
+     * Constructs a new {@code StyledMapRenderer}.
+     *
+     * @param g the graphics context. Must not be null.
+     * @param nc the map viewport. Must not be null.
+     * @param isInactiveMode if true, the paint visitor shall render OSM objects such that they
+     * look inactive. Example: rendering of data in an inactive layer using light gray as color only.
+     * @throws IllegalArgumentException thrown if {@code g} is null
+     * @throws IllegalArgumentException thrown if {@code nc} is null
+     */
     public StyledMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) {
         super(g, nc, isInactiveMode);
@@ -1329 +1339 @@
         return null;
     }
-    
+
     @Override
     public void render(final DataSet data, boolean renderVirtualNodes, Bounds bounds) {
@@ -1343 +1353 @@
         
         highlightWaySegments = data.getHighlightedWaySegments();
-        
+
         long timeStart=0, timePhase1=0, timeFinished;
         if (Main.isTraceEnabled()) {
@@ -1369 +1379 @@
                 this.output = output;
             }
-            
+
             @Override
             public List<StyleRecord> call() throws Exception {
@@ -1380 +1390 @@
                 return output;
             }
-            
+
             @Override
             public void visit(Node n) {
@@ -1456 +1466 @@
         
         final List<StyleRecord> allStyleElems = new ArrayList<>(nodes.size()+ways.size()+relations.size());
-        
+
         class ConcurrentTasksHelper {
-            
+
             void process(List<? extends OsmPrimitive> prims) {
                 final List<ComputeStyleListWorker> tasks = new ArrayList<>();
@@ -1490 +1500 @@
         }
         ConcurrentTasksHelper helper = new ConcurrentTasksHelper();
-        
+
         // Need to process all relations first.
         // Reason: Make sure, ElemStyles.getStyleCacheWithRange is
@@ -1505 +1515 @@
             System.err.print("phase 1 (calculate styles): " + (timePhase1 - timeStart) + " ms");
         }
-        
+
         Collections.sort(allStyleElems);
-        
+
         for (StyleRecord r : allStyleElems) {
             r.style.paintPrimitive(