Changeset 29535 in osm for applications/editors/josm/plugins

Timestamp:

2013-04-23T13:43:26+02:00 (11 years ago)

Author:

donvip

Message:

[josm_reltoolbox] Fix some warnings

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• .settings (added)
• .settings/org.eclipse.core.resources.prefs (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• src/relcontext/ChosenRelationComponent.java (modified) (3 diffs)
• src/relcontext/RelContextDialog.java (modified) (3 diffs)
• src/relcontext/RelContextPlugin.java (modified) (1 diff)
• src/relcontext/actions/DownloadParentsAction.java (modified) (2 diffs)
• src/relcontext/actions/ReconstructPolygonAction.java (modified) (1 diff)
• src/relcontext/actions/TheRing.java (modified) (7 diffs)

applications/editors/josm/plugins/reltoolbox/src/relcontext/ChosenRelationComponent.java

@@ -1 +1 @@
 package relcontext;
 
-import java.awt.Color;
 import javax.swing.JLabel;
-import javax.swing.border.BevelBorder;
-import javax.swing.border.LineBorder;
+
 import org.openstreetmap.josm.data.osm.Relation;
 
@@ -16 +14 @@
 public class ChosenRelationComponent extends JLabel implements ChosenRelationListener {
 
-    private ChosenRelation chRel;
+    //private ChosenRelation chRel;
 
     public ChosenRelationComponent(ChosenRelation rel) {
@@ -23 +21 @@
         setOpaque(true);
         setBorder(new LineBorder(Color.black, 1, true));*/
-        this.chRel = rel;
+        //this.chRel = rel;
         rel.addChosenRelationListener(this);
     }

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java

@@ -1 +1 @@
 package relcontext;
 
-import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.command.Command;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dialog.ModalityType;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.awt.Point;
-import java.awt.Component;
-import java.awt.Dimension;
-import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+
+import javax.swing.AbstractListModel;
+import javax.swing.Action;
+import javax.swing.Box;
+import javax.swing.ComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
-import javax.swing.table.TableColumnModel;
-import javax.swing.table.DefaultTableModel;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import relcontext.actions.*;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dialog.ModalityType;
-import java.awt.GridBagLayout;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumnModel;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
+import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
-import static org.openstreetmap.josm.tools.I18n.tr;
+
+import relcontext.actions.AddRemoveMemberAction;
+import relcontext.actions.ClearChosenRelationAction;
+import relcontext.actions.CreateMultipolygonAction;
+import relcontext.actions.CreateRelationAction;
+import relcontext.actions.DeleteChosenRelationAction;
+import relcontext.actions.DownloadChosenRelationAction;
+import relcontext.actions.DownloadParentsAction;
+import relcontext.actions.DuplicateChosenRelationAction;
+import relcontext.actions.EditChosenRelationAction;
+import relcontext.actions.FindRelationAction;
+import relcontext.actions.ReconstructPolygonAction;
+import relcontext.actions.RelationHelpAction;
+import relcontext.actions.SelectInRelationPanelAction;
+import relcontext.actions.SelectMembersAction;
+import relcontext.actions.SelectRelationAction;
+import relcontext.actions.SortAndFixAction;
 
 /**
@@ -508 +555 @@
         }
     }
-
+/*
     private class MultipolygonSettingsAction extends AbstractAction {
         public MultipolygonSettingsAction() {
@@ -518 +565 @@
         public void actionPerformed( ActionEvent e ) {
             Component c = e.getSource() instanceof Component ? (Component)e.getSource() : Main.parent;
-            Point p = getMousePosition();
             multiPopupMenu.show(c, 0, 0);
         }
-    }
+    }*/
 
     private class MultipolygonSettingsPopup extends JPopupMenu implements ActionListener {

applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextPlugin.java

@@ -1 +1 @@
 package relcontext;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.MapFrame;

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
@@ -8 +9 @@
 import java.util.List;
 import java.util.Set;
+
 import javax.swing.AbstractAction;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadReferrersTask;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationMemberTask;
 import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask;
 import org.openstreetmap.josm.tools.ImageProvider;
+
 import relcontext.ChosenRelation;
 import relcontext.ChosenRelationListener;

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -107 +107 @@
                                 Way tmp = w;
                                 w = candidateWay;
-                                candidateWay = w;
+                                candidateWay = tmp;
                             }
                             commands.add(new DeleteCommand(w));

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/TheRing.java

@@ -1 +1 @@
 package relcontext.actions;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.*;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.*;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.Geometry.PolygonIntersection;
@@ -326 +338 @@
             }
         }
-        // todo: когда два кольца меняют одно и то же отношение, в список команд добавляется
-        // изменение базового отношения на новое, а не предыдущего
-        // поэтому сохраняется только первое изменение
+        // todo: когда два кольца мен�ют одно и то же отношение, в �пи�ок команд добавл�ет��
+        // изменение базового отношени� на новое, а не предыдущего
+        // по�тому �охран�ет�� только первое изменение
 
         List<Command> commands = new ArrayList<Command>();
@@ -389 +401 @@
      * Appends "append" to "base" so the closed polygon forms.
      */
-    private static void closePolygon( List<Node> base, List<Node> append ) {
+    /*private static void closePolygon( List<Node> base, List<Node> append ) {
         if( append.get(0).equals(base.get(0)) && append.get(append.size() - 1).equals(base.get(base.size() - 1)) ) {
             List<Node> ap2 = new ArrayList<Node>(append);
@@ -397 +409 @@
         base.remove(base.size() - 1);
         base.addAll(append);
-    }
+    }*/
 
     /**
      * Checks if a middle point between two nodes is inside a polygon. Useful to check if the way is inside.
      */
-    private static boolean segmentInsidePolygon( Node n1, Node n2, List<Node> polygon ) {
+    /*private static boolean segmentInsidePolygon( Node n1, Node n2, List<Node> polygon ) {
         EastNorth en1 = n1.getEastNorth();
         EastNorth en2 = n2.getEastNorth();
         Node testNode = new Node(new EastNorth((en1.east() + en2.east()) / 2.0, (en1.north() + en2.north()) / 2.0));
         return Geometry.nodeInsidePolygon(testNode, polygon);
-    }
+    }*/
     
     private static void log( String s ) {
@@ -420 +432 @@
         private boolean isRing;
 
-        private RingSegment() {
-        }
+        /*private RingSegment() {
+        }*/
 
         public RingSegment( Way w ) {
@@ -435 +447 @@
         }
 
-        public RingSegment( RingSegment ref ) {
+        /*public RingSegment( RingSegment ref ) {
             this.nodes = null;
             this.references = ref;
-        }
+        }*/
 
         /**
@@ -559 +571 @@
          * @return true if ways are equals, or one references another.
          */
-        public boolean isReferencingEqual( RingSegment other ) {
+        /*public boolean isReferencingEqual( RingSegment other ) {
             return this.equals(other) || (other.isReference() && other.references == this) || (isReference() && references == other);
-        }
+        }*/
 
         @Override