Changeset 104 in josm for src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

Timestamp:

2006-07-03T00:31:24+02:00 (19 years ago)

Author:

imi

Message:

• started i18n
• started "download incomplete ways" action
• added straight line selection mode

File:

• src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (11 diffs)

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
@@ -53 +55 @@
  */
 public class SelectionListDialog extends ToggleDialog implements SelectionChangedListener {
-
         public static enum SearchMode {replace, add, remove}
 
@@ -62 +63 @@
                 private OsmIdReader idReader = new OsmIdReader();
                 public SelectionWebsiteLoader(String urlStr, SearchMode mode) {
-                super("Load Selection");
+                super(tr("Load Selection"));
                 this.mode = mode;
                 URL u = null;
@@ -69 +70 @@
         }
                 @Override protected void realRun() {
-                        currentAction.setText("Contact "+url.getHost()+"...");
+                        currentAction.setText(tr("Contact {0}...", url.getHost()));
                         sel = mode != SearchMode.remove ? new LinkedList<OsmPrimitive>() : Main.ds.allNonDeletedPrimitives();
                         try {
                         URLConnection con = url.openConnection();
                         InputStream in = new ProgressReader(con, progress, currentAction);
-                                currentAction.setText("Downloading...");
+                                currentAction.setText(tr("Downloading..."));
                                 Map<Long, String> ids = idReader.parseIds(in);
                         for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
@@ -86 +87 @@
                 } catch (IOException e) {
                         e.printStackTrace();
-                        JOptionPane.showMessageDialog(Main.parent, "Could not read from url: '"+url+"'");
+                        JOptionPane.showMessageDialog(Main.parent, tr("Could not read from url: '{0}'",url));
                 } catch (SAXException e) {
                         e.printStackTrace();
-                        JOptionPane.showMessageDialog(Main.parent, "Parsing error in url: '"+url+"'");
+                        JOptionPane.showMessageDialog(Main.parent,tr("Parsing error in url: '{0}'",url));
                 }
         }
@@ -116 +117 @@
          */
         public SelectionListDialog(MapFrame mapFrame) {
-                super("Current Selection", "selectionlist", "Open a selection list window.", KeyEvent.VK_E);
+                super(tr("Current Selection"), "selectionlist", tr("Open a selection list window."), KeyEvent.VK_E);
                 setPreferredSize(new Dimension(320,150));
                 displaylist.setCellRenderer(new OsmPrimitivRenderer());
@@ -132 +133 @@
                 JPanel buttonPanel = new JPanel(new GridLayout(1,2));
                 
-                JButton button = new JButton("Select", ImageProvider.get("mapmode", "selection"));
-                button.setToolTipText("Set the selected elements on the map to the selected items in the list above.");
+                JButton button = new JButton(tr("Select"), ImageProvider.get("mapmode/selection/select"));
+                button.setToolTipText(tr("Set the selected elements on the map to the selected items in the list above."));
                 button.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
@@ -141 +142 @@
                 buttonPanel.add(button);
 
-                button = new JButton("Reload", ImageProvider.get("dialogs", "refresh"));
-                button.setToolTipText("Refresh the selection list.");
+                button = new JButton(tr("Reload"), ImageProvider.get("dialogs", "refresh"));
+                button.setToolTipText(tr("Refresh the selection list."));
                 button.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
@@ -150 +151 @@
                 buttonPanel.add(button);
                 
-                button = new JButton("Search", ImageProvider.get("dialogs", "search"));
-                button.setToolTipText("Search for objects.");
+                button = new JButton(tr("Search"), ImageProvider.get("dialogs", "search"));
+                button.setToolTipText(tr("Search for objects."));
                 button.addActionListener(new ActionListener(){
                         private String lastSearch = "";
                         public void actionPerformed(ActionEvent e) {
-                                JLabel label = new JLabel("Please enter a search string.");
+                                JLabel label = new JLabel(tr("Please enter a search string."));
                                 final JTextField input = new JTextField(lastSearch);
-                                input.setToolTipText("<html>Fulltext search.<ul>" +
+                                input.setToolTipText(tr("<html>Fulltext search.<ul>" +
                                                 "<li><code>Baker Street</code>  - 'Baker' and 'Street' in any key or name.</li>" +
                                                 "<li><code>\"Baker Street\"</code>  - 'Baker Street' in any key or name.</li>" +
@@ -163 +164 @@
                                                 "<li><code>-name:Bak</code>  - not 'Bak' in the name.</li>" +
                                                 "<li><code>foot:</code>  - key=foot set to any value." +
-                                                "</ul></html>");
-
-                                JRadioButton replace = new JRadioButton("replace selection", true);
-                                JRadioButton add = new JRadioButton("add to selection", false);
-                                JRadioButton remove = new JRadioButton("remove from selection", false);
+                                                "</ul></html>"));
+
+                                JRadioButton replace = new JRadioButton(tr("replace selection"), true);
+                                JRadioButton add = new JRadioButton(tr("add to selection"), false);
+                                JRadioButton remove = new JRadioButton(tr("remove from selection"), false);
                                 ButtonGroup bg = new ButtonGroup();
                                 bg.add(replace);
@@ -184 +185 @@
                     }
                                 };
-                                pane.createDialog(Main.parent, "Search").setVisible(true);
+                                pane.createDialog(Main.parent,tr("Search")).setVisible(true);
                                 if (!Integer.valueOf(JOptionPane.OK_OPTION).equals(pane.getValue()))
                                         return;