Changeset 30002 in osm for applications/editors/josm


Ignore:
Timestamp:
2013-10-06T21:04:16+02:00 (12 years ago)
Author:
donvip
Message:

[josm_utilsplugin2] fix #9118 - conflict with core + fix warnings

Location:
applications/editors/josm/plugins/utilsplugin2
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/utilsplugin2/.classpath

    r26670 r30002  
    22<classpath>
    33        <classpathentry kind="src" path="src"/>
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
     4        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
    55        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
    66        <classpathentry kind="output" path="build"/>

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

    r29771 r30002  
    22package org.openstreetmap.josm.plugins.utilsplugin2;
    33
    4 import java.awt.event.KeyEvent;
    54import java.util.Arrays;
    65import java.util.Collection;
    76import java.util.HashSet;
    87import java.util.Set;
     8
    99import javax.swing.JMenu;
    1010import javax.swing.JMenuItem;
     11
    1112import org.openstreetmap.josm.Main;
    1213import org.openstreetmap.josm.actions.search.PushbackTokenizer;
    … …  
    2526import org.openstreetmap.josm.plugins.Plugin;
    2627import org.openstreetmap.josm.plugins.PluginInformation;
    27 import org.openstreetmap.josm.plugins.utilsplugin2.actions.*;
     28import org.openstreetmap.josm.plugins.utilsplugin2.actions.AddIntersectionsAction;
     29import org.openstreetmap.josm.plugins.utilsplugin2.actions.AlignWayNodesAction;
     30import org.openstreetmap.josm.plugins.utilsplugin2.actions.ExtractPointAction;
     31import org.openstreetmap.josm.plugins.utilsplugin2.actions.PasteRelationsAction;
     32import org.openstreetmap.josm.plugins.utilsplugin2.actions.SplitObjectAction;
     33import org.openstreetmap.josm.plugins.utilsplugin2.actions.SplitOnIntersectionsAction;
     34import org.openstreetmap.josm.plugins.utilsplugin2.actions.SymmetryAction;
     35import org.openstreetmap.josm.plugins.utilsplugin2.actions.TagBufferAction;
     36import org.openstreetmap.josm.plugins.utilsplugin2.actions.TagSourceAction;
     37import org.openstreetmap.josm.plugins.utilsplugin2.actions.UnGlueRelationAction;
    2838import org.openstreetmap.josm.plugins.utilsplugin2.curves.CurveAction;
    2939import org.openstreetmap.josm.plugins.utilsplugin2.customurl.ChooseURLAction;
    … …  
    3242import org.openstreetmap.josm.plugins.utilsplugin2.latlon.LatLonAction;
    3343import org.openstreetmap.josm.plugins.utilsplugin2.replacegeometry.ReplaceGeometryAction;
    34 import org.openstreetmap.josm.plugins.utilsplugin2.selection.*;
    35 import static org.openstreetmap.josm.tools.I18n.marktr;
     44import org.openstreetmap.josm.plugins.utilsplugin2.selection.AdjacentNodesAction;
     45import org.openstreetmap.josm.plugins.utilsplugin2.selection.AdjacentWaysAction;
     46import org.openstreetmap.josm.plugins.utilsplugin2.selection.ConnectedWaysAction;
     47import org.openstreetmap.josm.plugins.utilsplugin2.selection.IntersectedWaysAction;
     48import org.openstreetmap.josm.plugins.utilsplugin2.selection.IntersectedWaysRecursiveAction;
     49import org.openstreetmap.josm.plugins.utilsplugin2.selection.MiddleNodesAction;
     50import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils;
     51import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectAllInsideAction;
     52import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectBoundaryAction;
     53import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectHighwayAction;
     54import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectModNodesAction;
     55import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectModWaysAction;
     56import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectWayNodesAction;
     57import org.openstreetmap.josm.plugins.utilsplugin2.selection.UndoSelectionAction;
     58import org.openstreetmap.josm.plugins.utilsplugin2.selection.UnselectNodesAction;
    3659
    3760public class UtilsPlugin2 extends Plugin {

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

    r29769 r30002  
    3333                tr("Extracts node from a way"),
    3434                Shortcut.registerShortcut("tools:extnode", tr("Tool: {0}","Extract node"),
    35                 KeyEvent.VK_J, Shortcut.ALT), true);
     35                KeyEvent.VK_J, Shortcut.ALT_SHIFT), true);
    3636        putValue("help", ht("/Action/ExtractNode"));
    3737    }

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

    r29769 r30002  
    9090        }
    9191    }
    92    
    93     private void filterInnerNodes( Node n, List<Way> ways ) {
    94         Iterator<Way> it = ways.iterator();
    95         while (it.hasNext()) {
    96             Way w = it.next();
    97             if(!w.isInnerNode(n))
    98                 it.remove();
    99         }
    100     }
    10192
    10293    @Override

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

    r29769 r30002  
    4141        // FIXME: get rid of hardcoded URLS
    4242
    43         String addr =  URLList.getSelectedURL();
     43        URLList.getSelectedURL();
    4444        table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"}));
    4545
    … …  
    107107    private void fillRows(List<String> items) {
    108108        if (items==null) return;
    109         int p=0,row=0;
     109        int p=0;
    110110        String name, url;
    111111        DefaultTableModel model = (DefaultTableModel) table.getModel();
    … …  
    115115            if (p>=n) break;
    116116            name = items.get(p);
    117             //System.out.println("name="+name);
    118117            p++;
    119118            if (p>=n) break;
    120119            url = items.get(p);
    121             //System.out.println("url="+url);
    122120            p++;
    123121            model.addRow(new String[]{name,url});
    124             row++;
    125122        }
    126123        model.addRow(new String[]{"",""});
    … …  
    129126    @Override
    130127    public boolean ok() {
    131         String addr=combo1.getText();
     128        combo1.getText();
    132129        List<String> lst = readItemsFromTable();
    133130        URLList.updateURLList(lst);

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

    r29769 r30002  
    5252    private JRadioButton rbClosedWay;
    5353    private ButtonGroup bgType;
    54     private String geomType;
    5554
    5655    private LatLon[] latLonCoordinates;

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

    r29769 r30002  
    3030        putValue("help", ht("/Action/MiddleNodes"));
    3131    }
    32 
    33     private  Set<Way> activeWays = new HashSet<Way>();
    3432
    3533    @Override

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

    r29769 r30002  
    430430     */
    431431    public static int getRayIntersectionsCount(EastNorth point, List<EastNorth> polygonPoints) {
    432         int n=polygonPoints.size();
    433432        if (point==null) return 0;
    434433        EastNorth oldPoint = null;
    435                 //polygonPoints.get(n-1);
    436434        double n1,n2,n3,e1,e2,e3,d;
    437435        int interCount=0;

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

    r29769 r30002  
    3030    @Override
    3131    public void actionPerformed(ActionEvent e) {
    32         long t=System.currentTimeMillis();
    3332        Collection<OsmPrimitive> insideSelected = NodeWayUtils.selectAllInside(getCurrentDataSet().getSelected(), getCurrentDataSet());
    3433       
    … …  
    4039               tr("Warning"), JOptionPane.WARNING_MESSAGE);
    4140        }
    42 
    4341    }
    4442

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

    r28028 r30002  
    2929    @Override
    3030    public void actionPerformed(ActionEvent e) {
    31         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
    3231        List<Way> selectedWays = OsmPrimitive.getFilteredList(getCurrentDataSet().getSelected(), Way.class);
    3332

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

    r29769 r30002  
    2323public class SelectWayNodesAction extends JosmAction {
    2424
    25     private Node selectedNode;
    2625    private ArrayList<Node> selectedNodes;
    2726
    … …  
    4443        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
    4544
    46         String errMsg = null;
    4745        for (OsmPrimitive p : selection) {
    4846            if (p instanceof Way) {
Note: See TracChangeset for help on using the changeset viewer.