Changeset 3928 in josm for trunk/src/org

Timestamp:

2011-02-23T21:45:50+01:00 (14 years ago)

Author:

jttt

Message:

Fix #6015 Relation-Editor: added objects are not selected when adding "above selected"

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.relation;
 
-import static org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction.*;
+import static org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction.BACKWARD;
+import static org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction.FORWARD;
+import static org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction.NONE;
+import static org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction.ROUNDABOUT_LEFT;
+import static org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction.ROUNDABOUT_RIGHT;
 
 import java.util.ArrayList;
@@ -377 +381 @@
     }
 
-    public void addMembersAtBeginning(List<OsmPrimitive> primitives) {
+    private void addMembersAtIndex(List<? extends OsmPrimitive> primitives, int index) {
         if (primitives == null)
             return;
-        int index = 0;
-        for (OsmPrimitive primitive : primitives) {
-            RelationMember member = new RelationMember("", primitive);
-            members.add(index++, member);
-        }
-        fireTableDataChanged();
-        getSelectionModel().clearSelection();
-        for (int i = 0; i < primitives.size(); i++) {
-            getSelectionModel().addSelectionInterval(i, i);
-        }
-        fireMakeMemberVisible(0);
-    }
-
-    public void addMembersAtEnd(List<? extends OsmPrimitive> primitives) {
-        if (primitives == null)
-            return;
-
-        for (OsmPrimitive primitive : primitives) {
-            RelationMember member = new RelationMember("", primitive);
-            members.add(member);
-        }
-        fireTableDataChanged();
-        getSelectionModel().clearSelection();
-        for (int i = 0; i < primitives.size(); i++) {
-            getSelectionModel().addSelectionInterval(members.size() - 1 - i, members.size() - 1 - i);
-        }
-        fireMakeMemberVisible(members.size() - 1);
-    }
-
-    public void addMembersBeforeIdx(List<? extends OsmPrimitive> primitives, int idx) {
-        if (primitives == null)
-            return;
-
+        int idx = index;
         for (OsmPrimitive primitive : primitives) {
             RelationMember member = new RelationMember("", primitive);
@@ -418 +390 @@
         }
         fireTableDataChanged();
-        getSelectionModel().setValueIsAdjusting(true);
         getSelectionModel().clearSelection();
-        for (int i = 0; i < primitives.size(); i++) {
-            getSelectionModel().addSelectionInterval(idx + i, idx + i);
-        }
-        getSelectionModel().setValueIsAdjusting(false);
-        fireMakeMemberVisible(idx);
+        getSelectionModel().addSelectionInterval(index, index + primitives.size() - 1);
+        fireMakeMemberVisible(index);
+    }
+
+    public void addMembersAtBeginning(List<? extends OsmPrimitive> primitives) {
+        addMembersAtIndex(primitives, 0);
+    }
+
+    public void addMembersAtEnd(List<? extends OsmPrimitive> primitives) {
+        addMembersAtIndex(primitives, members.size());
+    }
+
+    public void addMembersBeforeIdx(List<? extends OsmPrimitive> primitives, int idx) {
+        addMembersAtIndex(primitives, idx);
     }
 
     public void addMembersAfterIdx(List<? extends OsmPrimitive> primitives, int idx) {
-        if (primitives == null)
-            return;
-        int j = 1;
-        for (OsmPrimitive primitive : primitives) {
-            RelationMember member = new RelationMember("", primitive);
-            members.add(idx + j, member);
-            j++;
-        }
-        fireTableDataChanged();
-        getSelectionModel().setValueIsAdjusting(true);
-        getSelectionModel().clearSelection();
-        for (int i = 0; i < primitives.size(); i++) {
-            getSelectionModel().addSelectionInterval(idx + 1 + i, idx + 1 + i);
-        }
-        getSelectionModel().setValueIsAdjusting(false);
-        fireMakeMemberVisible(idx + 1);
+        addMembersAtIndex(primitives, idx + 1);
     }
 
@@ -962 +927 @@
             final RelationMember m = members.get(i);
             if (!m.isWay() || m.getWay() == null || m.getWay().isIncomplete()) {
-                if(i > 0) makeLoopIfNeeded(con, i-1);
+                if(i > 0) {
+                    makeLoopIfNeeded(con, i-1);
+                }
                 con.set(i, new WayConnectionType());
                 firstGroupIdx = i;
                 continue;
             }
-          
+
             WayConnectionType wct = new WayConnectionType(false);
             wct.linkPrev = i>0 && con.get(i-1) != null && con.get(i-1).isValid();
@@ -973 +940 @@
 
             if(isOneway(m)){
-                if(lastWct != null && lastWct.isOnewayTail)
+                if(lastWct != null && lastWct.isOnewayTail) {
                     wct.isOnewayHead = true;
+                }
                 if(lastBackwardWay == UNCONNECTED && lastForwardWay == UNCONNECTED){ //Beginning of new oneway
                     wct.isOnewayHead = true;
@@ -981 +949 @@
                     onewayBeginning = true;
                 }
-            }            
+            }
 
             if (wct.linkPrev) {
                 if(lastBackwardWay != UNCONNECTED && lastForwardWay != UNCONNECTED) {
                     wct = determineOnewayConnectionType(con, m, i, wct);
-                    if(!wct.linkPrev)
+                    if(!wct.linkPrev) {
                         firstGroupIdx = i;
+                    }
                 }
 
@@ -993 +962 @@
                     wct.direction = determineDirection(i-1, lastWct.direction, i);
                     wct.linkPrev = (wct.direction != NONE);
-                }                   
-            }
-            
+                }
+            }
+
             if (!wct.linkPrev) {
                 wct.direction = determineDirectionOfFirst(i, m);
@@ -1005 +974 @@
 
             wct.linkNext = false;
-            if(lastWct != null)
+            if(lastWct != null) {
                 lastWct.linkNext = wct.linkPrev;
+            }
             con.set(i, wct);
             lastWct = wct;
 
             if(!wct.linkPrev) {
-                if(i > 0) makeLoopIfNeeded(con, i-1);
+                if(i > 0) {
+                    makeLoopIfNeeded(con, i-1);
+                }
                 firstGroupIdx = i;
             }
@@ -1019 +991 @@
     }
 
