Changeset 2666 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-12-20T16:19:03+01:00 (14 years ago)

Author:

jttt

Message:

Minor mappaint cleanup, use constants for colors

Location:

trunk/src/org/openstreetmap/josm/actions/mapmode

Files:

• DrawAction.java (modified) (4 diffs)
• ExtrudeAction.java (modified) (5 diffs)
• SelectAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.mapmode;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trn;
@@ -48 +47 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -208 +208 @@
         super.enterMode();
         currCursor = Cursors.crosshair;
-        selectedColor = Main.pref.getColor(marktr("selected"), Color.red);
+        selectedColor =PaintColors.SELECTED.get();
         drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);
         drawTargetHighlight = Main.pref.getBoolean("draw.target-highlight", true);
@@ -344 +344 @@
                 newSelection.add(n);
                 getCurrentDataSet().setSelected(n);
-                selection = getCurrentDataSet().getSelected();
                 // The user explicitly selected a node, so let him continue drawing
                 wayIsFinished = false;

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.mapmode;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -34 +33 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -65 +65 @@
      * counts as a move, in milliseconds
      */
-    private static int initialMoveDelay = 200;
+    private int initialMoveDelay = 200;
     /**
      * The initial EastNorths of node1 and node2
@@ -105 +105 @@
         putValue("help", "Action/Extrude/Extrude");
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200);
-        selectedColor = Main.pref.getColor(marktr("selected"), Color.red);
+        selectedColor = PaintColors.SELECTED.get();
     }
 
@@ -235 +235 @@
         } else {
             if (newN1en != null) {
-                Graphics2D g2 = (Graphics2D)g;
+                Graphics2D g2 = g;
                 g2.setColor(selectedColor);
                 g2.setStroke(new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -20 +20 @@
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.logging.Logger;
 
 import javax.swing.JOptionPane;
@@ -39 +38 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.AllNodesVisitor;
-import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
+import org.openstreetmap.josm.data.osm.visitor.paint.SimplePaintVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -62 +61 @@
  */
 public class SelectAction extends MapMode implements SelectionEnded {
-    static private final Logger logger = Logger.getLogger(SelectAction.class.getName());
+    //static private final Logger logger = Logger.getLogger(SelectAction.class.getName());
 
     /**