Changeset 10853 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2016-08-19T03:43:18+02:00 (10 years ago)

Author:

Don-vip

Message:

see #13309 - fix most of deprecation warnings

Location:

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

Files:

• DrawAction.java (modified) (3 diffs)
• ExtrudeAction.java (modified) (2 diffs)
• ImproveWayAccuracyAction.java (modified) (2 diffs)
• ParallelWayAction.java (modified) (2 diffs)

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

@@ -53 +53 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPath2D;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -246 +247 @@
     @Override
     protected void readPreferences() {
-        rubberLineColor = Main.pref.getColor(marktr("helper line"), null);
-        if (rubberLineColor == null) rubberLineColor = PaintColors.SELECTED.get();
+        rubberLineColor = new ColorProperty(marktr("helper line"), (Color) null).get();
+        if (rubberLineColor == null)
+            rubberLineColor = PaintColors.SELECTED.get();
 
         rubberLineStroke = GuiHelper.getCustomizedStroke(Main.pref.get("draw.stroke.helper-line", "3"));
@@ -1456 +1458 @@
 
             normalStroke = rubberLineStroke;
-            snapHelperColor = Main.pref.getColor(marktr("draw angle snap"), Color.ORANGE);
-
-            highlightColor = Main.pref.getColor(marktr("draw angle snap highlight"), ORANGE_TRANSPARENT);
+            snapHelperColor = new ColorProperty(marktr("draw angle snap"), Color.ORANGE).get();
+
+            highlightColor = new ColorProperty(marktr("draw angle snap highlight"), ORANGE_TRANSPARENT).get();
             highlightStroke = GuiHelper.getCustomizedStroke(Main.pref.get("draw.anglesnap.stroke.highlight", "10"));
             helperStroke = GuiHelper.getCustomizedStroke(Main.pref.get("draw.anglesnap.stroke.helper", "1 4"));

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

@@ -44 +44 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -304 +305 @@
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay", 200);
         initialMoveThreshold = Main.pref.getInteger("extrude.initial-move-threshold", 1);
-        mainColor = Main.pref.getColor(marktr("Extrude: main line"), null);
+        mainColor = new ColorProperty(marktr("Extrude: main line"), (Color) null).get();
         if (mainColor == null) mainColor = PaintColors.SELECTED.get();
-        helperColor = Main.pref.getColor(marktr("Extrude: helper line"), Color.ORANGE);
+        helperColor = new ColorProperty(marktr("Extrude: helper line"), Color.ORANGE).get();
         helperStrokeDash = GuiHelper.getCustomizedStroke(Main.pref.get("extrude.stroke.helper-line", "1 4"));
         helperStrokeRA = new BasicStroke(1);

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

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPath2D;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -152 +153 @@
     @Override
     protected void readPreferences() {
-        guideColor = Main.pref.getColor(marktr("improve way accuracy helper line"), null);
-        if (guideColor == null) guideColor = PaintColors.HIGHLIGHT.get();
+        guideColor = new ColorProperty(marktr("improve way accuracy helper line"), (Color) null).get();
+        if (guideColor == null)
+            guideColor = PaintColors.HIGHLIGHT.get();
 
         selectTargetWayStroke = GuiHelper.getCustomizedStroke(Main.pref.get("improvewayaccuracy.stroke.select-target", "2"));

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

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -155 +156 @@
         helpLineStroke = GuiHelper.getCustomizedStroke(getStringPref("stroke.hepler-line", "1"));
         refLineStroke = GuiHelper.getCustomizedStroke(getStringPref("stroke.ref-line", "1 2 2"));
-        mainColor = Main.pref.getColor(marktr("make parallel helper line"), null);
-        if (mainColor == null) mainColor = PaintColors.SELECTED.get();
+        mainColor = new ColorProperty(marktr("make parallel helper line"), (Color) null).get();
+        if (mainColor == null)
+            mainColor = PaintColors.SELECTED.get();
 
         //// Needed to update the mouse cursor if modifiers are changed when the mouse is motionless