[183317] Cleanup access rules

7 files changed, 25 insertions, 73 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
index ece67da1f..e89817519 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
@@ -49,7 +49,7 @@ import org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider;
 import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.internal.Workbench;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.navigator.CommonViewer;
 import org.eclipse.ui.navigator.INavigatorContentService;
 import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
@@ -117,7 +117,7 @@ public class J2EEComponentProjectMigrator implements IComponentProjectMigrator {
 	private void ensureJ2EEContentExtensionsEnabled() {
 		IViewPart view = null;
 		try {
-			view = Workbench.getInstance().getWorkbenchWindows()[0].getActivePage().findView(PROJECT_EXPLORER);
+			view = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getActivePage().findView(PROJECT_EXPLORER);
 		} catch (Exception e) { 
 			//Just bail and return if there is no view
 		}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
index 20e606fcc..3cf6c7da2 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.internal.Workbench;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
 import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
 import org.eclipse.wst.common.internal.emfworkbench.validateedit.IValidateEditContext;
@@ -53,12 +53,12 @@ public class ValidateEditListener extends ShellAdapter implements IValidateEditL
 		try {
 			Display.getDefault().asyncExec(new Runnable() {
 				public void run() {
-					IWorkbench wb = Workbench.getInstance();
+					IWorkbench wb = PlatformUI.getWorkbench();
 					if (wb == null) return;
 					IWorkbenchWindow window = wb.getActiveWorkbenchWindow();
-					if (window == null && Workbench.getInstance().getWorkbenchWindowCount()>0) {
-						for (int i=0; i<Workbench.getInstance().getWorkbenchWindows().length; i++) {
-							window = Workbench.getInstance().getWorkbenchWindows()[i];
+					if (window == null && wb.getWorkbenchWindowCount()>0) {
+						for (int i=0; i<wb.getWorkbenchWindows().length; i++) {
+							window = wb.getWorkbenchWindows()[i];
 							if (window != null)
 								break;
 						}
@@ -231,9 +231,9 @@ public class ValidateEditListener extends ShellAdapter implements IValidateEditL
 	}
 
 	public IStatus validateState() {
-		IWorkbench wb = Workbench.getInstance();
-		if ((fShell==null) && (wb != null && (Workbench.getInstance().getActiveWorkbenchWindow() != null)))
-			fShell=Workbench.getInstance().getActiveWorkbenchWindow().getShell();
+		IWorkbench wb = PlatformUI.getWorkbench();
+		if ((fShell==null) && (wb != null && (wb.getActiveWorkbenchWindow() != null)))
+			fShell=wb.getActiveWorkbenchWindow().getShell();
 		if (fNeedsStateValidation) {
 			setNeedsStateValidation(false);
 			try {
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java
index 7ef0dec23..37accf110 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java
@@ -318,22 +318,7 @@ public abstract class J2EEComponentCreationWizardPage extends DataModelWizardPag
         earGroup = new ServerEarAndStandaloneGroup(parent, getDataModel(), synchHelper);
     }
 
-	/**
-	 * @return
-	 */
-//	private IProject getSelectedProject() {
-//		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-//		if (window == null)
-//			return null;
-//		ISelection selection = window.getSelectionService().getSelection();
-//		if (selection == null || !(selection instanceof StructuredSelection))
-//			return null;
-//		StructuredSelection stucturedSelection = (StructuredSelection) selection;
-//		Object obj = stucturedSelection.getFirstElement();
-//		if (obj instanceof IProject)
-//			return (IProject) obj;
-//		return null;
-//	}
+
 	
     protected String[] getValidationPropertyNames() {
         return new String[]{IComponentCreationDataModelProperties.PROJECT_NAME, RUNTIME_TARGET_ID, COMPONENT_VERSION, COMPONENT_NAME, LOCATION, EAR_COMPONENT_NAME, ADD_TO_EAR, JAVASOURCE_FOLDER };    }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java
index 1ff6ce074..5b0a13047 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java
@@ -42,8 +42,8 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IPluginContribution;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.activities.WorkbenchActivityHelper;
-import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.wizards.IWizardDescriptor;
 import org.eclipse.ui.wizards.IWizardRegistry;
 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
@@ -390,7 +390,7 @@ public class NewJ2EEComponentSelectionPage extends DataModelWizardPage implement
                 protected IWizard createWizard() {
                     NewProjectDataModelFacetWizard result = null;
 
-                    IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
+                    IWizardRegistry newWizardRegistry = PlatformUI.getWorkbench().getNewWizardRegistry();
                     IWizardDescriptor descriptor = newWizardRegistry.findWizard("org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"); //$NON-NLS-1$
                     try {
                         result = (NewProjectDataModelFacetWizard)descriptor.createWizard();
@@ -428,7 +428,7 @@ public class NewJ2EEComponentSelectionPage extends DataModelWizardPage implement
                 protected IWizard createWizard() {
                 	NewProjectDataModelFacetWizard result = null;
 
-                    IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
+                    IWizardRegistry newWizardRegistry = PlatformUI.getWorkbench().getNewWizardRegistry();
                     IWizardDescriptor descriptor = newWizardRegistry.findWizard("org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard"); //$NON-NLS-1$
                     try {
                         result = (NewProjectDataModelFacetWizard)descriptor.createWizard();
@@ -465,7 +465,7 @@ public class NewJ2EEComponentSelectionPage extends DataModelWizardPage implement
                  */
                 protected IWizard createWizard() {
                 	NewProjectDataModelFacetWizard result = null;
-                    IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
+                    IWizardRegistry newWizardRegistry = PlatformUI.getWorkbench().getNewWizardRegistry();
                     IWizardDescriptor servletWizardDescriptor = newWizardRegistry.findWizard("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"); //$NON-NLS-1$
                     try {
                         result = (NewProjectDataModelFacetWizard)servletWizardDescriptor.createWizard();
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java
index 89c2f6f35..74e3f0cd7 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java
@@ -49,7 +49,6 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.Workbench;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
 
@@ -331,7 +330,7 @@ public class NewJavaClassOptionsWizardPage extends DataModelWizardPage {
 	 */
 	protected void handleInterfaceAddButtonSelected() {
 		IProject project = (IProject) model.getProperty(INewJavaClassDataModelProperties.PROJECT);
-		IRunnableContext context = Workbench.getInstance().getActiveWorkbenchWindow();
+		IRunnableContext context = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
 		// this eliminates the non-exported classpath entries
 		final IJavaSearchScope scope = TypeSearchEngine.createJavaSearchScopeForAProject(javaProject, true, true);
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
index 259938ef3..21cdb7bc7 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
@@ -70,7 +70,6 @@ import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.internal.Workbench;
 import org.eclipse.ui.model.WorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.ui.views.contentoutline.ContentOutline;
@@ -549,7 +548,7 @@ public class NewJavaClassWizardPage extends DataModelWizardPage {
 	 * @return
 	 */
 	private IProject getSelectedProject() {
-		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		if (window == null)
 			return null;
 		ISelection selection = window.getSelectionService().getSelection();
@@ -574,7 +573,7 @@ public class NewJavaClassWizardPage extends DataModelWizardPage {
 	 * @return
 	 */
 	private IPackageFragment getSelectedPackageFragment() {
-		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		if (window == null)
 			return null;
 		ISelection selection = window.getSelectionService().getSelection();
@@ -594,7 +593,7 @@ public class NewJavaClassWizardPage extends DataModelWizardPage {
 	}
 	
 	private IPackageFragmentRoot getSelectedPackageFragmentRoot() {
-		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		if (window == null)
 			return null;
 		ISelection selection = window.getSelectionService().getSelection();
@@ -642,9 +641,12 @@ public class NewJavaClassWizardPage extends DataModelWizardPage {
 			}
 		}
 		if (jelem == null) {
-			IWorkbenchPart part = JavaPlugin.getActivePage().getActivePart();
+			IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+			if (window == null)
+				return null;
+			IWorkbenchPart part = window.getActivePage().getActivePart();
 			if (part instanceof ContentOutline) {
-				part = JavaPlugin.getActivePage().getActiveEditor();
+				part = window.getActivePage().getActiveEditor();
 			}
 
 			if (part instanceof IViewPartInputProvider) {
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java
index cb0f3ad3b..2e6393631 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java
@@ -144,41 +144,7 @@ public class NewModuleGroup implements IJ2EEComponentCreationDataModelProperties
 //		synchHelper.synchCombo(projectNameCombo, PROJECT_NAME, new Control[]{projectNameLabel});
 //	}
 	
-	/**
-	 * @return
-	 */
-//	private IProject getSelectedProject() {
-//		IWorkbenchWindow window = Workbench.getInstance().getActiveWorkbenchWindow();
-//		if (window == null)
-//			return null;
-//		ISelection selection = window.getSelectionService().getSelection();
-//		if (selection == null || !(selection instanceof StructuredSelection))
-//			return null;
-//		StructuredSelection stucturedSelection = (StructuredSelection) selection;
-//		Object obj = stucturedSelection.getFirstElement();
-//		if (obj instanceof IProject)
-//			return (IProject) obj;
-//		return null;
-//	}
-//	
-	/**
-	 * 
-	 *
-	 */
-//	private void handleNewProjectSelected() {
-//		IDataModel projModel = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
-//		FlexibleProjectCreationWizard newProjectWizard = new FlexibleProjectCreationWizard(projModel);
-//		WizardDialog dialog = new WizardDialog(parentComposite.getShell(), newProjectWizard);
-//		if (Window.OK == dialog.open()) {
-//			String newProjectName = projModel.getStringProperty(PROJECT_NAME);
-//			projectNameCombo.add(newProjectName);
-//			projectNameCombo.setText(newProjectName);
-//			IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
-//			IRuntime runtime = ServerCore.getProjectProperties(project).getRuntimeTarget();
-//			if (runtime != null)
-//				serverTargetText.setText(runtime.getName());
-//		}
-//	}
+	
 	
 	/**
 	 *