Changeset 9062 in josm for trunk

Timestamp:

2015-11-25T01:21:14+01:00 (8 years ago)

Author:

Don-vip

Message:

Sonar - squid:S1941 - Variables should not be declared before they are relevant

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateCircleAction.java (modified) (2 diffs)
• actions/CreateMultipolygonAction.java (modified) (2 diffs)
• actions/JoinAreasAction.java (modified) (2 diffs)
• actions/JumpToAction.java (modified) (2 diffs)
• actions/MergeNodesAction.java (modified) (3 diffs)
• actions/OpenLocationAction.java (modified) (3 diffs)
• actions/SelectNonBranchingWaySequences.java (modified) (1 diff)
• actions/SessionSaveAsAction.java (modified) (2 diffs)
• actions/SplitWayAction.java (modified) (2 diffs)
• actions/UploadSelectionAction.java (modified) (3 diffs)
• actions/mapmode/AddNoteAction.java (modified) (2 diffs)
• actions/mapmode/DrawAction.java (modified) (5 diffs)
• actions/mapmode/ParallelWayAction.java (modified) (2 diffs)
• actions/mapmode/SelectAction.java (modified) (2 diffs)
• command/DeleteCommand.java (modified) (2 diffs)
• command/PurgeCommand.java (modified) (3 diffs)
• corrector/TagCorrector.java (modified) (2 diffs)
• plugins/PluginHandler.java (modified) (2 diffs)
• plugins/ReadRemotePluginInformationTask.java (modified) (2 diffs)
• tools/Geometry.java (modified) (4 diffs)
• tools/I18n.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (2 diffs)
• tools/OsmUrlToBounds.java (modified) (2 diffs)
• tools/WindowGeometry.java (modified) (2 diffs)
• tools/date/PrimaryDateParser.java (modified) (4 diffs)

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

@@ -162 +162 @@
         }
 
-        // now we can start doing things to OSM data
-        Collection<Command> cmds = new LinkedList<>();
-        EastNorth center = null;
+        EastNorth center;
 
         if (nodes.size() == 2) {
@@ -201 +199 @@
         int[] count = distributeNodes(angles,
                 numberOfNodesInCircle >= nodes.size() ? numberOfNodesInCircle - nodes.size() : 0);
+
+        // now we can start doing things to OSM data
+        Collection<Command> cmds = new LinkedList<>();
 
         // build a way for the circle

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

@@ -141 +141 @@
 
         final Collection<Way> selectedWays = Main.main.getCurrentDataSet().getSelectedWays();
-        final Collection<Relation> selectedRelations = Main.main.getCurrentDataSet().getSelectedRelations();
 
         if (selectedWays.isEmpty()) {
@@ -154 +153 @@
         }
 
+        final Collection<Relation> selectedRelations = Main.main.getCurrentDataSet().getSelectedRelations();
         final Relation multipolygonRelation = update
                 ? getSelectedMultipolygonRelation(selectedWays, selectedRelations)

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

@@ -768 +768 @@
     private List<WayInPolygon> markWayInsideSide(List<Way> parts, boolean isInner) {
 
-        List<WayInPolygon> result = new ArrayList<>();
-
         //prepare next map
         Map<Way, Way> nextWayMap = new HashMap<>();
@@ -854 +852 @@
         Way curWay = topWay;
         boolean curWayInsideToTheRight = wayClockwise ^ isInner;
+        List<WayInPolygon> result = new ArrayList<>();
 
         //iterate till full circle is reached

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

@@ -97 +97 @@
 
         double dist = mv.getDist100Pixel();
-        double zoomFactor = 1/dist;
-
         zm.setText(Long.toString(Math.round(dist*100)/100));
         updateUrl(true);
@@ -161 +159 @@
         }
 
+        double zoomFactor = 1/dist;
         mv.zoomToFactor(mv.getProjection().latlon2eastNorth(ll), zoomFactor * zoomLvl);
     }

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

