Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java (revision 20217) @@ -19,4 +19,6 @@ ***************************************************************************/ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.io.File; @@ -44,6 +46,5 @@ @Override public String getDescription() { - return "Calibration Files (*" + EXTENSION + ")"; + return tr("Calibration Files")+ " (*" + EXTENSION + ")"; } - } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/HelpAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/HelpAction.java (revision 20214) +++ (revision ) @@ -1,103 +1,0 @@ -/*************************************************************************** - * Copyright (C) 2009 by Tomasz Stelmach * - * http://www.stelmach-online.net/ * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ - -package org.openstreetmap.josm.plugins.piclayer; - -import java.awt.event.ActionEvent; - -import javax.swing.JFrame; -import javax.swing.JScrollPane; -import javax.swing.JTextPane; - -import org.openstreetmap.josm.actions.JosmAction; - -/** - * Help class. Basically copied from WMSPlugin. - */ -public class HelpAction extends JosmAction { - - /** - * Constructor - */ - public HelpAction() { - super( "Help", null, null, null, false); - - } - - /** - * Shows help window. - */ - public void actionPerformed(ActionEvent e) { - String helptext = - "This plugin is meant for showing images as a background of the data being edited." - + "It offers two ways of loading the data - from a file and from the clipboard." - + "This is an early version and is not end-user-proof, so please follow the steps exactly in case you want to use it." - + "Actually... it's barely working at the moment but I already find it very useful :)." - + "\n\n" - + "NOTE: Make sure the image is suitable, copyright-wise, if in doubt, don't use." - + "\n" - + "Step 1) Load some data from the server so that map is visible." - + "\n" - + "Step 2) Go to PicLayer menu and either choose to add a layer from a file or from the clipboard." - + "\n" - + "Step 2a) If you chose a file, a file selector will pop-up. Choose the image you want. Of course the format you are using might not be supported yet :)" - + "\n" - + "Step 2b) If you chose a clipboard, please wait. For some reason it takes time. To be fixed later." - + "\n" - + "NOTE) If something failed, you should get a message box. If not - check the console for messages (Linux only?)" - + "\n" - + "Step 3) Once the image is visible you may start positioning it. For that - select the PicLayer in the layers list and activate it (!!!)." - + "\n" - + "Step 4) Start aligning the image." - + "\n" - + "Step 4a) Move the image by choosing 'Move' from the toolbar and draggin the mouse around with left button pressed." - + "\n" - + "Step 4b) Rotate the image by choosing 'Rotate' from the toolbar and draggin the mouse up/down with left button pressed." - + "\n" - + "Step 4c) Scale the image by choosing 'Scale' from the toolbar and draggin the mouse up/down with left button pressed." - + "\n" - + "Step 4d) You can also choose to scale in just one axis by selecting the proper button." - + "\n" - + "NOTE) If it does not work - make sure the right layer is selected AND ACTIVATED." - + "\n" - + "Step 5) If you need to reset your changes - you can use the popup menu available under the PicLayer entry in the layer list." - + "\n" - + "Step 6) If you want to save the calibraton of the picture you have made, you can also do this using the popup menu." - + "\n\n" - + "This plugin is meant to help with mapping from photos (for me it's mostly buildings) for people who simply don't like MetaCarta Rectifier (like me)." - + "\n\n" - + "Although I wrote it only to help myself and currently have no intention of extending it beyond what I need, you may still contact me with any suggestions that you think are important: tomasz.stelmach@poczta.onet.pl" - + "\n\n" - + "I used wmsplugin and routing plugin code very much during coding. Thank you and I hope you don't mind :)" - ; - - JTextPane tp = new JTextPane(); - JScrollPane js = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); - - js.getViewport().add(tp); - JFrame jf = new JFrame("PicLayer Help"); - jf.getContentPane().add(js); - jf.pack(); - jf.setSize(600,600); - jf.setVisible(true); - tp.setText(helptext); - } -} Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java (revision 20217) @@ -20,4 +20,7 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.event.ActionEvent; import java.io.File; @@ -48,5 +51,5 @@ */ public LoadPictureCalibrationAction( PicLayerAbstract owner ) { - super("Load Picture Calibration...", null, "Loads calibration data to a file", null, false); + super(tr("Load Picture Calibration..."), null, tr("Loads calibration data to a file"), null, false); // Remember the owner... m_owner = owner; @@ -74,7 +77,7 @@ // Error e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent , "Loading file failed: " + e.getMessage()); + JOptionPane.showMessageDialog(Main.parent , tr("Loading file failed: {0}", e.getMessage())); } - } + } } } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java (revision 20217) @@ -20,4 +20,6 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.MouseEvent; @@ -51,5 +53,5 @@ */ public MovePictureAction(MapFrame frame) { - super("PicLayer", "move", "Drag to move the picture", frame, ImageProvider.getCursor("crosshair", null)); + super(tr("PicLayer move"), "move", tr("Drag to move the picture"), frame, ImageProvider.getCursor("crosshair", null)); } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java (revision 20217) @@ -21,4 +21,6 @@ package org.openstreetmap.josm.plugins.piclayer; +import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.event.ActionEvent; import java.io.IOException; @@ -38,5 +40,5 @@ */ public NewLayerFromClipboardAction() { - super("New picture layer from clipboard", null, null, null, false); + super(tr("New picture layer from clipboard"), null, null, null, false); } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java (revision 20217) @@ -20,4 +20,6 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.ActionEvent; @@ -60,5 +62,5 @@ @Override public String getDescription() { - return "Image files"; + return tr("Image files"); } @@ -69,5 +71,5 @@ */ public NewLayerFromFileAction() { - super("New picture layer from file...", null, null, null, false); + super(tr("New picture layer from file..."), null, null, null, false); } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java (revision 20217) @@ -20,4 +20,6 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Color; @@ -93,5 +95,5 @@ // Create popup menu // Reset submenu - JMenu reset_submenu = new JMenu( "Reset" ); + JMenu reset_submenu = new JMenu(tr("Reset")); reset_submenu.add( new ResetPictureAllAction( this ) ); reset_submenu.addSeparator(); @@ -105,6 +107,4 @@ new JMenuItem( new SavePictureCalibrationAction(this)), new JMenuItem( new LoadPictureCalibrationAction(this)), - new JSeparator(), - new JMenuItem( new HelpAction() ) }; @@ -122,5 +122,5 @@ Image image = createImage(); if ( image == null ) { - throw new IOException( "Image not created properly."); + throw new IOException(tr("Image not created properly.")); } // Convert to Buffered Image - not sure if this is the right way... @@ -136,5 +136,5 @@ m_initial_scale = Main.map.mapView.getDist100Pixel(); } else { - throw new IOException( "Could not find the map object." ); + throw new IOException(tr("Could not find the map object.")); } } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java (revision 20217) @@ -21,4 +21,6 @@ package org.openstreetmap.josm.plugins.piclayer; +import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.Image; import java.awt.Toolkit; @@ -41,5 +43,5 @@ // Check result if ( t == null ) { - throw new IOException( "Nothing in clipboard" ); + throw new IOException(tr("Nothing in clipboard")); } @@ -50,5 +52,5 @@ image = (Image)t.getTransferData(DataFlavor.imageFlavor); } else { - throw new IOException( "The clipboard data is not an image" ); + throw new IOException(tr("The clipboard data is not an image")); } } catch (UnsupportedFlavorException e) { 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 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (revision 20217) @@ -70,6 +70,4 @@ 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 ); Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java (revision 20217) @@ -20,4 +20,7 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.event.ActionEvent; @@ -39,5 +42,5 @@ */ public ResetPictureAllAction( PicLayerAbstract owner ) { - super("All", null, "Resets picture calibration", null, false); + super(tr("All"), null, tr("Resets picture calibration"), null, false); // Remember the owner... m_owner = owner; Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java (revision 20217) @@ -20,4 +20,7 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.event.ActionEvent; @@ -39,5 +42,5 @@ */ public ResetPictureAngleAction( PicLayerAbstract owner ) { - super("Angle", null, "Resets picture rotation", null, false); + super(tr("Angle"), null, tr("Resets picture rotation"), null, false); // Remember the owner... m_owner = owner; Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java (revision 20217) @@ -20,4 +20,7 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.event.ActionEvent; @@ -39,5 +42,5 @@ */ public ResetPicturePositionAction( PicLayerAbstract owner ) { - super("Position", null, "Resets picture position", null, false); + super(tr("Reset position"), null, tr("Resets picture position"), null, false); // Remember the owner... m_owner = owner; Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java (revision 20217) @@ -20,4 +20,7 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.event.ActionEvent; @@ -39,5 +42,5 @@ */ public ResetPictureScaleAction( PicLayerAbstract owner ) { - super("Scale", null, "Resets picture scale", null, false); + super(tr("Scale"), null, tr("Resets picture scale"), null, false); // Remember the owner... m_owner = owner; Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java (revision 20217) @@ -20,4 +20,6 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.event.MouseEvent; @@ -50,5 +52,5 @@ */ public RotatePictureAction(MapFrame frame) { - super("PicLayer", "rotate", "Drag to rotate the picture", frame, ImageProvider.getCursor("crosshair", null)); + super(tr("PicLayer rotate"), "rotate", tr("Drag to rotate the picture"), frame, ImageProvider.getCursor("crosshair", null)); // TODO Auto-generated constructor stub } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java (revision 20217) @@ -20,4 +20,7 @@ package org.openstreetmap.josm.plugins.piclayer; + +import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.event.ActionEvent; import java.io.File; @@ -47,5 +50,5 @@ */ public SavePictureCalibrationAction( PicLayerAbstract owner ) { - super("Save Picture Calibration...", null, "Saves calibration data to a file", null, false); + super(tr("Save Picture Calibration..."), null, tr("Saves calibration data to a file"), null, false); // Remember the owner... m_owner = owner; @@ -76,9 +79,9 @@ m_owner.saveCalibration(props); try { - props.store(new FileOutputStream(file), "JOSM PicLayer plugin calibration data"); + props.store(new FileOutputStream(file), tr("JOSM PicLayer plugin calibration data")); } catch (Exception e) { // Error e.printStackTrace(); - JOptionPane.showMessageDialog(Main.parent , "Saving file failed: " + e.getMessage()); + JOptionPane.showMessageDialog(Main.parent , tr("Saving file failed: {0}", e.getMessage())); } } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java (revision 20217) @@ -21,4 +21,6 @@ package org.openstreetmap.josm.plugins.piclayer; +import static org.openstreetmap.josm.tools.I18n.tr; + import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.mapmode.MapMode; @@ -37,5 +39,5 @@ */ public ScaleXPictureAction(MapFrame frame) { - super("PicLayer", "scale_x", "Drag to scale the picture in the X Axis", frame); + super(tr("PicLayer scale X"), "scale_x", tr("Drag to scale the picture in the X Axis"), frame); // TODO Auto-generated constructor stub } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java (revision 20217) @@ -21,4 +21,6 @@ package org.openstreetmap.josm.plugins.piclayer; +import static org.openstreetmap.josm.tools.I18n.tr; + import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.mapmode.MapMode; @@ -37,5 +39,5 @@ */ public ScaleXYPictureAction(MapFrame frame) { - super("PicLayer", "scale", "Drag to scale the picture in the X and Y Axis", frame); + super(tr("PicLayer scale"), "scale", tr("Drag to scale the picture in the X and Y Axis"), frame); // TODO Auto-generated constructor stub } Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java (revision 20214) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java (revision 20217) @@ -21,4 +21,6 @@ package org.openstreetmap.josm.plugins.piclayer; +import static org.openstreetmap.josm.tools.I18n.tr; + import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.mapmode.MapMode; @@ -37,5 +39,5 @@ */ public ScaleYPictureAction(MapFrame frame) { - super("PicLayer", "scale_y", "Drag to scale the picture in the Y Axis", frame); + super(tr("PicLayer scale Y"), "scale_y", tr("Drag to scale the picture in the Y Axis"), frame); // TODO Auto-generated constructor stub }