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

Timestamp:

2016-03-16T01:17:59+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - fix various issues

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatter.java (modified) (1 diff)
• MapMover.java (modified) (2 diffs)
• conflict/pair/ListMerger.java (modified) (1 diff)
• conflict/pair/nodes/NodeListMerger.java (modified) (2 diffs)
• conflict/pair/relation/RelationMemberMerger.java (modified) (2 diffs)
• dialogs/properties/TagEditHelper.java (modified) (1 diff)
• layer/AlignImageryPanel.java (modified) (1 diff)
• mappaint/StyleCache.java (modified) (1 diff)
• mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• preferences/imagery/ImageryPreference.java (modified) (1 diff)

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

@@ -455 +455 @@
     }
 
-    private String getRelationName(IRelation relation) {
-        String nameTag = null;
+    private static String getRelationName(IRelation relation) {
+        String nameTag;
         for (String n : getNamingtagsForRelations()) {
             nameTag = getNameTagValue(relation, n);

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

@@ -22 +22 @@
 
 import org.openstreetmap.gui.jmapviewer.JMapViewer;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.SelectAction;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
-import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -58 +57 @@
         }
 
-        private void updateJMapViewer() {
+        private static void updateJMapViewer() {
             JMapViewer.zoomReverseWheel = MapMover.PROP_ZOOM_REVERSE_WHEEL.get();
         }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -49 +49 @@
  * @since 1631
  */
-public abstract class ListMerger<T extends PrimitiveId> extends JPanel implements PropertyChangeListener, Observer {
+public abstract class ListMerger<T extends PrimitiveId> extends JPanel implements PropertyChangeListener, Observer, IConflictResolver {
     protected OsmPrimitivesTable myEntriesTable;
     protected OsmPrimitivesTable mergedEntriesTable;

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

@@ -8 +8 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
 
@@ -15 +14 @@
  * @since 1622
  */
-public class NodeListMerger extends ListMerger<Node> implements IConflictResolver {
+public class NodeListMerger extends ListMerger<Node> {
 
     /**

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

@@ -8 +8 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.ListMerger;
 
@@ -15 +14 @@
  * @since 1631
  */
-public class RelationMemberMerger extends ListMerger<RelationMember> implements IConflictResolver {
+public class RelationMemberMerger extends ListMerger<RelationMember> {
 
     /**

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -315 +315 @@
     }
 
-    private void warnAboutParseError(SearchCompiler.ParseError parseError) {
+    private static void warnAboutParseError(SearchCompiler.ParseError parseError) {
         Main.warn(parseError);
         JOptionPane.showMessageDialog(

trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java

@@ -61 +61 @@
                     Main.map.removeTopPanel(AlignImageryPanel.class);
                     if (doNotShowAgain.isSelected()) {
-                        showAgain.put(false);
+                        showAgain.put(Boolean.FALSE);
                     }
                 }

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

@@ -53 +53 @@
     }
 
-    private int getIndex(boolean selected) {
+    private static int getIndex(boolean selected) {
         return selected ? SELECTED : PLAIN;
     }

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

@@ -294 +294 @@
          * @return An arbitrary key this rule depends on or <code>null</code> if there is no such key.
          */
-        private String findAnyRequiredKey(List<Condition> conds) {
+        private static String findAnyRequiredKey(List<Condition> conds) {
             String key = null;
             for (Condition c : conds) {

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -97 +97 @@
     }
 
-    private void addSettingsSection(final JPanel p, String name, JPanel section) {
+    private static void addSettingsSection(final JPanel p, String name, JPanel section) {
         addSettingsSection(p, name, section, GBC.eol());
     }