[jbosstools-commits] JBoss Tools SVN: r38975 - in branches/jbosstools-3.3.0.Beta1/openshift/plugins: org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directory.

Author: adietish Date: 2012-02-22 08:24:32 -0500 (Wed, 22 Feb 2012) New Revision: 38975 Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java Log: [JBIDE-10484] now reporting error details to the user Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.1.1-SNAPSHOT.jar =================================================================== (Binary files differ) Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-02-22 12:41:50 UTC (rev 38974) +++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-02-22 13:24:32 UTC (rev 38975) @@ -15,10 +15,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftEndpointException; /** * @author Andre Dietisheim @@ -47,8 +49,12 @@ try { model.renameDomain(); return Status.OK_STATUS; + } catch(OpenShiftEndpointException e) { + return OpenShiftUIActivator.createErrorStatus(NLS.bind( + "Could not create domain \"{0}\": {1}", model.getNamespace(), e.getResponseResult()), e); } catch (Exception e) { - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not rename domain", e); + return OpenShiftUIActivator.createErrorStatus(NLS.bind( + "Could not rename domain {0}", model.getNamespace()), e); } } }, getContainer()); Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-02-22 12:41:50 UTC (rev 38974) +++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-02-22 13:24:32 UTC (rev 38975) @@ -20,6 +20,7 @@ import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftEndpointException; /** * @author André Dietisheim @@ -41,9 +42,12 @@ protected IStatus run(IProgressMonitor monitor) { try { model.createDomain(); + } catch (OpenShiftEndpointException e) { + return OpenShiftUIActivator.createErrorStatus(NLS.bind( + "Could not create domain \"{0}\": {1}", model.getNamespace(), e.getResponseResult()), e); } catch (Exception e) { - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - NLS.bind("Could not create domain \"{0}\"", model.getNamespace()), e); + return OpenShiftUIActivator.createErrorStatus(NLS.bind( + "Could not create domain \"{0}\"", model.getNamespace()), e); } return Status.OK_STATUS; } Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22 12:41:50 UTC (rev 38974) +++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22 13:24:32 UTC (rev 38975) @@ -45,6 +45,7 @@ import com.openshift.express.client.IApplication; import com.openshift.express.client.IEmbeddableCartridge; import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftEndpointException; import com.openshift.express.client.OpenShiftException; /** @@ -193,8 +194,12 @@ try { getWizardModel().createApplication(monitor); return Status.OK_STATUS; - } catch (Exception e) { + } catch (OpenShiftEndpointException e) { // TODO: refresh user + return OpenShiftUIActivator.createErrorStatus("Could not create application \"{0}\": {1}", + e, applicationName, e.getResponseResult()); + } catch (OpenShiftException e) { + // TODO: refresh user return OpenShiftUIActivator.createErrorStatus("Could not create application \"{0}\"", e, applicationName); } @@ -210,9 +215,9 @@ private boolean addRemoveCartridges(final IApplication application, final Set<IEmbeddableCartridge> selectedCartridges) { try { + final String applicationName = getWizardModel().getApplication().getName(); IStatus status = WizardUtils.runInWizard( - new Job(NLS.bind("Adding selected embedded cartridges for application {0}...", getWizardModel() - .getApplication().getName())) { + new Job(NLS.bind("Adding selected embedded cartridges for application {0}...", applicationName)) { @Override protected IStatus run(IProgressMonitor monitor) { @@ -222,6 +227,10 @@ embeddableCartridges.addAll(selectedCartridges); application.addEmbbedCartridges(embeddableCartridges); } + } catch (OpenShiftEndpointException e) { + // TODO: refresh user + return OpenShiftUIActivator.createErrorStatus(NLS.bind( + "Could not embed cartridges to application {0}: {1}", applicationName, e.getResponseResult())); } catch (OpenShiftException e) { return OpenShiftUIActivator.createErrorStatus(NLS.bind( "Could not embed cartridges to application {0}", getWizardModel()