Index: /applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java =================================================================== --- /applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java (revision 30686) +++ /applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java (revision 30687) @@ -1,3 +1,3 @@ -// License: GPL. Copyright 2007 by Immanuel Scholz and others +// License: GPL. For details, see LICENSE file. package sk.zdila.josm.plugin.simplify; @@ -62,5 +62,5 @@ final ButtonSpec[] options = new ButtonSpec[] { new ButtonSpec(tr("Yes, delete nodes"), ImageProvider.get("ok"), tr("Delete nodes outside of downloaded data regions"), null), new ButtonSpec(tr("No, abort"), ImageProvider.get("cancel"), tr("Cancel operation"), null) }; - final int ret = HelpAwareOptionPane.showOptionDialog( + return 0 == HelpAwareOptionPane.showOptionDialog( Main.parent, "" + trn("The selected way has nodes outside of the downloaded data region.", "The selected ways have nodes outside of the downloaded data region.", getCurrentDataSet().getSelectedWays().size()) @@ -68,5 +68,4 @@ tr("Delete nodes outside of data regions?"), JOptionPane.WARNING_MESSAGE, null, // no special icon options, options[0], null); - return ret == 0; } @@ -78,8 +77,7 @@ final ButtonSpec[] options = new ButtonSpec[] { new ButtonSpec(tr("Yes"), ImageProvider.get("ok"), tr("Simplify all selected ways"), null), new ButtonSpec(tr("Cancel"), ImageProvider.get("cancel"), tr("Cancel operation"), null) }; - final int ret = HelpAwareOptionPane.showOptionDialog(Main.parent, tr("The selection contains {0} ways. Are you sure you want to simplify them all?", numWays), tr("Simplify ways?"), + return 0 == HelpAwareOptionPane.showOptionDialog(Main.parent, tr("The selection contains {0} ways. Are you sure you want to simplify them all?", numWays), tr("Simplify ways?"), JOptionPane.WARNING_MESSAGE, null, // no special icon options, options[0], null); - return ret == 0; } @@ -115,5 +113,5 @@ } - final List nodesToDelete = new ArrayList(); // can contain duplicate instances + final List nodesToDelete = new ArrayList<>(); // can contain duplicate instances for (final Way way : ways) { @@ -125,5 +123,5 @@ } - final Map nodeCountMap = new HashMap(); + final Map nodeCountMap = new HashMap<>(); for (final Node node : nodesToDelete) { Count count = nodeCountMap.get(node); @@ -135,5 +133,5 @@ } - final Collection nodesReallyToRemove = new ArrayList(); + final Collection nodesReallyToRemove = new ArrayList<>(); for (final Entry entry : nodeCountMap.entrySet()) { @@ -146,5 +144,5 @@ } - final Collection allCommands = new ArrayList(); + final Collection allCommands = new ArrayList<>(); if (!nodesReallyToRemove.isEmpty()) { @@ -186,5 +184,5 @@ final double mergeThreshold = Main.pref.getDouble(SimplifyAreaPreferenceSetting.MERGE_THRESHOLD, 0.2); - final Map coordMap = new HashMap(); + final Map coordMap = new HashMap<>(); for (final Way way : ways) { for (final Node n : way.getNodes()) { @@ -266,6 +264,6 @@ } - final Collection commands = new ArrayList(); - final Set nodesToDelete2 = new HashSet(); + final Collection commands = new ArrayList<>(); + final Set nodesToDelete2 = new HashSet<>(); for (final Way way : ways) { final List nodesToDelete = way.getNodes(); @@ -329,5 +327,5 @@ // remove nodes within threshold - final List weightList = new ArrayList(nodes.size()); // weight cache + final List weightList = new ArrayList<>(nodes.size()); // weight cache for (int i = 0; i < nodes.size(); i++) { weightList.add(null); @@ -396,5 +394,5 @@ } - final HashSet delNodes = new HashSet(w.getNodes()); + final HashSet delNodes = new HashSet<>(w.getNodes()); delNodes.removeAll(nodes); Index: /applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPlugin.java =================================================================== --- /applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPlugin.java (revision 30686) +++ /applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPlugin.java (revision 30687) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package sk.zdila.josm.plugin.simplify; @@ -18,4 +19,3 @@ return new SimplifyAreaPreferenceSetting(); } - } Index: /applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java =================================================================== --- /applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java (revision 30686) +++ /applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaPreferenceSetting.java (revision 30687) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package sk.zdila.josm.plugin.simplify; @@ -72,5 +73,4 @@ mergeThreshold.setText(Main.pref.get(MERGE_THRESHOLD, "0.2")); - // mergeThreshold.setToolTipText(tr("bla bla")); tab.add(new JLabel(tr("Merge Nearby Nodes Threshold")), GBC.std()); tab.add(mergeThreshold, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5)); @@ -90,4 +90,3 @@ return false; } - }