@@ -314 +314 @@
         try {
             TagCollection nodeTags = TagCollection.unionOfAllPrimitives(nodes);
-            List<Command> resultion = CombinePrimitiveResolverDialog.launchIfNecessary(nodeTags, nodes, Collections.singleton(targetNode));
-            List<Command> cmds = new LinkedList<>();
 
             // the nodes we will have to delete
@@ -324 +322 @@
             // fix the ways referring to at least one of the merged nodes
             //
-            Collection<Way> waysToDelete = new HashSet<>();
-            List<Command> wayFixCommands = fixParentWays(
-                    nodesToDelete,
-                    targetNode);
+            List<Command> wayFixCommands = fixParentWays(nodesToDelete, targetNode);
             if (wayFixCommands == null) {
                 return null;
             }
-            cmds.addAll(wayFixCommands);
+            List<Command> cmds = new LinkedList<>(wayFixCommands);
 
             // build the commands
@@ -343 +338 @@
                 }
             }
-            cmds.addAll(resultion);
+            cmds.addAll(CombinePrimitiveResolverDialog.launchIfNecessary(nodeTags, nodes, Collections.singleton(targetNode)));
             if (!nodesToDelete.isEmpty()) {
                 cmds.add(new DeleteCommand(nodesToDelete));
-            }
-            if (!waysToDelete.isEmpty()) {
-                cmds.add(new DeleteCommand(waysToDelete));
             }
             return new SequenceCommand(/* for correct i18n of plural forms - see #9110 */

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

@@ -189 +189 @@
      */
     public void openUrl(boolean newLayer, final String url) {
-        PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download Data"));
         Collection<DownloadTask> tasks = findDownloadTasks(url, false);
 
@@ -198 +197 @@
             return;
         }
+
+        PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download Data"));
 
         for (final DownloadTask task : tasks) {
@@ -207 +208 @@
             }
         }
-
     }
 

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

