Index: /applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/build.xml (revision 29798)
+++ /applications/editors/josm/plugins/imagewaypoint/build.xml (revision 29799)
@@ -30,157 +30,18 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building against core revision ${coreversion.info.entry.revision}.
- Plugin-Mainversion is set to ${plugin.main.version}.
-
-
-
-
- Commiting the plugin source with message '${commit.message}' ...
-
-
-
-
-
-
-
-
-
- Updating plugin source ...
-
-
-
-
-
- Updating ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
- ***** Properties of published ${plugin.jar} *****
- Commit message : '${commit.message}'
- Plugin-Mainversion: ${plugin.main.version}
- JOSM build version: ${coreversion.info.entry.revision}
- Plugin-Version : ${version.entry.commit.revision}
- ***** / Properties of published ${plugin.jar} *****
+
+
+
+
+
- Now commiting ${plugin.jar} ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
Index: /applications/editors/josm/plugins/imagewaypoint/nbproject/project.xml
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/nbproject/project.xml (revision 29799)
+++ /applications/editors/josm/plugins/imagewaypoint/nbproject/project.xml (revision 29799)
@@ -0,0 +1,67 @@
+
+
+ org.netbeans.modules.ant.freeform
+
+
+ ImageWayPoint
+
+
+
+ ImageWayPoint
+
+
+
+
+ .
+ UTF-8
+
+
+
+ java
+ src
+ UTF-8
+
+
+
+
+ compile
+
+
+ clean
+
+
+ runjosm
+
+
+ clean
+ compile
+
+
+
+
+
+
+ src
+
+
+ build.xml
+
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ ../../core/src
+ 1.6
+
+
+
+
Index: /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java (revision 29798)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java (revision 29799)
@@ -5,4 +5,5 @@
import java.awt.event.ActionEvent;
import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -14,8 +15,13 @@
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.gui.MainMenu;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.FileImporter;
+import org.openstreetmap.josm.io.IllegalDataException;
import org.openstreetmap.josm.plugins.PluginInformation;
@@ -37,36 +43,27 @@
}
- private static final class LoadImagesAction extends JosmAction {
- private static final long serialVersionUID = 4480306223276347301L;
+ private final class ImageWaypointImporter extends FileImporter {
- private final ImageWayPointPlugin plugin;
-
- public LoadImagesAction(final ImageWayPointPlugin plugin) {
- super(tr("Open images with ImageWayPoint"),
- "imagewaypoint-open",
- tr("Load set of images as a new layer."),
- null,
- false);
-
- this.plugin = plugin;
+ public ImageWaypointImporter() {
+ super(new ExtensionFileFilter("jpg,jpeg,png,gif", "jpg", "Image files [by ImageWayPoint plugin] (*.jpg, *.jpeg, *.png, *.gif)"));
}
- public final void actionPerformed(final ActionEvent actionEvent) {
- final JFileChooser fileChooser = new JFileChooser(Main.pref.get("tagimages.lastdirectory"));
- fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
- fileChooser.setMultiSelectionEnabled(true);
- fileChooser.setAcceptAllFileFilterUsed(false);
- fileChooser.setFileFilter(new ImageFileFilter());
+ @Override
+ public boolean isBatchImporter() {
+ return true;
+ }
- fileChooser.showOpenDialog(Main.parent);
+ @Override
+ public double getPriority() {
+ return -3;
+ }
- final File[] selectedFiles = fileChooser.getSelectedFiles();
- if (null != selectedFiles && 0 != selectedFiles.length) {
- Main.pref.put("tagimages.lastdirectory",
- fileChooser.getCurrentDirectory().getPath());
-
+ @Override
+ public void importData(List files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
+ if (null != files && !files.isEmpty()) {
+
// recursively find all files
final List allFiles = new ArrayList();
- this.plugin.addFiles(allFiles, selectedFiles);
+ addFiles(allFiles, files.toArray(new File[0]));
// add files to ImageEntries
@@ -86,5 +83,10 @@
}
if (!foundImageWayPointLayer) {
- new ImageWayPointLayer();
+ GuiHelper.runInEDT(new Runnable() {
+ @Override
+ public void run() {
+ new ImageWayPointLayer();
+ }
+ });
}
}
@@ -97,7 +99,5 @@
public ImageWayPointPlugin(PluginInformation info) {
super(info);
-
- MainMenu menu = Main.main.menu;
- menu.add(menu.fileMenu, new LoadImagesAction(this));
+ ExtensionFileFilter.importers.add(new ImageWaypointImporter());
}