Move ShellStateListener to only test class that uses it

ShellStateListener is only used in a single test class, so move it there
from the to-be-removed UITestCase.

Author: HeikoKlare

tests/org.eclipse.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/UITestCase.java

@@ -22,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -31,8 +30,6 @@
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceMemento;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.events.ShellListener;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
@@ -330,39 +327,6 @@ public static boolean forceActive(Shell shell) {
 		return display.getActiveShell() == shell;
 	}
 
-	public static class ShellStateListener implements ShellListener {
-		private final AtomicBoolean shellIsActive;
-
-		public ShellStateListener(AtomicBoolean shellIsActive) {
-			this.shellIsActive = shellIsActive;
-		}
-
-		@Override
-		public void shellIconified(ShellEvent e) {
-			shellIsActive.set(false);
-		}
-
-		@Override
-		public void shellDeiconified(ShellEvent e) {
-			shellIsActive.set(true);
-		}
-
-		@Override
-		public void shellDeactivated(ShellEvent e) {
-			shellIsActive.set(false);
-		}
-
-		@Override
-		public void shellClosed(ShellEvent e) {
-			shellIsActive.set(false);
-		}
-
-		@Override
-		public void shellActivated(ShellEvent e) {
-			shellIsActive.set(true);
-		}
-	}
-
 	public static interface Condition {
 		public boolean compute();
 	}

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPageTest.java

@@ -37,6 +37,7 @@
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.swt.events.ShellEvent;
 import org.eclipse.swt.events.ShellListener;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
@@ -3332,4 +3333,38 @@ public void testGetViewStackWithSecondaryId() throws PartInitException {
 
 		assertEquals(part, stack[0]);
 	}
+
+	private static class ShellStateListener implements ShellListener {
+		private final AtomicBoolean shellIsActive;
+
+		public ShellStateListener(AtomicBoolean shellIsActive) {
+			this.shellIsActive = shellIsActive;
+		}
+
+		@Override
+		public void shellIconified(ShellEvent e) {
+			shellIsActive.set(false);
+		}
+
+		@Override
+		public void shellDeiconified(ShellEvent e) {
+			shellIsActive.set(true);
+		}
+
+		@Override
+		public void shellDeactivated(ShellEvent e) {
+			shellIsActive.set(false);
+		}
+
+		@Override
+		public void shellClosed(ShellEvent e) {
+			shellIsActive.set(false);
+		}
+
+		@Override
+		public void shellActivated(ShellEvent e) {
+			shellIsActive.set(true);
+		}
+	}
+
 }