Changeset 3233 in josm for trunk

Timestamp:

2010-05-11T21:20:27+02:00 (14 years ago)

Author:

stoecker

Message:

fix minor color issues

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• layer/OsmDataLayer.java (modified) (2 diffs)
• layer/RawGpsLayer.java (modified) (1 diff)
• preferences/ColorPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -172 +172 @@
     }
 
+    public static Color getBackgroundColor() {
+        return Main.pref.getColor(marktr("background"), Color.BLACK);
+    }
+
+    public static Color getOutsideColor() {
+        return Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW);
+    }
+
     /**
      * Initialize the hatch pattern used to paint the non-downloaded area
@@ -178 +186 @@
         BufferedImage bi = new BufferedImage(15, 15, BufferedImage.TYPE_INT_ARGB);
         Graphics2D big = bi.createGraphics();
-        big.setColor(Main.pref.getColor(marktr("background"), Color.BLACK));
+        big.setColor(getBackgroundColor());
         Composite comp = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.3f);
         big.setComposite(comp);
         big.fillRect(0,0,15,15);
-        big.setColor(Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW));
+        big.setColor(getOutsideColor());
         big.drawLine(0,15,15,0);
         Rectangle r = new Rectangle(0, 0, 15,15);

trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -237 +237 @@
         color.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
-                JColorChooser c = new JColorChooser(Main.pref.getColor(marktr("GPS point"), "layer "+getName(), Color.gray));
+                JColorChooser c = new JColorChooser(Main.pref.getColor(marktr("gps point"), "layer "+getName(), Color.gray));
                 Object[] options = new Object[]{tr("OK"), tr("Cancel"), tr("Default")};
                 int answer = JOptionPane.showOptionDialog(

trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

@@ -37 +37 @@
 import org.openstreetmap.josm.gui.MapScaler;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -256 +258 @@
         PaintColors.getColors();
         MarkerLayer.getColor(null);
+        GpxLayer.getColor(null);
+        OsmDataLayer.getBackgroundColor();
+        OsmDataLayer.getOutsideColor();
         MapScaler.getColor();
         ConflictDialog.getColor();