Author: adietish Date: 2012-02-06 11:55:09 -0500 (Mon, 06 Feb 2012) New Revision: 38447 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftApplicationWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java Log: [JBIDE-10805] fixing NPE. could not completely verify yet - prod and stg are currently down Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftApplicationWizardModel.java 2012-02-06 15:38:49 UTC (rev 38446) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftApplicationWizardModel.java 2012-02-06 16:55:09 UTC (rev 38447) @@ -17,6 +17,7 @@ import org.eclipse.wst.server.core.ServerCore; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.egit.core.EGitUtils; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ConfigureGitSharedProject; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ConfigureUnsharedProject; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportNewProject; @@ -24,7 +25,6 @@ import com.openshift.express.client.IApplication; import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IUser; import com.openshift.express.client.OpenShiftException; public class AbstractOpenShiftApplicationWizardModel extends ObservableUIPojo implements IOpenShiftWizardModel { @@ -94,7 +94,7 @@ getProjectName() , getApplication() , getRemoteName() - , getUser()) + , OpenShiftUIActivator.getDefault().getUser()) .execute(monitor); createServerAdapter(monitor, importedProjects); } @@ -132,7 +132,8 @@ getProjectName() , getApplication() , getRemoteName() - , getUser()) +// , getUser()) + , OpenShiftUIActivator.getDefault().getUser()) .execute(monitor); createServerAdapter(monitor, importedProjects); } @@ -166,15 +167,17 @@ return dataModel.get(key); } - @Override - public void setUser(IUser user) { - setProperty(USER, user); - } +// @Override +// public void setUser(IUser user) { +// setProperty(USER, user); +// OpenShiftUIActivator.getDefault().setUser(user); +// } - @Override - public IUser getUser() { - return (IUser) getProperty(USER); - } +// @Override +// public IUser getUser() { +// return (IUser) getProperty(USER); +// return OpenShiftUIActivator.getDefault().getUser(); +// } @Override public IApplication getApplication() { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-06 15:38:49 UTC (rev 38446) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-06 16:55:09 UTC (rev 38447) @@ -26,7 +26,7 @@ import com.openshift.express.client.OpenShiftException; /** - * @author Andr� Dietisheim + * @author Andr� Dietisheim * @author Xavier Coulon * */ @@ -52,7 +52,8 @@ } public IUser getUser() { - return wizardModel.getUser(); +// return wizardModel.getUser(); + return OpenShiftUIActivator.getDefault().getUser(); } public void loadExistingApplications() throws OpenShiftException { @@ -77,7 +78,8 @@ } public void loadCartridges() throws OpenShiftException { - setCartridges(wizardModel.getUser().getCartridges()); +// setCartridges(wizardModel.getUser().getCartridges()); + setCartridges(OpenShiftUIActivator.getDefault().getUser().getCartridges()); } public void setCartridges(List<ICartridge> cartridges) { @@ -99,7 +101,8 @@ } public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException { - List<IEmbeddableCartridge> cartridges = wizardModel.getUser().getEmbeddableCartridges(); +// List<IEmbeddableCartridge> cartridges = wizardModel.getUser().getEmbeddableCartridges(); + List<IEmbeddableCartridge> cartridges = OpenShiftUIActivator.getDefault().getUser().getEmbeddableCartridges(); setEmbeddableCartridges(cartridges); return cartridges; } @@ -155,7 +158,8 @@ public boolean hasApplication(ICartridge cartridge) { try { - return wizardModel.getUser().hasApplication(cartridge); +// return wizardModel.getUser().hasApplication(cartridge); + return getUser().hasApplication(cartridge); } catch (OpenShiftException e) { OpenShiftUIActivator.log(OpenShiftUIActivator .createErrorStatus("Could not get application by cartridge", e)); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionWizardPageModel.java 2012-02-06 15:38:49 UTC (rev 38446) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionWizardPageModel.java 2012-02-06 16:55:09 UTC (rev 38447) @@ -14,6 +14,7 @@ import java.util.List; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import com.openshift.express.client.IApplication; import com.openshift.express.client.IUser; @@ -63,7 +64,7 @@ } public IUser getUser() { - return wizardModel.getUser(); + return OpenShiftUIActivator.getDefault().getUser(); } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-06 15:38:49 UTC (rev 38446) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-06 16:55:09 UTC (rev 38447) @@ -49,13 +49,15 @@ public void addPages() { final IUser user = OpenShiftUIActivator.getDefault().getUser(); try { - if (user == null || !user.isValid()) { + if (user == null + || !user.isValid()) { addPage(new CredentialsWizardPage(this)); - } else { - getWizardModel().setUser(user); +// } else { +// getWizardModel().setUser(user); } } catch (OpenShiftException e) { - // if the user's validity can't be checked, we may want to re-connect.. + // if the user's validity can't be checked, we may want to + // re-connect.. addPage(new CredentialsWizardPage(this)); } addPage(new ApplicationConfigurationWizardPage(this, getWizardModel())); @@ -81,13 +83,13 @@ if (successfull) { try { final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor(); - IStatus jobResult = WizardUtils.runInWizard(new ImportJob(delegatingMonitor), delegatingMonitor, - getContainer()); + IStatus jobResult = WizardUtils.runInWizard( + new ImportJob(delegatingMonitor), delegatingMonitor, getContainer()); return JobUtils.isOk(jobResult); } catch (Exception e) { - ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.", new Status( - IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - "An exception occurred while creating local git repository.", e)); + ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.", + new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, + "An exception occurred while creating local git repository.", e)); return false; } } @@ -129,10 +131,11 @@ protected IStatus run(IProgressMonitor monitor) { try { - List<IEmbeddableCartridge> selectedCartridges = getWizardModel() - .getSelectedEmbeddableCartridges(); + List<IEmbeddableCartridge> selectedCartridges = + getWizardModel().getSelectedEmbeddableCartridges(); final IApplication application = getWizardModel().getApplication(); - if (selectedCartridges != null && !selectedCartridges.isEmpty()) { + if (selectedCartridges != null + && !selectedCartridges.isEmpty()) { application.addEmbbedCartridges(selectedCartridges); } queue.offer(true); @@ -150,5 +153,4 @@ return false; } } - } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java 2012-02-06 15:38:49 UTC (rev 38446) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java 2012-02-06 16:55:09 UTC (rev 38447) @@ -5,11 +5,13 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osgi.util.NLS; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import com.openshift.express.client.IApplication; import com.openshift.express.client.ICartridge; import com.openshift.express.client.IEmbeddableCartridge; +import com.openshift.express.client.IUser; import com.openshift.express.client.OpenShiftApplicationNotAvailableException; import com.openshift.express.client.OpenShiftException; @@ -37,7 +39,11 @@ } public IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { - IApplication application = getUser().createApplication(name, cartridge); + IUser user = OpenShiftUIActivator.getDefault().getUser(); + if (user == null) { + throw new OpenShiftException("Could not create application, have no valid user credentials"); + } + IApplication application = user.createApplication(name, cartridge); waitForAccessible(application, monitor); return application; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-06 15:38:49 UTC (rev 38446) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-06 16:55:09 UTC (rev 38447) @@ -12,6 +12,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.debug.internal.ui.importexport.launchconfigurations.WizardMessages; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; @@ -126,7 +127,6 @@ this.user = new User(getRhLogin(), getPassword(), CLIENT_ID); if (user.isValid()) { status = Status.OK_STATUS; - OpenShiftUIActivator.getDefault().setUser(user); } } catch (NotFoundOpenShiftException e) { // valid user without domain @@ -137,6 +137,9 @@ this.user = null; } + if (status.isOK()) { + OpenShiftUIActivator.getDefault().setUser(user); + } setCredentialsStatus(status); return status; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java 2012-02-06 15:38:49 UTC (rev 38446) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java 2012-02-06 16:55:09 UTC (rev 38447) @@ -24,7 +24,6 @@ import com.openshift.express.client.IApplication; import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IUser; import com.openshift.express.client.OpenShiftException; /** @@ -127,10 +126,10 @@ public Object getProperty(String key); - public void setUser(IUser user); +// public void setUser(IUser user); +// +// public IUser getUser(); - public IUser getUser(); - public IApplication getApplication(); public String getApplicationName(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java 2012-02-06 15:38:49 UTC (rev 38446) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java 2012-02-06 16:55:09 UTC (rev 38447) @@ -75,8 +75,6 @@ try { if(user == null || !user.isValid()) { addPage(new CredentialsWizardPage(this)); - } else { - getWizardModel().setUser(user); } } catch (OpenShiftException e) { // if the user's validity can't be checked, we may want to re-connect.. 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-06 15:38:49 UTC (rev 38446) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-02-06 16:55:09 UTC (rev 38447) @@ -51,7 +51,7 @@ public void create(IProject project, IOpenShiftWizardModel wizardModel, IProgressMonitor monitor) throws OpenShiftException { createServerAdapter(project, wizardModel.getServerType(), wizardModel.getRuntime(), wizardModel.getMode(), - wizardModel.getApplication(), wizardModel.getUser(), wizardModel.getRemoteName(), monitor); + wizardModel.getApplication(), OpenShiftUIActivator.getDefault().getUser(), wizardModel.getRemoteName(), monitor); } public void create(IProject project, IServerType serverType, IRuntime runtime, String mode,