Changeset 8130 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-03-09T08:46:22+01:00 (9 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/data

Files:

• imagery/ImageryLayerInfo.java (modified) (1 diff)
• osm/Changeset.java (modified) (3 diffs)
• validation/tests/MapCSSTagChecker.java (modified) (1 diff)

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;
 
         /**