Index: /applications/editors/josm/plugins/ImportImagePlugin/build.xml =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/build.xml (revision 29804) +++ /applications/editors/josm/plugins/ImportImagePlugin/build.xml (revision 29805) @@ -5,5 +5,5 @@ - + Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java (revision 29805) +++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java (revision 29805) @@ -0,0 +1,65 @@ +package org.openstreetmap.josm.plugins.ImportImagePlugin; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import javax.swing.JOptionPane; +import org.apache.log4j.Logger; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.ExtensionFileFilter; +import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import org.openstreetmap.josm.gui.progress.ProgressMonitor; +import org.openstreetmap.josm.io.IllegalDataException; +import org.openstreetmap.josm.io.FileImporter; +import org.openstreetmap.josm.plugins.ImportImagePlugin.ImageLayer.LayerCreationCancledException; + +/** + * Calss to open georeferened image with standard file open dialog + */ +public class ImportImageFileImporter extends FileImporter { + + private Logger logger = Logger.getLogger(LoadImageAction.class); + + public ImportImageFileImporter() { + super(new ExtensionFileFilter("tiff,tif,jpg,jpeg,bmp,png", "jpg", "Georeferened image file [by ImportImage plugin] (*.jpg, *.jpeg, *.tif, *.tiff, *.png, *.bmp)")); + } + + @Override + public boolean isBatchImporter() { + return true; + } + + @Override + public double getPriority() { + return -3; + } + + @Override + public void importData(List files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException { + if (null == files || files.isEmpty()) return; + + for (File file: files) { + if (file.isDirectory()) continue; + ImageLayer layer = null; + logger.info("File choosen:" + file); + try { + layer = new ImageLayer(file); + } catch (LayerCreationCancledException e) { + // if user decides that layer should not be created just return. + continue; + } catch (Exception e) { + logger.error("Error while creating image layer: \n" + e.getMessage()); + JOptionPane.showMessageDialog(null, tr("Error while creating image layer: {0}", e.getCause())); + continue; + } + + // Add layer: + Main.main.addLayer(layer); + BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor(); + layer.visitBoundingBox(boundingXYVisitor); + Main.map.mapView.recalculateCenterScale(boundingXYVisitor); + } + } +} Index: /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java =================================================================== --- /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (revision 29804) +++ /applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (revision 29805) @@ -16,4 +16,5 @@ import org.openstreetmap.josm.actions.ExtensionFileFilter; import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.gui.MainMenu; import org.openstreetmap.josm.plugins.Plugin; import org.openstreetmap.josm.plugins.PluginInformation; @@ -88,6 +89,7 @@ // create new Action for menu entry - LoadImageAction loadFileAction = new LoadImageAction(); + loadFileAction = new LoadImageAction(); loadFileAction.setEnabled(true); + MainMenu.add(Main.main.menu.imagerySubMenu, loadFileAction); // add menu entries Index: /applications/editors/josm/plugins/canvec_helper/build.xml =================================================================== --- /applications/editors/josm/plugins/canvec_helper/build.xml (revision 29804) +++ /applications/editors/josm/plugins/canvec_helper/build.xml (revision 29805) @@ -30,204 +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/canvec_helper/nbproject/project.xml =================================================================== --- /applications/editors/josm/plugins/canvec_helper/nbproject/project.xml (revision 29805) +++ /applications/editors/josm/plugins/canvec_helper/nbproject/project.xml (revision 29805) @@ -0,0 +1,67 @@ + + + org.netbeans.modules.ant.freeform + + + canvec_helper + + + + canvec_helper + + + + + . + UTF-8 + + + + java + src + UTF-8 + + + + + compile + + + clean + + + clean + compile + + + runjosm + + + + + + + src + + + build.xml + + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java =================================================================== --- /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java (revision 29804) +++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java (revision 29805) @@ -10,4 +10,5 @@ parent_temp = parent; } + @Override public void actionPerformed(java.awt.event.ActionEvent action) { canvec_layer layer; Index: /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/SetMaxZoom.java =================================================================== --- /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/SetMaxZoom.java (revision 29804) +++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/SetMaxZoom.java (revision 29805) @@ -12,4 +12,5 @@ this.parent = parent; } + @Override public void actionPerformed(ActionEvent ev) { parent.setMaxZoom(level); Index: /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_helper.java =================================================================== --- /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_helper.java (revision 29804) +++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_helper.java (revision 29805) @@ -10,6 +10,7 @@ super(info); System.out.println("in constructor"); - Main.main.menu.imageryMenu.add(new CanvecHelperAction(this)); + Main.main.menu.imagerySubMenu.add(new CanvecHelperAction(this)); } + @Override public void mapFrameInitialized(MapFrame old, MapFrame new1) { updateLayer(); Index: /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_layer.java =================================================================== --- /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_layer.java (revision 29804) +++ /applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_layer.java (revision 29805) @@ -7,5 +7,4 @@ import java.awt.event.MouseListener; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.Toolkit; import java.io.BufferedReader; @@ -16,5 +15,4 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.zip.ZipException; import javax.swing.AbstractAction; import javax.swing.Action; @@ -23,5 +21,4 @@ import javax.swing.JMenu; import javax.swing.JMenuItem; -//import org.openstreetmap.josm.actions.RenameLayerAction; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; @@ -83,4 +80,5 @@ } } + @Override public Action[] getMenuEntries() { return new Action[]{ @@ -98,8 +96,11 @@ this.parent = parent; } + @Override public void actionPerformed(ActionEvent e) {} + @Override public boolean supportLayers(List layers) { return false; } + @Override public Component createMenuComponent() { JMenu max_zoom = new JMenu("max zoom"); @@ -117,4 +118,5 @@ this.tile = tile; } + @Override public void actionPerformed(ActionEvent arg0) { tile.can_download = true; @@ -126,5 +128,7 @@ this.layer = layer; } + @Override public void actionPerformed(ActionEvent e) {} + @Override public Component createMenuComponent() { JMenu OpenOsm = new JMenu("Open tile"); @@ -134,4 +138,5 @@ return OpenOsm; } + @Override public boolean supportLayers(List layers) { return false; @@ -144,4 +149,5 @@ this.tile = tile; } + @Override public void actionPerformed(ActionEvent e) { tile.load_raw_osm(); @@ -153,8 +159,11 @@ this.parent = parent; } + @Override public void actionPerformed(ActionEvent e) {} + @Override public boolean supportLayers(List layers) { return false; } + @Override public Component createMenuComponent() { JMenu downloadCanvec = new JMenu("Download zip's"); @@ -168,16 +177,23 @@ this.max_zoom = max_zoom; } + @Override public Object getInfoComponent() { return getToolTipText(); } + @Override public String getToolTipText() { return tr("canvec tile helper"); } + @Override public void visitBoundingBox(BoundingXYVisitor v) {} + @Override public boolean isMergable(Layer other) { return false; } + @Override public void mergeFrom(Layer from) {} + @Override public Icon getIcon() { return layerIcon; } + @Override public void paint(Graphics2D g, MapView mv, Bounds bounds) { //long start = System.currentTimeMillis(); @@ -194,8 +210,13 @@ //System.out.println((end-start)+"ms spent"); } + @Override public void mouseExited(MouseEvent e) {} + @Override public void mouseEntered(MouseEvent e) {} + @Override public void mouseReleased(MouseEvent e) {} + @Override public void mousePressed(MouseEvent e) {} + @Override public void mouseClicked(MouseEvent e) { System.out.println("click!"); Index: /applications/editors/josm/plugins/pdfimport/build.xml =================================================================== --- /applications/editors/josm/plugins/pdfimport/build.xml (revision 29804) +++ /applications/editors/josm/plugins/pdfimport/build.xml (revision 29805) @@ -4,5 +4,5 @@ - + + pdfimport + + + + + . + UTF-8 + + + + java + src + UTF-8 + + + + + compile + + + clean + + + runjosm + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java =================================================================== --- /applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java (revision 29804) +++ /applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java (revision 29805) @@ -17,6 +17,6 @@ public PdfImportPlugin(PluginInformation info) { super(info); - name = tr("Import PDf file"); - MainMenu.add(Main.main.menu.dataMenu, new PdfImportAction()); + name = tr("Import PDF file"); + MainMenu.add(Main.main.menu.imagerySubMenu, new PdfImportAction()); } } Index: /applications/editors/josm/plugins/piclayer/build.xml =================================================================== --- /applications/editors/josm/plugins/piclayer/build.xml (revision 29804) +++ /applications/editors/josm/plugins/piclayer/build.xml (revision 29805) @@ -3,5 +3,5 @@ - + + PicLayer + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + runjosm + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + 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 29804) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java (revision 29805) @@ -21,19 +21,17 @@ package org.openstreetmap.josm.plugins.piclayer; -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; -import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.List; -import javax.swing.JMenu; import javax.swing.JOptionPane; import javax.swing.UIManager; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.actions.mapmode.MapMode; import org.openstreetmap.josm.gui.IconToggleButton; +import org.openstreetmap.josm.gui.MainMenu; import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.gui.MapView; @@ -64,6 +62,6 @@ // Plugin menu - private JMenu menu = null; - + JosmAction newLayerFromFileAction = new NewLayerFromFileAction(); + JosmAction newLayerFromClipboardAction = new NewLayerFromClipboardAction(); /** * Constructor... @@ -73,15 +71,8 @@ // Create menu entry - if ( Main.main.menu != null ) { - menu = Main.main.menu.addMenu(marktr("PicLayer") , KeyEvent.VK_L, Main.main.menu.getDefaultMenuPos(), ht("/Plugin/PicLayer")); - } - + // Add menu items - if ( menu != null ) { - menu.add(new NewLayerFromFileAction()); - menu.add(new NewLayerFromClipboardAction()); - menu.setEnabled(false); - } - + MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromFileAction); + MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromClipboardAction); // Listen to layers MapView.addLayerChangeListener(this); @@ -154,5 +145,6 @@ @Override public void layerAdded(Layer arg0) { - menu.setEnabled(true); + newLayerFromClipboardAction.setEnabled(true); + newLayerFromClipboardAction.setEnabled(true); } @@ -171,5 +163,6 @@ // Why should I do all these checks now? boolean enable = Main.map != null && Main.map.mapView != null && Main.map.mapView.getAllLayers() != null && Main.map.mapView.getAllLayers().size() != 0; - menu.setEnabled(enable); + newLayerFromClipboardAction.setEnabled(enable); + newLayerFromClipboardAction.setEnabled(enable); } }; Index: /applications/editors/josm/plugins/walkingpapers/build.xml =================================================================== --- /applications/editors/josm/plugins/walkingpapers/build.xml (revision 29804) +++ /applications/editors/josm/plugins/walkingpapers/build.xml (revision 29805) @@ -17,5 +17,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 29804) +++ /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java (revision 29805) @@ -27,7 +27,7 @@ { super(info); - walkingPapersMenu = Main.main.menu.imageryMenu; + walkingPapersMenu = Main.main.menu.imagerySubMenu; // ht("/Plugin/WalkingPapers")); - MainMenu.add(Main.main.menu.imageryMenu, new WalkingPapersAddLayerAction(), false, 0); + MainMenu.add(walkingPapersMenu, new WalkingPapersAddLayerAction(), false, 0); } }