Bug 161435 - [flex] Promote asynchronous viewer framework to API -v20111201-2011

(merge flex_viewer_refactor branch into master)

1 files changed, 70 insertions, 32 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenUpdate.java
index 6375f6bdd..766c7601f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenUpdate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenUpdate.java
@@ -14,7 +14,6 @@ package org.eclipse.debug.internal.ui.viewers.model;
 
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider;
-import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 import org.eclipse.jface.viewers.TreePath;
 
 /**
@@ -37,24 +36,25 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda
 	 * @param element the element
 	 * @param index the index of the element
 	 * @param elementContentProvider the content provider for the element
-	 * @param context the presentation context
 	 */
-	public ChildrenUpdate(ModelContentProvider provider, Object viewerInput, TreePath elementPath, Object element, int index, IElementContentProvider elementContentProvider, IPresentationContext context) {
-		super(provider, viewerInput, elementPath, element, elementContentProvider, context);
+	public ChildrenUpdate(TreeModelContentProvider provider, Object viewerInput, TreePath elementPath, Object element, int index, IElementContentProvider elementContentProvider) {
+		super(provider, viewerInput, elementPath, element, elementContentProvider, provider.getPresentationContext());
 		fIndex = index;
 		fLength = 1;
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#performUpdate()
-	 */
-	protected void performUpdate() {
-		TreeModelContentProvider provider = (TreeModelContentProvider) getContentProvider();
+	
+	public ChildrenUpdate(TreeModelContentProvider provider, Object viewerInput, TreePath elementPath, Object element, int index, int length, IElementContentProvider elementContentProvider) {
+		super(provider, viewerInput, elementPath, element, elementContentProvider, provider.getPresentationContext());
+		fIndex = index;
+		fLength = length;
+	}
+	
+	
+	protected void performUpdate(boolean updateFilterOnly) {
+		TreeModelContentProvider provider = getContentProvider();
 		TreePath elementPath = getElementPath();
 		if (fElements != null) {
-			ITreeModelContentProviderTarget viewer = provider.getViewer();
+			IInternalTreeModelViewer viewer = provider.getViewer();
 			for (int i = 0; i < fElements.length; i++) {
 				int modelIndex = fIndex + i;
 				Object element = fElements[i];
@@ -62,36 +62,54 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda
 					int viewIndex = provider.modelToViewIndex(elementPath, modelIndex);
 					if (provider.shouldFilter(elementPath, element)) {
 						if (provider.addFilteredIndex(elementPath, modelIndex, element)) {
-                            if (ModelContentProvider.DEBUG_CONTENT_PROVIDER && ModelContentProvider.DEBUG_TEST_PRESENTATION_ID(getPresentationContext())) {
-								System.out.println("REMOVE(" + getElement() + ", modelIndex: " + modelIndex + " viewIndex: " + viewIndex + ", " + element + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-							}
-							viewer.remove(elementPath, viewIndex);
+                            if (!updateFilterOnly) {
+                                if (TreeModelContentProvider.DEBUG_CONTENT_PROVIDER && TreeModelContentProvider.DEBUG_TEST_PRESENTATION_ID(getPresentationContext())) {
+    								System.out.println("REMOVE(" + getElement() + ", modelIndex: " + modelIndex + " viewIndex: " + viewIndex + ", " + element + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+    							}
+							    viewer.remove(elementPath, viewIndex);
+                            }
 						}
 					} else {
 						if (provider.isFiltered(elementPath, modelIndex)) {
 							provider.clearFilteredChild(elementPath, modelIndex);
-							int insertIndex = provider.modelToViewIndex(elementPath, modelIndex);
-							if (ModelContentProvider.DEBUG_CONTENT_PROVIDER) {
-								System.out.println("insert(" + getElement() + ", modelIndex: " + modelIndex + " insertIndex: " + insertIndex + ", " + element + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-							}
-							viewer.insert(elementPath, element, insertIndex);
-						} else {
-		                    if (ModelContentProvider.DEBUG_CONTENT_PROVIDER && ModelContentProvider.DEBUG_TEST_PRESENTATION_ID(getPresentationContext())) {
+                            if (!updateFilterOnly) {
+								int insertIndex = provider.modelToViewIndex(elementPath, modelIndex);
+								if (TreeModelContentProvider.DEBUG_CONTENT_PROVIDER) {
+									System.out.println("insert(" + getElement() + ", modelIndex: " + modelIndex + " insertIndex: " + insertIndex + ", " + element + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+								}
+								viewer.insert(elementPath, element, insertIndex);
+                            }
+						} else if (!updateFilterOnly){
+		                    if (TreeModelContentProvider.DEBUG_CONTENT_PROVIDER && TreeModelContentProvider.DEBUG_TEST_PRESENTATION_ID(getPresentationContext())) {
 								System.out.println("replace(" + getElement() + ", modelIndex: " + modelIndex + " viewIndex: " + viewIndex + ", " + element + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 							}
 							viewer.replace(elementPath, viewIndex, element);
 						}
-						TreePath childPath = elementPath.createChildPath(element);
-						provider.updateHasChildren(childPath);
-						provider.restorePendingStateOnUpdate(childPath, modelIndex, false, false, false);
+						if (!updateFilterOnly) {
+							TreePath childPath = elementPath.createChildPath(element);
+							provider.updateHasChildren(childPath);
+							provider.getStateTracker().restorePendingStateOnUpdate(childPath, modelIndex, false, false, false);
+						}
 					}
 				}
 			}
 			
-            provider.restorePendingStateOnUpdate(elementPath, -1, true, true, true);
-		} else {
+			if (!updateFilterOnly) {
+				provider.getStateTracker().restorePendingStateOnUpdate(elementPath, -1, true, true, true);
+			}
+		} else if (!updateFilterOnly) {
 			provider.updateHasChildren(elementPath);
 		}
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#performUpdate()
+	 */
+	protected void performUpdate() {
+		performUpdate(false);
 	}
 	
 	/* (non-Javadoc)
@@ -122,7 +140,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda
 					fIndex = Math.min(fIndex, otherStart);
 					end = Math.max(end, otherEnd);
 					fLength = end - fIndex;
-					if (ModelContentProvider.DEBUG_CONTENT_PROVIDER && ModelContentProvider.DEBUG_TEST_PRESENTATION_ID(getPresentationContext())) {
+					if (TreeModelContentProvider.DEBUG_CONTENT_PROVIDER && TreeModelContentProvider.DEBUG_TEST_PRESENTATION_ID(getPresentationContext())) {
 						System.out.println("coalesced: " + this.toString()); //$NON-NLS-1$
 					}
 					return true;
@@ -166,7 +184,7 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda
 		buf.append(" {"); //$NON-NLS-1$
 		buf.append(getOffset());
 		buf.append("->"); //$NON-NLS-1$
-		buf.append(getOffset() + getLength());
+		buf.append(getOffset() + getLength() - 1);
 		buf.append("}"); //$NON-NLS-1$
 		return buf.toString();
 	}
@@ -194,5 +212,25 @@ public class ChildrenUpdate extends ViewerUpdateMonitor implements IChildrenUpda
 	void setOffset(int offset) {
 		fIndex = offset;
 	}
-}
+	
+	Object[] getElements() {
+	    return fElements;
+	}
+	
+    protected boolean doEquals(ViewerUpdateMonitor update) {
+        return 
+            update instanceof ChildrenUpdate &&
+            ((ChildrenUpdate)update).getOffset() == getOffset() &&
+            ((ChildrenUpdate)update).getLength() == getLength() &&
+            getViewerInput().equals(update.getViewerInput()) && 
+            getElementPath().equals(getElementPath());
+    }
+
+    protected int doHashCode() {
+        return (int)Math.pow(
+            (getClass().hashCode() + getViewerInput().hashCode() + getElementPath().hashCode()) * (getOffset() + 2),
+            
+            getLength() + 2);
+    }
 
+}