Changeset 4043 in josm
- Timestamp:
- 2011-04-20T15:14:02+02:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
r3784 r4043 66 66 return ((List<Node>) o).get(0).getCoor().getRoundedToOsmPrecision(); 67 67 return RoundCoord(((List<Node>) o).get(0)); 68 } else {68 } else 69 69 throw new AssertionError(); 70 }71 70 } 72 71 … … 107 106 */ 108 107 public DuplicateNode() { 109 super(tr("Duplicated nodes ")+".",108 super(tr("Duplicated nodes."), 110 109 tr("This test checks that there are no nodes at the very same location.")); 111 110 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
r3674 r4043 65 65 */ 66 66 public DuplicateWay() { 67 super(tr("Duplicated ways ")+".",68 tr("This test checks that there are no ways with same tags and same node coordinates."));67 super(tr("Duplicated ways."), 68 tr("This test checks that there are no ways with same tags and same node coordinates.")); 69 69 } 70 70 … … 95 95 List<LatLon> wLat = new ArrayList<LatLon>(wNodes.size()); 96 96 for (int i=0;i<wNodes.size();i++) { 97 97 wLat.add(wNodes.get(i).getCoor()); 98 98 } 99 99 Map<String, String> wkeys = w.getKeys(); -
trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
r3674 r4043 39 39 */ 40 40 public SimilarNamedWays() { 41 super(tr("Similarly named ways ")+".",42 tr("This test checks for ways with similar names that may have been misspelled."));41 super(tr("Similarly named ways."), 42 tr("This test checks for ways with similar names that may have been misspelled.")); 43 43 } 44 44 -
trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
r3950 r4043 37 37 */ 38 38 public UntaggedNode() { 39 super(tr("Untagged and unconnected nodes ")+".",39 super(tr("Untagged and unconnected nodes."), 40 40 tr("This test checks for untagged nodes that are not part of any way.")); 41 41 } … … 69 69 String msg = marktr("Has tag containing ''fixme'' or ''FIXME''"); 70 70 errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"), 71 71 tr(msg), msg, UNTAGGED_NODE_FIXME, n)); 72 72 return; 73 73 } … … 94 94 if (msg != null) { 95 95 errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"), 96 96 tr(msg), msg, code, n)); 97 97 return; 98 98 } … … 100 100 // Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. 101 101 errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"), 102 102 tr("Other"), "Other", UNTAGGED_NODE_OTHER, n)); 103 103 } 104 104 } … … 118 118 int code = testError.getCode(); 119 119 switch (code) { 120 121 122 123 124 120 case UNTAGGED_NODE_BLANK: 121 case UNTAGGED_NODE_CREATED_BY: 122 case UNTAGGED_NODE_WATCH: 123 case UNTAGGED_NODE_SOURCE: 124 return true; 125 125 } 126 126 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
r3935 r4043 61 61 62 62 public InspectPrimitiveDialog(Collection<OsmPrimitive> primitives) { 63 super(Main.parent, tr("Advanced object info"), new String[] { "Close"});63 super(Main.parent, tr("Advanced object info"), new String[] {tr("Close")}); 64 64 this.primitives = primitives; 65 65 setPreferredSize(new Dimension(750, 550)); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java
r3083 r4043 19 19 // column 0 - Id 20 20 col = new TableColumn(0); 21 col.setHeaderValue( "ID");21 col.setHeaderValue(tr("ID")); 22 22 col.setResizable(true); 23 23 col.setWidth(20); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
r3530 r4043 665 665 gc.gridx = 2; 666 666 gc.weightx = 0.0; 667 pnl.add(new JLabel( "Time: "),gc);667 pnl.add(new JLabel(tr("Time:")),gc); 668 668 669 669 gc.gridx = 3; … … 698 698 gc.gridx = 3; 699 699 gc.weightx = 0.0; 700 pnl.add(new JLabel( "Time:"),gc);700 pnl.add(new JLabel(tr("Time:")),gc); 701 701 702 702 gc.gridx = 4; … … 729 729 gc.gridx = 3; 730 730 gc.weightx = 0.0; 731 pnl.add(new JLabel( "Time:"),gc);731 pnl.add(new JLabel(tr("Time:")),gc); 732 732 733 733 gc.gridx = 4; -
trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
r4021 r4043 641 641 .add( 642 642 new JLabel( 643 tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here: ")),643 tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>")), 644 644 GBC.eol()); 645 645 msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop()); -
trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
r3826 r4043 232 232 + "This is likely to lead to invalid WMS request. You should check your<br>" 233 233 + "preference settings.<br>" 234 + "Do you want to fetch WMS tiles anyway? ",234 + "Do you want to fetch WMS tiles anyway?</html>", 235 235 url); 236 236 String [] options = new String[] { -
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r4028 r4043 27 27 import java.util.List; 28 28 import java.util.Map; 29 import java.util.Map.Entry; 29 30 import java.util.Set; 30 import java.util.Map.Entry;31 31 import java.util.TreeSet; 32 32 import java.util.concurrent.ExecutionException; … … 50 50 import org.openstreetmap.josm.data.Version; 51 51 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 52 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; 52 53 import org.openstreetmap.josm.gui.JMultilineLabel; 53 54 import org.openstreetmap.josm.gui.MapFrame; 54 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;55 55 import org.openstreetmap.josm.gui.download.DownloadSelection; 56 56 import org.openstreetmap.josm.gui.help.HelpUtil; … … 477 477 if (e.getCause() instanceof ClassNotFoundException) { 478 478 msg = tr("<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was not found.<br>" 479 + "Delete from preferences? ", plugin.name, plugin.className);479 + "Delete from preferences?</html>", plugin.name, plugin.className); 480 480 } 481 481 } catch (Throwable e) { 482 482 e.printStackTrace(); 483 483 } 484 if(msg != null && confirmDisablePlugin(parent, msg, plugin.name)) 484 if(msg != null && confirmDisablePlugin(parent, msg, plugin.name)) { 485 485 Main.pref.removeFromCollection("plugins", plugin.name); 486 } 486 487 } 487 488 … … 707 708 */ 708 709 public static List<PluginInformation> updatePlugins(Window parent, 709 List<PluginInformation> plugins, ProgressMonitor monitor)710 throws IllegalArgumentException{710 List<PluginInformation> plugins, ProgressMonitor monitor) 711 throws IllegalArgumentException{ 711 712 CheckParameterUtil.ensureParameterNotNull(plugins, "plugins"); 712 713 if (monitor == null) { … … 1001 1002 pl.remove(pi.name); 1002 1003 pl.add(pi.name + " (" + (pi.localversion != null && !pi.localversion.equals("") 1003 ? pi.localversion : "unknown") + ")");1004 ? pi.localversion : "unknown") + ")"); 1004 1005 } 1005 1006 Collections.sort(pl); 1006 for (String s : pl) 1007 for (String s : pl) { 1007 1008 text += "Plugin: " + s + "\n"; 1009 } 1008 1010 return text; 1009 1011 }
Note:
See TracChangeset
for help on using the changeset viewer.