Author: adietish Date: 2010-11-17 04:15:00 -0500 (Wed, 17 Nov 2010) New Revision: 26659 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshImagesHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java Log: [JBIDE-7597] corrected error reporting: removed dialogs since command framework shows dialogs, corrected error messages Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java 2010-11-17 08:25:05 UTC (rev 26658) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java 2010-11-17 09:15:00 UTC (rev 26659) @@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; @@ -54,16 +53,9 @@ return Status.OK_STATUS; } catch (Exception e) { - String message = getInstanceNames(selection); - IStatus status = StatusFactory.getInstance( - IStatus.ERROR, - Activator.PLUGIN_ID, - e.getMessage(), - e); - ErrorDialog.openError(HandlerUtil.getActiveShell(event), - CVMessages.getString("DestroyInstancesDialogError.title"), - CVMessages.getFormattedString("DestroyInstancesDialogError.msg", message), status); - return status; + String errorMessage = CVMessages.getFormattedString("DestroyInstancesDialogError.msg", + getInstanceNames(selection)); + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage, e); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java 2010-11-17 08:25:05 UTC (rev 26658) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java 2010-11-17 09:15:00 UTC (rev 26659) @@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; @@ -53,16 +52,8 @@ return Status.OK_STATUS; } catch (Exception e) { - String message = getInstanceNames(selection); - IStatus status = StatusFactory.getInstance( - IStatus.ERROR, - Activator.PLUGIN_ID, - e.getMessage(), - e); - ErrorDialog.openError(HandlerUtil.getActiveShell(event), - CVMessages.getString("RebootInstancesDialogError.title"), - CVMessages.getFormattedString("RebootInstancesDialogError.msg", message), status); - return status; + String errorMessage = CVMessages.getFormattedString("RebootInstancesDialogError.msg", getInstanceNames(selection)); + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage, e); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java 2010-11-17 08:25:05 UTC (rev 26658) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshCloudHandler.java 2010-11-17 09:15:00 UTC (rev 26659) @@ -56,9 +56,8 @@ try { cloud.loadChildren(); } catch (Exception e) { - IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, - e.getMessage(), e); - return status; + // TODO internationalize strings + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, "Could not load children of cloud " + cloud.getName(), e); } return Status.OK_STATUS; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshImagesHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshImagesHandler.java 2010-11-17 08:25:05 UTC (rev 26658) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshImagesHandler.java 2010-11-17 09:15:00 UTC (rev 26659) @@ -57,14 +57,8 @@ return Status.OK_STATUS; } catch (Exception e) { - IStatus status = StatusFactory.getInstance( - IStatus.ERROR, - Activator.PLUGIN_ID, - e.getMessage(), - e); - return status; + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e); } - } }.schedule(); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java 2010-11-17 08:25:05 UTC (rev 26658) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RefreshInstancesHandler.java 2010-11-17 09:15:00 UTC (rev 26659) @@ -56,9 +56,7 @@ cloud.loadChildren(); return Status.OK_STATUS; } catch (Exception e) { - IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, - e.getMessage(), e); - return status; + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java 2010-11-17 08:25:05 UTC (rev 26658) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java 2010-11-17 09:15:00 UTC (rev 26659) @@ -16,11 +16,9 @@ import org.eclipse.core.commands.IHandler; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.model.IHost; -import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.handlers.HandlerUtil; import org.jboss.tools.common.log.StatusFactory; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; @@ -38,18 +36,14 @@ ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof IStructuredSelection) { DeltaCloudInstance instance = UIUtils.getFirstAdaptedElement(selection, DeltaCloudInstance.class); - Shell shell = HandlerUtil.getActiveShell(event); try { String connectionName = RSEUtils.createConnectionName(instance); IHost host = RSEUtils.createHost(connectionName, RSEUtils.createHostName(instance)); RSEUtils.launchRemoteSystemExplorer(instance.getName(), connectionName, host); } catch (Exception e) { - IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e); - // TODO: internationalize strings - ErrorDialog.openError(shell, "Error", + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", - status); - return status; + e); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java 2010-11-17 08:25:05 UTC (rev 26658) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java 2010-11-17 09:15:00 UTC (rev 26659) @@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; @@ -53,16 +52,9 @@ return Status.OK_STATUS; } catch (Exception e) { - String message = getInstanceNames(selection); - IStatus status = StatusFactory.getInstance( - IStatus.ERROR, - Activator.PLUGIN_ID, - e.getMessage(), - e); - ErrorDialog.openError(HandlerUtil.getActiveShell(event), - CVMessages.getString("StartInstancesDialogError.title"), - CVMessages.getFormattedString("StartInstancesDialogError.msg", message), status); - return status; + String errorMessage = CVMessages.getFormattedString("StartInstancesDialogError.msg", + getInstanceNames(selection)); + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage, e); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2010-11-17 08:25:05 UTC (rev 26658) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2010-11-17 09:15:00 UTC (rev 26659) @@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; @@ -51,16 +50,9 @@ } return Status.OK_STATUS; } catch (Exception e) { - String message = getInstanceNames(selection); - IStatus status = StatusFactory.getInstance( - IStatus.ERROR, - Activator.PLUGIN_ID, - e.getMessage(), - e); - ErrorDialog.openError(HandlerUtil.getActiveShell(event), - CVMessages.getString("StopInstancesDialogError.title"), - CVMessages.getFormattedString("StopInstancesDialogError.msg", message), status); - return status; + String errorMessage = CVMessages.getFormattedString("StopInstancesDialogError.msg", + getInstanceNames(selection)); + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage, e); } }