commit 21620c0fccd54cd6dffeba1960b2cd291ed77abb
author nitind <nitind> Thu Sep 29 01:50:40 2005 +0000
committer nitind <nitind> Thu Sep 29 01:50:40 2005 +0000
tree 4e9dcecff164e03417934e474742187b5425c98b
parent e64d5045c477091dbc83abd7ec5b20f5d314aca7

change getTreeviewer().getControl() calls to just getControl()

bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/ConfigurableContentOutlinePage.java

diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/ConfigurableContentOutlinePage.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/ConfigurableContentOutlinePage.java
index 2a90f02..05cb2ed 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/ConfigurableContentOutlinePage.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/contentoutline/ConfigurableContentOutlinePage.java
@@ -378,9 +378,9 @@
 		getControl().setMenu(menu);
 
 		fDragAdapter = new DelegatingDragAdapter();
-		fDragSource = new DragSource(getTreeViewer().getControl(), DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);
+		fDragSource = new DragSource(getControl(), DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);
 		fDropAdapter = new DelegatingDropAdapter();
-		fDropTarget = new DropTarget(getTreeViewer().getControl(), DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);
+		fDropTarget = new DropTarget(getControl(), DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK);
 
 		setConfiguration(getConfiguration());
 
@@ -498,11 +498,11 @@
 		// configuration
 		if (getTreeViewer() != null) {
 			// remove the key listeners
-			if (getTreeViewer().getControl() != null && !getTreeViewer().getControl().isDisposed()) {
+			if (getControl() != null && !getControl().isDisposed()) {
 				KeyListener[] listeners = getConfiguration().getKeyListeners(getTreeViewer());
 				if (listeners != null) {
 					for (int i = 0; i < listeners.length; i++) {
-						getTreeViewer().getControl().removeKeyListener(listeners[i]);
+						getControl().removeKeyListener(listeners[i]);
 					}
 				}
 			}
@@ -636,7 +636,7 @@
 			KeyListener[] listeners = getConfiguration().getKeyListeners(getTreeViewer());
 			if (listeners != null) {
 				for (int i = 0; i < listeners.length; i++) {
-					getTreeViewer().getControl().addKeyListener(listeners[i]);
+					getControl().addKeyListener(listeners[i]);
 				}
 			}
 		}
@@ -706,8 +706,8 @@
 					fContextMenuManager.addMenuListener(listener);
 				fContextMenuManager.addMenuListener(fGroupAdder);
 
-				fContextMenu = fContextMenuManager.createContextMenu(getTreeViewer().getControl());
-				getTreeViewer().getControl().setMenu(fContextMenu);
+				fContextMenu = fContextMenuManager.createContextMenu(getControl());
+				getControl().setMenu(fContextMenu);
 
 				getSite().registerContextMenu(fContextMenuId, fContextMenuManager, this);