Changeset 8130 in josm for trunk

Timestamp:

2015-03-09T08:46:22+01:00 (10 years ago)

Author:

Don-vip

Message:

fix Sonar issue squid:ModifiersOrderCheck - Modifiers should be declared in the correct order

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• data/osm/Changeset.java (modified) (3 diffs)
• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• gui/tagging/PresetLabel.java (modified) (4 diffs)
• gui/tagging/ac/AutoCompletionItemPriority.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -179 +179 @@
      * @since 7636
      */
-    public static abstract class AbstractInternalTask extends PleaseWaitRunnable {
+    public abstract static class AbstractInternalTask extends PleaseWaitRunnable {
 
         protected final boolean newLayer;

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -31 +31 @@
     private final List<ImageryInfo> layers = new ArrayList<>();
     private final Map<String, ImageryInfo> layerIds = new HashMap<>();
-    private final static List<ImageryInfo> defaultLayers = new ArrayList<>();
-    private final static Map<String, ImageryInfo> defaultLayerIds = new HashMap<>();
+    private static final List<ImageryInfo> defaultLayers = new ArrayList<>();
+    private static final Map<String, ImageryInfo> defaultLayerIds = new HashMap<>();
 
     private static final String[] DEFAULT_LAYER_SITES = {

trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

@@ -18 +18 @@
  * Represents a single changeset in JOSM. For now its only used during
  * upload but in the future we may do more.
- *
+ * @since 625
  */
 public final class Changeset implements Tagged {
@@ -349 +349 @@
      * @since 7704
      */
-    public synchronized final List<ChangesetDiscussionComment> getDiscussion() {
+    public final synchronized List<ChangesetDiscussionComment> getDiscussion() {
         if (discussion == null) {
             return Collections.emptyList();
@@ -361 +361 @@
      * @since 7704
      */
-    public synchronized final void addDiscussionComment(ChangesetDiscussionComment comment) {
+    public final synchronized void addDiscussionComment(ChangesetDiscussionComment comment) {
         if (comment == null) {
             return;

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -77 +77 @@
     public static class GroupedMapCSSRule {
         /** MapCSS selectors **/
-        final public List<Selector> selectors;
+        public final List<Selector> selectors;
         /** MapCSS declaration **/
-        final public Declaration declaration;
+        public final Declaration declaration;
 
         /**

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -83 +83 @@
      * stack trace.
      */
-    public final static ReadWriteLock STYLE_SOURCE_LOCK = new ReentrantReadWriteLock();
+    public static final ReadWriteLock STYLE_SOURCE_LOCK = new ReentrantReadWriteLock();
 
     /**

trunk/src/org/openstreetmap/josm/gui/tagging/PresetLabel.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging;
 
-import javax.swing.JLabel;
 import java.awt.Cursor;
 import java.awt.Font;
@@ -10 +9 @@
 import java.util.Collections;
 
+import javax.swing.JLabel;
+
 public class PresetLabel extends JLabel {
 
     protected final TaggingPreset t;
 
+    /**
+     * Constructs a new {@code PresetLabel}.
+     * @param t the tagging preset
+     */
     public PresetLabel(TaggingPreset t) {
         super(t.getName() + " …");
@@ -26 +31 @@
      */
     public static class PresetLabelMouseListener implements MouseListener {
-        final protected JLabel label;
-        final protected Font hover;
-        final protected Font normal;
+        protected final JLabel label;
+        protected final Font hover;
+        protected final Font normal;
 
+        /**
+         * Constructs a new {@code PresetLabelMouseListener}.
+         * @param lbl Label to highlight
+         */
         public PresetLabelMouseListener(JLabel lbl) {
             label = lbl;
@@ -36 +45 @@
             hover = normal.deriveFont(Collections.singletonMap(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_LOW_DOTTED));
         }
+
         @Override
-        public void mouseClicked(MouseEvent arg0) {
+        public void mouseClicked(MouseEvent e) {
+            // Do nothing
         }
 
         @Override
-        public void mouseEntered(MouseEvent arg0) {
+        public void mouseEntered(MouseEvent e) {
             label.setFont(hover);
         }
+
         @Override
-        public void mouseExited(MouseEvent arg0) {
+        public void mouseExited(MouseEvent e) {
             label.setFont(normal);
         }
+
         @Override
-        public void mousePressed(MouseEvent arg0) {}
+        public void mousePressed(MouseEvent e) {
+            // Do nothing
+        }
+
         @Override
-        public void mouseReleased(MouseEvent arg0) {}
+        public void mouseReleased(MouseEvent e) {
+            // Do nothing
+        }
     }
 }

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPriority.java

@@ -37 +37 @@
     public static final AutoCompletionItemPriority UNKNOWN = new AutoCompletionItemPriority(false, false, false);
 
-    private final static int NO_USER_INPUT = Integer.MAX_VALUE;
+    private static final int NO_USER_INPUT = Integer.MAX_VALUE;
 
     private final int userInput;
@@ -43 +43 @@
     private final boolean inStandard;
     private final boolean selected;
-    
+
 
     /**
      * Create new AutoCompletionItemPriority object.
-     * 
+     *
      * @param inDataSet true, if the item is found in the currently active data layer
      * @param inStandard true, if the item is a standard tag, e.g. from the presets.
@@ -81 +81 @@
         return userInput == NO_USER_INPUT ? null : userInput;
     }
-    
+
     /**
      * Imposes an ordering on the priorities.
@@ -115 +115 @@
     }
 
-    @Override public String toString() {
-        return String.format("<Priority; userInput: %s, inDataSet: %b, inStandard: %b, selected: %b>", 
+    @Override
+    public String toString() {
+        return String.format("<Priority; userInput: %s, inDataSet: %b, inStandard: %b, selected: %b>",
                 userInput == NO_USER_INPUT ? "no" : Integer.toString(userInput), inDataSet, inStandard, selected);
     }