Changeset 11713 in josm for trunk/src/org/openstreetmap/josm/Main.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/Main.java (modified) (3 diffs)

trunk

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

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

trunk/src/org/openstreetmap/josm/Main.java

@@ -82 +82 @@
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
+import org.openstreetmap.josm.gui.preferences.display.LafPreference;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
@@ -765 +766 @@
 
         String defaultlaf = platform.getDefaultStyle();
-        String laf = Main.pref.get("laf", defaultlaf);
+        String laf = LafPreference.LAF.get();
         try {
             UIManager.setLookAndFeel(laf);
@@ -787 +788 @@
                 } catch (UnsupportedLookAndFeelException ex) {
                     info("Look and Feel not supported: " + laf);
-                    Main.pref.put("laf", defaultlaf);
+                    LafPreference.LAF.put(defaultlaf);
                     trace(ex);
                 }
             } else {
                 info("Look and Feel not found: " + laf);
-                Main.pref.put("laf", defaultlaf);
+                LafPreference.LAF.put(defaultlaf);
             }
         } catch (UnsupportedLookAndFeelException e) {
             info("Look and Feel not supported: " + laf);
-            Main.pref.put("laf", defaultlaf);
+            LafPreference.LAF.put(defaultlaf);
             trace(e);
         } catch (InstantiationException | IllegalAccessException e) {

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