Changeset 3824 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/SimpleNodeElemStyle.java

Timestamp:

2011-01-27T21:18:27+01:00 (14 years ago)

Author:

bastiK

Message:

Separate styles from style generation. This may seem a little over the top, but its just an intermediate state of development, should make sense later. Regarding performance: execution time is the same, memory use is similar, or a little less (due to intern pool for StyleCache). Tested, but can have still some bugs.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/SimpleNodeElemStyle.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/SimpleNodeElemStyle.java

@@ -8 +8 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPainter;
 
-public class SimpleNodeElemStyle extends ElemStyle {
+public class SimpleNodeElemStyle extends NodeElemStyle {
 
     public static final SimpleNodeElemStyle INSTANCE = new SimpleNodeElemStyle();
 
     private SimpleNodeElemStyle() {
-        minScale = 0;
-        maxScale = 1500;
+        super(0, Long.MAX_VALUE);
+        annotate = true;
     }
 
-    private static final int max(int a, int b, int c, int d) {
+    private static int max(int a, int b, int c, int d) {
         return Math.max(Math.max(a, b), Math.max(c, d));
     }
@@ -25 +25 @@
             boolean selected, boolean member) {
         Node n = (Node)primitive;
-        String name = painter.isShowNames()?painter.getNodeName(n):null;
-
 
         if (n.isHighlighted()) {
-            painter.drawNode(n, settings.getHighlightColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode(), name);
+            painter.drawNode(n, settings.getHighlightColor(), settings.getSelectedNodeSize(), settings.isFillSelectedNode(), getName(n, painter));
         } else {
 
@@ -65 +63 @@
                                     settings.isFillUnselectedNode();
 
-            painter.drawNode(n, color, size, fill, name);
+            painter.drawNode(n, color, size, fill, getName(n, painter));
         }
     }
-
 }