Changeset 6977 in josm for trunk/src

Timestamp:

2014-04-15T00:43:24+02:00 (10 years ago)

Author:

Don-vip

Message:

fix some sonar issues recently introduced

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddNodeAction.java (modified) (1 diff)
• actions/AlignInLineAction.java (modified) (1 diff)
• actions/CreateCircleAction.java (modified) (3 diffs)
• actions/JoinAreasAction.java (modified) (1 diff)
• gui/MapStatus.java (modified) (3 diffs)
• gui/io/DownloadPrimitivesWithReferrersTask.java (modified) (3 diffs)
• gui/io/UploadPrimitivesTask.java (modified) (4 diffs)
• gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (2 diffs)
• gui/mappaint/mapcss/Selector.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

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

@@ -23 +23 @@
     private String textLatLon, textEastNorth;
 
+    /**
+     * Constructs a new {@code AddNodeAction}.
+     */
     public AddNodeAction() {
         super(tr("Add Node..."), "addnode", tr("Add a node by entering latitude / longitude or easting / northing."),

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

@@ -257 +257 @@
             for(int i = 1; i < nodes.size()-1; i++)
                 if(nodes.get(i) == node) {
-                    System.out.printf("Find 2 neighbors\n");
                     neighbors.add(nodes.get(i-1));
                     neighbors.add(nodes.get(i+1));
-                    //lines.add(new Line(nodes.get(i-1), nodes.get(i+1)));
                 }
             if(neighbors.size() == 0)

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

@@ -97 +97 @@
      * Class designed to create a couple between a node and its angle relative to the center of the circle.
      */
-    private class PolarNode {
+    private static class PolarNode {
         double a;
         Node node;
@@ -111 +111 @@
      * Comparator used to order PolarNode relative to their angle.
      */
-    private class PolarNodeComparator implements Comparator<PolarNode> {
+    private static class PolarNodeComparator implements Comparator<PolarNode> {
 
         @Override
@@ -186 +186 @@
             double yc = 0.5 * (y1 + y2);
             center = new EastNorth(xc, yc);
-        } else if (nodes.size() == 3) {
+        } else {
             // triangle: three single nodes needed or a way with three nodes
             center = Geometry.getCenter(nodes);

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

@@ -54 +54 @@
     private final LinkedList<Command> cmds = new LinkedList<Command>();
     private int cmdsCount = 0;
-    private final LinkedList<Relation> addedRelations = new LinkedList<Relation>();
+    private final List<Relation> addedRelations = new LinkedList<Relation>();
 
     /**

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

@@ -717 +717 @@
     private class MapStatusPopupMenu extends JPopupMenu {
 
-        private final JMenuItem jumpButton = createActionComponent(Main.main.menu.jumpToAct);
+        private final JMenuItem jumpButton = add(Main.main.menu.jumpToAct);
         
         private final Collection<JCheckBoxMenuItem> somItems = new ArrayList<JCheckBoxMenuItem>();
@@ -743 +743 @@
             }
             
-            add(jumpButton);
             add(separator);
             add(doNotHide);
@@ -751 +750 @@
                 public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
                     Component invoker = ((JPopupMenu)e.getSource()).getInvoker();
-                    jumpButton.setVisible(invoker == latText || invoker == lonText);
-                    String currentSOM = ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get();;
+                    jumpButton.setVisible(latText.equals(invoker) || lonText.equals(invoker));
+                    String currentSOM = ProjectionPreference.PROP_SYSTEM_OF_MEASUREMENT.get();
                     for (JMenuItem item : somItems) {
                         item.setSelected(item.getText().equals(currentSOM));
-                        item.setVisible(invoker == distText);
+                        item.setVisible(distText.equals(invoker));
                     }
-                    separator.setVisible(invoker == distText);
+                    separator.setVisible(distText.equals(invoker));
                     doNotHide.setSelected(Main.pref.getBoolean("statusbar.always-visible", true));
                 }

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java

@@ -75 +75 @@
         // All downloaded primitives are put in a tmpLayer
         tmpLayer = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
-        //Main.main.addLayer(tmpLayer);
     }
 
@@ -194 +193 @@
      * Dialog for report a problem during download.
      * @param errs Primitives involved
-     * @param TITLE Title of dialog
-     * @param TEXT Detail message
-     * @param LIST_LABEL List of primitives description
-     * @param msgType Type of message {@see JOptionPane}
+     * @param title Title of dialog
+     * @param text Detail message
+     * @param listLabel List of primitives description
+     * @param msgType Type of message, see {@link JOptionPane}
      * @return The Dialog object
      */
     private static ExtendedDialog reportProblemDialog(Set<PrimitiveId> errs,
-            String TITLE, String TEXT, String LIST_LABEL, int msgType) {
+            String title, String text, String listLabel, int msgType) {
         JPanel p = new JPanel(new GridBagLayout());
-        p.add(new HtmlPanel(TEXT), GBC.eop());
-        if (LIST_LABEL != null) {
-            JLabel missing = new JLabel(LIST_LABEL);
+        p.add(new HtmlPanel(text), GBC.eop());
+        if (listLabel != null) {
+            JLabel missing = new JLabel(listLabel);
             missing.setFont(missing.getFont().deriveFont(Font.PLAIN));
             p.add(missing, GBC.eol());
@@ -221 +220 @@
         return new ExtendedDialog(
                 Main.parent,
-                TITLE,
+                title,
                 new String[] { tr("Ok") })
         .setButtonIcons(new String[] { "ok" })

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -7 +7 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashSet;
@@ -38 +37 @@
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.xml.sax.SAXException;
 
 /**
- * The task for uploading a collection of primitives
+ * The task for uploading a collection of primitives.
  *
  */
-public class UploadPrimitivesTask extends  AbstractUploadTask {
+public class UploadPrimitivesTask extends AbstractUploadTask {
     private boolean uploadCanceled = false;
     private Exception lastException = null;
@@ -240 +238 @@
     }
 
-    @Override protected void realRun() throws SAXException, IOException {
+    @Override protected void realRun() {
         try {
             uploadloop:while(true) {
@@ -294 +292 @@
                 }
             }
-        // if required close the changeset
-        //
-        if (strategy.isCloseChangesetAfterUpload() && changeset != null && !changeset.isNew() && changeset.isOpen()) {
-            OsmApi.getOsmApi().closeChangeset(changeset, progressMonitor.createSubTaskMonitor(0, false));
-        }
+            // if required close the changeset
+            //
+            if (strategy.isCloseChangesetAfterUpload() && changeset != null && !changeset.isNew() && changeset.isOpen()) {
+                OsmApi.getOsmApi().closeChangeset(changeset, progressMonitor.createSubTaskMonitor(0, false));
+            }
         } catch (Exception e) {
             if (uploadCanceled) {

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

@@ -64 +64 @@
      * Class to format a length according to SystemOfMesurement.
      */
-    private final class TrackLength {
+    private static final class TrackLength {
         private double value;
 
@@ -88 +88 @@
      * Comparator for TrackLength objects
      */
-    private final class LengthContentComparator implements Comparator<TrackLength> {
+    private static final class LengthContentComparator implements Comparator<TrackLength> {
 
         /**

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

@@ -265 +265 @@
                             final Node n = w.getNode(i - 1);
                             final Environment e2 = e.withPrimitive(n).withParent(w).withChild(e.osm);
-                            if (left.matches(e2)) {
-                                if (link.matches(e2.withLinkContext())) {
-                                    e.child = n;
-                                    e.index = i;
-                                    e.parent = w;
-                                    return true;
-                                }
+                            if (left.matches(e2) && link.matches(e2.withLinkContext())) {
+                                e.child = n;
+                                e.index = i;
+                                e.parent = w;
+                                return true;
                             }
                         }

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -51 +51 @@
         String java = System.getProperty("java.version");
         String os = System.getProperty("os.version");
-        if (java != null && java.startsWith("1.6") && os != null && (
-                os.startsWith("10.7.") || os.startsWith("10.8") || os.startsWith("10.9"))) {
+        if (java != null && java.startsWith("1.6") && os != null && os.matches("^10\\.[789].*")) {
             askUpdateJava(java);
         }

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -46 +46 @@
             String os = getOSDescription();
             if (java != null && java.startsWith("1.6") && os != null && (
-                    os.startsWith("Linux Debian GNU/Linux 7") || os.startsWith("Linux Mint") ||
-                    os.startsWith("Linux Ubuntu 12") || os.startsWith("Linux Ubuntu 13") || os.startsWith("Linux Ubuntu 14"))) {
+                    os.startsWith("Linux Debian GNU/Linux 7") || os.startsWith("Linux Mint") || os.matches("^Linux Ubuntu 1[234].*"))) {
                 String url;
                 // apturl does not exist on Debian (see #8465)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -75 +75 @@
     private static final int MILLIS_OF_DAY = 86400000;
 
-    public static String URL_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=";
+    public static final String URL_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=";
     
     /**