Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryDownloadAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryDownloadAction.java (revision 31250) +++ (revision ) @@ -1,64 +1,0 @@ -/** - * - */ -package org.openstreetmap.josm.plugins.mapillary; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; - -import org.openstreetmap.josm.gui.layer.Layer; -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.tools.Shortcut; - -/** - * Action that triggers the plugin. - * - * @author nokutu - * - */ -public class MapillaryDownloadAction extends JosmAction { - MapillaryLayer layer; - - public MapillaryDownloadAction() { - super(tr("Mapillary"), new ImageProvider("icon24.png"), - tr("Create Mapillary layer."), Shortcut.registerShortcut( - "menu:Mapillary", tr("Menu: {0}", tr("Mapillary")), - KeyEvent.VK_M, Shortcut.ALT_CTRL_SHIFT), false, - "mapillaryDownload", false); - } - - /* - * (non-Javadoc) - * - * @see - * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ - @Override - public void actionPerformed(ActionEvent arg0) { - this.layer = null; - if (Main.map == null || Main.map.mapView == null - || Main.map.mapView.getEditLayer() == null) { - return; - } - for (Layer layer : Main.map.mapView.getAllLayers()) { - if (layer instanceof MapillaryLayer) { - this.layer = (MapillaryLayer) layer; - } - } - - if (this.layer == null) - layer = new MapillaryLayer(); - else { - if (Main.map.mapView.getActiveLayer() != layer) - Main.map.mapView.setActiveLayer(layer); - else - Main.map.mapView - .setActiveLayer(Main.map.mapView.getEditLayer()); - } - } - -} Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryExportAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryExportAction.java (revision 31250) +++ (revision ) @@ -1,70 +1,0 @@ -package org.openstreetmap.josm.plugins.mapillary; - -import static org.openstreetmap.josm.tools.I18n.tr; - -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JDialog; -import javax.swing.JOptionPane; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.actions.JosmAction; -import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryExportManager; -import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryExportDialog; -import org.openstreetmap.josm.tools.ImageProvider; - -/** - * Action that launches a MapillaryExportDialog. - * - * @author nokutu - * - */ -public class MapillaryExportAction extends JosmAction { - - MapillaryExportDialog dialog; - - public MapillaryExportAction() { - super(tr("Export images"), new ImageProvider("icon24.png"), - tr("Export images."), null, false, "mapillaryExport", false); - } - - @Override - public void actionPerformed(ActionEvent e) { - dialog = new MapillaryExportDialog(); - JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, - JOptionPane.OK_CANCEL_OPTION); - JDialog dlg = pane.createDialog(Main.parent, tr("Export images")); - dlg.setMinimumSize(new Dimension(400, 150)); - dlg.setVisible(true); - - // Checks if the inputs are correct and starts the export process. - if (pane.getValue() != null - && (int) pane.getValue() == JOptionPane.OK_OPTION - && dialog.chooser != null) { - if (dialog.group.isSelected(dialog.all.getModel())) { - export(MapillaryData.getInstance().getImages()); - } else if (dialog.group.isSelected(dialog.sequence.getModel())) { - ArrayList images = new ArrayList<>(); - for (MapillaryImage image : MapillaryData.getInstance().getMultiSelectedImages()) - if (!images.contains(image)) - images.addAll(image.getSequence().getImages()); - export(images); - } else if (dialog.group.isSelected(dialog.selected.getModel())) { - export(MapillaryData.getInstance().getMultiSelectedImages()); - } - } - dlg.dispose(); - } - - /** - * Exports the given images from the database. - */ - public void export(List images) { - Main.worker.submit(new Thread(new MapillaryExportManager(images, - dialog.chooser.getSelectedFile().toString()))); - } - -} Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java (revision 31250) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java (revision 31251) @@ -20,4 +20,5 @@ import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryPreferenceSetting; import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryToggleDialog; +import org.openstreetmap.josm.plugins.mapillary.actions.*; import org.openstreetmap.josm.tools.ImageProvider; Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java (revision 31251) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadAction.java (revision 31251) @@ -0,0 +1,65 @@ +/** + * + */ +package org.openstreetmap.josm.plugins.mapillary.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * Action that triggers the plugin. + * + * @author nokutu + * + */ +public class MapillaryDownloadAction extends JosmAction { + MapillaryLayer layer; + + public MapillaryDownloadAction() { + super(tr("Mapillary"), new ImageProvider("icon24.png"), + tr("Create Mapillary layer."), Shortcut.registerShortcut( + "menu:Mapillary", tr("Menu: {0}", tr("Mapillary")), + KeyEvent.VK_M, Shortcut.ALT_CTRL_SHIFT), false, + "mapillaryDownload", false); + } + + /* + * (non-Javadoc) + * + * @see + * java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ + @Override + public void actionPerformed(ActionEvent arg0) { + this.layer = null; + if (Main.map == null || Main.map.mapView == null + || Main.map.mapView.getEditLayer() == null) { + return; + } + for (Layer layer : Main.map.mapView.getAllLayers()) { + if (layer instanceof MapillaryLayer) { + this.layer = (MapillaryLayer) layer; + } + } + + if (this.layer == null) + layer = new MapillaryLayer(); + else { + if (Main.map.mapView.getActiveLayer() != layer) + Main.map.mapView.setActiveLayer(layer); + else + Main.map.mapView + .setActiveLayer(Main.map.mapView.getEditLayer()); + } + } + +} Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java (revision 31251) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java (revision 31251) @@ -0,0 +1,72 @@ +package org.openstreetmap.josm.plugins.mapillary.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.JDialog; +import javax.swing.JOptionPane; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.plugins.mapillary.MapillaryData; +import org.openstreetmap.josm.plugins.mapillary.MapillaryImage; +import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryExportManager; +import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryExportDialog; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * Action that launches a MapillaryExportDialog. + * + * @author nokutu + * + */ +public class MapillaryExportAction extends JosmAction { + + MapillaryExportDialog dialog; + + public MapillaryExportAction() { + super(tr("Export images"), new ImageProvider("icon24.png"), + tr("Export images."), null, false, "mapillaryExport", false); + } + + @Override + public void actionPerformed(ActionEvent e) { + dialog = new MapillaryExportDialog(); + JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, + JOptionPane.OK_CANCEL_OPTION); + JDialog dlg = pane.createDialog(Main.parent, tr("Export images")); + dlg.setMinimumSize(new Dimension(400, 150)); + dlg.setVisible(true); + + // Checks if the inputs are correct and starts the export process. + if (pane.getValue() != null + && (int) pane.getValue() == JOptionPane.OK_OPTION + && dialog.chooser != null) { + if (dialog.group.isSelected(dialog.all.getModel())) { + export(MapillaryData.getInstance().getImages()); + } else if (dialog.group.isSelected(dialog.sequence.getModel())) { + ArrayList images = new ArrayList<>(); + for (MapillaryImage image : MapillaryData.getInstance().getMultiSelectedImages()) + if (!images.contains(image)) + images.addAll(image.getSequence().getImages()); + export(images); + } else if (dialog.group.isSelected(dialog.selected.getModel())) { + export(MapillaryData.getInstance().getMultiSelectedImages()); + } + } + dlg.dispose(); + } + + /** + * Exports the given images from the database. + */ + public void export(List images) { + Main.worker.submit(new Thread(new MapillaryExportManager(images, + dialog.chooser.getSelectedFile().toString()))); + } + +} Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java (revision 31250) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java (revision 31251) @@ -1,4 +1,5 @@ package org.openstreetmap.josm.plugins.mapillary.gui; +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.Cursor; import java.awt.event.ActionEvent; @@ -20,5 +21,4 @@ * The normal text set by the user. */ - private String text; @@ -26,9 +26,8 @@ /** - * Creates a new LinkLabel with the given text. + * Creates a new HyperlinlLabel. */ - public HyperlinkLabel() { - super("View in website", SwingUtilities.RIGHT); + super(tr("View in website"), SwingUtilities.RIGHT); this.addActionListener(this); setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); @@ -40,5 +39,4 @@ * Sets the text of the label. */ - public void setText(String text) { super.setText("" + text + ""); //$NON-NLS-1$ //$NON-NLS-2$ Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java (revision 31250) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryExportDialog.java (revision 31251) @@ -59,5 +59,5 @@ selected.setEnabled(false); } - path = new JLabel("Select a folder"); + path = new JLabel(tr("Select a folder")); choose = new JButton(tr("Explore")); choose.addActionListener(this); @@ -87,5 +87,5 @@ chooser.setCurrentDirectory(new java.io.File(System .getProperty("user.home"))); - chooser.setDialogTitle("Select a directory"); + chooser.setDialogTitle(tr("Select a directory")); chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); chooser.setAcceptAllFileFilterUsed(false); Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java (revision 31250) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java (revision 31251) @@ -1,4 +1,5 @@ package org.openstreetmap.josm.plugins.mapillary.gui; +import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.FlowLayout; @@ -13,5 +14,5 @@ public class MapillaryPreferenceSetting implements SubPreferenceSetting { - private JCheckBox reverseButtons = new JCheckBox("Reverse buttons position when displaying images.");; + private JCheckBox reverseButtons = new JCheckBox(tr("Reverse buttons position when displaying images."));; @Override Index: applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java =================================================================== --- applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java (revision 31250) +++ applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java (revision 31251) @@ -200,7 +200,7 @@ class redAction extends AbstractAction { public redAction() { - putValue(NAME, "Jump to red"); + putValue(NAME, tr("Jump to red")); putValue(SHORT_DESCRIPTION, - tr("Shows the previous picture in the sequence")); + tr("Jumps to the picture at the other side of the red line")); } @@ -221,7 +221,7 @@ class blueAction extends AbstractAction { public blueAction() { - putValue(NAME, "Jump to blue"); + putValue(NAME, tr("Jump to blue")); putValue(SHORT_DESCRIPTION, - tr("Shows the previous picture in the sequence")); + tr("Jumps to the picture at the other side of the blue line")); }