Changeset 29805 in osm


Ignore:
Timestamp:
2013-08-01T18:46:11+02:00 (11 years ago)
Author:
akks
Message:

[josm/plugins]: more imagery layer adding actions to Imagery/More submenu

Location:
applications/editors/josm/plugins
Files:
7 added
16 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/ImportImagePlugin/build.xml

    r29435 r29805  
    55        <property name="commit.message" value="use consistent plugin name (don't mix up the words)" />
    66        <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7         <property name="plugin.main.version" value="4549" />
     7        <property name="plugin.main.version" value="6097" />
    88
    99    <property name="plugin.author" value="Christoph Beekmans, Fabian Kowitz, Anna Robaszkiewicz, Oliver Kuhn, Martin Ulitzny"/>

  • applications/editors/josm/plugins/ImportImagePlugin/nbproject

    • Property svn:ignore set to
      private

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

    r29803 r29805  
    1616import org.openstreetmap.josm.actions.ExtensionFileFilter;
    1717import org.openstreetmap.josm.actions.JosmAction;
     18import org.openstreetmap.josm.gui.MainMenu;
    1819import org.openstreetmap.josm.plugins.Plugin;
    1920import org.openstreetmap.josm.plugins.PluginInformation;
    … …  
    8889
    8990            // create new Action for menu entry
    90             LoadImageAction loadFileAction = new LoadImageAction();
     91            loadFileAction = new LoadImageAction();
    9192            loadFileAction.setEnabled(true);
     93            MainMenu.add(Main.main.menu.imagerySubMenu, loadFileAction);
    9294
    9395            // add menu entries

  • applications/editors/josm/plugins/canvec_helper/build.xml

    r29435 r29805  
    3030<project name="canvec_helper" default="dist" basedir=".">
    3131    <!-- enter the SVN commit message -->
    32     <property name="commit.message" value="Commit message"/>
     32    <property name="commit.message" value="JOSM/Canvec_helper: update to new menu structure"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4394"/>
    35     <!-- should not be necessary to change the following properties -->
    36     <property name="josm" location="../../core/dist/josm-custom.jar"/>
    37     <property name="plugin.build.dir" value="build"/>
    38     <property name="plugin.src.dir" value="src"/>
    39     <!-- this is the directory where the plugin jar is copied to -->
    40     <property name="plugin.dist.dir" value="../../dist"/>
    41     <property name="ant.build.javac.target" value="1.5"/>
    42     <property name="plugin.dist.dir" value="../../dist"/>
    43     <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    44     <!--
    45     **********************************************************
    46     ** init - initializes the build
    47     **********************************************************
     34    <property name="plugin.main.version" value="6097"/>
     35   
     36    <!-- Configure these properties (replace "..." accordingly).
     37         See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins
    4838    -->
    49     <target name="init">
    50         <mkdir dir="${plugin.build.dir}"/>
    51     </target>
    52     <!--
    53     **********************************************************
    54     ** compile - complies the source tree
    55     **********************************************************
    56     -->
    57     <target name="compile" depends="init">
    58         <echo message="compiling sources for  ${plugin.jar} ... "/>
    59         <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}">
    60             <compilerarg value="-Xlint:deprecation"/>
    61             <compilerarg value="-Xlint:unchecked"/>
    62         </javac>
    63     </target>
    64     <!--
    65     **********************************************************
    66     ** dist - creates the plugin jar
    67     **********************************************************
    68     -->
    69     <target name="dist" depends="compile,revision">
    70         <echo message="creating ${ant.project.name}.jar ... "/>
    71         <copy todir="${plugin.build.dir}/resources">
    72             <fileset dir="resources"/>
    73         </copy>
    74         <copy todir="${plugin.build.dir}/images">
    75             <fileset dir="images"/>
    76         </copy>
    77         <copy todir="${plugin.build.dir}/data">
    78             <fileset dir="data"/>
    79         </copy>
    80         <copy todir="${plugin.build.dir}">
    81             <fileset dir=".">
    82                 <include name="README"/>
    83                 <include name="LICENSE"/>
    84             </fileset>
    85         </copy>
    86         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
    87             <!--
    88             ************************************************
    89             ** configure these properties. Most of them will be copied to the plugins
    90             ** manifest file. Property values will also show up in the list available
    91             ** plugins: http://josm.openstreetmap.de/wiki/Plugins.
    92             **
    93             ************************************************
    94             -->
    95             <manifest>
    96                 <attribute name="Author" value="Michael Bishop"/>
    97                 <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.canvec_helper.canvec_helper"/>
    98                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
    99                 <attribute name="Plugin-Description" value="Overlays the canvec tile grid on the map and prints URL''s to the .zip files. Future goals: allow auto-downloading and loading of canvec .osm files"/>
    100                 <!--<attribute name="Plugin-Icon" value="..."/>-->
    101                 <!--<attribute name="Plugin-Link" value="http://ext.earthtools.ca/dummy"/>-->
    102                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
    103                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
    104             </manifest>
    105         </jar>
    106     </target>
    107     <!--
    108     **********************************************************
    109     ** revision - extracts the current revision number for the
    110     **    file build.number and stores it in the XML property
    111     **    version.*
    112     **********************************************************
    113     -->
    114     <target name="revision">
    115         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    116             <env key="LANG" value="C"/>
    117             <arg value="info"/>
    118             <arg value="--xml"/>
    119             <arg value="."/>
    120         </exec>
    121         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    122         <delete file="REVISION"/>
    123     </target>
    124     <!--
    125     **********************************************************
    126     ** clean - clean up the build environment
    127     **********************************************************
    128     -->
    129     <target name="clean">
    130         <delete dir="${plugin.build.dir}"/>
    131         <delete file="${plugin.jar}"/>
    132     </target>
    133     <!--
    134     **********************************************************
    135     ** install - install the plugin in your local JOSM installation
    136     **********************************************************
    137     -->
    138     <target name="install" depends="dist">
    139         <property environment="env"/>
    140         <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">
    141             <and>
    142                 <os family="windows"/>
    143             </and>
    144         </condition>
    145         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    146     </target>
    147     <!--
    148     ************************** Publishing the plugin ***********************************
    149     -->
    150     <!--
    151     ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    152     ** property ${coreversion.info.entry.revision}
    153     -->
    154     <target name="core-info">
    155         <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
    156             <env key="LANG" value="C"/>
    157             <arg value="info"/>
    158             <arg value="--xml"/>
    159             <arg value="../../core"/>
    160         </exec>
    161         <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
    162         <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>
    163         <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
    164         <delete file="core.info.xml"/>
    165     </target>
    166     <!-- commits the source tree for this plugin -->
    167     <target name="commit-current">
    168         <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
    169         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    170             <env key="LANG" value="C"/>
    171             <arg value="commit"/>
    172             <arg value="-m '${commit.message}'"/>
    173             <arg value="."/>
    174         </exec>
    175     </target>
    176     <!-- updates (svn up) the source tree for this plugin -->
    177     <target name="update-current">
    178         <echo>Updating plugin source ...</echo>
    179         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    180             <env key="LANG" value="C"/>
    181             <arg value="up"/>
    182             <arg value="."/>
    183         </exec>
    184         <echo>Updating ${plugin.jar} ...</echo>
    185         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    186             <env key="LANG" value="C"/>
    187             <arg value="up"/>
    188             <arg value="../dist/${plugin.jar}"/>
    189         </exec>
    190     </target>
    191     <!-- commits the plugin.jar -->
    192     <target name="commit-dist">
    193         <echo>
    194     ***** Properties of published ${plugin.jar} *****
    195     Commit message    : '${commit.message}'                   
    196     Plugin-Mainversion: ${plugin.main.version}
    197     JOSM build version: ${coreversion.info.entry.revision}
    198     Plugin-Version    : ${version.entry.commit.revision}
    199     ***** / Properties of published ${plugin.jar} *****                   
    200                        
    201     Now commiting ${plugin.jar} ...
    202     </echo>
    203         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
    204             <env key="LANG" value="C"/>
    205             <arg value="-m '${commit.message}'"/>
    206             <arg value="commit"/>
    207             <arg value="${plugin.jar}"/>
    208         </exec>
    209     </target>
    210     <!-- make sure svn is present as a command line tool -->
    211     <target name="ensure-svn-present">
    212         <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code">
    213             <env key="LANG" value="C"/>
    214             <arg value="--version"/>
    215         </exec>
    216         <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system.">
    217             <!-- return code not set at all? Most likely svn isn't installed -->
    218             <condition>
    219                 <not>
    220                     <isset property="svn.exit.code"/>
    221                 </not>
    222             </condition>
    223         </fail>
    224         <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system.">
    225             <!-- error code from SVN? Most likely svn is not what we are looking on this system -->
    226             <condition>
    227                 <isfailure code="${svn.exit.code}"/>
    228             </condition>
    229         </fail>
    230     </target>
    231     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
    232     </target>
     39    <property name="plugin.author" value="Michael Bishop"/>
     40    <property name="plugin.class" value="org.openstreetmap.josm.plugins.canvec_helper.canvec_helper"/>
     41    <property name="plugin.description" value="Overlays the canvec tile grid on the map and prints URL''s to the .zip files. Future goals: allow auto-downloading and loading of canvec .osm files"/>
     42    <property name="plugin.icon" value="images/favicon.png"/>
     43    <property name="plugin.link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/FastDraw"/>
     44
     45    <!-- ** include targets that all plugins have in common ** -->
     46    <import file="../build-common.xml"/>               
    23347</project>

  • applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/CanvecHelperAction.java

    r27926 r29805  
    1010                parent_temp = parent;
    1111        }
     12        @Override
    1213        public void actionPerformed(java.awt.event.ActionEvent action) {
    1314                canvec_layer layer;

  • applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/SetMaxZoom.java

    r27931 r29805  
    1212                this.parent = parent;
    1313        }
     14        @Override
    1415        public void actionPerformed(ActionEvent ev) {
    1516                parent.setMaxZoom(level);

  • applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_helper.java

    r27926 r29805  
    1010                super(info);
    1111                System.out.println("in constructor");
    12                 Main.main.menu.imageryMenu.add(new CanvecHelperAction(this));
     12                Main.main.menu.imagerySubMenu.add(new CanvecHelperAction(this));
    1313        }
     14        @Override
    1415        public void mapFrameInitialized(MapFrame old, MapFrame new1) {
    1516                updateLayer();

  • applications/editors/josm/plugins/canvec_helper/src/org/openstreetmap/josm/plugins/canvec_helper/canvec_layer.java

    r27950 r29805  
    77import java.awt.event.MouseListener;
    88import java.awt.Graphics2D;
    9 import java.awt.Point;
    109import java.awt.Toolkit;
    1110import java.io.BufferedReader;
    … …  
    1615import java.util.regex.Matcher;
    1716import java.util.regex.Pattern;
    18 import java.util.zip.ZipException;
    1917import javax.swing.AbstractAction;
    2018import javax.swing.Action;
    … …  
    2321import javax.swing.JMenu;
    2422import javax.swing.JMenuItem;
    25 //import org.openstreetmap.josm.actions.RenameLayerAction;
    2623import org.openstreetmap.josm.data.Bounds;
    2724import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
    … …  
    8380                }
    8481        }
     82        @Override
    8583        public Action[] getMenuEntries() {
    8684                return new Action[]{
    … …  
    9896                        this.parent = parent;
    9997                }
     98                @Override
    10099                public void actionPerformed(ActionEvent e) {}
     100                @Override
    101101                public boolean supportLayers(List<Layer> layers) {
    102102                        return false;
    103103                }
     104                @Override
    104105                public Component createMenuComponent() {
    105106                        JMenu max_zoom = new JMenu("max zoom");
    … …  
    117118                        this.tile = tile;
    118119                }
     120                @Override
    119121                public void actionPerformed(ActionEvent arg0) {
    120122                        tile.can_download = true;
    … …  
    126128                        this.layer = layer;
    127129                }
     130                @Override
    128131                public void actionPerformed(ActionEvent e) {}
     132                @Override
    129133                public Component createMenuComponent() {
    130134                        JMenu OpenOsm = new JMenu("Open tile");
    … …  
    134138                        return OpenOsm;
    135139                }
     140                @Override
    136141                public boolean supportLayers(List<Layer> layers) {
    137142                        return false;
    … …  
    144149                        this.tile = tile;
    145150                }
     151                @Override
    146152                public void actionPerformed(ActionEvent e) {
    147153                        tile.load_raw_osm();
    … …  
    153159                        this.parent = parent;
    154160                }
     161                @Override
    155162                public void actionPerformed(ActionEvent e) {}
     163                @Override
    156164                public boolean supportLayers(List<Layer> layers) {
    157165                        return false;
    158166                }
     167                @Override
    159168                public Component createMenuComponent() {
    160169                        JMenu downloadCanvec = new JMenu("Download zip's");
    … …  
    168177                this.max_zoom = max_zoom;
    169178        }
     179        @Override
    170180        public Object getInfoComponent() {
    171181                return getToolTipText();
    172182        }
     183        @Override
    173184        public String getToolTipText() {
    174185                return tr("canvec tile helper");
    175186        }
     187        @Override
    176188        public void visitBoundingBox(BoundingXYVisitor v) {}
     189        @Override
    177190        public boolean isMergable(Layer other) {
    178191                return false;
    179192        }
     193        @Override
    180194        public void mergeFrom(Layer from) {}
     195        @Override
    181196        public Icon getIcon() { return layerIcon; }
     197        @Override
    182198        public void paint(Graphics2D g, MapView mv, Bounds bounds) {
    183199                //long start = System.currentTimeMillis();
    … …  
    194210                //System.out.println((end-start)+"ms spent");
    195211        }
     212        @Override
    196213        public void mouseExited(MouseEvent e) {}
     214        @Override
    197215        public void mouseEntered(MouseEvent e) {}
     216        @Override
    198217        public void mouseReleased(MouseEvent e) {}
     218        @Override
    199219        public void mousePressed(MouseEvent e) {}
     220        @Override
    200221        public void mouseClicked(MouseEvent e) {
    201222                System.out.println("click!");

  • applications/editors/josm/plugins/imagewaypoint/nbproject

    • Property svn:ignore set to
      private

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

    r29803 r29805  
    44    <property name="commit.message" value="Initial pdfimport version"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="6088"/>
     6    <property name="plugin.main.version" value="6097"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

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

    r29803 r29805  
    1717        public PdfImportPlugin(PluginInformation info) {
    1818                super(info);
    19                 name = tr("Import PDf file");
    20                 MainMenu.add(Main.main.menu.dataMenu, new PdfImportAction());
     19                name = tr("Import PDF file");
     20                MainMenu.add(Main.main.menu.imagerySubMenu, new PdfImportAction());
    2121        }
    2222}

  • applications/editors/josm/plugins/piclayer/build.xml

    r29784 r29805  
    33    <property name="commit.message" value="PicLayer - #8743 - fixed NPE when removing last layer"/>
    44    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    5     <property name="plugin.main.version" value="6088"/>
     5    <property name="plugin.main.version" value="6097"/>
    66       
    77    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java

    r29784 r29805  
    2121package org.openstreetmap.josm.plugins.piclayer;
    2222
    23 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    24 import static org.openstreetmap.josm.tools.I18n.marktr;
    2523import static org.openstreetmap.josm.tools.I18n.tr;
    2624
    27 import java.awt.event.KeyEvent;
    2825import java.util.ArrayList;
    2926import java.util.List;
    3027
    31 import javax.swing.JMenu;
    3228import javax.swing.JOptionPane;
    3329import javax.swing.UIManager;
    3430
    3531import org.openstreetmap.josm.Main;
     32import org.openstreetmap.josm.actions.JosmAction;
    3633import org.openstreetmap.josm.actions.mapmode.MapMode;
    3734import org.openstreetmap.josm.gui.IconToggleButton;
     35import org.openstreetmap.josm.gui.MainMenu;
    3836import org.openstreetmap.josm.gui.MapFrame;
    3937import org.openstreetmap.josm.gui.MapView;
    … …  
    6462
    6563    // Plugin menu
    66     private JMenu menu = null;
    67 
     64    JosmAction newLayerFromFileAction = new NewLayerFromFileAction();
     65    JosmAction newLayerFromClipboardAction = new NewLayerFromClipboardAction();
    6866    /**
    6967     * Constructor...
    … …  
    7371
    7472        // Create menu entry
    75         if ( Main.main.menu != null ) {
    76             menu = Main.main.menu.addMenu(marktr("PicLayer") , KeyEvent.VK_L, Main.main.menu.getDefaultMenuPos(), ht("/Plugin/PicLayer"));
    77         }
    78 
     73       
    7974        // Add menu items
    80         if ( menu != null ) {
    81             menu.add(new NewLayerFromFileAction());
    82             menu.add(new NewLayerFromClipboardAction());
    83             menu.setEnabled(false);
    84         }
    85 
     75        MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromFileAction);
     76        MainMenu.add(Main.main.menu.imagerySubMenu, newLayerFromClipboardAction);
    8677        // Listen to layers
    8778        MapView.addLayerChangeListener(this);
    … …  
    154145    @Override
    155146    public void layerAdded(Layer arg0) {
    156         menu.setEnabled(true);
     147        newLayerFromClipboardAction.setEnabled(true);
     148        newLayerFromClipboardAction.setEnabled(true);
    157149    }
    158150
    … …  
    171163        // Why should I do all these checks now?
    172164        boolean enable = Main.map != null && Main.map.mapView != null && Main.map.mapView.getAllLayers() != null && Main.map.mapView.getAllLayers().size() != 0;
    173         menu.setEnabled(enable);
     165        newLayerFromClipboardAction.setEnabled(enable);
     166        newLayerFromClipboardAction.setEnabled(enable);
    174167    }
    175168};

  • applications/editors/josm/plugins/walkingpapers/build.xml

    r29778 r29805  
    1717    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    1818    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    19     <property name="plugin.main.version" value="6082"/>
     19    <property name="plugin.main.version" value="6097"/>
    2020
    2121    <property name="plugin.author" value="Frederik Ram"/>

  • applications/editors/josm/plugins/walkingpapers/nbproject

    • Property svn:ignore set to
      private

  • applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java

    r29778 r29805  
    2727    {
    2828        super(info);
    29         walkingPapersMenu = Main.main.menu.imageryMenu;
     29        walkingPapersMenu = Main.main.menu.imagerySubMenu;
    3030         // ht("/Plugin/WalkingPapers"));
    31         MainMenu.add(Main.main.menu.imageryMenu, new WalkingPapersAddLayerAction(), false, 0);
     31        MainMenu.add(walkingPapersMenu, new WalkingPapersAddLayerAction(), false, 0);
    3232    }
    3333}
Note: See TracChangeset for help on using the changeset viewer.