Ignore:
Timestamp:
2013-07-24T18:01:58+02:00 (12 years ago)
Author:
akks
Message:

[josm_utilsplugin2. josm_commandline, josm_livegps, josm_reverter, josm_opendata, josm_videomapping]:
rearrange menu items and change menu accelerators, add Netbeans projects, fix some syntax warnings

Location:
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2
Files:
27 edited

Legend:

Unmodified
Added
Removed

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

    r29742 r29769  
    7171    public UtilsPlugin2(PluginInformation info) {
    7272        super(info);
    73 
    74         JMenu toolsMenu = Main.main.menu.addMenu(marktr("More tools"), KeyEvent.VK_Q, 4, "help");
    75         unglueRelation = MainMenu.add(toolsMenu, new UnGlueRelationAction());
     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;
     79               
    7680        addIntersections = MainMenu.add(toolsMenu, new AddIntersectionsAction());
    7781        splitObject = MainMenu.add(toolsMenu, new SplitObjectAction());
    78        
     82        alignWayNodes = MainMenu.add(toolsMenu, new AlignWayNodesAction());
     83        symmetry = MainMenu.add(toolsMenu, new SymmetryAction());
     84        splitOnIntersections = MainMenu.add(toolsMenu, new SplitOnIntersectionsAction());
     85        unglueRelation = MainMenu.add(toolsMenu, new UnGlueRelationAction());
    7986        toolsMenu.addSeparator();
    8087        replaceGeometry = MainMenu.add(toolsMenu, new ReplaceGeometryAction());
     88        extractPoint = MainMenu.add(toolsMenu, new ExtractPointAction());
    8189        tagBuffer = MainMenu.add(toolsMenu, new TagBufferAction());
    8290        sourceTag = MainMenu.add(toolsMenu, new TagSourceAction());
    8391        pasteRelations = MainMenu.add(toolsMenu, new PasteRelationsAction());
    84         alignWayNodes = MainMenu.add(toolsMenu, new AlignWayNodesAction());
    85         splitOnIntersections = MainMenu.add(toolsMenu, new SplitOnIntersectionsAction());
    86         extractPoint = MainMenu.add(toolsMenu, new ExtractPointAction());
    87         symmetry = MainMenu.add(toolsMenu, new SymmetryAction());
    88         wiki = MainMenu.add(toolsMenu, new OpenPageAction());
     92        wiki = MainMenu.add(dataMenu, new OpenPageAction());
    8993        latlon = MainMenu.add(toolsMenu, new LatLonAction());
    90 
    91         JMenu selectionMenu = Main.main.menu.addMenu(marktr("Selection"), KeyEvent.VK_N, Main.main.menu.defaultMenuPos, "help");
     94        drawArc = MainMenu.add(toolsMenu, new CurveAction());
     95
     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       
    92104        selectWayNodes = MainMenu.add(selectionMenu, new SelectWayNodesAction());
    93105        adjNodes = MainMenu.add(selectionMenu, new AdjacentNodesAction());
    … …  
    105117        selectAreaBoundary = MainMenu.add(selectionMenu, new SelectBoundaryAction());
    106118       
    107         selectURL = MainMenu.add(toolsMenu, new ChooseURLAction());
    108         drawArc = MainMenu.add(toolsMenu, new CurveAction());
    109 
     119        selectURL = MainMenu.add(dataMenu, new ChooseURLAction());
     120       
    110121        // register search operators
    111122        SearchCompiler.addMatchFactory(new UtilsUnaryMatchFactory());

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

    r28028 r29769  
    22package org.openstreetmap.josm.plugins.utilsplugin2.actions;
    33
    4 import java.awt.MouseInfo;
    54import java.awt.Point;
    65import static org.openstreetmap.josm.gui.help.HelpUtil.ht;

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

    r28028 r29769  
    2424    }
    2525
     26    @Override
    2627    public void actionPerformed( ActionEvent e ) {
    2728        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r28028 r29769  
    3030    }
    3131
     32    @Override
    3233    public void actionPerformed( ActionEvent e ) {
    3334        List<Command> list = new ArrayList<Command>();

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

    r28028 r29769  
    4040    }
    4141
     42    @Override
    4243    public void actionPerformed(ActionEvent e) {
    4344        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();

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

    r29672 r29769  
    2828    }
    2929
     30    @Override
    3031    public void actionPerformed( ActionEvent e ) {
    3132        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r28028 r29769  
    2929    }
    3030
     31    @Override
    3132    public void actionPerformed( ActionEvent e ) {
    3233        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r29391 r29769  
    4646     * Called when the action is executed.
    4747     */
     48    @Override
    4849    public void actionPerformed(ActionEvent e) {
    4950

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

    r28028 r29769  
    22
    33import java.awt.GridBagLayout;
    4 import java.awt.event.ItemEvent;
    54import java.util.List;
    6 import java.util.logging.Level;
    7 import java.util.logging.Logger;
    8 import javax.swing.JComboBox;
    95import javax.swing.JPanel;
    106import javax.swing.event.ListSelectionEvent;
    … …  
    139import org.openstreetmap.josm.Main;
    1410import java.awt.event.ActionEvent;
    15 import java.awt.event.ItemListener;
    16 import java.awt.event.KeyEvent;
    1711import javax.swing.JCheckBox;
    1812import javax.swing.JLabel;
    … …  
    2216import javax.swing.event.ListSelectionListener;
    2317import org.openstreetmap.josm.actions.JosmAction;
    24 import org.openstreetmap.josm.gui.SelectionManager;
    2518import static org.openstreetmap.josm.tools.I18n.tr;
    2619

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

    r28028 r29769  
    4040    }
    4141
     42    @Override
    4243    public void actionPerformed(ActionEvent e) {
    4344        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
    … …  
    6263        try {
    6364        while (m.find()) {
    64                 key=m.group(1); val=null;               
    65                 if (key.equals("#id")) {
    66                     if (p!=null) val=Long.toString(p.getId()); ;
    67                 } else if (key.equals("#type")) {
    68                     if (p!=null) val = OsmPrimitiveType.from(p).getAPIName(); ;
    69                 } else if (key.equals("#lat")) {
    70                     val = Double.toString(center.lat());
    71                 } else if (key.equals("#lon")) {
    72                     val = Double.toString(center.lon());
     65            key=m.group(1); val=null;               
     66            if (key.equals("#id")) {
     67                if (p!=null) val=Long.toString(p.getId());
     68            } else if (key.equals("#type")) {
     69                if (p!=null) val = OsmPrimitiveType.from(p).getAPIName();
     70            } else if (key.equals("#lat")) {
     71                val = Double.toString(center.lat());
     72            } else if (key.equals("#lon")) {
     73                val = Double.toString(center.lon());
     74            }
     75            else {
     76                if (p!=null) {
     77                    val =p.get(key);
     78                    if (val!=null) val =URLEncoder.encode(p.get(key), "UTF-8"); else return;
    7379                }
    74                 else {
    75                     if (p!=null) {
    76                         val =p.get(key);
    77                         if (val!=null) val =URLEncoder.encode(p.get(key), "UTF-8"); else return;
    78                     }
    79                 }
    80                 keys[i]=m.group();
    81                 if  (val!=null) vals[i]=val;
    82                 else vals[i]="";
    83                 i++;
     80            }
     81            keys[i]=m.group();
     82            if  (val!=null) vals[i]=val;
     83            else vals[i]="";
     84            i++;
    8485        }
    8586        } catch (UnsupportedEncodingException ex) {

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

    r28523 r29769  
    4848        resetButton = new JButton(tr("Reset"));
    4949        resetButton.addActionListener(new ActionListener() {
     50            @Override
    5051            public void actionPerformed(ActionEvent e) {
    5152                fillRows(URLList.resetURLList());
    … …  
    5556        saveButton = new JButton(tr("Save to file"));
    5657        saveButton.addActionListener(new ActionListener() {
     58            @Override
    5759            public void actionPerformed(ActionEvent e) {
    5860                URLList.saveURLList(readItemsFromTable());
    … …  
    6264        loadButton = new JButton(tr("Load from file"));
    6365        loadButton.addActionListener(new ActionListener() {
     66            @Override
    6467            public void actionPerformed(ActionEvent e) {
    6568                fillRows(URLList.loadURLList());

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

    r28028 r29769  
    3535    }
    3636
     37    @Override
    3738    public void actionPerformed(ActionEvent e) {
    3839        if (!isEnabled())

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

    r28028 r29769  
    77import java.awt.Component;
    88import java.awt.GridBagLayout;
    9 import java.awt.event.ActionEvent;
    109import java.awt.event.FocusEvent;
    1110import java.awt.event.FocusListener;
    12 import java.awt.event.WindowAdapter;
    13 import java.awt.event.WindowEvent;
    1411import java.text.NumberFormat;
    1512import java.text.ParsePosition;
    … …  
    2017import java.util.regex.Pattern;
    2118
    22 import javax.swing.AbstractAction;
    2319import javax.swing.BorderFactory;
    2420import javax.swing.JLabel;
    … …  
    2723import javax.swing.JTabbedPane;
    2824
    29 import javax.swing.text.Document;
    3025import javax.swing.JTextArea;
    3126import javax.swing.JScrollPane;
    … …  
    4540import org.openstreetmap.josm.gui.widgets.HtmlPanel;
    4641import org.openstreetmap.josm.tools.GBC;
    47 import org.openstreetmap.josm.tools.ImageProvider;
    4842import org.openstreetmap.josm.tools.WindowGeometry;
    4943
    … …  
    288282
    289283    class LatLonInputVerifier implements DocumentListener {
    290         public void changedUpdate(DocumentEvent e) {
     284        @Override public void changedUpdate(DocumentEvent e) {
    291285            parseLatLonUserInput();
    292286        }
    293287
    294         public void insertUpdate(DocumentEvent e) {
     288        @Override public void insertUpdate(DocumentEvent e) {
    295289            parseLatLonUserInput();
    296290        }
    297291
    298         public void removeUpdate(DocumentEvent e) {
     292        @Override public void removeUpdate(DocumentEvent e) {
    299293            parseLatLonUserInput();
    300294        }
    … …  
    302296
    303297    static class TextFieldFocusHandler implements FocusListener {
     298        @Override
    304299        public void focusGained(FocusEvent e) {
    305300            Component c = e.getComponent();
    … …  
    309304            }
    310305        }
     306        @Override
    311307        public void focusLost(FocusEvent e) {}
    312308    }
    … …  
    448444
    449445    private class CoordinateListener implements DocumentListener {
    450         public void changedUpdate(DocumentEvent e) {
     446        @Override public void changedUpdate(DocumentEvent e) {
    451447            //not fired
    452448        }
    453         public void insertUpdate(DocumentEvent e) {
     449        @Override public void insertUpdate(DocumentEvent e) {
    454450            updateButtons();
    455451        }
    456         public void removeUpdate(DocumentEvent e) {
     452        @Override public void removeUpdate(DocumentEvent e) {
    457453            updateButtons();
    458454        }

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

    r28028 r29769  
    3131    private  Set<Way> activeWays = new HashSet<Way>();
    3232
     33    @Override
    3334    public void actionPerformed(ActionEvent e) {
    3435        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r28028 r29769  
    3030    }
    3131
     32    @Override
    3233    public void actionPerformed(ActionEvent e) {
    3334        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r28028 r29769  
    2727    }
    2828
     29    @Override
    2930    public void actionPerformed(ActionEvent e) {
    3031        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r28028 r29769  
    2929    }
    3030
     31    @Override
    3132    public void actionPerformed(ActionEvent e) {
    3233        Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);

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

    r28028 r29769  
    3030    }
    3131
     32    @Override
    3233    public void actionPerformed(ActionEvent e) {
    33         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
    3434       
    3535        Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
    … …  
    4141                    selectedWays, newWays);
    4242            getCurrentDataSet().addSelected(newWays);
    43             return;
    4443        } else {
    4544             JOptionPane.showMessageDialog(Main.parent,

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

    r28028 r29769  
    3333    private  Set<Way> activeWays = new HashSet<Way>();
    3434
     35    @Override
    3536    public void actionPerformed(ActionEvent e) {
    3637        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
    3738        Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
    3839
    39         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
    40        
    4140        // if no 2 nodes and no ways are selected, do nothing
    4241        if (selectedNodes.size() != 2) {

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

    r28222 r29769  
    181181
    182182    public static void addWaysIntersectingWaysRecursively
    183             (Collection<Way> allWays, Collection<Way> initWays, Set<Way> newWays)
    184     {
     183            (Collection<Way> allWays, Collection<Way> initWays, Set<Way> newWays) {
    185184            Set<Way> foundWays = new HashSet<Way>();
    186185            foundWays.addAll(initWays);
    187186            newWays.addAll(initWays);
    188             Set<Way> newFoundWays = new HashSet<Way>();
     187            Set<Way> newFoundWays;
    189188
    190189            int level=0,c;
    … …  
    207206                 }
    208207            } while ( c >0 && level < maxLevel );
    209             return;
    210208    }
    211209
    … …  
    234232            } while ( c >0 && level < maxLevel );
    235233           // System.out.println("time = "+(System.currentTimeMillis()-t)+" ways = "+newWays.size());
    236             return;
    237234    }
    238235
    … …  
    269266            }
    270267        }
    271         if (newNodes.size()==0) {
     268        if (newNodes.isEmpty()) {
    272269                JOptionPane.showMessageDialog(Main.parent,
    273270                    tr("Please select two nodes connected by way!"),

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

    r28028 r29769  
    88import java.awt.event.KeyEvent;
    99import java.util.Collection;
    10 import java.util.HashSet;
    11 import java.util.Set;
    1210
    1311import javax.swing.JOptionPane;

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

    r28028 r29769  
    1919import org.openstreetmap.josm.Main;
    2020import org.openstreetmap.josm.actions.JosmAction;
    21 import org.openstreetmap.josm.data.coor.EastNorth;
    2221import org.openstreetmap.josm.data.osm.Node;
    2322import org.openstreetmap.josm.data.osm.OsmPrimitive;
    … …  
    4039    }
    4140
     41    @Override
    4242    public void actionPerformed(ActionEvent e) {
    43         long t=System.currentTimeMillis();
     43        //long t=System.currentTimeMillis();
    4444        Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
    4545        Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Node.class);

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

    r28028 r29769  
    3232    }
    3333
     34    @Override
    3435     public void actionPerformed(ActionEvent e) {
    3536        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r28028 r29769  
    3232    }
    3333
     34    @Override
    3435    public void actionPerformed(ActionEvent e) {
    3536        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r28028 r29769  
    4040     * This method does some checking on the selection and calls the matching selectWayNodes method.
    4141     */
     42    @Override
    4243    public void actionPerformed(ActionEvent e) {
    4344        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r28028 r29769  
    1010import java.util.HashSet;
    1111import java.util.LinkedList;
    12 import java.util.List;
    1312import java.util.Set;
    14 import org.openstreetmap.josm.Main;
    1513import org.openstreetmap.josm.actions.JosmAction;
    1614import org.openstreetmap.josm.data.osm.*;
    … …  
    3432    private Collection<OsmPrimitive> lastSel;
    3533    private int index;
     34    @Override
    3635    public void actionPerformed(ActionEvent e) {
    37         LinkedList<Collection<? extends OsmPrimitive>>history
     36        LinkedList<Collection<? extends OsmPrimitive>> history
    3837                    = getCurrentDataSet().getSelectionHistory();
     38        if (history==null || history.isEmpty()) return; // empty history
    3939        int num=history.size();
    40         if (history==null || num==0) return; // empty history
    4140       
    4241        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

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

    r28028 r29769  
    2828    }
    2929
     30    @Override
    3031    public void actionPerformed(ActionEvent e) {
    3132        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Note: See TracChangeset for help on using the changeset viewer.