Changeset 3095 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

Timestamp:

08.03.2010 09:24:03 (2 years ago)

Author:

jttt

Message:

Changes in multipolygon handling (see #4661), cosmetics

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -50 +51 @@
      * data of the table model: The list of members and the cached WayConnectionType of each member.
      **/
-    private ArrayList<RelationMember> members;
-    private ArrayList<WayConnectionType> connectionType = null;
+    private List<RelationMember> members;
+    private List<WayConnectionType> connectionType = null;
 
     private DefaultListSelectionModel listSelectionModel;
@@ -69 +70 @@
     public OsmDataLayer getLayer() {
         return layer;
+    }
+
+    public void register() {
+        DataSet.selListeners.add(this);
+        getLayer().data.addDataSetListener(this);
+    }
+
+    public void unregister() {
+        DataSet.selListeners.remove(this);
+        getLayer().data.removeDataSetListener(this);
     }
 
@@ -695 +706 @@
      * @return sorted collection of relation members
      */
-    private ArrayList<RelationMember> sortMembers(ArrayList<RelationMember> relationMembers) {
+    private List<RelationMember> sortMembers(List<RelationMember> relationMembers) {
         RelationNodeMap map = new RelationNodeMap(relationMembers);
         // List of groups of linked members
@@ -744 +755 @@
      */
     void sort() {
-        ArrayList<RelationMember> selectedMembers = new ArrayList<RelationMember>(getSelectedMembers());
-        ArrayList<RelationMember> sortedMembers = null;
-        ArrayList<RelationMember> newMembers;
+        List<RelationMember> selectedMembers = new ArrayList<RelationMember>(getSelectedMembers());
+        List<RelationMember> sortedMembers = null;
+        List<RelationMember> newMembers;
         if (selectedMembers.size() <= 1) {
             newMembers = sortMembers(members);