Changeset 4043 in josm

Timestamp:

Apr 20, 2011 3:14:02 PM (2 years ago)

Author:

stoecker

Message:

fix #6153 - spelling fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/DuplicateNode.java (modified) (2 diffs)
• data/validation/tests/DuplicateWay.java (modified) (2 diffs)
• data/validation/tests/SimilarNamedWays.java (modified) (1 diff)
• data/validation/tests/UntaggedNode.java (modified) (5 diffs)
• gui/dialogs/InspectPrimitiveDialog.java (modified) (1 diff)
• gui/dialogs/changeset/ChangesetCacheTableColumnModel.java (modified) (1 diff)
• gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified) (3 diffs)
• gui/layer/GpxLayer.java (modified) (1 diff)
• gui/layer/WMSLayer.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (5 diffs)

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

@@ -66 +66 @@
                     return ((List<Node>) o).get(0).getCoor().getRoundedToOsmPrecision();
                 return RoundCoord(((List<Node>) o).get(0));
-            } else {
+            } else
                 throw new AssertionError();
-            }
         }
 
@@ -107 +106 @@
      */
     public DuplicateNode() {
-        super(tr("Duplicated nodes")+".",
+        super(tr("Duplicated nodes."),
                 tr("This test checks that there are no nodes at the very same location."));
     }

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

@@ -65 +65 @@
      */
     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 +95 @@
         List<LatLon> wLat = new ArrayList<LatLon>(wNodes.size());
         for (int i=0;i<wNodes.size();i++) {
-             wLat.add(wNodes.get(i).getCoor());
+            wLat.add(wNodes.get(i).getCoor());
         }
         Map<String, String> wkeys = w.getKeys();

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

@@ -39 +39 @@
      */
     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."));
     }
 

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

@@ -37 +37 @@
      */
     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 +69 @@
                     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 +94 @@
                 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 +100 @@
             // 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 +118 @@
             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;
             }
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -61 +61 @@
 
     public InspectPrimitiveDialog(Collection<OsmPrimitive> 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));

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java

@@ -19 +19 @@
         // column 0 - Id
         col = new TableColumn(0);
-        col.setHeaderValue("ID");
+        col.setHeaderValue(tr("ID"));
         col.setResizable(true);
         col.setWidth(20);

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java

@@ -665 +665 @@
             gc.gridx = 2;
             gc.weightx = 0.0;
-            pnl.add(new JLabel("Time: "),gc);
+            pnl.add(new JLabel(tr("Time:")),gc);
 
             gc.gridx = 3;
@@ -698 +698 @@
             gc.gridx = 3;
             gc.weightx = 0.0;
-            pnl.add(new JLabel("Time:"),gc);
+            pnl.add(new JLabel(tr("Time:")),gc);
 
             gc.gridx = 4;
@@ -729 +729 @@
             gc.gridx = 3;
             gc.weightx = 0.0;
-            pnl.add(new JLabel("Time:"),gc);
+            pnl.add(new JLabel(tr("Time:")),gc);
 
             gc.gridx = 4;

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -641 +641 @@
             .add(
                     new JLabel(
-                            tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:")),
+                            tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>")),
                             GBC.eol());
             msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop());

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -232 +232 @@
                 + "This is likely to lead to invalid WMS request. You should check your<br>"
                 + "preference settings.<br>"
-                + "Do you want to fetch WMS tiles anyway?",
+                + "Do you want to fetch WMS tiles anyway?</html>",
                 url);
         String [] options = new String[] {

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

@@ -27 +27 @@
 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 +50 @@
 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 +477 @@
             if (e.getCause() instanceof ClassNotFoundException) {
                 msg = tr("<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was not found.<br>"
-                        + "Delete from preferences?", plugin.name, plugin.className);
+                        + "Delete from preferences?</html>", 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 +708 @@
      */
     public static List<PluginInformation>  updatePlugins(Window parent,
-    List<PluginInformation> plugins, ProgressMonitor monitor)
-    throws IllegalArgumentException{
+            List<PluginInformation> plugins, ProgressMonitor monitor)
+            throws IllegalArgumentException{
         CheckParameterUtil.ensureParameterNotNull(plugins, "plugins");
         if (monitor == null) {
@@ -1001 +1002 @@
             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;
     }