-//    private static void unconnectPreviousLink(List<WayConnectionType> con, int beg, boolean backward){
-//        int i = beg;
-//        while(true){
-//            WayConnectionType t = con.get(i--);
-//            t.isOnewayOppositeConnected = false;
-//            if(backward && t.isOnewayLoopBackwardPart) break;
-//            if(!backward && t.isOnewayLoopForwardPart) break;
-//        }
-//    }
+    //    private static void unconnectPreviousLink(List<WayConnectionType> con, int beg, boolean backward){
+    //        int i = beg;
+    //        while(true){
+    //            WayConnectionType t = con.get(i--);
+    //            t.isOnewayOppositeConnected = false;
+    //            if(backward && t.isOnewayLoopBackwardPart) break;
+    //            if(!backward && t.isOnewayLoopForwardPart) break;
+    //        }
+    //    }
 
     private static Direction reverse(final Direction dir){
@@ -1042 +1014 @@
         return member.getRole().equals("forward");
     }
-    
+
     public static boolean isOneway(final RelationMember member){
         return isForward(member) || isBackward(member);
@@ -1063 +1035 @@
 
     private Direction determineDirectionOfFirst(final int i, final RelationMember m) {
-        if (roundaboutType(i) != NONE) {
+        if (roundaboutType(i) != NONE)
             return roundaboutType(i);
-        }
-        
+
         if (isOneway(m)){
             if(isBackward(m)) return BACKWARD;
@@ -1084 +1055 @@
         Direction dirBW = NONE;
         if(onewayBeginning) {
-            if(lastBackwardWay < 0)
+            if(lastBackwardWay < 0) {
                 dirBW = determineDirection(firstGroupIdx, reverse(con.get(firstGroupIdx).direction), i, true);
-            else
+            } else {
                 dirBW = determineDirection(lastBackwardWay, con.get(lastBackwardWay).direction, i, true);
-
-            if(dirBW != NONE)
+            }
+
+            if(dirBW != NONE) {
                 onewayBeginning = false;
-        } else
+            }
+        } else {
             dirBW = determineDirection(lastBackwardWay, con.get(lastBackwardWay).direction, i, true);
+        }
 
         if(isOneway(m)) {
@@ -1106 +1080 @@
             }
             if(dirFW == NONE && dirBW == NONE) { //Not connected to previous
-//                        unconnectPreviousLink(con, i, true);
-//                        unconnectPreviousLink(con, i, false);
+                //                        unconnectPreviousLink(con, i, true);
+                //                        unconnectPreviousLink(con, i, false);
                 wct.linkPrev = false;
                 if(isOneway(m)){
@@ -1137 +1111 @@
             lastForwardWay = UNCONNECTED;
             lastBackwardWay = UNCONNECTED;
-            if(dirFW == NONE || dirBW == NONE)
+            if(dirFW == NONE || dirBW == NONE) {
                 wct.linkPrev = false;
+            }
         }
         return wct;