FORGE-1460: Fixed CompositeResult cast

forge · Jan 17, 2014 · 67de79e · 67de79e
1 parent d149faf
commit 67de79e
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 23 deletions.
diff --git a/ui/api/src/main/java/org/jboss/forge/addon/ui/result/CompositeResult.java b/ui/api/src/main/java/org/jboss/forge/addon/ui/result/CompositeResult.java
@@ -9,30 +9,11 @@
 
 import java.util.List;
 
-import org.jboss.forge.furnace.util.Assert;
-
 /**
  * 
  * @author <a href="ggastald@redhat.com">George Gastaldi</a>
  */
-public class CompositeResult implements Result
+public interface CompositeResult extends Result
 {
-   public final List<Result> results;
-
-   public CompositeResult(List<Result> results)
-   {
-      Assert.notNull(results, "Result list cannot be null");
-      this.results = results;
-   }
-
-   public List<Result> getResults()
-   {
-      return results;
-   }
-
-   public String getMessage()
-   {
-      throw new UnsupportedOperationException(
-               "getMessage() should not be called in a CompositeResult. Call getResults() instead.");
-   }
+   public List<Result> getResults();
 }
diff --git a/...l/src/main/java/org/jboss/forge/addon/ui/impl/controller/WizardCommandControllerImpl.java b/...l/src/main/java/org/jboss/forge/addon/ui/impl/controller/WizardCommandControllerImpl.java
@@ -27,12 +27,12 @@
 import org.jboss.forge.addon.ui.controller.WizardCommandController;
 import org.jboss.forge.addon.ui.impl.context.UIExecutionContextImpl;
 import org.jboss.forge.addon.ui.impl.context.UINavigationContextImpl;
+import org.jboss.forge.addon.ui.impl.result.CompositeResultImpl;
 import org.jboss.forge.addon.ui.input.InputComponent;
 import org.jboss.forge.addon.ui.input.UIPrompt;
 import org.jboss.forge.addon.ui.metadata.UICommandMetadata;
 import org.jboss.forge.addon.ui.output.UIMessage;
 import org.jboss.forge.addon.ui.progress.UIProgressMonitor;
-import org.jboss.forge.addon.ui.result.CompositeResult;
 import org.jboss.forge.addon.ui.result.NavigationResult;
 import org.jboss.forge.addon.ui.result.Result;
 import org.jboss.forge.addon.ui.wizard.UIWizard;
@@ -133,7 +133,7 @@ public Result execute() throws Exception
             throw e;
          }
       }
-      return new CompositeResult(results);
+      return new CompositeResultImpl(results);
    }
 
    @Override

diff --git a/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/result/CompositeResultImpl.java b/ui/impl/src/main/java/org/jboss/forge/addon/ui/impl/result/CompositeResultImpl.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright 2014 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Eclipse Public License version 1.0, available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.jboss.forge.addon.ui.impl.result;
+
+import java.util.List;
+
+import org.jboss.forge.addon.ui.result.CompositeResult;
+import org.jboss.forge.addon.ui.result.Result;
+import org.jboss.forge.furnace.util.Assert;
+
+/**
+ * 
+ * @author <a href="ggastald@redhat.com">George Gastaldi</a>
+ */
+public class CompositeResultImpl implements CompositeResult
+{
+   public final List<Result> results;
+
+   public CompositeResultImpl(List<Result> results)
+   {
+      Assert.notNull(results, "Result list cannot be null");
+      this.results = results;
+   }
+
+   @Override
+   public List<Result> getResults()
+   {
+      return results;
+   }
+
+   public String getMessage()
+   {
+      throw new UnsupportedOperationException(
+               "getMessage() should not be called in a CompositeResult. Call getResults() instead.");
+   }
+
+}