Changeset 1792 in josm

Timestamp:

Jul 15, 2009 5:47:09 PM (4 years ago)

Author:

Gubaer

Message:

fixed #2647: Relation editor: moving members should keep them in view

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• IMemberModelListener.java (added)
• MemberTable.java (modified) (5 diffs)
• MemberTableModel.java (modified) (10 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.relation;
 
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -12 +13 @@
 import javax.swing.table.TableColumnModel;
 
-public class MemberTable extends JTable {
+public class MemberTable extends JTable implements IMemberModelListener {
 
     /**
@@ -22 +23 @@
     public MemberTable(MemberTableModel model) {
         super(model, new MemberTableColumnModel(), model.getSelectionModel());
+        model.addMemberModelListener(this);
         init();
     }
@@ -65 +67 @@
 
         }
+    }
+
+    public void makeMemberVisible(int index) {
+        scrollRectToVisible(
+                getCellRect(index, 0, true)
+        );
     }
 
@@ -126 +134 @@
         }
     }
+
+
 }

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

@@ -7 +7 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.DefaultListSelectionModel;
@@ -23 +24 @@
     private ArrayList<String> memberLinkingInfo;
     private DefaultListSelectionModel listSelectionModel;
+    private CopyOnWriteArrayList<IMemberModelListener> listeners;
 
     /**
@@ -30 +32 @@
         members = new ArrayList<RelationMember>();
         memberLinkingInfo = new ArrayList<String>();
+        listeners = new CopyOnWriteArrayList<IMemberModelListener>();
+    }
+
+    public void addMemberModelListener(IMemberModelListener listener) {
+        synchronized(listeners) {
+            if (listener != null && ! listeners.contains(listener)) {
+                listeners.add(listener);
+            }
+        }
+    }
+
+    public void removeMemberModelListener(IMemberModelListener listener) {
+        synchronized(listeners) {
+            if (listener != null && listeners.contains(listener)) {
+                listeners.remove(listener);
+            }
+        }
+    }
+
+    protected void fireMakeMemberVisible(int index) {
+        synchronized(listeners) {
+            for (IMemberModelListener listener: listeners) {
+                listener.makeMemberVisible(index);
+            }
+        }
     }
 
@@ -91 +118 @@
             listSelectionModel.addSelectionInterval(row, row);
         }
+        fireMakeMemberVisible(selectedRows[0] -1);
     }
 
@@ -110 +138 @@
             listSelectionModel.addSelectionInterval(row, row);
         }
+        fireMakeMemberVisible(selectedRows[0] + 1);
     }
 
@@ -185 +214 @@
         }
         if (min < Integer.MAX_VALUE) {
-            //FIXME: scroll to min
+            fireMakeMemberVisible(min);
         }
     }
@@ -233 +262 @@
             getSelectionModel().addSelectionInterval(i,i);
         }
+        fireMakeMemberVisible(0);
     }
 
@@ -247 +277 @@
             getSelectionModel().addSelectionInterval(members.size()-1-i,members.size()-1-i);
         }
+        fireMakeMemberVisible(members.size() -1);
     }
 
@@ -261 +292 @@
             getSelectionModel().addSelectionInterval(idx+i,idx+i);
         }
+        fireMakeMemberVisible(idx);
     }
 
@@ -276 +308 @@
             getSelectionModel().addSelectionInterval(idx+1 + i,idx+1 +i);
         }
+        fireMakeMemberVisible(idx+1);
     }
 }