revert, causes 170 JUnit failures
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
index dc47f1d..1887624 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/ServerUtil.java
@@ -53,7 +53,7 @@
if (factories != null) {
int size = factories.length;
for (int i = 0; i < size; i++) {
- IModule[] modules = factories[i].getModules(project);
+ IModule[] modules = factories[i].getModules();
if (modules != null) {
int size2 = modules.length;
for (int j = 0; j < size2; j++) {
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModuleFactory.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModuleFactory.java
index 050abbe..8eaaf83 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModuleFactory.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/ModuleFactory.java
@@ -13,7 +13,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -118,10 +117,6 @@
}
return null;
}
-
- public IModule[] getModules(IProject project) {
- return getDelegate(null).getModules(project);
- }
public void clearModuleCache() {
modules = null;
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleFactoryDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleFactoryDelegate.java
index db0b5ff..461d813 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleFactoryDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/model/ModuleFactoryDelegate.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.wst.server.core.model;
-import java.util.ArrayList;
-
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.wst.server.core.IModule;
@@ -138,22 +136,4 @@
* @return a possibly-empty array of modules {@link IModule}
*/
public abstract IModule[] getModules();
-
- /**
- * Return the modules for the given project.
- * This default implementation is not optimized and subclasses should override
- * @param project
- * @return
- */
- public IModule[] getModules(IProject project) {
- if (project == null) throw new IllegalArgumentException();
- IModule[] modules = getModules();
- ArrayList projectModules = new ArrayList();
- for(int i=0;i<modules.length;i++) {
- if (modules[i].getProject().equals(project)) {
- projectModules.add(modules[i]);
- }
- }
- return (IModule[])projectModules.toArray(new IModule[projectModules.size()]);
- }
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java
index 6190019..a177b84 100644
--- a/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java
+++ b/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/util/ProjectModuleFactoryDelegate.java
@@ -95,10 +95,6 @@
modules.toArray(modules2);
return modules2;
}
-
- public IModule[] getModules(IProject project) {
- return createModules(project);
- }
/**
* Handle changes to a project.
