Changeset 134:c4130551faad

Timestamp:

08/01/2008 09:53:22 AM (4 months ago)

Author:

marc@f1.local

branch:

default

Message:

Large changes for #80 --- watch these with some care and be prepared to roll back in the case of wierdness

Files:

• development/java/field/core/dispatch/FastVisualElementOverridesDispatch.java (modified) (16 diffs)
• development/java/field/core/dispatch/iVisualElementOverrides.java (modified) (2 diffs)
• development/java/field/core/plugins/selection/SelectionSetDriver.java (modified) (5 diffs)

development/java/field/core/dispatch/FastVisualElementOverridesDispatch.java

@@ -4 +4 @@
-import java.awt.event.MouseEvent;
-import java.util.Collection;
+import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
@@ -17 +18 @@
- * we're 'de-abstracting' our Dispatch<x,y> code for the purposes of speed. For
- * many things, this has become part of our inner loops.
- 
+
- * @author marc
- 
+
- */
-public class FastVisualElementOverridesDispatch implements iVisualElementOverrides {
@@ -30 +31 @@
-
-        public VisitCode added(iVisualElement newSource) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-                }
@@ -64 +63 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.beginExecution(source);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.beginExecution(source);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -92 +91 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.deleteProperty(source, prop);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.deleteProperty(source, prop);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -120 +119 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.deleted(source);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.deleted(source);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -148 +147 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.endExecution(source);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.endExecution(source);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -173 +172 @@
-
-        public <T> VisitCode getProperty(iVisualElement source, VisualElementProperty<T> prop, Ref<T> ref) {
-
-
-
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.getProperty(source, prop, ref);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+
+
+
+
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.getProperty(source, prop, ref);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -205 +204 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.handleKeyboardEvent(newSource, event);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.handleKeyboardEvent(newSource, event);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -233 +232 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.inspectablePropertiesFor(source, properties);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.inspectablePropertiesFor(source, properties);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -258 +257 @@
-
-        public VisitCode isHit(iVisualElement source, MouseEvent event, Ref<Boolean> is) {
-
-
-
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.isHit(source, event, is);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+
+
+
+
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.isHit(source, event, is);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -290 +289 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.menuItemsFor(source, items);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.menuItemsFor(source, items);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -318 +317 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.paintNow(source, bounds, visible);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.paintNow(source, bounds, visible);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -346 +345 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.prepareForSave();
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.prepareForSave();
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -374 +373 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.setProperty(source, prop, to);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-
-
-}
-else
-{
-if (backwards)
-fringe.addAll((Collection<? extends iVisualElement>) next.getParents
-else
-               fringe.addAll((Collection<? extends iVisualElement>) next.getChildren());
-}
+HashSet<iVisualElement> seen = new HashSet<iVisualElement>();
+
+while (fringe.size() > 0) {
+VisualElement next = fringe.remove(0);
+if (!seen.contains(next)) {
+VisualElementOverrides over = next.getProperty(iVisualElement.overrides);
+if (over != null) 
+       VisitCode o = over.setProperty(source, prop, to);
+       if (o.equals(VisitCode.skip)) {
+       } else if (o.equals(VisitCode.stop)) 
+       
+       } else {
+               if (backwards)
+                       fringe.addAll((Collection<? extends iVisualElement>) next.getParents());
+       else
+       fringe.addAll(next.getChildren
+}
+}
+seen.add(next);
-                        }
-                }
@@ -402 +401 @@
-                fringe.add(iVisualElementOverrides.topology.getAt());
-
-while (fringe.size() > 0) {
-
-       iVisualElementOverrides over = next.getProperty(iVisualElement.overrides);
-f (over != null) {
-       VisitCode o = over.shouldChangeFrame(source, newFrame, oldFrame, now);
-f (o.equals(VisitCode.skip))
-
-}
-else if (o.equals(VisitCode.stop))
-