[jbosstools-commits] JBoss Tools SVN: r41315 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2012-05-23 16:07:54 -0400 (Wed, 23 May 2012)
New Revision: 41315

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
Log:
[JBIDE-11314] implementing dialog that asks if you want to continue to wait

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java	2012-05-23 20:00:28 UTC (rev 41314)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java	2012-05-23 20:07:54 UTC (rev 41315)
@@ -125,10 +125,6 @@
 			IStatus status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e);
 			OpenShiftUIActivator.log(status);
 			ErrorDialog.openError(getShell(), "Error", "Error initializing application configuration page", status);
-		} catch (SocketTimeoutException e) {
-			IStatus status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e);
-			OpenShiftUIActivator.log(status);
-			ErrorDialog.openError(getShell(), "Error", "Error initializing application configuration page", status);
 		}
 	}
 
@@ -221,10 +217,6 @@
 									OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind(
 											"Could not get embedded cartridges for application {0}",
 											selectedApplication.getName()), ex));
-								} catch (SocketTimeoutException ex) {
-									OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind(
-											"Could not get embedded cartridges for application {0}",
-											selectedApplication.getName()), ex));
 								}
 								return Status.OK_STATUS;
 							}

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-05-23 20:00:28 UTC (rev 41314)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java	2012-05-23 20:07:54 UTC (rev 41315)
@@ -66,7 +66,7 @@
 	private boolean existingApplicationsLoaded = false;;
 
 	public ApplicationConfigurationWizardPageModel(OpenShiftExpressApplicationWizardModel wizardModel)
-			throws OpenShiftException, SocketTimeoutException {
+			throws OpenShiftException {
 		this.wizardModel = wizardModel;
 		setExistingApplication(wizardModel.getApplication());
 	}
@@ -146,7 +146,7 @@
 	 * 
 	 * @see #doSetExistingApplication(IApplication)
 	 */
-	public void setExistingApplicationName(String applicationName) throws OpenShiftException, SocketTimeoutException {
+	public void setExistingApplicationName(String applicationName) throws OpenShiftException {
 		firePropertyChange(PROPERTY_EXISTING_APPLICATION_NAME
 				, this.existingApplicationName, this.existingApplicationName = applicationName);
 
@@ -300,7 +300,7 @@
 	 * @see #setSelectedEmbeddableCartridges(Set)
 	 * @see #wizardModel#setApplication
 	 */
-	public void setExistingApplication(IApplication application) throws OpenShiftException, SocketTimeoutException {
+	public void setExistingApplication(IApplication application) throws OpenShiftException {
 		if (application != null) {
 			setExistingApplicationName(application.getName());
 			doSetExistingApplication(application);
@@ -320,7 +320,7 @@
 	 * @see #setSelectedEmbeddableCartridges(Set)
 	 * @see #wizardModel#setApplication
 	 */
-	protected void doSetExistingApplication(IApplication application) throws OpenShiftException, SocketTimeoutException {
+	protected void doSetExistingApplication(IApplication application) throws OpenShiftException {
 		if (application != null) {
 			setApplicationName(application.getName());
 			setSelectedCartridge(application.getCartridge());