Changeset 5464 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

Timestamp:

2012-08-20T23:06:41+02:00 (12 years ago)

Author:

Don-vip

Message:

Rework Properties a bit to simplify management of Color properties

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (modified) (5 diffs)

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

@@ -26 +26 @@
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -129 +128 @@
         final JPanel p = new JPanel(new GridBagLayout());
 
-        this.colFadeColor = ImageryLayer.getFadeColor();
+        this.colFadeColor = ImageryLayer.PROP_FADE_COLOR.get();
         this.btnFadeColor = new JButton();
 
@@ -196 +195 @@
         JLabel labelEast = new JLabel(tr("% of east:"));
         JLabel labelNorth = new JLabel(tr("% of north:"));
-        spinEast = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_OVERLAP_EAST.get(), 1, 50, 1));
-        spinNorth = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_OVERLAP_NORTH.get(), 1, 50, 1));
+        spinEast = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_OVERLAP_EAST.get().intValue(), 1, 50, 1));
+        spinNorth = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_OVERLAP_NORTH.get().intValue(), 1, 50, 1));
 
         JPanel overlapPanel = new JPanel(new FlowLayout());
@@ -211 +210 @@
         p.add(Box.createHorizontalGlue(), GBC.eol().fill(GBC.HORIZONTAL));
         JLabel labelSimConn = new JLabel(tr("Simultaneous connections"));
-        spinSimConn = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_SIMULTANEOUS_CONNECTIONS.get(), 1, 30, 1));
+        spinSimConn = new JSpinner(new SpinnerNumberModel(WMSLayer.PROP_SIMULTANEOUS_CONNECTIONS.get().intValue(), 1, 30, 1));
         JPanel overlapPanelSimConn = new JPanel(new FlowLayout(FlowLayout.LEFT));
         overlapPanelSimConn.add(labelSimConn);
@@ -352 +351 @@
 
         ImageryLayer.PROP_FADE_AMOUNT.put(this.fadeAmount.getValue());
-        ImageryLayer.setFadeColor(this.colFadeColor);
+        ImageryLayer.PROP_FADE_COLOR.put(this.colFadeColor);
         ImageryLayer.PROP_SHARPEN_LEVEL.put(sharpen.getSelectedIndex());