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

Timestamp:

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

Author:

Don-vip

Message:

see #13309 - fix most of deprecation warnings

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (3 diffs)
• actions/mapmode/ExtrudeAction.java (modified) (2 diffs)
• actions/mapmode/ImproveWayAccuracyAction.java (modified) (2 diffs)
• actions/mapmode/ParallelWayAction.java (modified) (2 diffs)
• data/validation/Severity.java (modified) (2 diffs)
• gui/MapScaler.java (modified) (3 diffs)
• gui/dialogs/ConflictDialog.java (modified) (4 diffs)
• gui/layer/OsmDataLayer.java (modified) (4 diffs)
• gui/preferences/advanced/PreferencesTable.java (modified) (2 diffs)
• gui/preferences/imagery/ImageryPreference.java (modified) (3 diffs)
• gui/preferences/shortcut/PrefJPanel.java (modified) (3 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

trunk/src/org/openstreetmap/josm/data/validation/Severity.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 
 /** The error severity */
@@ -13 +14 @@
     // CHECKSTYLE.OFF: SingleSpaceSeparator
     /** Error messages */
-    ERROR(tr("Errors"), /* ICON(data/) */"error",       Main.pref.getColor(marktr("validation error"), Color.RED)),
+    ERROR(tr("Errors"), /* ICON(data/) */"error",       new ColorProperty(marktr("validation error"), Color.RED).get()),
     /** Warning messages */
-    WARNING(tr("Warnings"), /* ICON(data/) */"warning", Main.pref.getColor(marktr("validation warning"), Color.YELLOW)),
+    WARNING(tr("Warnings"), /* ICON(data/) */"warning", new ColorProperty(marktr("validation warning"), Color.YELLOW).get()),
     /** Other messages */
-    OTHER(tr("Other"), /* ICON(data/) */"other",        Main.pref.getColor(marktr("validation other"), Color.CYAN));
+    OTHER(tr("Other"), /* ICON(data/) */"other",        new ColorProperty(marktr("validation other"), Color.CYAN).get());
     // CHECKSTYLE.ON: SingleSpaceSeparator
 

trunk/src/org/openstreetmap/josm/gui/MapScaler.java

@@ -15 +15 @@
 import javax.swing.JComponent;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.help.Helpful;
 
@@ -28 +28 @@
     private static final int PADDING_LEFT = 5;
     private static final int PADDING_RIGHT = 50;
+
+    private static final ColorProperty SCALER_COLOR = new ColorProperty(marktr("scale"), Color.WHITE);
 
     /**
@@ -61 +63 @@
      */
     public static Color getColor() {
-        return Main.pref.getColor(marktr("scale"), Color.white);
+        return SCALER_COLOR.get();
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -53 +53 @@
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
@@ -76 +77 @@
 public final class ConflictDialog extends ToggleDialog implements ActiveLayerChangeListener, IConflictListener, SelectionChangedListener {
 
+    private static final ColorProperty CONFLICT_COLOR = new ColorProperty(marktr("conflict"), Color.GRAY);
+    private static final ColorProperty BACKGROUND_COLOR = new ColorProperty(marktr("background"), Color.BLACK);
+
     /** the collection of conflicts displayed by this conflict dialog */
     private transient ConflictCollection conflicts;
@@ -110 +114 @@
      */
     public static Color getColor() {
-        return Main.pref.getColor(marktr("conflict"), Color.gray);
+        return CONFLICT_COLOR.get();
     }
 
@@ -259 +263 @@
     public void paintConflicts(final Graphics g, final NavigatableComponent nc) {
         Color preferencesColor = getColor();
-        if (preferencesColor.equals(Main.pref.getColor(marktr("background"), Color.black)))
+        if (preferencesColor.equals(BACKGROUND_COLOR.get()))
             return;
         g.setColor(preferencesColor);

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

@@ -77 +77 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.data.preferences.StringProperty;
@@ -135 +136 @@
     public static final StringProperty PROPERTY_SAVE_EXTENSION = new StringProperty("save.extension.osm", "osm");
 
+    private static final ColorProperty PROPERTY_BACKGROUND_COLOR = new ColorProperty(marktr("background"), Color.BLACK);
+    private static final ColorProperty PROPERTY_OUTSIDE_COLOR = new ColorProperty(marktr("outside downloaded area"), Color.YELLOW);
 
     /** List of recent relations */
@@ -320 +323 @@
      */
     public static Color getBackgroundColor() {
-        return Main.pref != null ? Main.pref.getColor(marktr("background"), Color.BLACK) : Color.BLACK;
+        return PROPERTY_BACKGROUND_COLOR.get();
     }
 
@@ -328 +331 @@
      */
     public static Color getOutsideColor() {
-        return Main.pref != null ? Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW) : Color.YELLOW;
+        return PROPERTY_OUTSIDE_COLOR.get();
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

@@ -29 +29 @@
 import javax.swing.table.DefaultTableModel;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.data.preferences.ListListSetting;
 import org.openstreetmap.josm.data.preferences.ListSetting;
@@ -336 +336 @@
     static final class SettingCellRenderer extends DefaultTableCellRenderer {
         private final Color backgroundColor = UIManager.getColor("Table.background");
-        private final Color changedColor = Main.pref.getColor(
+        private final Color changedColor = new ColorProperty(
                          marktr("Advanced Background: Changed"),
-                         new Color(200, 255, 200));
-        private final Color nonDefaultColor = Main.pref.getColor(
+                         new Color(200, 255, 200)).get();
+        private final Color nonDefaultColor = new ColorProperty(
                             marktr("Advanced Background: NonDefault"),
-                            new Color(255, 255, 200));
+                            new Color(255, 255, 200)).get();
 
         @Override

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -56 +56 @@
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
 import org.openstreetmap.josm.data.imagery.Shape;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
@@ -239 +240 @@
         private static class ImageryURLTableCellRenderer extends DefaultTableCellRenderer {
 
+            private static final ColorProperty IMAGERY_BACKGROUND_COLOR = new ColorProperty(
+                    marktr("Imagery Background: Default"),
+                    new Color(200, 255, 200));
+
             private final transient List<ImageryInfo> layers;
 
@@ -255 +260 @@
                     for (ImageryInfo l : layers) {
                         if (l.getExtendedUrl().equals(t)) {
-                            GuiHelper.setBackgroundReadable(label, Main.pref.getColor(
-                                    marktr("Imagery Background: Default"),
-                                    new Color(200, 255, 200)));
+                            GuiHelper.setBackgroundReadable(label, IMAGERY_BACKGROUND_COLOR.get());
                             break;
                         }

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -46 +46 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
@@ -158 +159 @@
     private class ShortcutTableCellRenderer extends DefaultTableCellRenderer {
 
+        private final transient ColorProperty SHORTCUT_BACKGROUND_USER_COLOR = new ColorProperty(
+                marktr("Shortcut Background: User"),
+                new Color(200, 255, 200));
+        private final transient ColorProperty SHORTCUT_BACKGROUND_MODIFIED_COLOR = new ColorProperty(
+                marktr("Shortcut Background: Modified"),
+                new Color(255, 255, 200));
+
         private final boolean name;
 
@@ -175 +183 @@
             GuiHelper.setBackgroundReadable(label, UIManager.getColor("Table.background"));
             if (sc.isAssignedUser()) {
-                GuiHelper.setBackgroundReadable(label, Main.pref.getColor(
-                        marktr("Shortcut Background: User"),
-                        new Color(200, 255, 200)));
+                GuiHelper.setBackgroundReadable(label, SHORTCUT_BACKGROUND_USER_COLOR.get());
             } else if (!sc.isAssignedDefault()) {
-                GuiHelper.setBackgroundReadable(label, Main.pref.getColor(
-                        marktr("Shortcut Background: Modified"),
-                        new Color(255, 255, 200)));
+                GuiHelper.setBackgroundReadable(label, SHORTCUT_BACKGROUND_MODIFIED_COLOR.get());
             }
             return label;