Author: rob.stryker(a)jboss.com Date: 2012-02-17 07:32:37 -0500 (Fri, 17 Feb 2012) New Revision: 38864 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java Log: JBIDE-10511 - fixed it Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-17 10:34:22 UTC (rev 38863) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-17 12:32:37 UTC (rev 38864) @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.core.ServerCore; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; @@ -81,8 +82,27 @@ , getRemoteName() , getRepositoryFile()) .execute(monitor); - createServerAdapter(monitor, importedProjects); + String appName = getApplication().getName(); + String host = getApplication().getApplicationUrl(); + IServer found = findServer(appName, host); + if( found == null ) + createServerAdapter(monitor, importedProjects); + else { + new ServerAdapterFactory().addModules(found, importedProjects, monitor); + } } + + private IServer findServer(String appName, String host) { + IServer[] all = ServerCore.getServers(); + for( int i = 0; i < all.length; i++ ) { + String host1 = all[i].getHost(); + String app1 = ExpressServerUtils.getExpressApplicationName(all[i]); + if( (host.endsWith("/" + host1 + "/") || (host.endsWith("/" + host1))) + && appName.equals(app1)) + return all[i]; + } + return null; + } /** * Enables the user chosen, unshared project to be used on the chosen Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-02-17 10:34:22 UTC (rev 38863) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-02-17 12:32:37 UTC (rev 38864) @@ -112,6 +112,10 @@ application.getName(), application.getUUID(), mode, remoteName); return server; } + + public void addModules(IServer server, List<IProject> importedProjects, IProgressMonitor monitor) throws CoreException { + addModules(getModules(importedProjects), server, monitor); + } private void addModules(List<IModule> modules, IServer server, IProgressMonitor monitor) throws CoreException { if (modules == null