@@ -136 +136 @@
      */
     public void extend(DataSet data) {
-        Collection<OsmPrimitive> currentSelection;
-        Collection<OsmPrimitive> selection;
-        boolean selectionChanged = false;
-        Way way;
-
         if (!canExtend())
             return;
 
-        currentSelection = data.getSelected();
+        Collection<OsmPrimitive> currentSelection = data.getSelected();
 
-        way = findWay(currentSelection);
+        Way way = findWay(currentSelection);
 
         if (way == null)
             return;
 
-        selection = new LinkedList<>();
+        boolean selectionChanged = false;
+        Collection<OsmPrimitive> selection = new LinkedList<>();
         for (OsmPrimitive primitive : currentSelection) {
             selection.add(primitive);

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

@@ -230 +230 @@
 
         protected final Component build() {
-            JPanel p = new JPanel(new GridBagLayout());
             JPanel ip = new JPanel(new GridBagLayout());
             for (Layer layer : layers) {
@@ -249 +248 @@
             JScrollPane sp = new JScrollPane(ip);
             sp.setBorder(BorderFactory.createEmptyBorder());
+            JPanel p = new JPanel(new GridBagLayout());
             p.add(sp, GBC.eol().fill());
             final JTabbedPane tabs = new JTabbedPane();

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

@@ -137 +137 @@
         List<Node> selectedNodes = OsmPrimitive.getFilteredList(selection, Node.class);
         List<Way> selectedWays = OsmPrimitive.getFilteredList(selection, Way.class);
-        List<Relation> selectedRelations =
-            OsmPrimitive.getFilteredList(selection, Relation.class);
         List<Way> applicableWays = getApplicableWays(selectedWays, selectedNodes);
 
@@ -191 +189 @@
         final List<List<Node>> wayChunks = buildSplitChunks(selectedWay, selectedNodes);
         if (wayChunks != null) {
+            List<Relation> selectedRelations =
+                    OsmPrimitive.getFilteredList(selection, Relation.class);
             final List<OsmPrimitive> sel = new ArrayList<>(selectedWays.size() + selectedRelations.size());
             sel.addAll(selectedWays);

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

@@ -101 +101 @@
             }
         }
-        UploadHullBuilder builder = new UploadHullBuilder();
-        UploadSelectionDialog dialog = new UploadSelectionDialog();
         Collection<OsmPrimitive> modifiedCandidates = getModifiedPrimitives(getEditLayer().data.getAllSelected());
         Collection<OsmPrimitive> deletedCandidates = getDeletedPrimitives(getEditLayer().data);
@@ -114 +112 @@
             return;
         }
+        UploadSelectionDialog dialog = new UploadSelectionDialog();
         dialog.populate(
                 modifiedCandidates,
@@ -121 +120 @@
         if (dialog.isCanceled())
             return;
-        Collection<OsmPrimitive> toUpload = builder.build(dialog.getSelectedPrimitives());
+        Collection<OsmPrimitive> toUpload = new UploadHullBuilder().build(dialog.getSelectedPrimitives());
         if (toUpload.isEmpty()) {
             JOptionPane.showMessageDialog(

trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java

@@ -68 +68 @@
         }
         Main.map.selectMapMode(Main.map.mapModeSelect);
-        LatLon latlon = Main.map.mapView.getLatLon(e.getPoint().x, e.getPoint().y);
 
         NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Create new note"), tr("Create note"));
@@ -79 +78 @@
         String input = dialog.getInputText();
         if (input != null && !input.isEmpty()) {
+            LatLon latlon = Main.map.mapView.getLatLon(e.getPoint().x, e.getPoint().y);
             noteData.createNote(latlon, input);
         } else {

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -394 +394 @@
         DataSet ds = getCurrentDataSet();
         Collection<OsmPrimitive> selection = new ArrayList<>(ds.getSelected());
-        Collection<Command> cmds = new LinkedList<>();
-        Collection<OsmPrimitive> newSelection = new LinkedList<>(ds.getSelected());
-
-        List<Way> reuseWays = new ArrayList<>(),
-                replacedWays = new ArrayList<>();
+
         boolean newNode = false;
         Node n = null;
@@ -451 +447 @@
             snapHelper.unsetFixedMode();
         }
+
+        Collection<Command> cmds = new LinkedList<>();
+        Collection<OsmPrimitive> newSelection = new LinkedList<>(ds.getSelected());
+        List<Way> reuseWays = new ArrayList<>();
+        List<Way> replacedWays = new ArrayList<>();
 
         if (newNode) {
@@ -769 +770 @@
      */
     private void computeHelperLine() {
-        MapView mv = Main.map.mapView;
         if (mousePos == null) {
             // Don't draw the line.
@@ -779 +779 @@
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
 
+        MapView mv = Main.map.mapView;
         Node currentMouseNode = null;
         mouseOnExistingNode = null;
@@ -1271 +1272 @@
         public void actionPerformed(ActionEvent e) {
             Main.main.undoRedo.undo();
-            Node n = null;
             Command lastCmd = Main.main.undoRedo.commands.peekLast();
             if (lastCmd == null) return;
+            Node n = null;
             for (OsmPrimitive p: lastCmd.getParticipatingPrimitives()) {
                 if (p instanceof Node) {

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

@@ -393 +393 @@
         mouseHasBeenDragged = true;
 
-        Point p = e.getPoint();
         if (mode == Mode.normal) {
             // Should we ensure that the copyTags modifiers are still valid?
@@ -407 +406 @@
 
         // Calculate distance to the reference line
+        Point p = e.getPoint();
         EastNorth enp = mv.getEastNorth((int) p.getX(), (int) p.getY());
         EastNorth nearestPointOnRefLine = Geometry.closestPointToLine(referenceSegment.getFirstNode().getEastNorth(),

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -1102 +1102 @@
          */
         private Collection<OsmPrimitive> cyclePrims() {
-            OsmPrimitive nxt = null;
-
             if (cycleList.size() <= 1) {
                 // no real cycling, just return one-element collection with nearest primitive in it
@@ -1112 +1110 @@
             DataSet ds = getCurrentDataSet();
             OsmPrimitive first = cycleList.iterator().next(), foundInDS = null;
-            nxt = first;
+            OsmPrimitive nxt = first;
 
             if (cyclePrims && shift) {

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -374 +374 @@
             return null;
 
-        Collection<Way> waysToBeChanged = new HashSet<>();
-
         if (alsoDeleteNodesInWay) {
             // delete untagged nodes only referenced by primitives in primitivesToDelete, too
@@ -386 +384 @@
             return null;
 
-        waysToBeChanged.addAll(OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Way.class));
+        Collection<Way> waysToBeChanged = new HashSet<>(OsmPrimitive.getFilteredSet(OsmPrimitive.getReferrer(primitivesToDelete), Way.class));
 
         Collection<Command> cmds = new LinkedList<>();

trunk/src/org/openstreetmap/josm/command/PurgeCommand.java

@@ -200 +200 @@
         @SuppressWarnings({ "unchecked", "rawtypes" })
         Set<Relation> inR = (Set) in;
-        Set<Relation> childlessR = new HashSet<>();
-        List<Relation> outR = new ArrayList<>(inR.size());
 
         Map<Relation, Integer> numChilds = new HashMap<>();
@@ -219 +217 @@
             }
         }
+        Set<Relation> childlessR = new HashSet<>();
         for (Relation r : inR) {
             if (numChilds.get(r).equals(0)) {
@@ -225 +224 @@
         }
 
+        List<Relation> outR = new ArrayList<>(inR.size());
         while (!childlessR.isEmpty()) {
             // Identify one childless Relation and

trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java

@@ -139 +139 @@
             if (answer == JOptionPane.YES_OPTION) {
                 for (Entry<OsmPrimitive, List<TagCorrection>> entry : tagCorrectionsMap.entrySet()) {
-                    List<TagCorrection> tagCorrections = entry.getValue();
                     OsmPrimitive primitive = entry.getKey();
 
@@ -158 +157 @@
 
                     // apply all changes to this clone
+                    List<TagCorrection> tagCorrections = entry.getValue();
                     for (int i = 0; i < tagCorrections.size(); i++) {
                         if (tagTableMap.get(primitive).getCorrectionTableModel().getApply(i)) {

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -380 +380 @@
         if (message == null) return false;
 
+        UpdatePluginsMessagePanel pnlMessage = new UpdatePluginsMessagePanel();
+        pnlMessage.setMessage(message);
+        pnlMessage.initDontShowAgain(togglePreferenceKey);
+
+        // check whether automatic update at startup was disabled
+        //
+        String policy = Main.pref.get(togglePreferenceKey, "ask").trim().toLowerCase(Locale.ENGLISH);
+        switch(policy) {
+        case "never":
+            if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) {
+                Main.info(tr("Skipping plugin update after JOSM upgrade. Automatic update at startup is disabled."));
+            } else if ("pluginmanager.time-based-update.policy".equals(togglePreferenceKey)) {
+                Main.info(tr("Skipping plugin update after elapsed update interval. Automatic update at startup is disabled."));
+            }
+            return false;
+
+        case "always":
+            if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) {
+                Main.info(tr("Running plugin update after JOSM upgrade. Automatic update at startup is enabled."));
+            } else if ("pluginmanager.time-based-update.policy".equals(togglePreferenceKey)) {
+                Main.info(tr("Running plugin update after elapsed update interval. Automatic update at startup is disabled."));
+            }
+            return true;
+
+        case "ask":
+            break;
+
+        default:
+            Main.warn(tr("Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''.", policy, togglePreferenceKey));
+        }
+
         ButtonSpec[] options = new ButtonSpec[] {
                 new ButtonSpec(
@@ -394 +425 @@
                 )
         };
-
-        UpdatePluginsMessagePanel pnlMessage = new UpdatePluginsMessagePanel();
-        pnlMessage.setMessage(message);
-        pnlMessage.initDontShowAgain(togglePreferenceKey);
-
-        // check whether automatic update at startup was disabled
-        //
-        String policy = Main.pref.get(togglePreferenceKey, "ask").trim().toLowerCase(Locale.ENGLISH);
-        switch(policy) {
-        case "never":
-            if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) {
-                Main.info(tr("Skipping plugin update after JOSM upgrade. Automatic update at startup is disabled."));
-            } else if ("pluginmanager.time-based-update.policy".equals(togglePreferenceKey)) {
-                Main.info(tr("Skipping plugin update after elapsed update interval. Automatic update at startup is disabled."));
-            }
-            return false;
-
-        case "always":
-            if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) {
-                Main.info(tr("Running plugin update after JOSM upgrade. Automatic update at startup is enabled."));
-            } else if ("pluginmanager.time-based-update.policy".equals(togglePreferenceKey)) {
-                Main.info(tr("Running plugin update after elapsed update interval. Automatic update at startup is disabled."));
-            }
-            return true;
-
-        case "ask":
-            break;
-
-        default:
-            Main.warn(tr("Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''.", policy, togglePreferenceKey));
-        }
 
         int ret = HelpAwareOptionPane.showOptionDialog(

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -315 +315 @@
         if (sites == null) return;
         getProgressMonitor().setTicksCount(sites.size() * 3);
-        File pluginDir = Main.pref.getPluginsDirectory();
 
         // collect old cache files and remove if no longer in use
@@ -334 +333 @@
         }
 
+        File pluginDir = Main.pref.getPluginsDirectory();
         for (String site: sites) {
             String printsite = site.replaceAll("%<(.*)>", "");

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

@@ -352 +352 @@
         double a2 = p4.getY() - p3.getY();
         double b2 = p3.getX() - p4.getX();
-        double c2 = (p4.getX() - p1.getX()) * (p3.getY() - p1.getY()) - (p3.getX() - p1.getX()) * (p4.getY() - p1.getY());
 
         // Solve the equations
@@ -358 +357 @@
         if (det == 0)
             return null; // Lines are parallel
+
+        double c2 = (p4.getX() - p1.getX()) * (p3.getY() - p1.getY()) - (p3.getX() - p1.getX()) * (p4.getY() - p1.getY());
 
         return new EastNorth(b1 * c2 / det + p1.getX(), -a1 * c2 / det + p1.getY());
@@ -573 +574 @@
             return false;
 
+        //iterate each side of the polygon, start with the last segment
+        Node oldPoint = polygonNodes.get(polygonNodes.size() - 1);
+
+        if (!oldPoint.isLatLonKnown()) {
+            return false;
+        }
+
         boolean inside = false;
         Node p1, p2;
-
-        //iterate each side of the polygon, start with the last segment
-        Node oldPoint = polygonNodes.get(polygonNodes.size() - 1);
-
-        if (!oldPoint.isLatLonKnown()) {
-            return false;
-        }
 
         for (Node newPoint : polygonNodes) {
@@ -708 +709 @@
      */
     public static boolean isClockwise(List<Node> nodes) {
-        double area2 = 0.;
         int nodesCount = nodes.size();
         if (nodesCount < 3 || nodes.get(0) != nodes.get(nodesCount - 1)) {
             throw new IllegalArgumentException("Way must be closed to check orientation.");
         }
+        double area2 = 0.;
 
         for (int node = 1; node <= /*sic! consider last-first as well*/ nodesCount; node++) {

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

@@ -583 +583 @@
                     }
                     String[] enstrings = new String[ennum];
-                    String[] trstrings = new String[trnum];
                     for (int i = 0; i < ennum; ++i) {
                         int val = ens.read(enlen);
@@ -597 +596 @@
                         enstrings[i] = new String(str, 0, val, StandardCharsets.UTF_8);
                     }
+                    String[] trstrings = new String[trnum];
                     for (int i = 0; i < trnum; ++i) {
                         int val = trs.read(trlen);

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

@@ -836 +836 @@
         Matcher m = dataUrlPattern.matcher(url);
         if (m.matches()) {
-            String mediatype = m.group(1);
             String base64 = m.group(2);
             String data = m.group(3);
@@ -850 +849 @@
                 }
             }
+            String mediatype = m.group(1);
             if ("image/svg+xml".equals(mediatype)) {
                 String s = new String(bytes, StandardCharsets.UTF_8);

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

@@ -93 +93 @@
         }
         int zoom;
-        double lat, lon;
         try {
             zoom = Integer.parseInt(parts[0]);
@@ -100 +99 @@
             return null;
         }
+        double lat, lon;
         try {
             lat = Double.parseDouble(parts[1]);

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

@@ -67 +67 @@
      */
     public static WindowGeometry centerInWindow(Component reference, Dimension extent) {
-        Window parentWindow = null;
         while (reference != null && !(reference instanceof Window)) {
             reference = reference.getParent();
@@ -73 +72 @@
         if (reference == null)
             return new WindowGeometry(new Point(0, 0), extent);
-        parentWindow = (Window) reference;
+        Window parentWindow = (Window) reference;
         Point topLeft = new Point(
                 Math.max(0, (parentWindow.getSize().width - extent.width) /2),

trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java

@@ -41 +41 @@
 
     private static boolean isDateInShortStandardFormat(String date) {
-        char[] dateChars;
         // We can only parse the date if it is in a very specific format.
         // eg. 2007-09-23T08:25:43Z
@@ -49 +48 @@
         }
 
-        dateChars = date.toCharArray();
+        char[] dateChars = date.toCharArray();
 
         // Make sure any fixed characters are in the correct place.
@@ -108 +107 @@
 
     private static boolean isDateInLongStandardFormat(String date) {
-        char[] dateChars;
         // We can only parse the date if it is in a very specific format.
         // eg. 2007-09-23T08:25:43.000Z
@@ -116 +114 @@
         }
 
-        dateChars = date.toCharArray();
+        char[] dateChars = date.toCharArray();
 
         // Make sure any fixed characters are in the correct place.