Changeset 11713 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

Timestamp:

2017-03-10T02:28:00+01:00 (7 years ago)

Author:

Don-vip

Message:

add Ant target to run PMD (only few rules for now), fix violations

Location:

trunk

Files:

• . (modified) (1 prop)
• src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java (modified) (4 diffs)

trunk

@@ -12 +12 @@
 junit*.properties
 foobar
+pmd-josm.xml

@@ -12 +12 @@
 junit*.properties
 foobar
+pmd-josm.xml

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -26 +26 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.MapMover;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -44 +45 @@
  */
 public class LafPreference implements SubPreferenceSetting {
+
+    /**
+     * Look-and-feel property.
+     * @since 11713
+     */
+    public static final StringProperty LAF = new StringProperty("laf", Main.platform.getDefaultStyle());
 
     static final class LafListCellRenderer implements ListCellRenderer<LookAndFeelInfo> {
@@ -100 +107 @@
         }
 
-        String laf = Main.pref.get("laf", Main.platform.getDefaultStyle());
+        String laf = LAF.get();
         for (int i = 0; i < lafCombo.getItemCount(); ++i) {
             if (lafCombo.getItemAt(i).getClassName().equals(laf)) {
@@ -203 +210 @@
         NavigatableComponent.PROP_ZOOM_INTERMEDIATE_STEPS.put(zoomIntermediateSteps.isSelected());
         NavigatableComponent.PROP_ZOOM_RATIO.put(Math.pow(2, 1/(double) spinZoomRatio.getModel().getValue()));
-        mod |= Main.pref.put("laf", ((LookAndFeelInfo) lafCombo.getSelectedItem()).getClassName());
+        mod |= LAF.put(((LookAndFeelInfo) lafCombo.getSelectedItem()).getClassName());
         return mod;
     }

@@ -12 +12 @@
 junit*.properties
 foobar
+pmd-josm.xml