Fixed: #12 Weitere Steuermöglichkeiten aus den Sema4g Commands heraus.

Fixed: #12 Weitere Steuermöglichkeiten aus den Sema4g Commands heraus. Fixed: #12 Weitere Steuermöglichkeiten aus den Sema4g Commands heraus.
mvp4g · Jun 21, 2018 · 3c841da · 3c841da
1 parent 558b1dd
commit 3c841da
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 
   <groupId>com.github.mvp4g</groupId>
   <artifactId>sema4g-parent</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.1</version>
   <packaging>pom</packaging>
 
   <name>SeMa4g parent - parent pom for sema4g</name>

diff --git a/sema4g-client/pom.xml b/sema4g-client/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.github.mvp4g</groupId>
     <artifactId>sema4g-parent</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
   </parent>
 
   <artifactId>sema4g</artifactId>

diff --git a/sema4g-client/src/main/java/com/github/mvp4g/sema4g/client/SeMa4g.java b/sema4g-client/src/main/java/com/github/mvp4g/sema4g/client/SeMa4g.java
@@ -70,7 +70,11 @@ public State getState() {
   }
 
   /**
-   * <p>Use this method to invoke all commands</p> <p>Make sure, that this method is called only once.</p>
+   * Use this method to invoke all commands
+   *
+   * Make sure, that this method is called only once.
+   *
+   * @throws SeMa4gException in case some thing went wrong (validation error, etc.)
    */
   public void run()
     throws SeMa4gException {
@@ -144,8 +148,20 @@ public void signalError() {
    * start the next one.
    */
   public void signalFinish() {
+   this.signalFinish(true);
+  }
+
+  /**
+   * This command can be called to finish an execution and
+   * start the next one.
+   *
+   * @param finishSema4gContext true: finish Sema4gContext, false: finish command
+   */
+  public void signalFinish(boolean finishSema4gContext) {
     // set state
-    this.state = State.FINISH;
+    if (finishSema4gContext) {
+      this.state = State.FINISH;
+    }
     // trigger another command
     executeRun();
   }

diff --git a/sema4g-client/src/main/java/com/github/mvp4g/sema4g/client/command/AbstractCommand.java b/sema4g-client/src/main/java/com/github/mvp4g/sema4g/client/command/AbstractCommand.java
@@ -15,14 +15,14 @@
  */
 package com.github.mvp4g.sema4g.client.command;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.github.mvp4g.sema4g.client.SeMa4g;
 import com.github.mvp4g.sema4g.client.SeMa4gConstants;
 import com.github.mvp4g.sema4g.client.SeMa4gUtils;
 import com.github.mvp4g.sema4g.client.exception.SeMa4gException;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>AbstractCommand provides base functionality to run a SeMa4g command.</p>
  */
@@ -56,8 +56,18 @@ String getId() {
    * start the next one.
    */
   public void signalFinish() {
+    this.signalFinish(false);
+  }
+
+  /**
+   * This command can be called to finish an execution and
+   * start the next one depending on the parameter finishSema4gContext .
+   *
+   * @param finishSema4gContext true: context will be finished, false: only the task will be finished
+   */
+  public void signalFinish(boolean finishSema4gContext) {
     this.state = State.FINISH;
-    executionContext.signalFinish();
+    executionContext.signalFinish(finishSema4gContext);
   }
 
   /**

diff --git a/sema4g-example/pom.xml b/sema4g-example/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>de.gishmo.gwt.example</groupId>
   <artifactId>sema4g-example</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.1</version>
   <modelVersion>4.0.0</modelVersion>
 
   <packaging>gwt-app</packaging>
@@ -76,12 +76,12 @@
     <dependency>
       <groupId>com.github.mvp4g</groupId>
       <artifactId>sema4g</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.1</version>
     </dependency>
     <dependency>
       <groupId>com.github.mvp4g</groupId>
       <artifactId>sema4g-rpc</artifactId>
-      <version>1.6.0</version>
+      <version>1.6.1</version>
     </dependency>
     <dependency>
       <groupId>com.squareup</groupId>

diff --git a/sema4g-requestbuilder/pom.xml b/sema4g-requestbuilder/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.github.mvp4g</groupId>
     <artifactId>sema4g-parent</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/sema4g-resty/pom.xml b/sema4g-resty/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.github.mvp4g</groupId>
     <artifactId>sema4g-parent</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/sema4g-rpc/pom.xml b/sema4g-rpc/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.github.mvp4g</groupId>
     <artifactId>sema4g-parent</artifactId>
-    <version>1.6.0</version>
+    <version>1.6.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>