Reverting change done for bug 424173 as it caused a regression (bug 458868)v4430oR4_4_2M20150204-1700M20150204-0900

Change-Id: If224cfb1a5d5acb026686845bcb6cf0f57db13f8
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

4 files changed, 5 insertions, 64 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
index bba9560425..8e67570323 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -1651,21 +1651,4 @@ void updateLayout (boolean all) {
 		}
 	}
 }
-
-public void setVisible (boolean visible) {
-	super.setVisible (visible);
-
-	/*
-	 * Workaround for the Bug 424173 making the child elements visible so that
-	 * the child elements can perform pending actions
-	 */
-	Control [] list = getChildren ();
-	for (Control i: list) {
-		if ((i instanceof Table) || (i instanceof Tree)) {
-			i.setVisible (visible);
-		}
-	}
-}
 }
-
-
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index bb3abfb2ad..b10ee28a91 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -2301,18 +2301,6 @@ public void setVisible (boolean visible) {
 		OS.gtk_widget_hide (shellHandle);
 		sendEvent (SWT.Hide);
 	}
-
-	/*
-	 * Workaround for the Bug 424173 making the child elements visible so that
-	 * the child elements can perform pending actions
-	 */
-	Control [] list = getChildren ();
-
-	for (Control i: list) {
-		if (i instanceof Composite) {
-			i.setVisible (visible);
-		}
-	}
 }
 
 @Override
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
index e423d56529..2558fd1ae9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -97,8 +97,7 @@ public class Table extends Composite {
 	int drawState, drawFlags;
 	GdkColor drawForeground;
 	boolean ownerDraw, ignoreSize, ignoreAccessibility;
-	TableItem pendingShowItem = null;
-
+	
 	static final int CHECKED_COLUMN = 0;
 	static final int GRAYED_COLUMN = 1;
 	static final int FOREGROUND_COLUMN = 2;
@@ -3523,16 +3522,6 @@ public void setTopIndex (int index) {
 	OS.gtk_tree_path_free (path);
 }
 
-@Override
-public void setVisible (boolean visible) {
-	super.setVisible (visible);
-
-	if ((visible) && (pendingShowItem != null)) {
-		showItem (pendingShowItem);
-		pendingShowItem = null;
-	}
-}
-
 /**
  * Shows the column.  If the column is already showing in the receiver,
  * this method simply returns.  Otherwise, the columns are scrolled until
@@ -3616,10 +3605,6 @@ public void showItem (TableItem item) {
 	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (item.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
 	if (item.parent != this) return;
-
-	if (!this.isVisible ()) {
-		pendingShowItem = item;
-	}
 	showItem (item.handle);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
index 3b286bf834..4603cff021 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -90,7 +90,6 @@ public class Tree extends Composite {
 	int drawState, drawFlags;
 	GdkColor drawForeground;
 	boolean ownerDraw, ignoreSize, ignoreAccessibility;
-	TreeItem pendingShowItem = null;
 	
 	static final int ID_COLUMN = 0;
 	static final int CHECKED_COLUMN = 1;
@@ -3558,11 +3557,6 @@ public void showItem (TreeItem item) {
 	if (item == null) error (SWT.ERROR_NULL_ARGUMENT);
 	if (item.isDisposed ()) error(SWT.ERROR_INVALID_ARGUMENT);
 	if (item.parent != this) return;
-
-	if (!this.isVisible ()) {
-		pendingShowItem = item;
-	}
-
 	long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, item.handle);
 	showItem (path, true);
 	OS.gtk_tree_path_free (path);
@@ -3619,13 +3613,4 @@ long /*int*/ windowProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ us
 	return super.windowProc (handle, arg0, user_data);
 }
 
-@Override
-public void setVisible (boolean visible) {
-	super.setVisible (visible);
-
-	if ((visible) && (pendingShowItem != null)) {
-		showItem (pendingShowItem);
-		pendingShowItem = null;
-	}
-}
 }