- Timestamp:
- 2006-07-17T02:47:02+02:00 (18 years ago)
- Location:
- src/org/openstreetmap/josm
- Files:
-
- 42 edited
Legend:
- Unmodified
- Added
- Removed
-
src/org/openstreetmap/josm/actions/AutoScaleAction.java
r104 r113 2 2 3 3 import static org.openstreetmap.josm.tools.I18n.tr; 4 import static org.xnap.commons.i18n.I18n.marktr; 4 5 5 6 import java.awt.event.ActionEvent; … … 25 26 public class AutoScaleAction extends GroupAction { 26 27 27 private enum AutoScaleMode {data, selection, layer, conflict} 28 private AutoScaleMode mode = AutoScaleMode.data; 28 private static final String[] modes = { 29 marktr("data"), 30 marktr("selection"), 31 marktr("layer"), 32 marktr("conflict") 33 }; 34 private String mode = "data"; 29 35 private final MapFrame mapFrame; 30 36 31 37 private class Action extends AbstractAction { 32 private final AutoScaleModemode;33 public Action( AutoScaleModemode) {34 super(tr("Auto Scale "+": "+tr(mode.toString())), ImageProvider.get("dialogs/autoscale/"+mode));35 putValue(SHORT_DESCRIPTION, tr("Auto zoom the view ")+tr("(to "+mode+")")+tr(". Disabled if the view is moved."));38 private final String mode; 39 public Action(String mode) { 40 super(tr("Auto Scale: {0}", tr(mode)), ImageProvider.get("dialogs/autoscale/"+mode)); 41 putValue(SHORT_DESCRIPTION, tr("Auto zoom the view (to {0}. Disabled if the view is moved)", tr(mode))); 36 42 this.mode = mode; 37 43 } … … 48 54 public AutoScaleAction(final MapFrame mapFrame) { 49 55 super(KeyEvent.VK_A, 0); 50 for ( AutoScaleMode mode : AutoScaleMode.values())56 for (String mode : modes) 51 57 actions.add(new Action(mode)); 52 58 setCurrent(0); … … 54 60 Main.ds.addSelectionChangedListener(new SelectionChangedListener(){ 55 61 public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) { 56 if (mode == AutoScaleMode.selection)62 if (mode.equals("selection")) 57 63 mapFrame.mapView.recalculateCenterScale(); 58 64 } … … 62 68 public BoundingXYVisitor getBoundingBox() { 63 69 BoundingXYVisitor v = new BoundingXYVisitor(); 64 switch (mode) { 65 case data: 70 if (mode.equals("data")) { 66 71 for (Layer l : mapFrame.mapView.getAllLayers()) 67 72 l.visitBoundingBox(v); 68 break; 69 case layer: 73 } else if (mode.equals("layer")) 70 74 mapFrame.mapView.getActiveLayer().visitBoundingBox(v); 71 break; 72 case selection: 73 case conflict: 74 Collection<OsmPrimitive> sel = mode == AutoScaleMode.selection ? Main.ds.getSelected() : mapFrame.conflictDialog.conflicts.keySet(); 75 else if (mode.equals("selection") || mode.equals("conflict")) { 76 Collection<OsmPrimitive> sel = mode.equals("selection") ? Main.ds.getSelected() : mapFrame.conflictDialog.conflicts.keySet(); 75 77 for (OsmPrimitive osm : sel) 76 78 osm.visit(v); … … 81 83 v.max = new EastNorth(v.max.east()+en.east(), v.max.north()+en.north()); 82 84 } 83 break;84 85 } 85 86 return v; -
src/org/openstreetmap/josm/actions/DiskAccessAction.java
r104 r113 7 7 import javax.swing.JFileChooser; 8 8 import javax.swing.JOptionPane; 9 import javax.swing.KeyStroke;10 9 11 10 import org.openstreetmap.josm.Main; … … 17 16 abstract public class DiskAccessAction extends JosmAction { 18 17 19 public DiskAccessAction(String name, String iconName, String tooltip, String shortCutName, KeyStroke shortCut) {20 super(name, iconName, tooltip, shortCut Name, shortCut);18 public DiskAccessAction(String name, String iconName, String tooltip, int shortCut, int modifiers) { 19 super(name, iconName, tooltip, shortCut, modifiers); 21 20 } 22 21 -
src/org/openstreetmap/josm/actions/DownloadAction.java
r104 r113 27 27 import javax.swing.JScrollPane; 28 28 import javax.swing.JTextField; 29 import javax.swing.KeyStroke;30 29 import javax.swing.SwingUtilities; 31 30 import javax.swing.event.ListSelectionEvent; … … 127 126 128 127 public DownloadAction() { 129 super(tr("Download from OSM"), "download", tr("Download map data from the OSM server."), tr("Ctrl-Shift-D"), 130 KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); 128 super(tr("Download from OSM"), "download", tr("Download map data from the OSM server."), KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK); 131 129 // TODO remove when bug in Java6 is fixed 132 130 for (JTextField f : latlon) -
src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java
r111 r113 13 13 14 14 import javax.swing.JOptionPane; 15 import javax.swing.KeyStroke;16 15 17 16 import org.openstreetmap.josm.Main; … … 84 83 85 84 public DownloadIncompleteAction() { 86 super(tr("Download incomplete objects"), "downloadincomplete", tr("Download all (selected) incomplete ways from the OSM server."), tr("Ctrl-Shift-Alt-D"), 87 KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK)); 85 super(tr("Download incomplete objects"), "downloadincomplete", tr("Download all (selected) incomplete ways from the OSM server."), KeyEvent.VK_D, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK | InputEvent.ALT_DOWN_MASK); 88 86 } 89 87 -
src/org/openstreetmap/josm/actions/GpxExportAction.java
r104 r113 24 24 import javax.swing.JTextArea; 25 25 import javax.swing.JTextField; 26 import javax.swing.KeyStroke;27 26 import javax.swing.ListSelectionModel; 28 27 … … 38 37 public class GpxExportAction extends DiskAccessAction { 39 38 40 private final static String warningGpl = tr("<html><font color='red' size='-2'>Note: GPL is not compatible to the OSM license. Do not upload GPL licensed tracks</html>");39 private final static String warningGpl = "<html><font color='red' size='-2'>"+tr("Note: GPL is not compatible to the OSM license. Do not upload GPL licensed tracks.")+"</html>"; 41 40 42 41 private final Layer layer; 43 42 44 43 public GpxExportAction(Layer layer) { 45 super(tr("Export to GPX"), "exportgpx", tr("Export the data to GPX file."), tr("Ctrl-E"), KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK));44 super(tr("Export to GPX"), "exportgpx", tr("Export the data to GPX file."), KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK); 46 45 this.layer = layer; 47 46 } -
src/org/openstreetmap/josm/actions/JosmAction.java
r99 r113 8 8 import org.openstreetmap.josm.Main; 9 9 import org.openstreetmap.josm.tools.ImageProvider; 10 import org.openstreetmap.josm.tools.ShortCutLabel; 10 11 11 12 /** … … 30 31 31 32 32 public JosmAction(String name, String iconName, String tooltip, String shortCutName, KeyStroke shortCut) {33 public JosmAction(String name, String iconName, String tooltip, int shortCut, int modifier) { 33 34 super(name, ImageProvider.get(iconName)); 34 putValue(SHORT_DESCRIPTION, "<html>"+tooltip+" <font size='-2'>"+ shortCutName+"</font> </html>");35 putValue(SHORT_DESCRIPTION, "<html>"+tooltip+" <font size='-2'>"+ShortCutLabel.name(shortCut, modifier)+"</font> </html>"); 35 36 //Main.panel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(shortCut, name); 36 37 //Main.panel.getActionMap().put(name, this); 37 Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put( shortCut, name);38 Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(shortCut, modifier), name); 38 39 Main.contentPane.getActionMap().put(name, this); 39 40 } -
src/org/openstreetmap/josm/actions/OpenAction.java
r110 r113 15 15 import javax.swing.JFileChooser; 16 16 import javax.swing.JOptionPane; 17 import javax.swing.KeyStroke;18 17 19 18 import org.openstreetmap.josm.Main; … … 39 38 */ 40 39 public OpenAction() { 41 super(tr("Open"), "open", tr("Open a file."), tr("Ctrl-O"), KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK));40 super(tr("Open"), "open", tr("Open a file."), KeyEvent.VK_O, InputEvent.CTRL_DOWN_MASK); 42 41 } 43 42 -
src/org/openstreetmap/josm/actions/PreferencesAction.java
r104 r113 5 5 import java.awt.event.ActionEvent; 6 6 import java.awt.event.KeyEvent; 7 8 import javax.swing.KeyStroke;9 7 10 8 import org.openstreetmap.josm.gui.PreferenceDialog; … … 21 19 */ 22 20 public PreferencesAction() { 23 super(tr("Preferences"), "preference", tr("Open a preferences page for global settings."), tr("F12"), KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0));21 super(tr("Preferences"), "preference", tr("Open a preferences page for global settings."), KeyEvent.VK_F12, 0); 24 22 } 25 23 -
src/org/openstreetmap/josm/actions/RedoAction.java
r104 r113 6 6 import java.awt.event.InputEvent; 7 7 import java.awt.event.KeyEvent; 8 9 import javax.swing.KeyStroke;10 8 11 9 import org.openstreetmap.josm.Main; … … 23 21 */ 24 22 public RedoAction() { 25 super(tr("Redo"), "redo", tr("Redo the last undone action."), tr("Ctrl-Shift-Z"), KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK));23 super(tr("Redo"), "redo", tr("Redo the last undone action."), KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK); 26 24 setEnabled(false); 27 25 } -
src/org/openstreetmap/josm/actions/SaveAction.java
r104 r113 12 12 import javax.swing.JFileChooser; 13 13 import javax.swing.JOptionPane; 14 import javax.swing.KeyStroke;15 14 import javax.swing.filechooser.FileFilter; 16 15 … … 31 30 */ 32 31 public SaveAction() { 33 super(tr("Save"), "save", tr("Save the current data."), tr("Ctrl-S"), KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK));32 super(tr("Save"), "save", tr("Save the current data."), KeyEvent.VK_S, InputEvent.CTRL_DOWN_MASK); 34 33 } 35 34 -
src/org/openstreetmap/josm/actions/UndoAction.java
r104 r113 6 6 import java.awt.event.InputEvent; 7 7 import java.awt.event.KeyEvent; 8 9 import javax.swing.KeyStroke;10 8 11 9 import org.openstreetmap.josm.Main; … … 23 21 */ 24 22 public UndoAction() { 25 super(tr("Undo"), "undo", tr("Undo the last action."), tr("Ctrl-Z"), KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK));23 super(tr("Undo"), "undo", tr("Undo the last action."), KeyEvent.VK_Z, InputEvent.CTRL_DOWN_MASK); 26 24 setEnabled(false); 27 25 } -
src/org/openstreetmap/josm/actions/UploadAction.java
r106 r113 15 15 import javax.swing.JPanel; 16 16 import javax.swing.JScrollPane; 17 import javax.swing.KeyStroke;18 17 19 18 import org.openstreetmap.josm.Main; … … 35 34 public class UploadAction extends JosmAction { 36 35 public UploadAction() { 37 super(tr("Upload to OSM"), "upload", tr("Upload all changes to the OSM server."), tr("Ctrl-Shift-U"), 38 KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)); 36 super(tr("Upload to OSM"), "upload", tr("Upload all changes to the OSM server."), KeyEvent.VK_U, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK); 39 37 } 40 38 -
src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java
r104 r113 52 52 "addsegment", 53 53 tr("Add a segment between two nodes."), 54 "G",55 54 KeyEvent.VK_G, 56 55 mapFrame, -
src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java
r104 r113 59 59 */ 60 60 public AddWayAction(MapFrame mapFrame) { 61 super(tr("Add Way"), "addway", tr("Add a new way to the data."), "W",KeyEvent.VK_W, mapFrame, ImageProvider.getCursor("normal", "way"));61 super(tr("Add Way"), "addway", tr("Add a new way to the data."), KeyEvent.VK_W, mapFrame, ImageProvider.getCursor("normal", "way")); 62 62 63 63 Main.ds.addSelectionChangedListener(this); -
src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
r106 r113 56 56 "delete", 57 57 tr("Delete nodes, streets or segments."), 58 "D",59 58 KeyEvent.VK_D, 60 59 mapFrame, -
src/org/openstreetmap/josm/actions/mapmode/MapMode.java
r104 r113 6 6 import java.awt.event.MouseListener; 7 7 import java.awt.event.MouseMotionListener; 8 9 import javax.swing.KeyStroke;10 8 11 9 import org.openstreetmap.josm.Main; … … 29 27 * Constructor for mapmodes without an menu 30 28 */ 31 public MapMode(String name, String iconName, String tooltip, String keyname,int keystroke, MapFrame mapFrame, Cursor cursor) {32 super(name, "mapmode/"+iconName, tooltip, key name, KeyStroke.getKeyStroke(keystroke, 0));29 public MapMode(String name, String iconName, String tooltip, int keystroke, MapFrame mapFrame, Cursor cursor) { 30 super(name, "mapmode/"+iconName, tooltip, keystroke, 0); 33 31 // this.cursor = cursor; 34 32 putValue("active", false); -
src/org/openstreetmap/josm/actions/mapmode/MoveAction.java
r104 r113 52 52 "move", 53 53 tr("Move selected objects around."), 54 "M",55 54 KeyEvent.VK_M, 56 55 mapFrame, -
src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java
r104 r113 44 44 */ 45 45 public ZoomAction(MapFrame mapFrame) { 46 super(tr("Zoom"), "zoom", tr("Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"), "Z",KeyEvent.VK_Z, mapFrame, ImageProvider.getCursor("normal", "zoom"));46 super(tr("Zoom"), "zoom", tr("Zoom in by dragging. (Ctrl+up,left,down,right,+,-)"), KeyEvent.VK_Z, mapFrame, ImageProvider.getCursor("normal", "zoom")); 47 47 mv = mapFrame.mapView; 48 48 selectionManager = new SelectionManager(this, true, mv); -
src/org/openstreetmap/josm/command/AddCommand.java
r104 r113 50 50 NameVisitor v = new NameVisitor(); 51 51 osm.visit(v); 52 return new DefaultMutableTreeNode(new JLabel(tr("Add")+" "+ v.className+" "+v.name, v.icon, JLabel.HORIZONTAL));52 return new DefaultMutableTreeNode(new JLabel(tr("Add")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); 53 53 } 54 54 } -
src/org/openstreetmap/josm/command/ChangeCommand.java
r104 r113 35 35 NameVisitor v = new NameVisitor(); 36 36 osm.visit(v); 37 return new DefaultMutableTreeNode(new JLabel(tr("Change")+" "+ v.className+" "+v.name, v.icon, JLabel.HORIZONTAL));37 return new DefaultMutableTreeNode(new JLabel(tr("Change")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); 38 38 } 39 39 } -
src/org/openstreetmap/josm/command/ChangePropertyCommand.java
r106 r113 68 68 NameVisitor v = new NameVisitor(); 69 69 objects.iterator().next().visit(v); 70 text += " "+ v.className+" "+v.name;70 text += " "+tr(v.className)+" "+v.name; 71 71 } else 72 text += objects.size()+ trn("object","objects",objects.size());72 text += objects.size()+" "+trn("object","objects",objects.size()); 73 73 DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL)); 74 74 if (objects.size() == 1) -
src/org/openstreetmap/josm/command/DeleteCommand.java
r104 r113 44 44 if (data.size() == 1) { 45 45 data.iterator().next().visit(v); 46 return new DefaultMutableTreeNode(new JLabel(tr("Delete" +" "+v.className+" "+v.name), v.icon, JLabel.HORIZONTAL));46 return new DefaultMutableTreeNode(new JLabel(tr("Delete")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL)); 47 47 } 48 48 … … 53 53 cname = v.className; 54 54 else if (!cname.equals(v.className)) 55 cname = " primitive";55 cname = "object"; 56 56 } 57 57 DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel( -
src/org/openstreetmap/josm/data/Preferences.java
r100 r113 1 1 package org.openstreetmap.josm.data; 2 3 import static org.xnap.commons.i18n.I18n.marktr; 2 4 3 5 import java.awt.Color; … … 128 130 properties.put("projection", "org.openstreetmap.josm.data.projection.Epsg4326"); 129 131 properties.put("osm-server.url", "http://www.openstreetmap.org/api"); 130 properties.put("color. background", ColorHelper.color2html(Color.black));131 properties.put("color. node", ColorHelper.color2html(Color.red));132 properties.put("color. segment", ColorHelper.color2html(SimplePaintVisitor.darkgreen));133 properties.put("color. way", ColorHelper.color2html(SimplePaintVisitor.darkblue));134 properties.put("color. incomplete way", ColorHelper.color2html(SimplePaintVisitor.darkerblue));135 properties.put("color. selected", ColorHelper.color2html(Color.white));136 properties.put("color. gps point", ColorHelper.color2html(Color.gray));137 properties.put("color. conflict", ColorHelper.color2html(Color.gray));132 properties.put("color."+marktr("background"), ColorHelper.color2html(Color.black)); 133 properties.put("color."+marktr("node"), ColorHelper.color2html(Color.red)); 134 properties.put("color."+marktr("segment"), ColorHelper.color2html(SimplePaintVisitor.darkgreen)); 135 properties.put("color."+marktr("way"), ColorHelper.color2html(SimplePaintVisitor.darkblue)); 136 properties.put("color."+marktr("incomplete way"), ColorHelper.color2html(SimplePaintVisitor.darkerblue)); 137 properties.put("color."+marktr("selected"), ColorHelper.color2html(Color.white)); 138 properties.put("color."+marktr("gps point"), ColorHelper.color2html(Color.gray)); 139 properties.put("color."+marktr("conflict"), ColorHelper.color2html(Color.gray)); 138 140 save(); 139 141 } -
src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java
r104 r113 46 46 if (name == null) { 47 47 if (ls.incomplete) 48 name = ls.id == 0 ? tr("new") : tr("{0} (unknown)", ls.id);48 name = ls.id == 0 ? tr("new") : ls.id+" ("+tr("unknown")+")"; 49 49 else 50 50 name = (ls.id==0?"":ls.id+" ")+"("+ls.from.coor.lat()+","+ls.from.coor.lon()+") -> ("+ls.to.coor.lat()+","+ls.to.coor.lon()+")"; 51 51 } 52 52 icon = ImageProvider.get("data", "segment"); 53 trn("segment", "segments", 0); // no marktrn available 53 54 className = "segment"; 54 55 } … … 63 64 name = (n.id==0?"":""+n.id)+" ("+n.coor.lat()+","+n.coor.lon()+")"; 64 65 icon = ImageProvider.get("data", "node"); 66 trn("node", "nodes", 0); // no marktrn available 65 67 className = "node"; 66 68 } … … 88 90 } 89 91 icon = ImageProvider.get("data", "way"); 92 trn("way", "ways", 0); // no marktrn available 90 93 className = "way"; 91 94 } -
src/org/openstreetmap/josm/gui/ConflictResolver.java
r104 r113 161 161 162 162 if (this.conflicts.isEmpty()) 163 throw new RuntimeException( tr("No conflicts but in conflict list:\n{0}" , Arrays.toString(conflicts.entrySet().toArray())));163 throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray())); 164 164 165 165 // have to initialize the JTables here and not in the declaration, because its constructor -
src/org/openstreetmap/josm/gui/MainApplication.java
r104 r113 49 49 } 50 50 if (modified) { 51 final String msg = uploadedModified ? tr("\nHint: Some changes came from uploading new data to the server.") : "";51 final String msg = uploadedModified ? "\n"+tr("Hint: Some changes came from uploading new data to the server.") : ""; 52 52 final int answer = JOptionPane.showConfirmDialog( 53 53 Main.parent, tr("There are unsaved changes. Really quit?")+msg, -
src/org/openstreetmap/josm/gui/MapStatus.java
r104 r113 219 219 setLayout(new BoxLayout(this, BoxLayout.X_AXIS)); 220 220 setBorder(BorderFactory.createEmptyBorder(5,5,5,5)); 221 add(new JLabel(tr("Lat/Lon ")));221 add(new JLabel(tr("Lat/Lon")+" ")); 222 222 add(positionText); 223 add(new JLabel( tr(" Object ")));223 add(new JLabel(" "+tr("Object")+" ")); 224 224 add(nameText); 225 225 -
src/org/openstreetmap/josm/gui/MapView.java
r108 r113 157 157 dataLayer.listenerModified.add(new ModifiedChangedListener(){ 158 158 public void modifiedChanged(boolean value, OsmDataLayer source) { 159 JOptionPane.getFrameForComponent(Main.parent).setTitle( tr("{0}Java Open Street Map - Editor",(value?"*":"")));159 JOptionPane.getFrameForComponent(Main.parent).setTitle((value?"*":"")+tr("Java Open Street Map - Editor")); 160 160 } 161 161 }); … … 326 326 public void setActiveLayer(Layer layer) { 327 327 if (!layers.contains(layer)) 328 throw new IllegalArgumentException( tr("layer must be in layerlist"));328 throw new IllegalArgumentException("Layer must be in layerlist"); 329 329 Layer old = activeLayer; 330 330 activeLayer = layer; -
src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
r111 r113 53 53 pane.add(currentAction, GBC.eol().fill(GBC.HORIZONTAL)); 54 54 pane.add(progressBar, GBC.eop().fill(GBC.HORIZONTAL)); 55 JButton cancel = new JButton(tr( tr("Cancel")));55 JButton cancel = new JButton(tr("Cancel")); 56 56 pane.add(cancel, GBC.eol().anchor(GBC.CENTER)); 57 57 pleaseWaitDlg.setContentPane(pane); … … 79 79 } catch (SAXException x) { 80 80 x.printStackTrace(); 81 errorMessage = tr("Error while parsing : ")+x.getMessage();81 errorMessage = tr("Error while parsing")+": "+x.getMessage(); 82 82 } catch (FileNotFoundException x) { 83 83 x.printStackTrace(); 84 errorMessage = tr(" Not found: ") +x.getMessage();84 errorMessage = tr("File Not found")+": "+x.getMessage(); 85 85 } catch (IOException x) { 86 86 x.printStackTrace(); -
src/org/openstreetmap/josm/gui/PreferenceDialog.java
r104 r113 230 230 for (Entry<String,String> e : allColors.entrySet()) { 231 231 Vector<Object> row = new Vector<Object>(2); 232 row.add( e.getKey().substring("color.".length()));232 row.add(tr(e.getKey().substring("color.".length()))); 233 233 row.add(ColorHelper.html2color(e.getValue())); 234 234 rows.add(row); 235 235 } 236 236 Vector<Object> cols = new Vector<Object>(2); 237 cols.add( "Color");238 cols.add( "Name");237 cols.add(tr("Color")); 238 cols.add(tr("Name")); 239 239 colors = new JTable(rows, cols){ 240 240 @Override public boolean isCellEditable(int row, int column) { -
src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
r110 r113 3 3 import static org.openstreetmap.josm.tools.I18n.tr; 4 4 import static org.openstreetmap.josm.tools.I18n.trn; 5 import static org.xnap.commons.i18n.I18n.marktr; 5 6 6 7 import java.awt.BorderLayout; … … 86 87 String key = data.getValueAt(row, 0).toString(); 87 88 Collection<OsmPrimitive> sel = Main.ds.getSelected(); 88 String msg = "<html>"+trn("This will change {0} object.", "This will change {0} objects.", sel.size(), sel.size())+"<br><br> "+tr("Please select a new value for \"{0}\".<br>(Empty string deletes the key.) </html>)", key);89 String msg = "<html>"+trn("This will change {0} object.", "This will change {0} objects.", sel.size(), sel.size())+"<br><br> "+tr("Please select a new value for \"{0}\".<br>(Empty string deletes the key.)", key)+"</html>"; 89 90 final JComboBox combo = (JComboBox)data.getValueAt(row, 1); 90 91 JPanel p = new JPanel(new BorderLayout()); … … 136 137 137 138 JPanel p = new JPanel(new BorderLayout()); 138 p.add(new JLabel(trn("<html>This will change {0} object.<br><br>Please select a key", 139 "<html>This will change {0} objects.<br><br>Please select a key", 140 sel.size(),sel.size())), 139 p.add(new JLabel("<html>"+trn("This will change {0} object.","This will change {0} objects.", sel.size(),sel.size())+"<br><br>"+tr("Please select a key")), 141 140 BorderLayout.NORTH); 142 141 TreeSet<String> allKeys = new TreeSet<String>(); … … 250 249 } 251 250 }; 252 buttonPanel.add(createButton( tr("Add"),tr("Add a new key/value pair to all objects"), KeyEvent.VK_A, buttonAction));253 buttonPanel.add(createButton( tr("Edit"),tr( "Edit the value of the selected key for all objects"), KeyEvent.VK_E, buttonAction));254 buttonPanel.add(createButton( tr("Delete"),tr("Delete the selected key in all objects"), KeyEvent.VK_D, buttonAction));251 buttonPanel.add(createButton(marktr("Add"),tr("Add a new key/value pair to all objects"), KeyEvent.VK_A, buttonAction)); 252 buttonPanel.add(createButton(marktr("Edit"),tr( "Edit the value of the selected key for all objects"), KeyEvent.VK_E, buttonAction)); 253 buttonPanel.add(createButton(marktr("Delete"),tr("Delete the selected key in all objects"), KeyEvent.VK_D, buttonAction)); 255 254 add(buttonPanel, BorderLayout.SOUTH); 256 255 } 257 256 258 257 private JButton createButton(String name, String tooltip, int mnemonic, ActionListener actionListener) { 259 JButton b = new JButton( name, ImageProvider.get("dialogs", name.toLowerCase()));258 JButton b = new JButton(tr(name), ImageProvider.get("dialogs", name.toLowerCase())); 260 259 b.setActionCommand(name); 261 260 b.addActionListener(actionListener); -
src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r98 r113 9 9 import javax.swing.JLabel; 10 10 import javax.swing.JPanel; 11 import javax.swing.KeyStroke;12 11 13 12 import org.openstreetmap.josm.Main; 14 13 import org.openstreetmap.josm.actions.JosmAction; 15 import org.openstreetmap.josm.tools.ShortCutLabel;16 14 17 15 /** … … 27 25 public AbstractButton button; 28 26 29 private ToggleDialogAction(String name, String iconName, String tooltip, String shortcut, KeyStroke cut, String prefname) {30 super(name, iconName, tooltip, short cut, cut);27 private ToggleDialogAction(String name, String iconName, String tooltip, int shortCut, int modifier, String prefname) { 28 super(name, iconName, tooltip, shortCut, modifier); 31 29 this.prefname = prefname; 32 30 } … … 48 46 public ToggleDialog(String name, String iconName, String tooltip, int shortCut) { 49 47 this.prefName = iconName; 50 action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, ShortCutLabel.name(shortCut, KeyEvent.ALT_MASK), KeyStroke.getKeyStroke(shortCut, KeyEvent.ALT_MASK), iconName);48 action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortCut, KeyEvent.ALT_MASK, iconName); 51 49 setLayout(new BorderLayout()); 52 50 add(new JLabel(name), BorderLayout.NORTH); -
src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java
r107 r113 94 94 for (GpsPoint p : c) { 95 95 if (p.time == null) 96 throw new IOException(tr("No time for point {0} ,{1}",p.latlon.lat(),p.latlon.lon()));96 throw new IOException(tr("No time for point {0} x {1}",p.latlon.lat(),p.latlon.lon())); 97 97 Date d = null; 98 98 try { … … 279 279 if (e.pos != null) 280 280 i++; 281 return trn("{0} image. {1} within the track.","{0} images. {1} within the track.",data.size(),data.size(),i);281 return data.size()+" "+trn("image","images",data.size())+". "+tr("{0} within the track.",i); 282 282 } 283 283 -
src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r104 r113 151 151 152 152 @Override public String getToolTipText() { 153 return trn("{0} node", "{0} nodes", undeletedSize(data.nodes), undeletedSize(data.nodes))154 +trn("{0} segment", "{0} segments", undeletedSize(data.segments), undeletedSize(data.segments))155 +trn("{0} way", "{0} ways", undeletedSize(data.ways), undeletedSize(data.ways));153 return undeletedSize(data.nodes)+" "+trn("node", "nodes", undeletedSize(data.nodes))+ 154 undeletedSize(data.segments)+" "+trn("segment", "segments", undeletedSize(data.segments))+ 155 undeletedSize(data.ways)+" "+trn("way", "ways", undeletedSize(data.ways)); 156 156 } 157 157 -
src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
r104 r113 130 130 for (Collection<GpsPoint> c : data) 131 131 points += c.size(); 132 return trn("{0} track", "{0} tracks", data.size(), data.size())133 +" "+ trn("{0} point", "{0} points", points, points);132 return data.size()+" "+trn("track", "tracks", data.size()) 133 +" "+points+" "+trn("point", "points", points); 134 134 } 135 135 … … 157 157 } 158 158 b.append("</html>"); 159 return "<html>"+tr("{0} consists of ")+trn("{0} track", "{0} tracks", data.size(), data.size())+" ("+trn("{0} point", "{0} points", points, points)+")<br>"+b.toString();159 return "<html>"+tr("{0} consists of {1} track", "{0} consists of {1} tracks", data.size(), name, data.size())+" ("+trn("{0} point", "{0} points", points, points)+")<br>"+b.toString(); 160 160 } 161 161 -
src/org/openstreetmap/josm/io/ObjectListDownloader.java
r104 r113 33 33 for (OsmPrimitive osm : toDownload) { 34 34 osm.visit(namer); 35 download( namer.className, osm.id);35 download(tr(namer.className), osm.id); 36 36 if (cancel) 37 37 break; -
src/org/openstreetmap/josm/io/OsmReader.java
r111 r113 94 94 if (qName.equals("osm")) { 95 95 if (atts == null) 96 throw new SAXException(tr("Unknown version ."));96 throw new SAXException(tr("Unknown version")); 97 97 if (!"0.3".equals(atts.getValue("version"))) 98 throw new SAXException(tr("Unknown version {0}",atts.getValue("version")));98 throw new SAXException(tr("Unknown version")+": "+atts.getValue("version")); 99 99 } else if (qName.equals("node")) { 100 100 current = new Node(new LatLon(getDouble(atts, "lat"), getDouble(atts, "lon"))); -
src/org/openstreetmap/josm/io/OsmServerWriter.java
r104 r113 69 69 return; 70 70 osm.visit(v); 71 currentAction.setText(tr("Upload {0} {1} ({2})...", v.className, v.name, osm.id));71 currentAction.setText(tr("Upload {0} {1} ({2})...", tr(v.className), v.name, osm.id)); 72 72 osm.visit(this); 73 73 progress.setValue(progress.getValue()+1); … … 154 154 try { 155 155 URL url = new URL(Main.pref.get("osm-server.url") + "/0.3/" + urlSuffix + "/" + osm.id); 156 System.out.println( tr("upload to: {0}"));156 System.out.println("upload to: "+url); 157 157 activeConnection = (HttpURLConnection) url.openConnection(); 158 158 activeConnection.setConnectTimeout(15000); … … 171 171 if (retCode == 200 && osm.id == 0) 172 172 osm.id = readId(activeConnection.getInputStream()); 173 System.out.println( tr("got return: {0} with id {1}",retCode,osm.id));173 System.out.println("got return: "+retCode+" with id "+osm.id); 174 174 String retMsg = activeConnection.getResponseMessage(); 175 175 activeConnection.disconnect(); … … 183 183 } 184 184 } catch (UnknownHostException e) { 185 throw new RuntimeException(tr("Unknown host : ")+e.getMessage(), e);185 throw new RuntimeException(tr("Unknown host")+": "+e.getMessage(), e); 186 186 } catch (Exception e) { 187 187 if (cancel) -
src/org/openstreetmap/josm/io/RawCsvReader.java
r110 r113 81 81 st.nextToken(); 82 82 else 83 throw new SAXException(tr("Unknown data type: \"{0}\". {1}",token,(Main.pref.get("csv.importstring").equals("") ? (" "+tr("Maybe add an format string in preferences.")) : "")));83 throw new SAXException(tr("Unknown data type: \"{0}\".",token)+(Main.pref.get("csv.importstring").equals("") ? (" "+tr("Maybe add an format string in preferences.")) : "")); 84 84 } 85 85 data.add(new GpsPoint(new LatLon(lat, lon), time)); -
src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
r104 r113 49 49 50 50 URL revUrl = Main.class.getResource("/REVISION"); 51 StringBuilder sb = new StringBuilder( "Please send this to josm@eigenheimstrasse.de\n\n");51 StringBuilder sb = new StringBuilder(tr("Please send this to josm@eigenheimstrasse.de\n\n")); 52 52 if (revUrl == null) { 53 53 sb.append("Development version. Unknown revision."); … … 70 70 71 71 JPanel p = new JPanel(new GridBagLayout()); 72 p.add(new JLabel( "Please send an email with the following information to josm@eigenheimstrasse.de"), GBC.eop());72 p.add(new JLabel(tr("Please send an email with the following information to josm@eigenheimstrasse.de")), GBC.eop()); 73 73 74 74 JTextArea info = new JTextArea(sb.toString(), 20, 60); -
src/org/openstreetmap/josm/tools/DateParser.java
r110 r113 1 1 package org.openstreetmap.josm.tools; 2 3 import static org.openstreetmap.josm.tools.I18n.tr;4 2 5 3 import java.text.ParseException; … … 42 40 try {return sdf.parse(d);} catch (ParseException pe) {} 43 41 } 44 throw new ParseException( tr("No applicable parse format"), 0);42 throw new ParseException("", 0); 45 43 } 46 44 } -
src/org/openstreetmap/josm/tools/ShortCutLabel.java
r104 r113 17 17 if ((modifiers & KeyEvent.SHIFT_MASK) != 0) 18 18 s += tr("Shift-"); 19 s += Character.toUpperCase((char)shortCut); 19 if (shortCut >= KeyEvent.VK_F1 && shortCut <= KeyEvent.VK_F12) 20 s += "F"+(shortCut-KeyEvent.VK_F1+1); 21 else 22 s += Character.toUpperCase((char)shortCut); 20 23 return s; 21 24 }
Note:
See TracChangeset
for help on using the changeset viewer.