Changeset 29771 in osm


Ignore:
Timestamp:
2013-07-24T21:45:09+02:00 (11 years ago)
Author:
akks
Message:

[josm_plugins]: move more plugin items to new menus, set minimum JOSM to 6082, add Netbeans projects

Location:
applications/editors/josm/plugins
Files:
18 added
1 deleted
31 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java

    r29769 r29771  
    190190
    191191        if ( Main.main.menu != null ) {
    192             boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
    193             commandMenu = Main.main.menu.addMenu(marktr("Commands") , oldMenu?KeyEvent.VK_M : KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/CommandLine"));
     192            commandMenu = Main.main.menu.addMenu(marktr("Commands") , KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/CommandLine"));
    194193            MainMenu.add(commandMenu, new CommandLineAction(this));
    195194        }

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

    r29435 r29771  
    3232    <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4980"/>
     34    <property name="plugin.main.version" value="6082"/>
    3535    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    3636    <property name="plugin.dist.dir" value="../../dist"/>

  • applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java

    r27852 r29771  
    4444     * existing ones (--this is from a translation machine--)
    4545     */
     46    @Override
    4647    public void actionPerformed(ActionEvent e) {
    4748        Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();

  • applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysPlugin.java

    r23192 r29771  
    99    public CreateGridOfWaysPlugin(PluginInformation info) {
    1010        super(info);
    11         MainMenu.add(Main.main.menu.toolsMenu, new CreateGridOfWaysAction());
     11        MainMenu.add(Main.main.menu.moreToolsMenu, new CreateGridOfWaysAction());
    1212    }
    1313}

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

    r29435 r29771  
    3232    <property name="commit.message" value="fixed main version"/>
    3333    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    34     <property name="plugin.main.version" value="4980"/>
     34    <property name="plugin.main.version" value="6082"/>
    3535    <!--
    3636      ************************************************

  • applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java

    r28477 r29771  
    7373    public OhePlugin(PluginInformation info) {
    7474        super(info);
    75         MainMenu.add(Main.main.menu.toolsMenu, new OheMenuAction());
     75        MainMenu.add(Main.main.menu.dataMenu, new OheMenuAction());
    7676    }
    7777
    … …  
    108108        }
    109109
     110        @Override
    110111        public void actionPerformed(ActionEvent evt) {
    111112            // fetch active Layer

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

    r29435 r29771  
    3535        with
    3636    -->
    37     <property name="plugin.main.version" value="5464"/>
     37    <property name="plugin.main.version" value="6082"/>
    3838    <!--
    3939        ************************************************ ** should not be

  • applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysPlugin.java

    r28624 r29771  
    3131       
    3232        // Add the action entries to the Tools Menu
    33         Main.main.menu.toolsMenu.addSeparator();
     33        Main.main.menu.moreToolsMenu.addSeparator();
    3434        awAction = new AlignWaysAction();
    35         MainMenu.add(Main.main.menu.toolsMenu, awAction);
     35        MainMenu.add(Main.main.menu.moreToolsMenu, awAction);
    3636    }
    3737

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

    r29596 r29771  
    44    <property name="commit.message" value="BuildingTools: update to current JOSM"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="5960"/>
     6    <property name="plugin.main.version" value="6082"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java

    r27852 r29771  
    1919    }
    2020
     21    @Override
    2122    public void actionPerformed(ActionEvent arg0) {
    2223        BuildingSizeDialog dlg = new BuildingSizeDialog();

  • applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java

    r28891 r29771  
    2626        super(info);
    2727        Main.main.menu.editMenu.addSeparator();
    28         MainMenu.add(Main.main.menu.editMenu, new BuildingSizeAction());
     28        MainMenu.add(Main.main.menu.dataMenu, new BuildingSizeAction());
    2929    }
    3030

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

    r29723 r29771  
    55    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="4980"/>
     7    <property name="plugin.main.version" value="6082"/>
    88
    99    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java

    r23190 r29771  
    1717    public LakewalkerPlugin(PluginInformation info) {
    1818        super(info);
    19         MainMenu.add(Main.main.menu.toolsMenu, new LakewalkerAction(tr("Lake Walker")));
     19        MainMenu.add(Main.main.menu.moreToolsMenu, new LakewalkerAction(tr("Lake Walker")));
    2020    }
    2121

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

    r29435 r29771  
    2727<project name="livegps" default="dist" basedir=".">
    2828    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
    29     <property name="plugin.main.version" value="5681"/>
     29    <property name="plugin.main.version" value="6082"/>
    3030    <!--
    3131      ************************************************

  • applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java

    r29769 r29771  
    116116        super(info);
    117117        MainMenu menu = Main.main.menu;
    118         boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
    119         lgpsmenu = oldMenu ?
    120                 menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G, menu.defaultMenuPos, ht("/Plugin/LiveGPS"))
    121                 : menu.gpsMenu;
     118        lgpsmenu = menu.gpsMenu;
    122119        if (lgpsmenu.getItemCount()>0) {
    123120            lgpsmenu.addSeparator();

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

    r29706 r29771  
    11<?xml version="1.0" encoding="utf-8"?>
    22<project name="opendata" default="dist" basedir=".">
    3     <property name="plugin.main.version" value="6031"/>
     3    <property name="plugin.main.version" value="6082"/>
    44    <property name="plugin.author" value="Don-vip"/>
    55    <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

  • applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

    r29769 r29771  
    9696        loadModules();
    9797        // Add menu
    98         boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
    9998       
    100         menu = oldMenu?
    101             Main.main.menu.addMenu(marktr("Open Data"), KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/OpenData"))
    102             : Main.main.menu.dataMenu;
     99        menu = Main.main.menu.dataMenu;
    103100        buildMenu();
    104101        // Add download task

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

    r29663 r29771  
    44    <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="5956"/>
     6    <property name="plugin.main.version" value="6082"/>
    77
    88    <!-- Configure these properties (replace "..." accordingly).

  • applications/editors/josm/plugins/reverter/nbproject

    • Property svn:ignore set to
      private

  • applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java

    r29769 r29771  
    1919    public ReverterPlugin(PluginInformation info) {
    2020        super(info);
    21         boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
    22         JMenu historyMenu = oldMenu?
    23                 Main.main.menu.addMenu(marktr("History"), KeyEvent.VK_Y,  Main.main.menu.defaultMenuPos, ht("/Plugin/Reverter"))
    24                 : Main.main.menu.dataMenu;
     21        JMenu historyMenu = Main.main.menu.dataMenu;
    2522        //MainMenu.add(historyMenu, new ObjectsHistoryAction());
    2623        MainMenu.add(historyMenu, new RevertChangesetAction());

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

    r29435 r29771  
    22<project name="terracer" default="dist" basedir=".">
    33    <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/>
    4     <property name="plugin.main.version" value="5613"/>
    5 
    6         <property name="plugin.author" value="Matt Amos"/>
     4    <property name="plugin.main.version" value="6082"/>
     5    <property name="plugin.author" value="Matt Amos"/>
    76    <property name="plugin.class" value="terracer.TerracerPlugin"/>
    87    <property name="plugin.description" value="Make terraced houses out of single blocks."/>

  • applications/editors/josm/plugins/terracer/src/terracer/TerracerPlugin.java

    r23191 r29771  
    2222        super(info);
    2323
    24         MainMenu.add(Main.main.menu.toolsMenu, new TerracerAction());
    25         MainMenu.add(Main.main.menu.toolsMenu, new ReverseTerraceAction());
     24        MainMenu.add(Main.main.menu.moreToolsMenu, new TerracerAction());
     25        MainMenu.add(Main.main.menu.moreToolsMenu, new ReverseTerraceAction());
    2626    }
    2727}

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

    r29596 r29771  
    44    <property name="commit.message" value="adapt to latest josm (getNodePairs changed)"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="5960"/>
     6    <property name="plugin.main.version" value="6082"/>
    77
    88    <property name="plugin.author" value="Jan Bilak, Petr Dlouhý"/>

  • applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerPlugin.java

    r20251 r29771  
    1616    public TracerPlugin(PluginInformation info) {
    1717        super(info);
    18         MainMenu.add(Main.main.menu.toolsMenu, new TracerAction(Main.map));
     18        MainMenu.add(Main.main.menu.moreToolsMenu, new TracerAction(Main.map));
    1919    }
    2020

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

    r29742 r29771  
    55    <property name="commit.message" value="[josm_utilsplugin2]: pasting tags is in core long ago. Please update you ancient JOSM :)"/>
    66    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    7     <property name="plugin.main.version" value="4980"/>
     7    <property name="plugin.main.version" value="6082"/>
    88
    9     <property name="plugin.author" value="Kalle Lampila, Upliner, and others"/>
     9    <property name="plugin.author" value="Kalle Lampila, Upliner, Zverik, akks, joshdoe and others"/>
    1010    <property name="plugin.class" value="org.openstreetmap.josm.plugins.utilsplugin2.UtilsPlugin2"/>
    1111    <property name="plugin.description" value="Several utilities that make your life easier."/>

  • applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java

    r29769 r29771  
    7171    public UtilsPlugin2(PluginInformation info) {
    7272        super(info);
    73         boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
    74         JMenu toolsMenu = oldMenu
    75                 ?  Main.main.menu.addMenu(marktr("More tools"), KeyEvent.VK_Q, 4, "help")
    76                 :  Main.main.menu.moreToolsMenu;
    77        
    78         JMenu dataMenu = oldMenu ? toolsMenu: Main.main.menu.dataMenu;
     73        JMenu toolsMenu = Main.main.menu.moreToolsMenu;
     74        JMenu dataMenu = Main.main.menu.dataMenu;
     75        JMenu selectionMenu = Main.main.menu.selectionMenu;
    7976               
    8077        addIntersections = MainMenu.add(toolsMenu, new AddIntersectionsAction());
    … …  
    9491        drawArc = MainMenu.add(toolsMenu, new CurveAction());
    9592
    96         JMenu selectionMenu;
    97         if (oldMenu) {
    98             selectionMenu = Main.main.menu.addMenu(marktr("Selection"), KeyEvent.VK_N, 4, "help");
    99         } else {
    100             selectionMenu = Main.main.menu.selectionMenu;
    101             selectionMenu.addSeparator();
    102         }
    103        
     93        selectionMenu.addSeparator();
     94           
    10495        selectWayNodes = MainMenu.add(selectionMenu, new SelectWayNodesAction());
    10596        adjNodes = MainMenu.add(selectionMenu, new AdjacentNodesAction());

  • applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java

    r29769 r29771  
    7878
    7979    private void createMenusAndShortCuts() {
    80         boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
    81         VMenu = Main.main.menu.addMenu(marktr("Video"), oldMenu?KeyEvent.VK_D: KeyEvent.VK_Q, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping"));
     80        VMenu = Main.main.menu.addMenu(marktr("Video"), KeyEvent.VK_Q, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping"));
    8281        VMenu.setEnabled(false);
    8382        VAdd= new JosmAction(tr("Import Video"),"videomapping",tr("Sync a video against this GPS track"),null,false) {

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

    r29435 r29771  
    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="4980"/>
     19    <property name="plugin.main.version" value="6082"/>
    2020
    2121    <property name="plugin.author" value="Harry Wood"/>

  • applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java

    r27852 r29771  
    4747        super(info);
    4848        //add WayDownloadAction to tools menu
    49         MainMenu.add(Main.main.menu.toolsMenu, new WayDownloadAction());
     49        MainMenu.add(Main.main.menu.moreToolsMenu, new WayDownloadAction());
    5050    }
    5151
    … …  
    9292
    9393        /** Called when the WayDownloadAction action is triggered (e.g. user clicked the menu option) */
     94        @Override
    9495        public void actionPerformed(ActionEvent e) {
    9596            selectedNode = null;
    9697            Collection<Node> selection = Main.main.getCurrentDataSet().getSelectedNodes();
    97             if (selection.size()==0) {
     98            if (selection.isEmpty()) {
    9899                Collection<Way> selWays = Main.main.getCurrentDataSet().getSelectedWays();
    99100                if (!workFromWaySelection(selWays)) {
    … …  
    104105            }
    105106
    106             if ( selection.size()==0 || selection.size()>1 || ! (selection.iterator().next() instanceof Node)) {
     107            if ( selection.isEmpty() || selection.size()>1 || ! (selection.iterator().next() instanceof Node)) {
    107108                showWarningMessage(tr("<html>Could not find a unique node to start downloading from.</html>"));
    108109                return;
    … …  
    115116            //Find connected way
    116117            List<Way> connectedWays = findConnectedWays(selectedNode);
    117             if (connectedWays.size()==0) {
     118            if (connectedWays.isEmpty()) {
    118119                showWarningMessage(
    119120                        tr("<html>There are no ways connected to node ''{0}''. Aborting.</html>",
    … …  
    143144            Main.worker.submit(
    144145                    new Runnable() {
     146                        @Override
    145147                        public void run() {
    146148                            try {
    … …  
    162164         * Logic to excute after the download has happened
    163165         */
     166        @Override
    164167        public void run() {
    165168            //Find ways connected to the node after the download
    166169            List<Way> connectedWays = findConnectedWays(selectedNode);
    167170
    168             if (connectedWays.size()==0) {
     171            if (connectedWays.isEmpty()) {
    169172                String msg = tr("Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t discovered after download",
    170173                                priorConnectedWay.getDisplayName(DefaultNameFormatter.getInstance())

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

    r29435 r29771  
    1717    <property name="commit.message" value="recompile due to core change"/>
    1818    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    19     <property name="plugin.main.version" value="4980"/>
     19    <property name="plugin.main.version" value="6082"/>
    2020
    2121    <property name="plugin.author" value="Marko Mäkelä"/>

  • applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java

    r27932 r29771  
    2828        super(info);
    2929
    30         MainMenu.add(Main.main.menu.toolsMenu, new WaySelectAction());
     30        MainMenu.add(Main.main.menu.selectionMenu, new WaySelectAction());
    3131    }
    3232
Note: See TracChangeset for help on using the changeset viewer.