Changeset 29803 in osm

Timestamp:

2013-08-01T16:51:32+02:00 (11 years ago)

Author:

akks

Message:

[josm/ImportImage, josm/pdfimport]: move ImportImage to file/open, move PDFImport to Data menu

Location:

applications/editors/josm/plugins

Files:

• ImportImagePlugin/nbproject (added)
• ImportImagePlugin/nbproject/project.xml (added)
• ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (modified) (2 diffs)
• ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (modified) (1 diff)
• imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java (modified) (2 diffs)
• importvec/nbproject (added)
• importvec/nbproject/project.xml (added)
• pdfimport/build.xml (modified) (1 diff)
• pdfimport/src/pdfimport/LoadPdfDialog.java (modified) (2 diffs)
• pdfimport/src/pdfimport/PdfImportPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java

@@ -14 +14 @@
 import org.apache.log4j.PropertyConfigurator;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -91 +92 @@
 
             // add menu entries
-            Main.main.menu.fileMenu.insert(loadFileAction, 8);
-            Main.main.menu.fileMenu.insertSeparator(9);
+            //Main.main.menu.fileMenu.insert(loadFileAction, 8);
+            
+            //Main.main.menu.fileMenu.insertSeparator(9);
+            
+            ExtensionFileFilter.importers.add(new ImportImageFileImporter());
 
         } catch (Exception e) {

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java

@@ -29 +29 @@
      */
     public LoadImageAction() {
-        super(tr("Import image"), (String)null, tr("Import georeferenced image"), null, false, "importimage/loadimage", true);
+        super(tr("Import image"), (String)null, tr("Import georeferenced image"), null, true, "importimage/loadimage", true);
     }
 

applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.ActionEvent;
 import java.io.File;
 import java.io.IOException;
@@ -11 +10 @@
 import java.util.List;
 
-import javax.swing.JFileChooser;
 import javax.swing.filechooser.FileFilter;
 
 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;

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

@@ -4 +4 @@
     <property name="commit.message" value="Initial pdfimport version"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="5236"/>
+    <property name="plugin.main.version" value="6088"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java

@@ -65 +65 @@
 public class LoadPdfDialog extends JFrame{
 
-        class LoadProgressRenderer implements ProgressRenderer{
+        class LoadProgressRenderer implements ProgressRenderer{
                 private final JProgressBar pBar;
                 private String title = "";
@@ -167 +167 @@
                 this.removeLayer();
         }
-
-        private void addListeners() {
+        
+        private void addListeners() {
 
                 this.projectionCombo.addActionListener(new ActionListener() {

applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -20 +18 @@
                 super(info);
                 name = tr("Import PDf file");
-                JMenu toolsMenu = null;
-                for (int i = 0; i < Main.main.menu.getMenuCount() && toolsMenu == null; i++) {
-                        JMenu menu = Main.main.menu.getMenu(i);
-                        String name = menu.getText();
-                        if (name != null && name.equals(tr("Tools"))) {
-                                toolsMenu = menu;
-                        }
-                }
-
-                if (toolsMenu == null) {
-                        toolsMenu = new JMenu(name);
-                        toolsMenu.add(new JMenuItem(new PdfImportAction()));
-                        Main.main.menu.add(toolsMenu, 2);
-                } else {
-                        toolsMenu.addSeparator();
-                        toolsMenu.add(new JMenuItem(new PdfImportAction()));
-                }
+                MainMenu.add(Main.main.menu.dataMenu, new PdfImportAction());
         }
 }