Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 4043) @@ -66,7 +66,6 @@ return ((List) o).get(0).getCoor().getRoundedToOsmPrecision(); return RoundCoord(((List) o).get(0)); - } else { + } else throw new AssertionError(); - } } @@ -107,5 +106,5 @@ */ public DuplicateNode() { - super(tr("Duplicated nodes")+".", + super(tr("Duplicated nodes."), tr("This test checks that there are no nodes at the very same location.")); } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (revision 4043) @@ -65,6 +65,6 @@ */ public DuplicateWay() { - super(tr("Duplicated ways")+".", - tr("This test checks that there are no ways with same tags and same node coordinates.")); + super(tr("Duplicated ways."), + tr("This test checks that there are no ways with same tags and same node coordinates.")); } @@ -95,5 +95,5 @@ List wLat = new ArrayList(wNodes.size()); for (int i=0;i wkeys = w.getKeys(); Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (revision 4043) @@ -39,6 +39,6 @@ */ public SimilarNamedWays() { - super(tr("Similarly named ways")+".", - tr("This test checks for ways with similar names that may have been misspelled.")); + super(tr("Similarly named ways."), + tr("This test checks for ways with similar names that may have been misspelled.")); } Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (revision 4043) @@ -37,5 +37,5 @@ */ public UntaggedNode() { - super(tr("Untagged and unconnected nodes")+".", + super(tr("Untagged and unconnected nodes."), tr("This test checks for untagged nodes that are not part of any way.")); } @@ -69,5 +69,5 @@ String msg = marktr("Has tag containing ''fixme'' or ''FIXME''"); errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"), - tr(msg), msg, UNTAGGED_NODE_FIXME, n)); + tr(msg), msg, UNTAGGED_NODE_FIXME, n)); return; } @@ -94,5 +94,5 @@ if (msg != null) { errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"), - tr(msg), msg, code, n)); + tr(msg), msg, code, n)); return; } @@ -100,5 +100,5 @@ // Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"), - tr("Other"), "Other", UNTAGGED_NODE_OTHER, n)); + tr("Other"), "Other", UNTAGGED_NODE_OTHER, n)); } } @@ -118,9 +118,9 @@ int code = testError.getCode(); switch (code) { - case UNTAGGED_NODE_BLANK: - case UNTAGGED_NODE_CREATED_BY: - case UNTAGGED_NODE_WATCH: - case UNTAGGED_NODE_SOURCE: - return true; + case UNTAGGED_NODE_BLANK: + case UNTAGGED_NODE_CREATED_BY: + case UNTAGGED_NODE_WATCH: + case UNTAGGED_NODE_SOURCE: + return true; } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 4043) @@ -61,5 +61,5 @@ public InspectPrimitiveDialog(Collection primitives) { - super(Main.parent, tr("Advanced object info"), new String[] {"Close"}); + super(Main.parent, tr("Advanced object info"), new String[] {tr("Close")}); this.primitives = primitives; setPreferredSize(new Dimension(750, 550)); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java (revision 4043) @@ -19,5 +19,5 @@ // column 0 - Id col = new TableColumn(0); - col.setHeaderValue("ID"); + col.setHeaderValue(tr("ID")); col.setResizable(true); col.setWidth(20); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 4043) @@ -665,5 +665,5 @@ gc.gridx = 2; gc.weightx = 0.0; - pnl.add(new JLabel("Time: "),gc); + pnl.add(new JLabel(tr("Time:")),gc); gc.gridx = 3; @@ -698,5 +698,5 @@ gc.gridx = 3; gc.weightx = 0.0; - pnl.add(new JLabel("Time:"),gc); + pnl.add(new JLabel(tr("Time:")),gc); gc.gridx = 4; @@ -729,5 +729,5 @@ gc.gridx = 3; gc.weightx = 0.0; - pnl.add(new JLabel("Time:"),gc); + pnl.add(new JLabel(tr("Time:")),gc); gc.gridx = 4; Index: /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 4043) @@ -641,5 +641,5 @@ .add( new JLabel( - tr("Upload of unprocessed GPS data as map data is considered harmful.
If you want to upload traces, look here:")), + tr("Upload of unprocessed GPS data as map data is considered harmful.
If you want to upload traces, look here:")), GBC.eol()); msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop()); Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 4043) @@ -232,5 +232,5 @@ + "This is likely to lead to invalid WMS request. You should check your
" + "preference settings.
" - + "Do you want to fetch WMS tiles anyway?", + + "Do you want to fetch WMS tiles anyway?", url); String [] options = new String[] { Index: /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 4042) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 4043) @@ -27,6 +27,6 @@ import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; -import java.util.Map.Entry; import java.util.TreeSet; import java.util.concurrent.ExecutionException; @@ -50,7 +50,7 @@ import org.openstreetmap.josm.data.Version; import org.openstreetmap.josm.gui.HelpAwareOptionPane; +import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; import org.openstreetmap.josm.gui.JMultilineLabel; import org.openstreetmap.josm.gui.MapFrame; -import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; import org.openstreetmap.josm.gui.download.DownloadSelection; import org.openstreetmap.josm.gui.help.HelpUtil; @@ -477,11 +477,12 @@ if (e.getCause() instanceof ClassNotFoundException) { msg = tr("Could not load plugin {0} because the plugin
main class ''{1}'' was not found.
" - + "Delete from preferences?", plugin.name, plugin.className); + + "Delete from preferences?", plugin.name, plugin.className); } } catch (Throwable e) { e.printStackTrace(); } - if(msg != null && confirmDisablePlugin(parent, msg, plugin.name)) + if(msg != null && confirmDisablePlugin(parent, msg, plugin.name)) { Main.pref.removeFromCollection("plugins", plugin.name); + } } @@ -707,6 +708,6 @@ */ public static List updatePlugins(Window parent, - List plugins, ProgressMonitor monitor) - throws IllegalArgumentException{ + List plugins, ProgressMonitor monitor) + throws IllegalArgumentException{ CheckParameterUtil.ensureParameterNotNull(plugins, "plugins"); if (monitor == null) { @@ -1001,9 +1002,10 @@ pl.remove(pi.name); pl.add(pi.name + " (" + (pi.localversion != null && !pi.localversion.equals("") - ? pi.localversion : "unknown") + ")"); + ? pi.localversion : "unknown") + ")"); } Collections.sort(pl); - for (String s : pl) + for (String s : pl) { text += "Plugin: " + s + "\n"; + } return text; }