Bug 377980 - Move org.eclipse.e4.ui.widgets.CTabFolder back to SWTv20120428-0129I20120429-2200

4 files changed, 8 insertions, 29 deletions

diff --git a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CssSpyDialog.java b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CssSpyDialog.java
index 177af623..6a55e106 100644
--- a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CssSpyDialog.java
+++ b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CssSpyDialog.java
@@ -55,6 +55,7 @@ import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
@@ -399,15 +400,11 @@ public class CssSpyDialog extends Dialog {
 			ToolItem item = (ToolItem) widget;
 			Rectangle bounds = item.getBounds();
 			return item.getDisplay().map(item.getParent(), null, bounds);
-		} else if (widget instanceof org.eclipse.swt.custom.CTabItem) {
-			org.eclipse.swt.custom.CTabItem item = (org.eclipse.swt.custom.CTabItem) widget;
+		} else if (widget instanceof CTabItem) {
+			CTabItem item = (CTabItem) widget;
 			Rectangle bounds = item.getBounds();
 			return item.getDisplay().map(item.getParent(), null, bounds);
-		} else if (widget instanceof org.eclipse.e4.ui.widgets.CTabItem) {
-			org.eclipse.e4.ui.widgets.CTabItem item = (org.eclipse.e4.ui.widgets.CTabItem) widget;
-			Rectangle bounds = item.getBounds();
-			return item.getDisplay().map(item.getParent(), null, bounds);
-		}
+		} 
 		// FIXME: figure out how to map items to a position
 		return null;
 	}
diff --git a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/WidgetTreeProvider.java b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/WidgetTreeProvider.java
index fe8aaf60..f9af9909 100644
--- a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/WidgetTreeProvider.java
+++ b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/WidgetTreeProvider.java
@@ -17,6 +17,7 @@ import java.util.List;
 import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -65,10 +66,8 @@ public class WidgetTreeProvider implements ITreeContentProvider {
 		if (element instanceof Control) {
 			Control control = (Control) element;
 			return control.isDisposed() ? null : control.getParent();
-		} else if (element instanceof org.eclipse.swt.custom.CTabItem) {
-			return ((org.eclipse.swt.custom.CTabItem) element).getParent();
-		} else if (element instanceof org.eclipse.e4.ui.widgets.CTabItem) {
-			return ((org.eclipse.e4.ui.widgets.CTabItem) element).getParent();
+		} else if (element instanceof CTabItem) {
+			return ((CTabItem) element).getParent();
 		} else if (element instanceof ToolItem) {
 			return ((ToolItem) element).getParent();
 		}
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
index 5e74fa25..94fcb0c1 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetContentProvider.java
@@ -71,11 +71,6 @@ public class WidgetContentProvider implements ITreeContentProvider {
 			if (item.getControl() != null) {
 				return new Object[] { item.getControl() };
 			}
-		} else if (parentElement instanceof org.eclipse.e4.ui.widgets.CTabItem) {
-			org.eclipse.e4.ui.widgets.CTabItem item = (org.eclipse.e4.ui.widgets.CTabItem) parentElement;
-			if (item.getControl() != null) {
-				return new Object[] { item.getControl() };
-			}
 		} else if (parentElement instanceof Tree) {
 			Tree tree = (Tree) parentElement;
 
@@ -94,12 +89,6 @@ public class WidgetContentProvider implements ITreeContentProvider {
 			Object[] rv = new Object[items.length];
 			System.arraycopy(items, 0, rv, 0, rv.length);
 			return rv;
-		} else if (parentElement instanceof org.eclipse.e4.ui.widgets.CTabFolder) {
-			org.eclipse.e4.ui.widgets.CTabFolder tabFolder = (org.eclipse.e4.ui.widgets.CTabFolder) parentElement;
-			org.eclipse.e4.ui.widgets.CTabItem[] items = tabFolder.getItems();
-			Object[] rv = new Object[items.length];
-			System.arraycopy(items, 0, rv, 0, rv.length);
-			return rv;
 		} else if (parentElement instanceof TabFolder) {
 			TabFolder tabFolder = (TabFolder) parentElement;
 			TabItem[] items = tabFolder.getItems();
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
index 0318e46c..b1811dca 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/uistructure/WidgetLabelProvider.java
@@ -121,7 +121,7 @@ public class WidgetLabelProvider extends StyledCellLabelProvider {
 		} else if (element instanceof TabFolder) {
 			cell.setText("TabFolder"); //$NON-NLS-1$
 			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_tabfolder_obj));
-		} else if (element instanceof CTabFolder || element instanceof org.eclipse.e4.ui.widgets.CTabFolder) {
+		} else if (element instanceof CTabFolder) {
 			cell.setText("CTabFolder"); //$NON-NLS-1$
 			cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_ctabfolder_obj));
 		} else if (element instanceof Combo) {
@@ -169,12 +169,6 @@ public class WidgetLabelProvider extends StyledCellLabelProvider {
 			cell.setStyleRanges(s.getStyleRanges());
 			cell.setText(s.getString());
 			// cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
-		} else if (element instanceof org.eclipse.e4.ui.widgets.CTabItem) {
-			StyledString s = new StyledString("CTabItem"); //$NON-NLS-1$
-			s.append(" - " + ((org.eclipse.e4.ui.widgets.CTabItem) element).getText(), StyledString.DECORATIONS_STYLER); //$NON-NLS-1$
-			cell.setStyleRanges(s.getStyleRanges());
-			cell.setText(s.getString());
-			// cell.setImage(resourcePool.getImageUnchecked(ResourceProvider.IMG_Widgets_clabel_obj));
 		} else if (element instanceof Button) {
 			Button b = (Button) element;
 			if ((b.getStyle() & SWT.PUSH) == SWT.PUSH) {