[107428] Fix add/remove project wizard enablement and delete unused classes
diff --git a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeWizardFragment.java b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeWizardFragment.java
index 5f13289..57fd360 100644
--- a/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.tomcat.ui/tomcatui/org/eclipse/jst/server/tomcat/ui/internal/TomcatRuntimeWizardFragment.java
@@ -60,7 +60,7 @@
public void exit() {
IRuntimeWorkingCopy runtime = (IRuntimeWorkingCopy) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
IPath path = runtime.getLocation();
- if (runtime.validate(null).isOK())
+ if (runtime.validate(null).getSeverity() != IStatus.ERROR)
TomcatPlugin.setPreference("location" + runtime.getRuntimeType().getId(), path.toString());
}
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
index 9d5b18f..4be7ffb 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
@@ -131,20 +131,6 @@
}
/**
- * Returns the translated String found with the given key.
- *
- * @param key java.lang.String
- * @return java.lang.String
- */
- public static String getResource2(String key) {
- try {
- return Platform.getResourceString(getInstance().getBundle(), key);
- } catch (Exception e) {
- return key;
- }
- }
-
- /**
* Convenience method for logging.
*
* @param status org.eclipse.core.runtime.IStatus
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewRuntimeWizardFragment.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewRuntimeWizardFragment.java
index 0889da9..741d96f 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewRuntimeWizardFragment.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/fragment/NewRuntimeWizardFragment.java
@@ -19,7 +19,6 @@
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.widgets.Composite;
/**
*
@@ -56,16 +55,6 @@
return page;
}
- public boolean isComplete() {
- if (page != null) {
- if (page.getRuntime() == null)
- return false;
- IStatus status = page.getRuntime().validate(null);
- return status == null || status.getSeverity() != IStatus.ERROR;
- }
- return true;
- }
-
protected void createChildFragments(List list) {
if (getTaskModel() == null)
return;
