svn commit: r13587 - trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java

Author: tfmorris
Date: 2007-09-24 18:39:32-0700
New Revision: 13587

Modified:
   trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java

Log:
Clarify documentation.  Optimize setTarget for most common case.

Modified: trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java?view=diff&rev=13587&p1=trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java&r1=13586&r2=13587
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/TabDiagram.java	2007-09-24 18:39:32-0700
@@ -75,6 +75,10 @@
  * It used to be possible (in past versions of ArgoUML)
  * to spawn objects of this class into a dialog via the spawn method of its
  * parent.
+ * <p>
+ * NOTE: This tab is unlike the others in that it acts as a bridge to forward
+ * received Diagram events to the TargetManager.  (Not sure if this 
+ * functionality is duplicated elsewhere - tfm 20070924)
  */
 public class TabDiagram
     extends AbstractArgoJPanel
@@ -162,7 +166,7 @@
     }
 
     /**
-     * Sets the target of the tab. The target should allways be an instance of
+     * Sets the target of the tab. The target should always be an instance of
      * UMLDiagram.
      * 
      * @param t the target
@@ -181,10 +185,13 @@
         if (target != null) {
             target.removePropertyChangeListener("remove", this);
         }
+        
         newTarget.addPropertyChangeListener("remove", this);
 
         setToolBar(newTarget.getJToolBar());
-        
+
+        // NOTE: This listener needs to always be active 
+        // even if this tab isn't visible
         graph.removeGraphSelectionListener(this);
         graph.setDiagram(newTarget);
         graph.addGraphSelectionListener(this);
@@ -268,17 +275,27 @@
                 TargetManager.getInstance().getTargets();
 
             List removedTargets = new ArrayList(currentSelection);
+            List addedTargets = new ArrayList();
             for (Object selection : selections) {
                 Object owner = TargetManager.getInstance().getOwner(selection);
                 if (currentSelection.contains(owner)) {
                     removedTargets.remove(owner); // remains selected
                 } else {
                     // add to selection
-                    TargetManager.getInstance().addTarget(owner);
+                    addedTargets.add(owner);
                 }
             }
-            for (Object o : removedTargets) {
-                TargetManager.getInstance().removeTarget(o);
+            if (addedTargets.size() == 1
+                    && removedTargets.size() == currentSelection.size()) {
+                // Optimize for the normal case to minimize target changes
+                TargetManager.getInstance().setTarget(addedTargets.get(0));
+            } else {
+                for (Object o : removedTargets) {
+                    TargetManager.getInstance().removeTarget(o);
+                }
+                for (Object o : addedTargets) {
+                    TargetManager.getInstance().addTarget(o);
+                }
             }
             updatingSelection = false;
         }