Changeset 8346 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2015-05-11T13:34:53+02:00 (9 years ago)

Author:

Don-vip

Message:

squid:S00116 - Field names should comply with a naming convention

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NotificationManager.java (modified) (1 diff)
• dialogs/ToggleDialog.java (modified) (8 diffs)
• history/HistoryBrowserDialogManager.java (modified) (2 diffs)
• layer/gpx/DateFilterPanel.java (modified) (4 diffs)
• mappaint/ElemStyle.java (modified) (4 diffs)
• mappaint/LineElemStyle.java (modified) (2 diffs)

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

@@ -73 +73 @@
     private static NotificationManager INSTANCE = null;
 
-    private final Color PANEL_SEMITRANSPARENT = new Color(224, 236, 249, 230);
-    private final Color PANEL_OPAQUE = new Color(224, 236, 249);
+    private static final Color PANEL_SEMITRANSPARENT = new Color(224, 236, 249, 230);
+    private static final Color PANEL_OPAQUE = new Color(224, 236, 249);
 
     public static synchronized NotificationManager getInstance() {

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

@@ -95 +95 @@
     public static final BooleanProperty PROP_DYNAMIC_BUTTONS = new BooleanProperty("dialog.dynamic.buttons", false);
 
-    private final transient ParametrizedEnumProperty<ButtonHidingType> PROP_BUTTON_HIDING = new ParametrizedEnumProperty<ToggleDialog.ButtonHidingType>(
-            ButtonHidingType.class, ButtonHidingType.DYNAMIC) {
+    private final transient ParametrizedEnumProperty<ButtonHidingType> propButtonHiding =
+            new ParametrizedEnumProperty<ToggleDialog.ButtonHidingType>(ButtonHidingType.class, ButtonHidingType.DYNAMIC) {
         @Override
         protected String getKey(String... params) {
@@ -107 +107 @@
             } catch (IllegalArgumentException e) {
                 // Legacy settings
-                return Boolean.parseBoolean(s)?ButtonHidingType.DYNAMIC:ButtonHidingType.ALWAYS_SHOWN;
+                return Boolean.parseBoolean(s) ? ButtonHidingType.DYNAMIC : ButtonHidingType.ALWAYS_SHOWN;
             }
         }
@@ -241 +241 @@
         isDocked = Main.pref.getBoolean(preferencePrefix+".docked", true);
         isCollapsed = Main.pref.getBoolean(preferencePrefix+".minimized", false);
-        buttonHiding = PROP_BUTTON_HIDING.get();
+        buttonHiding = propButtonHiding.get();
 
         /** show the minimize button */
@@ -490 +490 @@
         /** the label which displays the dialog's title **/
         private final JLabel lblTitle;
-        private final JComponent lblTitle_weak;
+        private final JComponent lblTitleWeak;
         /** the button which shows whether buttons are dynamic or not */
         private final JButton buttonsHide;
@@ -512 +512 @@
 
             // Cannot add the label directly since it would displace other elements on resize
-            lblTitle_weak = new JComponent() {
+            lblTitleWeak = new JComponent() {
                 @Override
                 public void paintComponent(Graphics g) {
@@ -518 +518 @@
                 }
             };
-            lblTitle_weak.setPreferredSize(new Dimension(Integer.MAX_VALUE,20));
-            lblTitle_weak.setMinimumSize(new Dimension(0,20));
-            add(lblTitle_weak, GBC.std().fill(GBC.HORIZONTAL));
+            lblTitleWeak.setPreferredSize(new Dimension(Integer.MAX_VALUE,20));
+            lblTitleWeak.setMinimumSize(new Dimension(0,20));
+            add(lblTitleWeak, GBC.std().fill(GBC.HORIZONTAL));
 
             buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN
@@ -597 +597 @@
         public void setTitle(String title) {
             lblTitle.setText(title);
-            lblTitle_weak.repaint();
+            lblTitleWeak.repaint();
         }
 
@@ -767 +767 @@
     protected void setIsButtonHiding(ButtonHidingType val) {
         buttonHiding = val;
-        PROP_BUTTON_HIDING.put(val);
+        propButtonHiding.put(val);
         refreshHidingButtons();
     }

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -33 +33 @@
  * @since 2019
  */
-public class HistoryBrowserDialogManager implements MapView.LayerChangeListener {
+public final class HistoryBrowserDialogManager implements MapView.LayerChangeListener {
+
+    private static final String WINDOW_GEOMETRY_PREF = HistoryBrowserDialogManager.class.getName() + ".geometry";
 
     private static HistoryBrowserDialogManager instance;
@@ -89 +91 @@
         return false;
     }
-
-    private final String WINDOW_GEOMETRY_PREF = getClass().getName() + ".geometry";
 
     protected void placeOnScreen(HistoryBrowserDialog dialog) {

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java

@@ -30 +30 @@
     private transient ActionListener filterAppliedListener;
 
-    private final String PREF_DATE_0;
-    private final String PREF_DATE_MIN;
-    private final String PREF_DATE_MAX;
+    private final String prefDate0;
+    private final String prefDateMin;
+    private final String prefDateMax;
 
     /**
@@ -41 +41 @@
     public DateFilterPanel(GpxLayer layer, String preferencePrefix, boolean enabled) {
         super(new GridBagLayout());
-        PREF_DATE_0 = preferencePrefix+".showzerotimestamp";
-        PREF_DATE_MIN = preferencePrefix+".mintime";
-        PREF_DATE_MAX = preferencePrefix+".maxtime";
+        prefDate0 = preferencePrefix+".showzerotimestamp";
+        prefDateMin = preferencePrefix+".mintime";
+        prefDateMax = preferencePrefix+".maxtime";
         this.layer = layer;
 
@@ -101 +101 @@
      */
     public void saveInPrefs() {
-        Main.pref.putLong(PREF_DATE_MIN, dateFrom.getDate().getTime());
-        Main.pref.putLong(PREF_DATE_MAX, dateTo.getDate().getTime());
-        Main.pref.put(PREF_DATE_0, noTimestampCb.isSelected());
+        Main.pref.putLong(prefDateMin, dateFrom.getDate().getTime());
+        Main.pref.putLong(prefDateMax, dateTo.getDate().getTime());
+        Main.pref.put(prefDate0, noTimestampCb.isSelected());
     }
 
@@ -111 +111 @@
      */
     public void loadFromPrefs() {
-        long t1 =Main.pref.getLong(PREF_DATE_MIN, 0);
+        long t1 =Main.pref.getLong(prefDateMin, 0);
         if (t1!=0) dateFrom.setDate(new Date(t1));
-        long t2 =Main.pref.getLong(PREF_DATE_MAX, 0);
+        long t2 =Main.pref.getLong(prefDateMax, 0);
         if (t2!=0) dateTo.setDate(new Date(t2));
-        noTimestampCb.setSelected(Main.pref.getBoolean(PREF_DATE_0, false));
+        noTimestampCb.setSelected(Main.pref.getBoolean(prefDate0, false));
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

@@ -23 +23 @@
     public static final String[] REPEAT_IMAGE_KEYS = {REPEAT_IMAGE, REPEAT_IMAGE_WIDTH, REPEAT_IMAGE_HEIGHT, REPEAT_IMAGE_OPACITY, null, null};
 
-    public float major_z_index;
-    public float z_index;
-    public float object_z_index;
+    public float majorZIndex;
+    public float zIndex;
+    public float objectZIndex;
     public boolean isModifier;  // false, if style can serve as main style for the
     // primitive; true, if it is a highlight or modifier
 
     public ElemStyle(float major_z_index, float z_index, float object_z_index, boolean isModifier) {
-        this.major_z_index = major_z_index;
-        this.z_index = z_index;
-        this.object_z_index = object_z_index;
+        this.majorZIndex = major_z_index;
+        this.zIndex = z_index;
+        this.objectZIndex = object_z_index;
         this.isModifier = isModifier;
     }
 
     protected ElemStyle(Cascade c, float default_major_z_index) {
-        major_z_index = c.get(MAJOR_Z_INDEX, default_major_z_index, Float.class);
-        z_index = c.get(Z_INDEX, 0f, Float.class);
-        object_z_index = c.get(OBJECT_Z_INDEX, 0f, Float.class);
+        majorZIndex = c.get(MAJOR_Z_INDEX, default_major_z_index, Float.class);
+        zIndex = c.get(Z_INDEX, 0f, Float.class);
+        objectZIndex = c.get(OBJECT_Z_INDEX, 0f, Float.class);
         isModifier = c.get(MODIFIER, false, Boolean.class);
     }
@@ -208 +208 @@
             return false;
         ElemStyle s = (ElemStyle) o;
-        return major_z_index == s.major_z_index &&
-                z_index == s.z_index &&
-                object_z_index == s.object_z_index &&
+        return majorZIndex == s.majorZIndex &&
+                zIndex == s.zIndex &&
+                objectZIndex == s.objectZIndex &&
                 isModifier == s.isModifier;
     }
@@ -217 +217 @@
     public int hashCode() {
         int hash = 5;
-        hash = 41 * hash + Float.floatToIntBits(this.major_z_index);
-        hash = 41 * hash + Float.floatToIntBits(this.z_index);
-        hash = 41 * hash + Float.floatToIntBits(this.object_z_index);
+        hash = 41 * hash + Float.floatToIntBits(this.majorZIndex);
+        hash = 41 * hash + Float.floatToIntBits(this.zIndex);
+        hash = 41 * hash + Float.floatToIntBits(this.objectZIndex);
         hash = 41 * hash + (isModifier ? 1 : 0);
         return hash;
@@ -226 +226 @@
     @Override
     public String toString() {
-        return String.format("z_idx=[%s/%s/%s] ", major_z_index, z_index, object_z_index) + (isModifier ? "modifier " : "");
+        return String.format("z_idx=[%s/%s/%s] ", majorZIndex, zIndex, objectZIndex) + (isModifier ? "modifier " : "");
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java

@@ -47 +47 @@
 
         public final String prefix;
-        public final float default_major_z_index;
+        public final float defaultMajorZIndex;
 
         LineType(String prefix, float default_major_z_index) {
             this.prefix = prefix;
-            this.default_major_z_index = default_major_z_index;
+            this.defaultMajorZIndex = default_major_z_index;
         }
     }
@@ -258 +258 @@
         }
 
-        return new LineElemStyle(c, type.default_major_z_index, line, color, dashesLine, dashesBackground, offset, realWidth);
+        return new LineElemStyle(c, type.defaultMajorZIndex, line, color, dashesLine, dashesBackground, offset, realWidth);
     }