Index: /trunk/eclipse/JOSM (Java 8).launch
===================================================================
--- /trunk/eclipse/JOSM (Java 8).launch (revision 10852)
+++ /trunk/eclipse/JOSM (Java 8).launch (revision 10853)
@@ -9,10 +9,4 @@
-
-
-
-
-
-
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 10853)
@@ -53,4 +53,5 @@
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,6 +247,7 @@
@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,7 +1458,7 @@
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"));
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java (revision 10853)
@@ -44,4 +44,5 @@
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,7 +305,7 @@
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);
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java (revision 10853)
@@ -37,4 +37,5 @@
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,6 +153,7 @@
@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"));
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (revision 10853)
@@ -29,4 +29,5 @@
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,6 +156,7 @@
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
Index: /trunk/src/org/openstreetmap/josm/data/validation/Severity.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/Severity.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/data/validation/Severity.java (revision 10853)
@@ -8,4 +8,5 @@
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
/** The error severity */
@@ -13,9 +14,9 @@
// 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
Index: /trunk/src/org/openstreetmap/josm/gui/MapScaler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapScaler.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/gui/MapScaler.java (revision 10853)
@@ -15,5 +15,5 @@
import javax.swing.JComponent;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
import org.openstreetmap.josm.gui.help.Helpful;
@@ -28,4 +28,6 @@
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,5 +63,5 @@
*/
public static Color getColor() {
- return Main.pref.getColor(marktr("scale"), Color.white);
+ return SCALER_COLOR.get();
}
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (revision 10853)
@@ -53,4 +53,5 @@
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,4 +77,7 @@
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,5 +114,5 @@
*/
public static Color getColor() {
- return Main.pref.getColor(marktr("conflict"), Color.gray);
+ return CONFLICT_COLOR.get();
}
@@ -259,5 +263,5 @@
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);
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 10853)
@@ -77,4 +77,5 @@
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,4 +136,6 @@
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,5 +323,5 @@
*/
public static Color getBackgroundColor() {
- return Main.pref != null ? Main.pref.getColor(marktr("background"), Color.BLACK) : Color.BLACK;
+ return PROPERTY_BACKGROUND_COLOR.get();
}
@@ -328,5 +331,5 @@
*/
public static Color getOutsideColor() {
- return Main.pref != null ? Main.pref.getColor(marktr("outside downloaded area"), Color.YELLOW) : Color.YELLOW;
+ return PROPERTY_OUTSIDE_COLOR.get();
}
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java (revision 10853)
@@ -29,5 +29,5 @@
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,10 +336,10 @@
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
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 10853)
@@ -56,4 +56,5 @@
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,4 +240,8 @@
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 layers;
@@ -255,7 +260,5 @@
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;
}
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 10852)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 10853)
@@ -46,4 +46,5 @@
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,4 +159,11 @@
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,11 +183,7 @@
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;
Index: /trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy (revision 10852)
+++ /trunk/test/unit/org/openstreetmap/josm/data/PreferencesTest.groovy (revision 10853)
@@ -6,4 +6,5 @@
import org.openstreetmap.josm.JOSMFixture
import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.data.preferences.ColorProperty
class PreferencesTest extends GroovyTestCase {
@@ -18,11 +19,11 @@
void testColorAlpha() {
- assert Main.pref.getColor("foo", new Color(0x12345678, true)).alpha == 0x12
+ assert new ColorProperty("foo", new Color(0x12345678, true)).get().alpha == 0x12
assert Main.pref.putColor("bar", new Color(0x12345678, true))
- assert Main.pref.getColor("bar", null).alpha == 0x12
+ assert new ColorProperty("bar", null).get().alpha == 0x12
}
void testColorNameAlpha() {
- assert Main.pref.getColor("foo", "bar", new Color(0x12345678, true)).alpha == 0x12
+ assert new ColorProperty("foo", "bar", new Color(0x12345678, true)).get().alpha == 0x12
assert Main.pref.getDefaultColor("foo") == new Color(0x34, 0x56, 0x78, 0x12)
assert Main.pref.getDefaultColor("foo").alpha == 0x12