diff options
author | Darin Wright | 2006-03-02 17:26:42 +0000 |
---|---|---|
committer | Darin Wright | 2006-03-02 17:26:42 +0000 |
commit | 85f186b4e3c2f6014d230e269ed80c9375919d8d (patch) | |
tree | 01e338277bf40ab8e093a7a6bba234b3e2c0b234 | |
parent | 3378d559eb3dd89156b90c3ff4b18c965fee1435 (diff) | |
download | eclipse.platform.debug-85f186b4e3c2f6014d230e269ed80c9375919d8d.tar.gz eclipse.platform.debug-85f186b4e3c2f6014d230e269ed80c9375919d8d.tar.xz eclipse.platform.debug-85f186b4e3c2f6014d230e269ed80c9375919d8d.zip |
Bug 121624 - [flex-hierarchy] Enhancements needed AsynchronousTableViewer
41 files changed, 174 insertions, 193 deletions
diff --git a/org.eclipse.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.debug.ui/META-INF/MANIFEST.MF index 138ac6d97..b21ba961d 100644 --- a/org.eclipse.debug.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.debug.ui/META-INF/MANIFEST.MF @@ -19,7 +19,6 @@ Export-Package: org.eclipse.debug.internal.ui;x-internal:=true, org.eclipse.debug.internal.ui.importexport.breakpoints;x-internal:=true, org.eclipse.debug.internal.ui.launchConfigurations;x-internal:=true, org.eclipse.debug.internal.ui.memory;x-internal:=true, - org.eclipse.debug.internal.ui.model.viewers;x-internal:=true, org.eclipse.debug.internal.ui.preferences;x-internal:=true, org.eclipse.debug.internal.ui.sourcelookup;x-internal:=true, org.eclipse.debug.internal.ui.sourcelookup.browsers;x-internal:=true, diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java index d908b1795..fa0987b2e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/CollapseAllAction.java @@ -12,7 +12,7 @@ package org.eclipse.debug.internal.ui.actions; import org.eclipse.debug.internal.ui.DebugPluginImages; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.jface.action.Action; /** @@ -20,9 +20,9 @@ import org.eclipse.jface.action.Action; */ public class CollapseAllAction extends Action { - private AsynchronousTreeModelViewer fViewer; + private AsynchronousTreeViewer fViewer; - public CollapseAllAction(AsynchronousTreeModelViewer viewer) { + public CollapseAllAction(AsynchronousTreeViewer viewer) { super(ActionMessages.CollapseAllAction_0, DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_COLLAPSE_ALL)); setToolTipText(ActionMessages.CollapseAllAction_0); setDisabledImageDescriptor(DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_COLLAPSE_ALL)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindElementAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindElementAction.java index bf6afbb9f..0030766bc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindElementAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/FindElementAction.java @@ -12,9 +12,9 @@ package org.eclipse.debug.internal.ui.actions; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeNavigationDialog; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeNavigationModel; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeNavigationDialog; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeNavigationModel; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.jface.action.Action; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.IUpdate; @@ -25,9 +25,9 @@ import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds; */ public class FindElementAction extends Action implements IUpdate { - private AsynchronousTreeModelViewer fViewer; + private AsynchronousTreeViewer fViewer; - public FindElementAction(AsynchronousTreeModelViewer viewer) { + public FindElementAction(AsynchronousTreeViewer viewer) { setText(ActionMessages.FindAction_0); setId(DebugUIPlugin.getUniqueIdentifier() + ".FindElementAction"); //$NON-NLS-1$ PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.FIND_ELEMENT_ACTION); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AbstractAddRemoveRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AbstractAddRemoveRequestMonitor.java index 90dac2190..9f059894e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AbstractAddRemoveRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AbstractAddRemoveRequestMonitor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import org.eclipse.jface.viewers.TreePath; @@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.TreePath; * * @since 3.2 */ -abstract class AbstractAddRemoveRequestMonitor extends AsynchronousModelRequestMonitor { +abstract class AbstractAddRemoveRequestMonitor extends AsynchronousRequestMonitor { private TreePath fPath; @@ -43,7 +43,7 @@ abstract class AbstractAddRemoveRequestMonitor extends AsynchronousModelRequestM /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.AsynchronousModelRequestMonitor#contains(org.eclipse.debug.internal.ui.viewers.AsynchronousModelRequestMonitor) */ - protected boolean contains(AsynchronousModelRequestMonitor update) { + protected boolean contains(AsynchronousRequestMonitor update) { if (update instanceof AbstractAddRemoveRequestMonitor) { ((AbstractAddRemoveRequestMonitor)update).getPath().equals(getPath()); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AbstractUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AbstractUpdatePolicy.java index ff66d7b76..be7d0afce 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AbstractUpdatePolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AbstractUpdatePolicy.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; /** @@ -17,12 +17,12 @@ package org.eclipse.debug.internal.ui.model.viewers; */ public abstract class AbstractUpdatePolicy implements IModelUpdatePolicy { - private AsynchronousModelViewer fViewer = null; + private AsynchronousViewer fViewer = null; /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.IUpdatePolicy#init(org.eclipse.debug.ui.viewers.update.IPresentation) */ - public void init(AsynchronousModelViewer viewer) { + public void init(AsynchronousViewer viewer) { fViewer = viewer; } @@ -39,7 +39,7 @@ public abstract class AbstractUpdatePolicy implements IModelUpdatePolicy { * * @return presentation to update */ - public AsynchronousModelViewer getViewer() { + public AsynchronousViewer getViewer() { return fViewer; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelAddRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AddRequestMonitor.java index 6a5f0c0d6..2d704157f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelAddRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AddRequestMonitor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import org.eclipse.jface.viewers.TreePath; @@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.TreePath; * * @since 3.2 */ -class ModelAddRequestMonitor extends AbstractAddRemoveRequestMonitor { +class AddRequestMonitor extends AbstractAddRemoveRequestMonitor { /** * Adds the given child to the specified parent. @@ -29,7 +29,7 @@ class ModelAddRequestMonitor extends AbstractAddRemoveRequestMonitor { * @param viewer * */ - ModelAddRequestMonitor(ModelNode parent, TreePath path, AsynchronousModel model) { + AddRequestMonitor(ModelNode parent, TreePath path, AsynchronousModel model) { super(parent, path, model); } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java index 660f4fd5e..c2b60e3c9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousModel.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import java.util.ArrayList; import java.util.HashMap; @@ -39,7 +39,7 @@ public abstract class AsynchronousModel { private ModelNode fRoot; // root node private Map fElementToNodes = new HashMap(); // map of element to corresponding tree nodes (list) private Map fModelProxies = new HashMap(); // map of installed model proxies, by element - private AsynchronousModelViewer fViewer; // viewer this model works for + private AsynchronousViewer fViewer; // viewer this model works for private boolean fDisposed = false; // whether disposed /** @@ -57,7 +57,7 @@ public abstract class AsynchronousModel { * * @param viewer associated viewer */ - public AsynchronousModel(AsynchronousModelViewer viewer) { + public AsynchronousModel(AsynchronousViewer viewer) { fViewer = viewer; } @@ -75,7 +75,7 @@ public abstract class AsynchronousModel { } } - protected AsynchronousModelViewer getViewer() { + protected AsynchronousViewer getViewer() { return fViewer; } @@ -272,11 +272,11 @@ public abstract class AsynchronousModel { * @param update the update to schedule */ protected void requestScheduled(IAsynchronousRequestMonitor update) { - AsynchronousModelRequestMonitor absUpdate = (AsynchronousModelRequestMonitor) update; + AsynchronousRequestMonitor absUpdate = (AsynchronousRequestMonitor) update; synchronized (fPendingUpdates) { Iterator updates = fPendingUpdates.listIterator(); while (updates.hasNext()) { - AsynchronousModelRequestMonitor pendingUpdate = (AsynchronousModelRequestMonitor) updates.next(); + AsynchronousRequestMonitor pendingUpdate = (AsynchronousRequestMonitor) updates.next(); if (absUpdate.contains(pendingUpdate)) { updates.remove(); pendingUpdate.setCanceled(true); @@ -344,7 +344,7 @@ public abstract class AsynchronousModel { Object element = node.getElement(); IAsynchronousLabelAdapter adapter = getLabelAdapter(element); if (adapter != null) { - ILabelRequestMonitor labelUpdate = new ModelLabelRequestMonitor(node, this); + ILabelRequestMonitor labelUpdate = new LabelRequestMonitor(node, this); requestScheduled(labelUpdate); adapter.retrieveLabel(element, getPresentationContext(), labelUpdate); } @@ -400,7 +400,7 @@ public abstract class AsynchronousModel { Object element = parent.getElement(); IAsynchronousContentAdapter adapter = getContentAdapter(element); if (adapter != null) { - IChildrenRequestMonitor update = new ModelChildrenRequestMonitor(parent, this); + IChildrenRequestMonitor update = new ChildrenRequestMonitor(parent, this); requestScheduled(update); adapter.retrieveChildren(element, getPresentationContext(), update); } @@ -432,7 +432,7 @@ public abstract class AsynchronousModel { * * @param monitor */ - protected void requestCanceled(AsynchronousModelRequestMonitor monitor) { + protected void requestCanceled(AsynchronousRequestMonitor monitor) { synchronized (fPendingUpdates) { fPendingUpdates.remove(monitor); } @@ -466,7 +466,7 @@ public abstract class AsynchronousModel { protected void setChildren(final ModelNode parentNode, List kids) { final Object[] children = filter(parentNode.getElement(), kids.toArray()); - final AsynchronousModelViewer viewer = getViewer(); + final AsynchronousViewer viewer = getViewer(); ViewerSorter sorter = viewer.getSorter(); if (sorter != null) { sorter.sort(viewer, children); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousModelRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousRequestMonitor.java index a00e26697..3d9b7605b 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousModelRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousRequestMonitor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -20,11 +20,11 @@ import org.eclipse.ui.progress.WorkbenchJob; * Base implementation of an asynchronous request monitor. * <p> * Not intended to be subclassed or instantiated by clients. For internal use - * with the <code>AsynchronousModelViewer</code> implementation. + * with the <code>AsynchronousViewer</code> implementation. * </p> * @since 3.2 */ -public abstract class AsynchronousModelRequestMonitor implements IAsynchronousRequestMonitor { +public abstract class AsynchronousRequestMonitor implements IAsynchronousRequestMonitor { /** * Model node the upadte is rooted at @@ -46,20 +46,20 @@ public abstract class AsynchronousModelRequestMonitor implements IAsynchronousRe */ private IStatus fStatus = null; - protected WorkbenchJob fViewerUpdateJob = new WorkbenchJob("AsynchronousModelRequestMonitor.fViewerUpdateJob") { //$NON-NLS-1$ + protected WorkbenchJob fViewerUpdateJob = new WorkbenchJob("Asynchronous viewer update") { //$NON-NLS-1$ public IStatus runInUIThread(IProgressMonitor monitor) { // necessary to check if widget is disposed. The item may // have been removed from the tree when another children update // occured. - getModel().viewerUpdateScheduled(AsynchronousModelRequestMonitor.this); - getModel().requestComplete(AsynchronousModelRequestMonitor.this); + getModel().viewerUpdateScheduled(AsynchronousRequestMonitor.this); + getModel().requestComplete(AsynchronousRequestMonitor.this); if (!isCanceled() && !getNode().isDisposed()) { if (fStatus != null && !fStatus.isOK()) { - getModel().getViewer().handlePresentationFailure(AsynchronousModelRequestMonitor.this, fStatus); + getModel().getViewer().handlePresentationFailure(AsynchronousRequestMonitor.this, fStatus); } performUpdate(); } - getModel().viewerUpdateComplete(AsynchronousModelRequestMonitor.this); + getModel().viewerUpdateComplete(AsynchronousRequestMonitor.this); return Status.OK_STATUS; } }; @@ -70,7 +70,7 @@ public abstract class AsynchronousModelRequestMonitor implements IAsynchronousRe * @param node model node * @param model model the node is in */ - public AsynchronousModelRequestMonitor(ModelNode node, AsynchronousModel model) { + public AsynchronousRequestMonitor(ModelNode node, AsynchronousModel model) { fNode = node; fModel = model; fViewerUpdateJob.setSystem(true); @@ -195,6 +195,6 @@ public abstract class AsynchronousModelRequestMonitor implements IAsynchronousRe * @param update update to compare to * @return whether this update will also perform the given update */ - protected abstract boolean contains(AsynchronousModelRequestMonitor update); + protected abstract boolean contains(AsynchronousRequestMonitor update); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java index 7b6c0ef99..0b5da4970 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableModel.java @@ -14,9 +14,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModel; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer; -import org.eclipse.debug.internal.ui.model.viewers.ModelNode; /** * @since 3.2 @@ -29,7 +26,7 @@ public class AsynchronousTableModel extends AsynchronousModel { * * @param viewer */ - public AsynchronousTableModel(AsynchronousModelViewer viewer) { + public AsynchronousTableModel(AsynchronousViewer viewer) { super(viewer); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java index 563f84f7e..182fefeac 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTableViewer.java @@ -7,10 +7,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModel; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer; -import org.eclipse.debug.internal.ui.model.viewers.IModelUpdatePolicy; -import org.eclipse.debug.internal.ui.model.viewers.ModelNode; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.util.Assert; import org.eclipse.jface.viewers.CellEditor; @@ -45,7 +41,7 @@ import org.eclipse.ui.progress.WorkbenchJob; /** * @since 3.2 */ -public class AsynchronousTableViewer extends AsynchronousModelViewer implements Listener { +public class AsynchronousTableViewer extends AsynchronousViewer implements Listener { private Table fTable; @@ -156,7 +152,7 @@ public class AsynchronousTableViewer extends AsynchronousModelViewer implements } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#internalRefresh(org.eclipse.debug.internal.ui.model.viewers.ModelNode) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#internalRefresh(org.eclipse.debug.internal.ui.model.viewers.ModelNode) */ protected void internalRefresh(ModelNode node) { super.internalRefresh(node); @@ -409,14 +405,14 @@ public class AsynchronousTableViewer extends AsynchronousModelViewer implements } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#createModel() + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#createModel() */ protected AsynchronousModel createModel() { return new AsynchronousTableModel(this); } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#setItemCount(org.eclipse.swt.widgets.Widget, int) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#setItemCount(org.eclipse.swt.widgets.Widget, int) */ protected void setItemCount(Widget parent, int itemCount) { fTable.setItemCount(itemCount); @@ -428,14 +424,14 @@ public class AsynchronousTableViewer extends AsynchronousModelViewer implements } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#createUpdatePolicy() + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#createUpdatePolicy() */ public IModelUpdatePolicy createUpdatePolicy() { - return new DefaultTableUpdatePolicy(); + return new TableUpdatePolicy(); } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#getParentWidget(org.eclipse.swt.widgets.Widget) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#getParentWidget(org.eclipse.swt.widgets.Widget) */ protected Widget getParentWidget(Widget widget) { if (widget instanceof TableItem) { @@ -445,7 +441,7 @@ public class AsynchronousTableViewer extends AsynchronousModelViewer implements } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#getChildIndex(org.eclipse.swt.widgets.Widget, org.eclipse.swt.widgets.Event) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#getChildIndex(org.eclipse.swt.widgets.Widget, org.eclipse.swt.widgets.Event) */ protected int getChildIndex(Widget parent, Event event) { if (parent instanceof Table) { @@ -455,7 +451,7 @@ public class AsynchronousTableViewer extends AsynchronousModelViewer implements } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#getChildWidget(org.eclipse.swt.widgets.Widget, int) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#getChildWidget(org.eclipse.swt.widgets.Widget, int) */ protected Widget getChildWidget(Widget parent, int index) { if (index < fTable.getItemCount()) { @@ -465,7 +461,7 @@ public class AsynchronousTableViewer extends AsynchronousModelViewer implements } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#clear(org.eclipse.swt.widgets.Widget) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#clear(org.eclipse.swt.widgets.Widget) */ protected void clear(Widget item) { if (item instanceof TableItem) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTreeModel.java index 8ac43d863..ef711e6c1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTreeModel.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import java.util.ArrayList; import java.util.List; @@ -30,7 +30,7 @@ public class AsynchronousTreeModel extends AsynchronousModel { * * @param viewer associated viewer */ - public AsynchronousTreeModel(AsynchronousModelViewer viewer) { + public AsynchronousTreeModel(AsynchronousViewer viewer) { super(viewer); } @@ -51,7 +51,7 @@ public class AsynchronousTreeModel extends AsynchronousModel { for (int i = 0; i < nodes.length; i++) { ModelNode node = nodes[i]; if (treePath.startsWith(node.getTreePath(), null)) { - ModelAddRequestMonitor addRequest = new ModelAddRequestMonitor(node, treePath, this); + AddRequestMonitor addRequest = new AddRequestMonitor(node, treePath, this); requestScheduled(addRequest); addRequest.done(); return; @@ -95,7 +95,7 @@ public class AsynchronousTreeModel extends AsynchronousModel { for (int i = 0; i < nodes.length; i++) { ModelNode node = nodes[i]; if (node.correspondsTo(treePath)) { - ModelRemoveRequestMonitor request = new ModelRemoveRequestMonitor(node, treePath, this); + RemoveRequestMonitor request = new RemoveRequestMonitor(node, treePath, this); requestScheduled(request); request.done(); return; @@ -139,7 +139,7 @@ public class AsynchronousTreeModel extends AsynchronousModel { unmapNode(node); node.dispose(); } - final AsynchronousTreeModelViewer viewer = getTreeViewer(); + final AsynchronousTreeViewer viewer = getTreeViewer(); preservingSelection(new Runnable() { public void run() { viewer.nodeDisposed(node); @@ -203,8 +203,8 @@ public class AsynchronousTreeModel extends AsynchronousModel { return paths; } - protected AsynchronousTreeModelViewer getTreeViewer() { - return (AsynchronousTreeModelViewer) getViewer(); + protected AsynchronousTreeViewer getTreeViewer() { + return (AsynchronousTreeViewer) getViewer(); } /** @@ -217,7 +217,7 @@ public class AsynchronousTreeModel extends AsynchronousModel { Object element = node.getElement(); IAsynchronousContentAdapter adapter = getContentAdapter(element); if (adapter != null) { - IContainerRequestMonitor update = new ContainerModelRequestMonitor(node, this); + IContainerRequestMonitor update = new ContainerRequestMonitor(node, this); requestScheduled(update); adapter.isContainer(element, getPresentationContext(), update); } @@ -240,7 +240,7 @@ public class AsynchronousTreeModel extends AsynchronousModel { } /** - * Called by <code>ContainerModelRequestMonitor</code> after it is determined + * Called by <code>ContainerRequestMonitor</code> after it is determined * if the node contains children. * * @param node @@ -261,7 +261,7 @@ public class AsynchronousTreeModel extends AsynchronousModel { } } // update tree outside lock - AsynchronousTreeModelViewer viewer = getTreeViewer(); + AsynchronousTreeViewer viewer = getTreeViewer(); if (containsChildren) { if (prevChildren == null) { viewer.nodeChildrenChanged(node); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeNavigationDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTreeNavigationDialog.java index e466d85f7..77833f1b9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeNavigationDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTreeNavigationDialog.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; import org.eclipse.jface.viewers.TreePath; @@ -29,7 +29,7 @@ import org.eclipse.ui.dialogs.ElementListSelectionDialog; public class AsynchronousTreeNavigationDialog extends ElementListSelectionDialog { private AsynchronousTreeNavigationModel fLabelProvider = null; - private AsynchronousTreeModelViewer fViewer = null; + private AsynchronousTreeViewer fViewer = null; /** * Constructs a dialog to navigate to an element in the given viewer. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeNavigationModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTreeNavigationModel.java index 09083ec8e..399dd3ba0 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeNavigationModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTreeNavigationModel.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import java.util.HashMap; import java.util.Map; @@ -27,9 +27,9 @@ import org.eclipse.swt.widgets.TreeItem; public class AsynchronousTreeNavigationModel extends LabelProvider { private Map fElementsToItems = new HashMap(); - private AsynchronousTreeModelViewer fViewer = null; + private AsynchronousTreeViewer fViewer = null; - public AsynchronousTreeNavigationModel(AsynchronousTreeModelViewer viewer) { + public AsynchronousTreeNavigationModel(AsynchronousTreeViewer viewer) { init(viewer); } @@ -37,7 +37,7 @@ public class AsynchronousTreeNavigationModel extends LabelProvider { * initialize cache of * @param viewer */ - private void init(AsynchronousTreeModelViewer viewer) { + private void init(AsynchronousTreeViewer viewer) { fViewer = viewer; TreeItem[] items = viewer.getTree().getItems(); traverse(items); @@ -100,7 +100,7 @@ public class AsynchronousTreeNavigationModel extends LabelProvider { * * @return */ - AsynchronousTreeModelViewer getViewer() { + AsynchronousTreeViewer getViewer() { return fViewer; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTreeViewer.java index 3d40afb0a..f09590606 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousTreeModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousTreeViewer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import java.util.ArrayList; import java.util.Arrays; @@ -62,7 +62,7 @@ import org.eclipse.ui.progress.WorkbenchJob; * * @since 3.2 */ -public class AsynchronousTreeModelViewer extends AsynchronousModelViewer implements Listener { +public class AsynchronousTreeViewer extends AsynchronousViewer implements Listener { /** * The tree @@ -86,7 +86,7 @@ public class AsynchronousTreeModelViewer extends AsynchronousModelViewer impleme * @param parent * the parent control */ - public AsynchronousTreeModelViewer(Composite parent) { + public AsynchronousTreeViewer(Composite parent) { this(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.VIRTUAL); } @@ -100,7 +100,7 @@ public class AsynchronousTreeModelViewer extends AsynchronousModelViewer impleme * @param style * the SWT style bits used to create the tree. */ - public AsynchronousTreeModelViewer(Composite parent, int style) { + public AsynchronousTreeViewer(Composite parent, int style) { this(new Tree(parent, style)); } @@ -112,7 +112,7 @@ public class AsynchronousTreeModelViewer extends AsynchronousModelViewer impleme * @param tree * the tree control */ - public AsynchronousTreeModelViewer(Tree tree) { + public AsynchronousTreeViewer(Tree tree) { super(); Assert.isTrue((tree.getStyle() & SWT.VIRTUAL) != 0); fTree = tree; @@ -384,7 +384,7 @@ public class AsynchronousTreeModelViewer extends AsynchronousModelViewer impleme } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#setItemCount(org.eclipse.swt.widgets.Widget, int) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#setItemCount(org.eclipse.swt.widgets.Widget, int) */ protected void setItemCount(Widget widget, int itemCount) { if (widget == fTree) { @@ -395,7 +395,7 @@ public class AsynchronousTreeModelViewer extends AsynchronousModelViewer impleme } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#getChildWidget(org.eclipse.swt.widgets.Widget, int) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#getChildWidget(org.eclipse.swt.widgets.Widget, int) */ protected Widget getChildWidget(Widget parent, int index) { if (parent instanceof Tree) { @@ -438,7 +438,7 @@ public class AsynchronousTreeModelViewer extends AsynchronousModelViewer impleme } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#getChildIndex(org.eclipse.swt.widgets.Widget, org.eclipse.swt.widgets.Event) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#getChildIndex(org.eclipse.swt.widgets.Widget, org.eclipse.swt.widgets.Event) */ protected int getChildIndex(Widget parent, Event event) { if (parent instanceof TreeItem) { @@ -468,7 +468,7 @@ public class AsynchronousTreeModelViewer extends AsynchronousModelViewer impleme } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#clear(org.eclipse.swt.widgets.Widget) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#clear(org.eclipse.swt.widgets.Widget) */ protected void clear(Widget widget) { if (widget instanceof TreeItem) { @@ -518,7 +518,7 @@ public class AsynchronousTreeModelViewer extends AsynchronousModelViewer impleme } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#internalRefresh(org.eclipse.debug.internal.ui.model.viewers.ModelNode) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#internalRefresh(org.eclipse.debug.internal.ui.model.viewers.ModelNode) */ protected void internalRefresh(ModelNode node) { super.internalRefresh(node); @@ -797,7 +797,7 @@ public class AsynchronousTreeModelViewer extends AsynchronousModelViewer impleme } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#createUpdatePolicy() + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#createUpdatePolicy() */ public IModelUpdatePolicy createUpdatePolicy() { return new TreeUpdatePolicy(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java index b54bc20dc..8dd3c6dba 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/AsynchronousModelViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/AsynchronousViewer.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import java.util.HashMap; import java.util.Iterator; @@ -67,7 +67,7 @@ import org.eclipse.ui.progress.WorkbenchJob; * </p> * @since 3.2 */ -public abstract class AsynchronousModelViewer extends StructuredViewer implements Listener { +public abstract class AsynchronousViewer extends StructuredViewer implements Listener { /** * Model of elements for this viewer @@ -125,7 +125,7 @@ public abstract class AsynchronousModelViewer extends StructuredViewer implement /** * Creates a new viewer */ - protected AsynchronousModelViewer() { + protected AsynchronousViewer() { setContentProvider(new NullContentProvider()); setUseHashlookup(true); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelChildrenRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java index 7d528d102..1c3b1dee9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelChildrenRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ChildrenRequestMonitor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import java.util.ArrayList; import java.util.Iterator; @@ -21,11 +21,11 @@ import org.eclipse.debug.internal.ui.viewers.provisional.IChildrenRequestMonitor * children from an asynchronous tree content adapter. * <p> * Not intended to be subclassed or instantiated by clients. For use - * speficially with <code>AsynchronousTreeModelViewer</code>. + * speficially with <code>AsynchronousTreeViewer</code>. * </p> * @since 3.2 */ -class ModelChildrenRequestMonitor extends AsynchronousModelRequestMonitor implements IChildrenRequestMonitor { +class ChildrenRequestMonitor extends AsynchronousRequestMonitor implements IChildrenRequestMonitor { private boolean fFirstUpdate = true; @@ -41,7 +41,7 @@ class ModelChildrenRequestMonitor extends AsynchronousModelRequestMonitor implem * @param parent parent to retrieve children for * @param model model being updated */ - ModelChildrenRequestMonitor(ModelNode parent, AsynchronousModel model) { + ChildrenRequestMonitor(ModelNode parent, AsynchronousModel model) { super(parent, model); } @@ -72,8 +72,8 @@ class ModelChildrenRequestMonitor extends AsynchronousModelRequestMonitor implem /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#contains(org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor) */ - protected boolean contains(AsynchronousModelRequestMonitor update) { - return (update instanceof ModelChildrenRequestMonitor || update instanceof ContainerModelRequestMonitor) && contains(update.getNode()); + protected boolean contains(AsynchronousRequestMonitor update) { + return (update instanceof ChildrenRequestMonitor || update instanceof ContainerRequestMonitor) && contains(update.getNode()); } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ContainerModelRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ContainerRequestMonitor.java index bf1730ea6..c285483aa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ContainerModelRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ContainerRequestMonitor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import org.eclipse.debug.internal.ui.viewers.provisional.IContainerRequestMonitor; @@ -17,11 +17,11 @@ import org.eclipse.debug.internal.ui.viewers.provisional.IContainerRequestMonito * an element contains children. * <p> * Not intended to be subclassed or instantiated by clients. For use - * speficially with <code>AsynchronousTreeModelViewer</code>. + * speficially with <code>AsynchronousTreeViewer</code>. * </p> * @since 3.2 */ -class ContainerModelRequestMonitor extends AsynchronousModelRequestMonitor implements IContainerRequestMonitor { +class ContainerRequestMonitor extends AsynchronousRequestMonitor implements IContainerRequestMonitor { /** * Whether the item has children @@ -34,7 +34,7 @@ class ContainerModelRequestMonitor extends AsynchronousModelRequestMonitor imple * @param node node to update * @param mode model the update was issued for */ - ContainerModelRequestMonitor(ModelNode node, AsynchronousModel model) { + ContainerRequestMonitor(ModelNode node, AsynchronousModel model) { super(node, model); } @@ -48,8 +48,8 @@ class ContainerModelRequestMonitor extends AsynchronousModelRequestMonitor imple /* (non-Javadoc) * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#contains(org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor) */ - protected boolean contains(AsynchronousModelRequestMonitor update) { - return (update instanceof ModelChildrenRequestMonitor || update instanceof ContainerModelRequestMonitor) && contains(update.getNode()); + protected boolean contains(AsynchronousRequestMonitor update) { + return (update instanceof ChildrenRequestMonitor || update instanceof ContainerRequestMonitor) && contains(update.getNode()); } /* (non-Javadoc) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/IModelUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/IModelUpdatePolicy.java index 01d13168e..cae6c2a9a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/IModelUpdatePolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/IModelUpdatePolicy.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; @@ -26,7 +26,7 @@ public interface IModelUpdatePolicy { * * @param viewer viewer to update */ - public void init(AsynchronousModelViewer viewer); + public void init(AsynchronousViewer viewer); /** * Disposes this update policy. diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelLabelRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelRequestMonitor.java index 697123f02..034d28821 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelLabelRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/LabelRequestMonitor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import org.eclipse.debug.internal.ui.viewers.provisional.ILabelRequestMonitor; import org.eclipse.jface.resource.ImageDescriptor; @@ -21,12 +21,12 @@ import org.eclipse.swt.widgets.Widget; * attributes from an asynchronous label adapter. * <p> * Not intended to be subclassed or instantiated by clients. For use speficially - * with <code>AsynchronousModelViewer</code>. + * with <code>AsynchronousViewer</code>. * </p> * * @since 3.2 */ -class ModelLabelRequestMonitor extends AsynchronousModelRequestMonitor implements ILabelRequestMonitor { +class LabelRequestMonitor extends AsynchronousRequestMonitor implements ILabelRequestMonitor { /** * Retrieved label text. Only <code>null</code> if cancelled or failed. @@ -56,7 +56,7 @@ class ModelLabelRequestMonitor extends AsynchronousModelRequestMonitor implement * @param node node to update * @param model model containing the node */ - ModelLabelRequestMonitor(ModelNode node, AsynchronousModel model) { + LabelRequestMonitor(ModelNode node, AsynchronousModel model) { super(node, model); } @@ -66,7 +66,7 @@ class ModelLabelRequestMonitor extends AsynchronousModelRequestMonitor implement * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#performUpdate() */ protected void performUpdate() { - AsynchronousModelViewer viewer = getModel().getViewer(); + AsynchronousViewer viewer = getModel().getViewer(); Widget widget = viewer.findItem(getNode()); if (widget != null && !widget.isDisposed()) { viewer.setLabels(widget, fLabels, fImageDescriptors); @@ -80,8 +80,8 @@ class ModelLabelRequestMonitor extends AsynchronousModelRequestMonitor implement * * @see org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor#contains(org.eclipse.debug.ui.viewers.AsynchronousRequestMonitor) */ - protected boolean contains(AsynchronousModelRequestMonitor update) { - return update instanceof ModelLabelRequestMonitor && update.getNode() == getNode(); + protected boolean contains(AsynchronousRequestMonitor update) { + return update instanceof LabelRequestMonitor && update.getNode() == getNode(); } /* diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelNode.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java index 2fd22fec1..7d55b1983 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelNode.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/ModelNode.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import java.util.ArrayList; import java.util.List; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelRemoveRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/RemoveRequestMonitor.java index e13a499dc..b4ab8d763 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/ModelRemoveRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/RemoveRequestMonitor.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import org.eclipse.jface.viewers.TreePath; @@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.TreePath; * * @since 3.2 */ -class ModelRemoveRequestMonitor extends AbstractAddRemoveRequestMonitor { +class RemoveRequestMonitor extends AbstractAddRemoveRequestMonitor { /** * Removes the given node from the given model. @@ -28,7 +28,7 @@ class ModelRemoveRequestMonitor extends AbstractAddRemoveRequestMonitor { * @param path path to the element to remove * @param model */ - ModelRemoveRequestMonitor(ModelNode node, TreePath path, AsynchronousModel model) { + RemoveRequestMonitor(ModelNode node, TreePath path, AsynchronousModel model) { super(node, path, model); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableAddRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableAddRequestMonitor.java index ab38a2d2e..0151bac98 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableAddRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableAddRequestMonitor.java @@ -10,15 +10,12 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModel; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor; -import org.eclipse.debug.internal.ui.model.viewers.ModelNode; /** * @since 3.2 * */ -public class TableAddRequestMonitor extends AsynchronousModelRequestMonitor { +public class TableAddRequestMonitor extends AsynchronousRequestMonitor { protected Object[] fElements; @@ -32,16 +29,16 @@ public class TableAddRequestMonitor extends AsynchronousModelRequestMonitor { } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor#performUpdate() + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousRequestMonitor#performUpdate() */ protected void performUpdate() { ((AsynchronousTableModel)getModel()).added(fElements); } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor#contains(org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousRequestMonitor#contains(org.eclipse.debug.internal.ui.model.viewers.AsynchronousRequestMonitor) */ - protected boolean contains(AsynchronousModelRequestMonitor update) { + protected boolean contains(AsynchronousRequestMonitor update) { return false; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableInsertRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableInsertRequestMonitor.java index eeb2a6d87..4761941ed 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableInsertRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableInsertRequestMonitor.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModel; -import org.eclipse.debug.internal.ui.model.viewers.ModelNode; /** * @since 3.2 @@ -31,7 +29,7 @@ public class TableInsertRequestMonitor extends TableAddRequestMonitor { } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor#performUpdate() + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousRequestMonitor#performUpdate() */ protected void performUpdate() { ((AsynchronousTableModel)getModel()).inserted(fElements, fIndex); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableRemoveRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableRemoveRequestMonitor.java index 9149993ee..e1fe7b085 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableRemoveRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableRemoveRequestMonitor.java @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModel; -import org.eclipse.debug.internal.ui.model.viewers.ModelNode; /** * @since 3.2 @@ -29,7 +27,7 @@ public class TableRemoveRequestMonitor extends TableAddRequestMonitor { } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor#performUpdate() + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousRequestMonitor#performUpdate() */ protected void performUpdate() { ((AsynchronousTableModel)getModel()).removed(fElements); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableReplaceRequestMonitor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableReplaceRequestMonitor.java index 671b3e3a7..ae6a8594e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableReplaceRequestMonitor.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableReplaceRequestMonitor.java @@ -10,15 +10,12 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModel; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor; -import org.eclipse.debug.internal.ui.model.viewers.ModelNode; /** * @since 3.2 * */ -public class TableReplaceRequestMonitor extends AsynchronousModelRequestMonitor { +public class TableReplaceRequestMonitor extends AsynchronousRequestMonitor { private Object fOriginal; private Object fReplacement; @@ -34,16 +31,16 @@ public class TableReplaceRequestMonitor extends AsynchronousModelRequestMonitor } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor#performUpdate() + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousRequestMonitor#performUpdate() */ protected void performUpdate() { ((AsynchronousTableModel)getModel()).replaced(fOriginal, fReplacement); } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor#contains(org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelRequestMonitor) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousRequestMonitor#contains(org.eclipse.debug.internal.ui.model.viewers.AsynchronousRequestMonitor) */ - protected boolean contains(AsynchronousModelRequestMonitor update) { + protected boolean contains(AsynchronousRequestMonitor update) { return false; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/DefaultTableUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableUpdatePolicy.java index a0b61c02d..d2df7a877 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/DefaultTableUpdatePolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TableUpdatePolicy.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.viewers; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer; import org.eclipse.debug.internal.ui.viewers.provisional.IModelChangedListener; import org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta; import org.eclipse.jface.viewers.StructuredSelection; @@ -20,14 +19,14 @@ import org.eclipse.jface.viewers.StructuredSelection; * * @since 3.2 */ -public class DefaultTableUpdatePolicy extends org.eclipse.debug.internal.ui.model.viewers.AbstractUpdatePolicy implements IModelChangedListener { +public class TableUpdatePolicy extends org.eclipse.debug.internal.ui.viewers.AbstractUpdatePolicy implements IModelChangedListener { public void modelChanged(IModelDelta delta) { updateNodes(new IModelDelta[] {delta}); } private void handleState(IModelDelta node) { - AsynchronousModelViewer viewer = getViewer(); + AsynchronousViewer viewer = getViewer(); if (viewer != null) { Object element = node.getElement(); viewer.update(element); @@ -35,7 +34,7 @@ public class DefaultTableUpdatePolicy extends org.eclipse.debug.internal.ui.mode } } private void handleContent(IModelDelta node) { - AsynchronousModelViewer viewer = getViewer(); + AsynchronousViewer viewer = getViewer(); if (viewer != null) { Object element = node.getElement(); viewer.refresh(element); @@ -44,7 +43,7 @@ public class DefaultTableUpdatePolicy extends org.eclipse.debug.internal.ui.mode } private void updateSelection(Object element, int flags) { - AsynchronousModelViewer viewer = getViewer(); + AsynchronousViewer viewer = getViewer(); if (viewer != null) { if ((flags & IModelDelta.SELECT) != 0) { getViewer().setSelection(new StructuredSelection(element)); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/TreeUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TreeUpdatePolicy.java index 450f35aab..e1859830e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/model/viewers/TreeUpdatePolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/TreeUpdatePolicy.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.model.viewers; +package org.eclipse.debug.internal.ui.viewers; import java.util.ArrayList; @@ -35,7 +35,7 @@ public class TreeUpdatePolicy extends AbstractUpdatePolicy implements IModelChan } protected void updateNodes(IModelDelta[] nodes) { - AsynchronousTreeModelViewer viewer = (AsynchronousTreeModelViewer) getViewer(); + AsynchronousTreeViewer viewer = (AsynchronousTreeViewer) getViewer(); if (viewer == null) { return; } @@ -73,27 +73,27 @@ public class TreeUpdatePolicy extends AbstractUpdatePolicy implements IModelChan } } - protected void handleState(AsynchronousTreeModelViewer viewer, IModelDelta delta) { + protected void handleState(AsynchronousTreeViewer viewer, IModelDelta delta) { viewer.update(delta.getElement()); } - protected void handleSelect(AsynchronousTreeModelViewer viewer, IModelDelta delta) { + protected void handleSelect(AsynchronousTreeViewer viewer, IModelDelta delta) { viewer.setSelection(new TreeSelection(getTreePath(delta))); } - protected void handleExpand(AsynchronousTreeModelViewer viewer, IModelDelta delta) { + protected void handleExpand(AsynchronousTreeViewer viewer, IModelDelta delta) { viewer.expand(new TreeSelection(getTreePath(delta))); } - protected void handleContent(AsynchronousTreeModelViewer viewer, IModelDelta delta) { + protected void handleContent(AsynchronousTreeViewer viewer, IModelDelta delta) { viewer.refresh(delta.getElement()); } - protected void handleRemove(AsynchronousTreeModelViewer viewer, IModelDelta delta) { + protected void handleRemove(AsynchronousTreeViewer viewer, IModelDelta delta) { viewer.remove(getTreePath(delta)); } - protected void handleAdd(AsynchronousTreeModelViewer viewer, IModelDelta delta) { + protected void handleAdd(AsynchronousTreeViewer viewer, IModelDelta delta) { viewer.add(getTreePath(delta)); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/AbstractViewerState.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/AbstractViewerState.java index 603b77774..eacfdebf1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/AbstractViewerState.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/AbstractViewerState.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.core.runtime.IPath; import org.eclipse.debug.core.DebugException; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.jface.viewers.TreePath; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.swt.widgets.TreeItem; @@ -33,7 +33,7 @@ public abstract class AbstractViewerState { /** * Constructs a memento for the given viewer. */ - public AbstractViewerState(AsynchronousTreeModelViewer viewer) { + public AbstractViewerState(AsynchronousTreeViewer viewer) { saveState(viewer); } @@ -43,7 +43,7 @@ public abstract class AbstractViewerState { * * @param viewer viewer of which to save the state */ - public void saveState(AsynchronousTreeModelViewer viewer) { + public void saveState(AsynchronousTreeViewer viewer) { List expanded = new ArrayList(); fSavedExpansion = null; TreeItem[] items = viewer.getTree().getItems(); @@ -115,7 +115,7 @@ public abstract class AbstractViewerState { * * @param viewer viewer to which state is restored */ - public void restoreState(AsynchronousTreeModelViewer viewer) { + public void restoreState(AsynchronousTreeViewer viewer) { boolean expansionComplete = true; if (fSavedExpansion != null && fSavedExpansion.size() > 0) { for (int i = 0; i < fSavedExpansion.size(); i++) { @@ -176,6 +176,6 @@ public abstract class AbstractViewerState { * @return element represented by the path, or <code>null</code> if none * @throws DebugException if unable to locate a variable */ - protected abstract TreePath decodePath(IPath path, AsynchronousTreeModelViewer viewer) throws DebugException; + protected abstract TreePath decodePath(IPath path, AsynchronousTreeViewer viewer) throws DebugException; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchTreeModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchTreeModel.java index 09aeffb26..93e74120d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchTreeModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchTreeModel.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.debug.core.model.IStackFrame; import org.eclipse.debug.internal.ui.DebugUIPlugin; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModel; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeModel; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.debug.internal.ui.viewers.provisional.AsynchronousContentAdapter; import org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousContentAdapter; import org.eclipse.debug.internal.ui.viewers.provisional.IPresentationContext; @@ -37,7 +37,7 @@ import org.osgi.framework.Bundle; */ public class LaunchTreeModel extends AsynchronousTreeModel { - public LaunchTreeModel(AsynchronousTreeModelViewer viewer) { + public LaunchTreeModel(AsynchronousTreeViewer viewer) { super(viewer); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java index 8d3895548..599ddcb1d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchView.java @@ -48,9 +48,9 @@ import org.eclipse.debug.internal.ui.actions.context.TerminateAndRemoveAction; import org.eclipse.debug.internal.ui.contexts.DebugContextManager; import org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener; import org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextProvider; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; import org.eclipse.debug.internal.ui.sourcelookup.EditSourceLookupPathAction; import org.eclipse.debug.internal.ui.sourcelookup.LookupSourceAction; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.debug.internal.ui.viewers.PresentationContext; import org.eclipse.debug.internal.ui.views.DebugUIViewsMessages; import org.eclipse.debug.ui.AbstractDebugView; @@ -235,7 +235,7 @@ public class LaunchView extends AbstractDebugView implements ISelectionChangedLi fAddToFavoritesAction = new AddToFavoritesAction(); fEditSourceAction = new EditSourceLookupPathAction(this); fLookupAction = new LookupSourceAction(this); - setAction(FIND_ACTION, new FindElementAction((AsynchronousTreeModelViewer) getViewer())); + setAction(FIND_ACTION, new FindElementAction((AsynchronousTreeViewer) getViewer())); IWorkbenchWindow window = getSite().getWorkbenchWindow(); @@ -278,7 +278,7 @@ public class LaunchView extends AbstractDebugView implements ISelectionChangedLi * @see org.eclipse.debug.ui.AbstractDebugView#createViewer(org.eclipse.swt.widgets.Composite) */ protected Viewer createViewer(Composite parent) { - AsynchronousTreeModelViewer viewer = new LaunchViewer(parent, this); + AsynchronousTreeViewer viewer = new LaunchViewer(parent, this); viewer.setContext(new PresentationContext(this)); viewer.setInput(DebugPlugin.getDefault().getLaunchManager()); @@ -435,8 +435,8 @@ public class LaunchView extends AbstractDebugView implements ISelectionChangedLi Viewer viewer = getViewer(); if (viewer != null) { viewer.removeSelectionChangedListener(this); - if (viewer instanceof AsynchronousTreeModelViewer) { - AsynchronousTreeModelViewer asyncTreeViewer = (AsynchronousTreeModelViewer) viewer; + if (viewer instanceof AsynchronousTreeViewer) { + AsynchronousTreeViewer asyncTreeViewer = (AsynchronousTreeViewer) viewer; asyncTreeViewer.dispose(); } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewUpdatePolicy.java index a2c026fad..243f7aee7 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewUpdatePolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewUpdatePolicy.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.views.launch; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; -import org.eclipse.debug.internal.ui.model.viewers.TreeUpdatePolicy; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; +import org.eclipse.debug.internal.ui.viewers.TreeUpdatePolicy; import org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta; /** @@ -37,7 +37,7 @@ public class LaunchViewUpdatePolicy extends TreeUpdatePolicy { /* (non-Javadoc) * @see org.eclipse.debug.internal.ui.viewers.update.DefaultUpdatePolicy#handleState(org.eclipse.debug.internal.ui.viewers.AsynchronousTreeModelViewer, org.eclipse.debug.internal.ui.viewers.IModelDelta) */ - protected void handleState(AsynchronousTreeModelViewer viewer, IModelDelta delta) { + protected void handleState(AsynchronousTreeViewer viewer, IModelDelta delta) { super.handleState(viewer, delta); // only context change if not already selected if ((delta.getFlags() & IModelDelta.SELECT) == 0) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewer.java index 60d783445..16cc3a941 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewer.java @@ -11,12 +11,12 @@ package org.eclipse.debug.internal.ui.views.launch; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModel; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; -import org.eclipse.debug.internal.ui.model.viewers.IModelUpdatePolicy; +import org.eclipse.debug.internal.ui.viewers.AsynchronousModel; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; +import org.eclipse.debug.internal.ui.viewers.IModelUpdatePolicy; import org.eclipse.swt.widgets.Composite; -public class LaunchViewer extends AsynchronousTreeModelViewer { +public class LaunchViewer extends AsynchronousTreeViewer { private LaunchView fView; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java index 02348b987..05a3ad402 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java @@ -34,7 +34,7 @@ import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; import org.eclipse.debug.internal.ui.contexts.DebugContextManager; import org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.debug.internal.ui.views.variables.ViewerState; import org.eclipse.debug.ui.DebugUITools; import org.eclipse.debug.ui.IDebugUIConstants; @@ -78,7 +78,7 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC public static final String PANE_ID = DebugUIPlugin.getUniqueIdentifier() + ".MemoryView.MemoryBlocksTreeViewPane"; //$NON-NLS-1$ private IViewPart fParent; - private AsynchronousTreeModelViewer fTreeViewer; + private AsynchronousTreeViewer fTreeViewer; protected IMemoryBlockRetrieval fRetrieval; private ViewPaneSelectionProvider fSelectionProvider; private AddMemoryBlockAction fAddMemoryBlockAction; @@ -238,8 +238,8 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC class MemoryViewerState extends ViewerState { private Hashtable fPathMap = new Hashtable(); - private AsynchronousTreeModelViewer fViewer; - public MemoryViewerState(AsynchronousTreeModelViewer viewer) { + private AsynchronousTreeViewer fViewer; + public MemoryViewerState(AsynchronousTreeViewer viewer) { super(viewer); fViewer = viewer; } @@ -259,7 +259,7 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC return null; } - protected TreePath decodePath(IPath path, AsynchronousTreeModelViewer viewer) throws DebugException { + protected TreePath decodePath(IPath path, AsynchronousTreeViewer viewer) throws DebugException { return (TreePath)fPathMap.get(path); } } @@ -322,7 +322,7 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC composite.setLayout(layout); fPaneId = paneId; - fTreeViewer = new AsynchronousTreeModelViewer(composite); + fTreeViewer = new AsynchronousTreeViewer(composite); MemoryViewPresentationContext presentationContext = new MemoryViewPresentationContext(fParent); presentationContext.setContainerId(getId()); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java index bf9193c92..c366b2dcc 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractVirtualContentTableModel.java @@ -12,13 +12,13 @@ package org.eclipse.debug.internal.ui.views.memory.renderings; import java.util.ArrayList; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer; -import org.eclipse.debug.internal.ui.model.viewers.ModelNode; import org.eclipse.debug.internal.ui.viewers.AsynchronousTableModel; +import org.eclipse.debug.internal.ui.viewers.AsynchronousViewer; +import org.eclipse.debug.internal.ui.viewers.ModelNode; abstract public class AbstractVirtualContentTableModel extends AsynchronousTableModel{ - public AbstractVirtualContentTableModel(AsynchronousModelViewer viewer) { + public AbstractVirtualContentTableModel(AsynchronousViewer viewer) { super(viewer); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java index 6b0fec436..7c0207713 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingUpdatePolicy.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.core.model.IMemoryBlockExtension; -import org.eclipse.debug.internal.ui.viewers.DefaultTableUpdatePolicy; +import org.eclipse.debug.internal.ui.viewers.TableUpdatePolicy; import org.eclipse.debug.internal.ui.viewers.provisional.IModelChangedListener; import org.eclipse.debug.internal.ui.viewers.provisional.IModelDelta; import org.eclipse.ui.progress.UIJob; @@ -29,7 +29,7 @@ import org.eclipse.ui.progress.UIJob; * when the memory block has changed when the rendering is not visible * */ -class AsyncTableRenderingUpdatePolicy extends DefaultTableUpdatePolicy +class AsyncTableRenderingUpdatePolicy extends TableUpdatePolicy { public void modelChanged(IModelDelta node) { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java index a30d9936d..cb50d45a2 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.Status; import org.eclipse.debug.internal.ui.DebugUIMessages; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.internal.ui.IInternalDebugUIConstants; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModel; -import org.eclipse.debug.internal.ui.model.viewers.IModelUpdatePolicy; +import org.eclipse.debug.internal.ui.viewers.AsynchronousModel; +import org.eclipse.debug.internal.ui.viewers.IModelUpdatePolicy; import org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor; import org.eclipse.debug.internal.ui.views.memory.MemoryViewUtil; import org.eclipse.jface.resource.JFaceResources; @@ -961,7 +961,7 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer { } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousModelViewer#getModel() + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousViewer#getModel() */ public AsynchronousModel getModel() { return super.getModel(); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java index 0365f73f9..e7acd91f8 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncVirtualContentTableViewer.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.SafeRunner; import org.eclipse.core.runtime.Status; import org.eclipse.debug.internal.ui.DebugUIPlugin; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousModel; +import org.eclipse.debug.internal.ui.viewers.AsynchronousModel; import org.eclipse.debug.internal.ui.viewers.AsynchronousTableViewer; import org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor; import org.eclipse.debug.internal.ui.viewers.provisional.ILabelRequestMonitor; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java index 1189928cc..4327e6e33 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingModel.java @@ -25,8 +25,8 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.model.IMemoryBlock; import org.eclipse.debug.core.model.IMemoryBlockExtension; import org.eclipse.debug.core.model.MemoryByte; -import org.eclipse.debug.internal.ui.model.viewers.ModelNode; import org.eclipse.debug.internal.ui.viewers.AsynchronousTableViewer; +import org.eclipse.debug.internal.ui.viewers.ModelNode; public class TableRenderingModel extends AbstractVirtualContentTableModel diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java index c5b9ae2f6..6e669ebef 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java @@ -47,8 +47,8 @@ import org.eclipse.debug.internal.ui.actions.variables.ShowTypesAction; import org.eclipse.debug.internal.ui.actions.variables.ToggleDetailPaneAction; import org.eclipse.debug.internal.ui.contexts.DebugContextManager; import org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; import org.eclipse.debug.internal.ui.preferences.IDebugPreferenceConstants; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.debug.internal.ui.viewers.PresentationContext; import org.eclipse.debug.internal.ui.views.AbstractViewerState; import org.eclipse.debug.internal.ui.views.IDebugExceptionHandler; @@ -397,8 +397,8 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis Viewer viewer = getViewer(); if (viewer != null) { getDetailDocument().removeDocumentListener(getDetailDocumentListener()); - if (viewer instanceof AsynchronousTreeModelViewer) { - AsynchronousTreeModelViewer asyncTreeViewer = (AsynchronousTreeModelViewer) viewer; + if (viewer instanceof AsynchronousTreeViewer) { + AsynchronousTreeViewer asyncTreeViewer = (AsynchronousTreeViewer) viewer; asyncTreeViewer.dispose(); } } @@ -782,7 +782,7 @@ public class VariablesView extends AbstractDebugView implements IDebugContextLis action = new ToggleLogicalStructureAction(this); setAction("ToggleContentProviders", action); //$NON-NLS-1$ - action = new CollapseAllAction((AsynchronousTreeModelViewer)getViewer()); + action = new CollapseAllAction((AsynchronousTreeViewer)getViewer()); setAction("CollapseAll", action); //$NON-NLS-1$ action = new ChangeVariableValueAction(this); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewer.java index f127660d3..9f589afc9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewer.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesViewer.java @@ -3,8 +3,8 @@ package org.eclipse.debug.internal.ui.views.variables; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; -import org.eclipse.debug.internal.ui.model.viewers.ModelNode; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; +import org.eclipse.debug.internal.ui.viewers.ModelNode; import org.eclipse.debug.internal.ui.viewers.provisional.IAsynchronousRequestMonitor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Composite; @@ -14,7 +14,7 @@ import org.eclipse.ui.progress.UIJob; * @since 3.2 * */ -public class VariablesViewer extends AsynchronousTreeModelViewer{ +public class VariablesViewer extends AsynchronousTreeViewer{ private VariablesView fView; @@ -45,7 +45,7 @@ public class VariablesViewer extends AsynchronousTreeModelViewer{ } /* (non-Javadoc) - * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer#internalRefresh(org.eclipse.debug.internal.ui.model.viewers.ModelNode) + * @see org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeViewer#internalRefresh(org.eclipse.debug.internal.ui.model.viewers.ModelNode) */ protected void internalRefresh(ModelNode node) { super.internalRefresh(node); diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ViewerState.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ViewerState.java index 5f3762b42..81485bf4d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ViewerState.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ViewerState.java @@ -17,7 +17,7 @@ import java.util.List; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.DebugException; -import org.eclipse.debug.internal.ui.model.viewers.AsynchronousTreeModelViewer; +import org.eclipse.debug.internal.ui.viewers.AsynchronousTreeViewer; import org.eclipse.debug.internal.ui.views.AbstractViewerState; import org.eclipse.jface.viewers.TreePath; import org.eclipse.swt.widgets.Tree; @@ -33,7 +33,7 @@ public class ViewerState extends AbstractViewerState { /** * Constructs a memento for the given viewer. */ - public ViewerState(AsynchronousTreeModelViewer viewer) { + public ViewerState(AsynchronousTreeViewer viewer) { super(viewer); } @@ -54,7 +54,7 @@ public class ViewerState extends AbstractViewerState { * @see org.eclipse.debug.internal.ui.views.AbstractViewerState#decodePath(org.eclipse.core.runtime.IPath, * org.eclipse.jface.viewers.TreeViewer) */ - protected TreePath decodePath(IPath path, AsynchronousTreeModelViewer viewer) throws DebugException { + protected TreePath decodePath(IPath path, AsynchronousTreeViewer viewer) throws DebugException { String[] names = path.segments(); Tree tree = viewer.getTree(); TreeItem[] items = tree.getItems(); |