Index: /applications/editors/josm/plugins/smed/build.xml
===================================================================
--- /applications/editors/josm/plugins/smed/build.xml (revision 23473)
+++ /applications/editors/josm/plugins/smed/build.xml (revision 23474)
@@ -120,8 +120,9 @@
+
- -->
+
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java (revision 23473)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java (revision 23474)
@@ -1,3 +1,5 @@
package oseam;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
import javax.swing.ImageIcon;
@@ -19,17 +21,17 @@
osm = new OSeaMAction();
osm.init();
- manager.setString("it works realy fine");
+ manager.setString(tr("it works realy fine"));
return osm.getPM01SeaMap();
}
@Override
- public String getInfo() {return "mapping seamarks"; }
+ public String getInfo() {return tr("mapping seamarks"); }
@Override
- public String getName() {return "Seamarks"; }
+ public String getName() {return tr("Seamarks"); }
@Override
public void setPluginManager(SmedPluginManager manager) {
- this.manager = manager;
+ OSeaM.manager = manager;
}
Index: /applications/editors/josm/plugins/smed/src/smed/Smed.java
===================================================================
--- /applications/editors/josm/plugins/smed/src/smed/Smed.java (revision 23473)
+++ /applications/editors/josm/plugins/smed/src/smed/Smed.java (revision 23474)
@@ -8,7 +8,6 @@
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.Arrays;
import java.util.Enumeration;
-import java.util.List;
+import java.util.ResourceBundle;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@@ -23,8 +22,5 @@
import smed.io.SmedFile;
-import smed.plug.SmedPluginApp;
-import smed.plug.ifc.SmedPluggable;
import smed.plug.util.JARFileFilter;
-import smed.plug.util.SmedPluginLoader;
import smed.tabs.SmedTabAction;
Index: /applications/editors/josm/plugins/smed/src/smed/keys/Events.java
===================================================================
--- /applications/editors/josm/plugins/smed/src/smed/keys/Events.java (revision 23474)
+++ /applications/editors/josm/plugins/smed/src/smed/keys/Events.java (revision 23474)
@@ -0,0 +1,16 @@
+package smed.keys;
+
+import java.awt.event.KeyEvent;
+import java.util.ListResourceBundle;
+
+public class Events extends ListResourceBundle {
+
+ private Object[][] contents = {
+ { "SmedMenuBar.001", new Integer(KeyEvent.VK_F) },
+ };
+
+ @Override
+ protected Object[][] getContents() {
+ return contents;
+ }
+}
Index: /applications/editors/josm/plugins/smed/src/smed/keys/Events_de.java
===================================================================
--- /applications/editors/josm/plugins/smed/src/smed/keys/Events_de.java (revision 23474)
+++ /applications/editors/josm/plugins/smed/src/smed/keys/Events_de.java (revision 23474)
@@ -0,0 +1,18 @@
+package smed.keys;
+
+import java.awt.event.KeyEvent;
+import java.util.ListResourceBundle;
+
+public class Events_de extends ListResourceBundle {
+
+ private Object[][] contents = {
+ { "SmedMenuBar.001", new Integer(KeyEvent.VK_D) },
+ };
+
+ @Override
+ protected Object[][] getContents() {
+
+ return contents;
+ }
+
+}
Index: /applications/editors/josm/plugins/smed/src/smed/keys/Events_en.java
===================================================================
--- /applications/editors/josm/plugins/smed/src/smed/keys/Events_en.java (revision 23474)
+++ /applications/editors/josm/plugins/smed/src/smed/keys/Events_en.java (revision 23474)
@@ -0,0 +1,18 @@
+package smed.keys;
+
+import java.awt.event.KeyEvent;
+import java.util.ListResourceBundle;
+
+public class Events_en extends ListResourceBundle {
+
+ private Object[][] contents = {
+ { "SmedMenuBar.001", new Integer(KeyEvent.VK_F) },
+ };
+
+ @Override
+ protected Object[][] getContents() {
+
+ return contents;
+ }
+
+}
Index: /applications/editors/josm/plugins/smed/src/smed/menu/SmedMenuBar.java
===================================================================
--- /applications/editors/josm/plugins/smed/src/smed/menu/SmedMenuBar.java (revision 23473)
+++ /applications/editors/josm/plugins/smed/src/smed/menu/SmedMenuBar.java (revision 23474)
@@ -1,9 +1,9 @@
package smed.menu;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ResourceBundle;
-import javax.swing.DefaultListModel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
@@ -11,6 +11,4 @@
import smed.menu.file.TabManager;
-import smed.plug.ifc.SmedPluggable;
-import smed.tabs.SmedTabbedPane;
public class SmedMenuBar extends JMenuBar {
@@ -24,11 +22,14 @@
JMenu menu, submenu;
JMenuItem menuItem;
- private List plugins = null;
public SmedMenuBar() {
+ ResourceBundle keyEvents = ResourceBundle.getBundle("smed.keys.Events");
+
menuBar = new JMenuBar();
- menu = new JMenu("File");
- menu.setMnemonic(KeyEvent.VK_F);
+ menu = new JMenu(tr("File"));
+ // menu.setMnemonic(KeyEvent.VK_F);
+ menu.setMnemonic((Integer) keyEvents.getObject("SmedMenuBar.001"));
+
menu.getAccessibleContext().setAccessibleDescription(
"The only menu in this program that has menu items");
Index: /applications/editors/josm/plugins/smed/src/smed/menu/file/TabManager.java
===================================================================
--- /applications/editors/josm/plugins/smed/src/smed/menu/file/TabManager.java (revision 23473)
+++ /applications/editors/josm/plugins/smed/src/smed/menu/file/TabManager.java (revision 23474)
@@ -1,4 +1,5 @@
package smed.menu.file;
+import static org.openstreetmap.josm.tools.I18n.tr;
import javax.swing.DefaultListModel;
@@ -186,5 +187,5 @@
tabButtonCancel.setBounds(new Rectangle(254, 44, 130, 30));
tabButtonCancel.setFont(new Font("Dialog", Font.BOLD, 12));
- tabButtonCancel.setText("Cancel");
+ tabButtonCancel.setText(tr("Cancel"));
tabButtonCancel.addActionListener(this);
tabButtonCancel.setActionCommand("cancel");
@@ -203,5 +204,5 @@
tabButtonUndo.setBounds(new Rectangle(254, 84, 130, 30));
tabButtonUndo.setFont(new Font("Dialog", Font.BOLD, 12));
- tabButtonUndo.setText("Undo");
+ tabButtonUndo.setText(tr("Undo"));
tabButtonUndo.addActionListener(this);
tabButtonUndo.setActionCommand("undo");
@@ -220,5 +221,5 @@
tabButtonLoad.setBounds(new Rectangle(186, 328, 104, 30));
tabButtonLoad.setFont(new Font("Dialog", Font.PLAIN, 12));
- tabButtonLoad.setText("Load");
+ tabButtonLoad.setText(tr("Load"));
tabButtonLoad.addActionListener(this);
tabButtonLoad.setActionCommand("load");
@@ -237,5 +238,5 @@
tabButtonSave.setBounds(new Rectangle(293, 328, 104, 30));
tabButtonSave.setFont(new Font("Dialog", Font.PLAIN, 12));
- tabButtonSave.setText("Save");
+ tabButtonSave.setText(tr("Save"));
tabButtonSave.addActionListener(this);
tabButtonSave.setActionCommand("save");
@@ -254,5 +255,5 @@
tabButtonDelete.setBounds(new Rectangle(186, 362, 104, 30));
tabButtonDelete.setFont(new Font("Dialog", Font.PLAIN, 12));
- tabButtonDelete.setText("Delete");
+ tabButtonDelete.setText(tr("Delete"));
tabButtonDelete.addActionListener(this);
tabButtonDelete.setActionCommand("delete");
@@ -271,5 +272,5 @@
tabButtonVisible.setBounds(new Rectangle(293, 362, 104, 30));
tabButtonVisible.setFont(new Font("Dialog", Font.PLAIN, 12));
- tabButtonVisible.setText("invisible");
+ tabButtonVisible.setText(tr("invisible"));
tabButtonVisible.addActionListener(this);
tabButtonVisible.setActionCommand("invisible");
@@ -288,5 +289,5 @@
tabButtonAll.setBounds(new Rectangle(92, 300, 72, 20));
tabButtonAll.setFont(new Font("Dialog", Font.PLAIN, 12));
- tabButtonAll.setText("all");
+ tabButtonAll.setText(tr("all"));
tabButtonAll.addActionListener(this);
tabButtonAll.setActionCommand("all");
@@ -305,5 +306,5 @@
tabButtonNone.setBounds(new Rectangle(166, 300, 72, 20));
tabButtonNone.setFont(new Font("Dialog", Font.PLAIN, 12));
- tabButtonNone.setText("none");
+ tabButtonNone.setText(tr("none"));
tabButtonNone.addActionListener(this);
tabButtonNone.setActionCommand("none");
Index: /applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java
===================================================================
--- /applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java (revision 23473)
+++ /applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java (revision 23474)
@@ -13,5 +13,4 @@
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
import javax.swing.WindowConstants;
@@ -34,9 +33,10 @@
private JMenuItem osmItem =null;
public static JTextField smedStatusBar = null;
+ private static String editor =tr("SeaMap Editor");
public SmedTabAction() {
- super( tr("Seamap Editor"), "Smed",tr("Seanap Editor"), Shortcut.registerShortcut(
+ super( editor, "Smed",editor, Shortcut.registerShortcut(
"tools:Semmaps",
- tr("Tool: {0}", tr("Seamap Editor")), KeyEvent.VK_K, //$NON-NLS-1$ //$NON-NLS-2$
+ tr("Tool: {0}", editor), KeyEvent.VK_K, //$NON-NLS-1$ //$NON-NLS-2$
Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
}
@@ -60,5 +60,5 @@
protected void createAndShowTabs() {
//Create and set up the window.
- frame = new JFrame("TabbedPaneDemo");
+ frame = new JFrame(editor);
smedStatusBar = new JTextField();
frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);