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

Timestamp:

2011-02-11T13:21:33+01:00 (15 years ago)

Author:

bastiK

Message:

mapcss: several small fixes

File:

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

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

@@ -56 +56 @@
 
     private final Color inactiveColor;
-    private final Color textColor;
     private final Color selectedColor;
     private final Color relationSelectedColor;
-    private final Color areaTextColor;
     private final Color nodeColor;
     private final Color backgroundColor;
@@ -90 +88 @@
 
         this.inactiveColor = PaintColors.INACTIVE.get();
-        this.textColor = PaintColors.TEXT.get();
         this.selectedColor = PaintColors.SELECTED.get();
         this.relationSelectedColor = PaintColors.RELATIONSELECTED.get();
-        this.areaTextColor = PaintColors.AREA_TEXT.get();
         this.nodeColor = PaintColors.NODE.get();
         this.backgroundColor = PaintColors.BACKGROUND.get();
@@ -493 +489 @@
                     polygon.contains(centeredNBounds) // slow but nice
             ) {
-                g.setColor(areaTextColor);
+                g.setColor(text.color);
                 Font defaultFont = g.getFont();
-                g.setFont (orderFont);
+                g.setFont (text.font);
                 g.drawString (name,
                         (int)(centeredNBounds.getMinX() - nb.getMinX()),