Index: /applications/editors/josm/plugins/cadastre-fr/build.xml =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/build.xml (revision 18403) +++ /applications/editors/josm/plugins/cadastre-fr/build.xml (revision 18404) @@ -26,6 +26,6 @@ - - + + Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java (revision 18403) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java (revision 18404) @@ -2,5 +2,4 @@ import static org.openstreetmap.josm.gui.help.HelpUtil.ht; -import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; @@ -134,5 +133,5 @@ if (cadastreJMenu == null) { - cadastreJMenu = menu.addMenu(marktr("Cadastre"), KeyEvent.VK_C, menu.defaultMenuPos, ht("/Menu/Cadastre")); + cadastreJMenu = menu.addMenu(tr("Cadastre"), KeyEvent.VK_C, menu.defaultMenuPos, ht("/Plugin/CadastreFr")); JosmAction grab = new MenuActionGrab(); JMenuItem menuGrab = new JMenuItem(grab); Index: /applications/editors/josm/plugins/czechaddress/build.xml =================================================================== --- /applications/editors/josm/plugins/czechaddress/build.xml (revision 18403) +++ /applications/editors/josm/plugins/czechaddress/build.xml (revision 18404) @@ -52,5 +52,5 @@ - + Index: /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java =================================================================== --- /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (revision 18403) +++ /applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/CzechAddressPlugin.java (revision 18404) @@ -1,3 +1,5 @@ package org.openstreetmap.josm.plugins.czechaddress; + +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import java.awt.event.KeyEvent; @@ -184,5 +186,5 @@ public void pluginStatusChanged(int message) { if (message == MESSAGE_DATABASE_LOADED) { - czechMenu = Main.main.menu.addMenu("Adresy", KeyEvent.VK_A, 4); + czechMenu = Main.main.menu.addMenu("Adresy", KeyEvent.VK_A, 4, ht("/Plugin/CzechAddress")); menuItems.add(MainMenu.add(czechMenu, new PointManipulatorAction())); menuItems.add(MainMenu.add(czechMenu, new GroupManipulatorAction())); Index: /applications/editors/josm/plugins/livegps/build.xml =================================================================== --- /applications/editors/josm/plugins/livegps/build.xml (revision 18403) +++ /applications/editors/josm/plugins/livegps/build.xml (revision 18404) @@ -26,5 +26,5 @@ - + Index: /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java =================================================================== --- /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java (revision 18403) +++ /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java (revision 18404) @@ -1,5 +1,5 @@ package livegps; -import static org.openstreetmap.josm.tools.I18n.marktr; +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; @@ -98,5 +98,5 @@ { MainMenu menu = Main.main.menu; - lgpsmenu = menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G, menu.defaultMenuPos); + lgpsmenu = menu.addMenu(tr("LiveGPS"), KeyEvent.VK_G, menu.defaultMenuPos, ht("/Plugin/LiveGPS")); JosmAction captureAction = new CaptureAction(); Index: /applications/editors/josm/plugins/piclayer/build.xml =================================================================== --- /applications/editors/josm/plugins/piclayer/build.xml (revision 18403) +++ /applications/editors/josm/plugins/piclayer/build.xml (revision 18404) @@ -81,5 +81,5 @@ - + Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (revision 18403) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (revision 18404) @@ -21,4 +21,7 @@ package org.openstreetmap.josm.plugins.piclayer; +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; +import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.event.KeyEvent; import javax.swing.JMenu; @@ -35,44 +38,44 @@ */ public class PicLayerPlugin extends Plugin implements LayerChangeListener { - - // Plugin menu - private JMenu m_menu = null; - - // Toolbar buttons - private IconToggleButton m_movePictureButton = null; - private IconToggleButton m_rotatePictureButton = null; - private IconToggleButton m_scalexPictureButton = null; - private IconToggleButton m_scaleyPictureButton = null; - private IconToggleButton m_scalexyPictureButton = null; - - // Menu actions - private NewLayerFromFileAction m_newFromFileAction = null; - private NewLayerFromClipboardAction m_newFromClipAction = null; - /** - * Constructor... - */ - public PicLayerPlugin() { - - // Create menu entry - if ( Main.main.menu != null ) { - m_menu = Main.main.menu.addMenu( "PicLayer" , KeyEvent.VK_I, Main.main.menu.defaultMenuPos ); - } - - // Add menu items - if ( m_menu != null ) { - m_menu.add( m_newFromFileAction = new NewLayerFromFileAction() ); - m_menu.add( m_newFromClipAction = new NewLayerFromClipboardAction() ); - m_menu.addSeparator(); - m_menu.add( new HelpAction() ); - m_newFromFileAction.setEnabled( false ); - m_newFromClipAction.setEnabled( false ); - } - - // Listen to layers - Layer.listeners.add( this ); - - } - + // Plugin menu + private JMenu m_menu = null; + + // Toolbar buttons + private IconToggleButton m_movePictureButton = null; + private IconToggleButton m_rotatePictureButton = null; + private IconToggleButton m_scalexPictureButton = null; + private IconToggleButton m_scaleyPictureButton = null; + private IconToggleButton m_scalexyPictureButton = null; + + // Menu actions + private NewLayerFromFileAction m_newFromFileAction = null; + private NewLayerFromClipboardAction m_newFromClipAction = null; + + /** + * Constructor... + */ + public PicLayerPlugin() { + + // Create menu entry + if ( Main.main.menu != null ) { + m_menu = Main.main.menu.addMenu(tr("PicLayer") , KeyEvent.VK_I, Main.main.menu.defaultMenuPos, ht("/Plugin/PicLayer")); + } + + // Add menu items + if ( m_menu != null ) { + m_menu.add( m_newFromFileAction = new NewLayerFromFileAction() ); + m_menu.add( m_newFromClipAction = new NewLayerFromClipboardAction() ); + m_menu.addSeparator(); + m_menu.add( new HelpAction() ); + m_newFromFileAction.setEnabled( false ); + m_newFromClipAction.setEnabled( false ); + } + + // Listen to layers + Layer.listeners.add( this ); + + } + /** * Called when the map is created. Creates the toolbar buttons. @@ -80,12 +83,12 @@ public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) { if(newFrame != null) { - // Create plugin map modes - MovePictureAction movePictureAction = new MovePictureAction(newFrame); - RotatePictureAction rotatePictureAction = new RotatePictureAction(newFrame); - ScaleXYPictureAction scaleXYPictureAction = new ScaleXYPictureAction(newFrame); - ScaleXPictureAction scaleXPictureAction = new ScaleXPictureAction(newFrame); - ScaleYPictureAction scaleYPictureAction = new ScaleYPictureAction(newFrame); - // Create plugin buttons and add them to the toolbar - m_movePictureButton = new IconToggleButton(movePictureAction); + // Create plugin map modes + MovePictureAction movePictureAction = new MovePictureAction(newFrame); + RotatePictureAction rotatePictureAction = new RotatePictureAction(newFrame); + ScaleXYPictureAction scaleXYPictureAction = new ScaleXYPictureAction(newFrame); + ScaleXPictureAction scaleXPictureAction = new ScaleXPictureAction(newFrame); + ScaleYPictureAction scaleYPictureAction = new ScaleYPictureAction(newFrame); + // Create plugin buttons and add them to the toolbar + m_movePictureButton = new IconToggleButton(movePictureAction); m_rotatePictureButton = new IconToggleButton(rotatePictureAction); m_scalexyPictureButton = new IconToggleButton(scaleXYPictureAction); @@ -109,28 +112,27 @@ } - /** - * The toolbar buttons shall be active only when the PicLayer is active. - */ - public void activeLayerChange(Layer oldLayer, Layer newLayer) { - } + /** + * The toolbar buttons shall be active only when the PicLayer is active. + */ + public void activeLayerChange(Layer oldLayer, Layer newLayer) { + } - /** - * The menu is enabled once another layer is first created. This is needed - * because the picture must be positioned based on the current mapview (so - * one must exist first). User should not be able to load a picture too early. - */ - public void layerAdded(Layer arg0) { - m_newFromFileAction.setEnabled( true ); - m_newFromClipAction.setEnabled( true ); - } + /** + * The menu is enabled once another layer is first created. This is needed + * because the picture must be positioned based on the current mapview (so + * one must exist first). User should not be able to load a picture too early. + */ + public void layerAdded(Layer arg0) { + m_newFromFileAction.setEnabled( true ); + m_newFromClipAction.setEnabled( true ); + } - /** - * When all layers are gone - the menu is gone too. - */ - public void layerRemoved(Layer arg0) { - boolean enable = Main.map.mapView.getAllLayers().size() != 0; - m_newFromFileAction.setEnabled( enable ); - m_newFromClipAction.setEnabled( enable ); - } - + /** + * When all layers are gone - the menu is gone too. + */ + public void layerRemoved(Layer arg0) { + boolean enable = Main.map.mapView.getAllLayers().size() != 0; + m_newFromFileAction.setEnabled( enable ); + m_newFromClipAction.setEnabled( enable ); + } }; Index: /applications/editors/josm/plugins/routing/build.xml =================================================================== --- /applications/editors/josm/plugins/routing/build.xml (revision 18403) +++ /applications/editors/josm/plugins/routing/build.xml (revision 18404) @@ -44,5 +44,5 @@ - + Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java =================================================================== --- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java (revision 18403) +++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java (revision 18404) @@ -137,5 +137,5 @@ layers = new ArrayList(); // Add menu - menu = new RoutingMenu(marktr("Routing")); + menu = new RoutingMenu(); // Register this class as LayerChangeListener Layer.listeners.add(this); Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java =================================================================== --- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java (revision 18403) +++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java (revision 18404) @@ -28,4 +28,5 @@ package com.innovant.josm.plugin.routing.gui; +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; @@ -71,7 +72,7 @@ * @param s */ - public RoutingMenu(final String name) { + public RoutingMenu() { MainMenu mm = Main.main.menu; - menu = mm.addMenu(name, KeyEvent.VK_O, mm.defaultMenuPos); + menu = mm.addMenu(tr("Routing"), KeyEvent.VK_O, mm.defaultMenuPos, ht("/Plugin/Routing")); startMI = new JMenuItem(tr("Add routing layer")); Index: /applications/editors/josm/plugins/walkingpapers/build.xml =================================================================== --- /applications/editors/josm/plugins/walkingpapers/build.xml (revision 18403) +++ /applications/editors/josm/plugins/walkingpapers/build.xml (revision 18404) @@ -26,5 +26,5 @@ - + Index: /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java =================================================================== --- /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java (revision 18403) +++ /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java (revision 18404) @@ -1,4 +1,5 @@ package org.openstreetmap.josm.plugins.walkingpapers; +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; @@ -20,12 +21,11 @@ public class WalkingPapersPlugin extends Plugin { - static JMenu walkingPapersMenu; - + static JMenu walkingPapersMenu; + public WalkingPapersPlugin() { MainMenu menu = Main.main.menu; - walkingPapersMenu = menu.addMenu(tr("Walking Papers"), KeyEvent.VK_K, menu.defaultMenuPos); + walkingPapersMenu = menu.addMenu(tr("Walking Papers"), KeyEvent.VK_K, menu.defaultMenuPos, ht("/Plugin/WalkingPapers")); walkingPapersMenu.add(new JMenuItem(new WalkingPapersAddLayerAction())); } - } Index: /applications/editors/josm/plugins/wmsplugin/build.xml =================================================================== --- /applications/editors/josm/plugins/wmsplugin/build.xml (revision 18403) +++ /applications/editors/josm/plugins/wmsplugin/build.xml (revision 18404) @@ -18,5 +18,5 @@ ** To build against the core in ../../core, create a correct manifest and deploy to ** SVN, run -** - set the property commit.message +** - set the property commit.message ** - set the property josm.reference.release to lowest JOSM release number this ** plugin build is compatible with @@ -32,6 +32,6 @@ - - + + @@ -85,5 +85,5 @@ - + @@ -98,5 +98,5 @@ - + Commiting the plugin source ... @@ -106,8 +106,8 @@ - + - + Updating basedir ... @@ -116,5 +116,5 @@ - + Updating ${plugin.jar} ... @@ -122,7 +122,7 @@ - + - + Commiting ${plugin.jar} ... @@ -132,7 +132,7 @@ - + - + Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java (revision 18403) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java (revision 18404) @@ -1,5 +1,5 @@ package wmsplugin; -import static org.openstreetmap.josm.tools.I18n.marktr; +import static org.openstreetmap.josm.gui.help.HelpUtil.ht; import static org.openstreetmap.josm.tools.I18n.tr; @@ -51,8 +51,8 @@ static int overlapEast = 14; static int overlapNorth = 4; - + // remember state of menu item to restore on changed preferences static private boolean menuEnabled = false; - + protected void initExporterAndImporter() { ExtensionFileFilter.exporters.add(new WMSLayerExporter()); @@ -94,17 +94,17 @@ TreeSet keys = new TreeSet(prefs.keySet()); - // Here we load the settings for "overlap" checkbox and spinboxes. - - try { - doOverlap = Boolean.valueOf(prefs.get("wmsplugin.url.overlap")); - } catch (Exception e) {} // If sth fails, we drop to default settings. - - try { - overlapEast = Integer.valueOf(prefs.get("wmsplugin.url.overlapEast")); - } catch (Exception e) {} // If sth fails, we drop to default settings. - - try { - overlapNorth = Integer.valueOf(prefs.get("wmsplugin.url.overlapNorth")); - } catch (Exception e) {} // If sth fails, we drop to default settings. + // Here we load the settings for "overlap" checkbox and spinboxes. + + try { + doOverlap = Boolean.valueOf(prefs.get("wmsplugin.url.overlap")); + } catch (Exception e) {} // If sth fails, we drop to default settings. + + try { + overlapEast = Integer.valueOf(prefs.get("wmsplugin.url.overlapEast")); + } catch (Exception e) {} // If sth fails, we drop to default settings. + + try { + overlapNorth = Integer.valueOf(prefs.get("wmsplugin.url.overlapNorth")); + } catch (Exception e) {} // If sth fails, we drop to default settings. // And then the names+urls of WMS servers @@ -169,5 +169,5 @@ if (wmsJMenu == null) - wmsJMenu = menu.addMenu(marktr("WMS"), KeyEvent.VK_W, menu.defaultMenuPos); + wmsJMenu = menu.addMenu(tr("WMS"), KeyEvent.VK_W, menu.defaultMenuPos, ht("/Plugin/WMS")); else wmsJMenu.removeAll();