Author: rob.stryker(a)jboss.com Date: 2012-02-09 09:20:09 -0500 (Thu, 09 Feb 2012) New Revision: 38554 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java Log: Ensuring credential page is only skipped if selection is an IUser or one is explicitly provided for import also Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-02-09 14:19:57 UTC (rev 38553) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-02-09 14:20:09 UTC (rev 38554) @@ -3,6 +3,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.viewers.TreePath; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Display; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; @@ -10,6 +11,7 @@ import org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard; import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; public class ImportApplicationAction extends AbstractAction { @@ -25,6 +27,12 @@ final IApplication application = (IApplication) treeSelection.getFirstElement(); //final IUser user = OpenShiftUIActivator.getDefault().getUser(); OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(); + TreePath[] paths = treeSelection.getPaths(); + if( paths != null && paths.length == 1 ) { + Object user = paths[0].getParentPath().getLastSegment(); + if( user instanceof IUser ) + wizard.setInitialUser((IUser)user); + } wizard.setSelectedApplication(application); final IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(application.getName()); if(project.exists()) {