Changeset 10000 in josm

Timestamp:

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

Author:

Don-vip

Message:

sonar - fix various issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JosmAction.java (modified) (1 diff)
• data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• data/imagery/WMTSTileSource.java (modified) (1 diff)
• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• data/osm/visitor/paint/relations/MultipolygonCache.java (modified) (1 diff)
• data/projection/CustomProjection.java (modified) (3 diffs)
• data/projection/proj/ObliqueMercator.java (modified) (1 diff)
• data/validation/tests/MultipolygonTest.java (modified) (1 diff)
• gui/DefaultNameFormatter.java (modified) (1 diff)
• gui/MapMover.java (modified) (2 diffs)
• gui/conflict/pair/ListMerger.java (modified) (1 diff)
• gui/conflict/pair/nodes/NodeListMerger.java (modified) (2 diffs)
• gui/conflict/pair/relation/RelationMemberMerger.java (modified) (2 diffs)
• gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)
• gui/layer/AlignImageryPanel.java (modified) (1 diff)
• gui/mappaint/StyleCache.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• gui/preferences/imagery/ImageryPreference.java (modified) (1 diff)
• io/CertificateAmendment.java (modified) (1 diff)
• io/OsmApi.java (modified) (2 diffs)
• io/remotecontrol/RequestProcessor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -71 +71 @@
      * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
      * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
-     * TODO: do not pass Icon, pass ImageProvider instead
      */
     public JosmAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar,

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

@@ -274 +274 @@
     }
 
-    private boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) {
+    private static boolean isSimilar(ImageryInfo iiA, ImageryInfo iiB) {
         if (iiA == null)
             return false;

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

@@ -293 +293 @@
         XMLInputFactory factory = XMLInputFactory.newFactory();
         // do not try to load external entities, nor validate the XML
-        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
-        factory.setProperty(XMLInputFactory.IS_VALIDATING, false);
-        factory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
+        factory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.IS_VALIDATING, Boolean.FALSE);
+        factory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
 
         try (CachedFile cf = new CachedFile(baseUrl); InputStream in = cf.setHttpHeaders(headers).

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -391 +391 @@
     }
 
-    private Polygon buildPolygon(Point center, int radius, int sides) {
+    private static Polygon buildPolygon(Point center, int radius, int sides) {
         return buildPolygon(center, radius, sides, 0.0);
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/MultipolygonCache.java

@@ -189 +189 @@
     }
 
-    private void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private static void processEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         if (event instanceof NodeMovedEvent || event instanceof WayNodesChangedEvent) {
             dispatchEvent(event, r, maps);

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -571 +571 @@
         }
         if (parameters.containsKey(Param.no_off.key) || parameters.containsKey(Param.no_uoff.key)) {
-            projParams.no_off = true;
+            projParams.no_off = Boolean.TRUE;
         }
         proj.initialize(projParams);
@@ -713 +713 @@
     /**
      * Factor to convert units of east/north coordinates to meters.
-     * 
+     *
      * When east/north coordinates are in degrees (geographic CRS), the scale
      * at the equator is taken, i.e. 360 degrees corresponds to the length of
      * the equator in meters.
-     * 
+     *
      * @return factor to convert units to meter
      */
@@ -780 +780 @@
     }
 
-    private EastNorth getPointAlong(int i, int N, ProjectionBounds r) {
+    private static EastNorth getPointAlong(int i, int N, ProjectionBounds r) {
         double dEast = (r.maxEast - r.minEast) / N;
         double dNorth = (r.maxNorth - r.minNorth) / N;

trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java

@@ -368 +368 @@
     }
 
-    private double normalizeLonRad(double a) {
+    private static double normalizeLonRad(double a) {
         return Math.toRadians(LatLon.normalizeLon(Math.toDegrees(a)));
     }

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

@@ -114 +114 @@
     }
 
-    private List<GeneralPath> createPolygons(List<Multipolygon.PolyData> joinedWays) {
+    private static List<GeneralPath> createPolygons(List<Multipolygon.PolyData> joinedWays) {
         List<GeneralPath> result = new ArrayList<>();
         for (Multipolygon.PolyData way : joinedWays) {

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());
     }

trunk/src/org/openstreetmap/josm/io/CertificateAmendment.java

@@ -106 +106 @@
             }
             if (certificateIsMissing(keyStore, cert)) {
-                Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName()));
+                if (Main.isDebugEnabled()) {
+                    Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName()));
+                }
                 String alias = "josm:" + new File(CERT_AMEND[i]).getName();
                 try {

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -859 +859 @@
      * @throws OsmTransferException if the API response cannot be parsed
      */
-    private Note parseSingleNote(String xml) throws OsmTransferException {
+    private static Note parseSingleNote(String xml) throws OsmTransferException {
         try {
             List<Note> newNotes = new NoteReader(xml).parse();
@@ -865 +865 @@
                 return newNotes.get(0);
             }
-            //Shouldn't ever execute. Server will either respond with an error (caught elsewhere) or one note
+            // Shouldn't ever execute. Server will either respond with an error (caught elsewhere) or one note
             throw new OsmTransferException(tr("Note upload failed"));
         } catch (SAXException | IOException e) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java

@@ -266 +266 @@
      *             If the error can not be written
      */
-    private void sendError(Writer out) throws IOException {
+    private static void sendError(Writer out) throws IOException {
         sendHeader(out, "500 Internal Server Error", "text/html", true);
         out.write("<HTML>\r\n");
@@ -285 +285 @@
      *             If the error can not be written
      */
-    private void sendNotImplemented(Writer out) throws IOException {
+    private static void sendNotImplemented(Writer out) throws IOException {
         sendHeader(out, "501 Not Implemented", "text/html", true);
         out.write("<HTML>\r\n");
@@ -306 +306 @@
      *             If the error can not be written
      */
-    private void sendForbidden(Writer out, String help) throws IOException {
+    private static void sendForbidden(Writer out, String help) throws IOException {
         sendHeader(out, "403 Forbidden", "text/html", true);
         out.write("<HTML>\r\n");
@@ -330 +330 @@
      *             If the error can not be written
      */
-    private void sendBadRequest(Writer out, String help) throws IOException {
+    private static void sendBadRequest(Writer out, String help) throws IOException {
         sendHeader(out, "400 Bad Request", "text/html", true);
         out.write("<HTML>\r\n");