Changeset 23474 in osm for applications/editors/josm

Timestamp:

2010-10-05T00:42:20+02:00 (14 years ago)

Author:

postfix

Message:

'some new internationalized messages'

Location:

applications/editors/josm/plugins/smed

Files:

• build.xml (modified) (1 diff)
• plugs/oseam/src/oseam/OSeaM.java (modified) (2 diffs)
• src/smed/Smed.java (modified) (2 diffs)
• src/smed/keys (added)
• src/smed/keys/Events.java (added)
• src/smed/keys/Events_de.java (added)
• src/smed/keys/Events_en.java (added)
• src/smed/menu/SmedMenuBar.java (modified) (3 diffs)
• src/smed/menu/file/TabManager.java (modified) (9 diffs)
• src/smed/tabs/SmedTabAction.java (modified) (3 diffs)

applications/editors/josm/plugins/smed/build.xml

@@ -120 +120 @@
                                 <attribute name="Plugin-Link" value="http://openseamap.org/"/>
                                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
+                                <!--
                                 <attribute name="Plugin-Version" value="23456"/>
-                                <!--
+                                -->
                                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-                                 -->
+                                 
                         </manifest>
                 </jar>

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/OSeaM.java

@@ -1 +1 @@
 package oseam;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import javax.swing.ImageIcon;
@@ -19 +21 @@
                 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;
         }
 

applications/editors/josm/plugins/smed/src/smed/Smed.java

@@ -8 +8 @@
 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 +22 @@
 
 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;
 

applications/editors/josm/plugins/smed/src/smed/menu/SmedMenuBar.java

@@ -1 +1 @@
 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 +11 @@
 
 import smed.menu.file.TabManager;
-import smed.plug.ifc.SmedPluggable;
-import smed.tabs.SmedTabbedPane;
 
 public class SmedMenuBar extends JMenuBar {
@@ -24 +22 @@
      JMenu menu, submenu;
      JMenuItem menuItem;
-     private List<SmedPluggable> 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");

applications/editors/josm/plugins/smed/src/smed/menu/file/TabManager.java

@@ -1 +1 @@
 package smed.menu.file;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import javax.swing.DefaultListModel;
@@ -186 +187 @@
                         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 +204 @@
                         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 +221 @@
                         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 +238 @@
                         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 +255 @@
                         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 +272 @@
                         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 +289 @@
                         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 +306 @@
                         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");

applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java

@@ -13 +13 @@
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
 import javax.swing.WindowConstants;
 
@@ -34 +33 @@
         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 +60 @@
     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);