CompositeResult can be nested

jbosstools · Feb 27, 2014 · 39bb404 · 39bb404
1 parent 4ed2740
commit 39bb404
Showing 1 changed file with 27 additions and 33 deletions.
diff --git a/...ns/org.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/wizards/ForgeWizard.java b/...ns/org.jboss.tools.forge.ui.ext/src/org/jboss/tools/forge/ui/ext/wizards/ForgeWizard.java
@@ -8,7 +8,6 @@
 package org.jboss.tools.forge.ui.ext.wizards;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -85,38 +84,8 @@ public void run(IProgressMonitor monitor)
 					attributeMap.put(Shell.class, shell);
 
 					Result commandResult = controller.execute();
-
-					List<Result> results;
-					if (commandResult instanceof CompositeResult) {
-						results = ((CompositeResult) commandResult)
-								.getResults();
-					} else {
-						results = Arrays.asList(commandResult);
-					}
-					for (Result result : results) {
-						if (result != null) {
-							String message = result.getMessage();
-							if (message != null) {
-								NotificationType notificationType = result instanceof Failed ? NotificationType.ERROR
-										: NotificationType.INFO;
-								ForgeUIPlugin.displayMessage(getWindowTitle(),
-										message, notificationType);
-							}
-							if (result instanceof Failed) {
-								Throwable exception = ((Failed) result)
-										.getException();
-								if (exception != null) {
-									ForgeUIPlugin.log(exception);
-									ForgeUIPlugin.displayMessage(
-											getWindowTitle(), String
-													.valueOf(exception
-															.getMessage()),
-											NotificationType.ERROR);
-								}
-							}
-						}
-						EventBus.INSTANCE.fireWizardFinished(uiContext);
-					}
+					displayResult(commandResult);
+					EventBus.INSTANCE.fireWizardFinished(uiContext);
 				} catch (Exception e) {
 					ForgeUIPlugin.displayMessage(getWindowTitle(),
 							"Error while executing task, check Error log view",
@@ -133,6 +102,31 @@ public void run(IProgressMonitor monitor)
 		});
 	}
 
+	private void displayResult(Result result) {
+		if (result instanceof CompositeResult) {
+			for (Result thisResult : ((CompositeResult) result).getResults()) {
+				displayResult(thisResult);
+			}
+		} else if (result != null) {
+			String message = result.getMessage();
+			if (message != null) {
+				NotificationType notificationType = result instanceof Failed ? NotificationType.ERROR
+						: NotificationType.INFO;
+				ForgeUIPlugin.displayMessage(getWindowTitle(), message,
+						notificationType);
+			}
+			if (result instanceof Failed) {
+				Throwable exception = ((Failed) result).getException();
+				if (exception != null) {
+					ForgeUIPlugin.log(exception);
+					ForgeUIPlugin.displayMessage(getWindowTitle(),
+							String.valueOf(exception.getMessage()),
+							NotificationType.ERROR);
+				}
+			}
+		}
+	}
+
 	@Override
 	public boolean performCancel() {
 		EventBus.INSTANCE.fireWizardClosed(uiContext);