fix lfet to plantuml activity converter

- add layout for lfet to asciidoc table converter
- add distributionsManagement

Author: uniqueck

README.adoc

@@ -59,20 +59,20 @@ lfet::src/test/resources/smallestDecisionTable.lfet[style=table]
 [width="100%",options=header,cols="1,3,2,2",frame=none,grid=all]
 |====
 2+|
-^|R01
-^|R02
-h|C01
-h|Condition1
-^|Y
-^|N
+^.^|R01
+^.^|R02
+^.^h|C01
+.^h|Condition1
+^.^|Y
+^.^|N
 4+|
-h|A01
-h|Action1
-^|X
-^|
-h|A02
-h|Action2
-^|
-^|X
+^.^h|A01
+.^h|Action1
+^.^|X
+^.^|
+^.^h|A02
+.^h|Action2
+^.^|
+^.^|X
 |====
 

pom.xml

@@ -21,6 +21,15 @@
         </developer>
     </developers>
 
+
+    <distributionManagement>
+        <repository>
+            <id>bintray</id>
+            <name>uniqueck-asciidoctorj-decisiontable-extension</name>
+            <url>https://api.bintray.com/maven/uniqueck/asciidoctorj/${project.artifactId}/;publish=1</url>
+        </repository>
+    </distributionManagement>
+
     <scm>
         <connection>scm:git:git@github.com:uniqueck/asciidoctorj-decisiontable-extension.git</connection>
         <developerConnection>scm:git:git@github.com:uniqueck/asciidoctorj-decisiontable-extension.git</developerConnection>

src/main/java/com/uniqueck/asciidoctorj/lfet/LFETAsciiDocTableGenerator.java

@@ -70,12 +70,12 @@ public List<String> generate() {
 
             Element condition = conditions.get(conditionIndex);
 
-            content.add(String.format("h|%s%02d", getLfetLanguage().getLabelCondition(), conditionIndex+1));
-            content.add(String.format("h|%s", condition.getChild(ELEMENT_TITLE).getAttributeValue(ATTR_VALUE)));
+            content.add(String.format("^.^h|%s%02d", getLfetLanguage().getLabelCondition(), conditionIndex+1));
+            content.add(String.format(".^h|%s", condition.getChild(ELEMENT_TITLE).getAttributeValue(ATTR_VALUE)));
 
             for (Element rule : rules) {
 
-                content.add("^|" + getConditionSymbol(rule, condition));
+                content.add("^.^|" + getConditionSymbol(rule, condition));
 
             }
 
@@ -88,12 +88,12 @@ public List<String> generate() {
 
             Element action = actions.get(actionIndex);
 
-            content.add(String.format("h|A%02d", actionIndex+1));
-            content.add(String.format("h|%s", action.getChild(ELEMENT_TITLE).getAttributeValue(ATTR_VALUE)));
+            content.add(String.format("^.^h|A%02d", actionIndex+1));
+            content.add(String.format(".^h|%s", action.getChild(ELEMENT_TITLE).getAttributeValue(ATTR_VALUE)));
 
             for (Element rule : rules) {
 
-                content.add("^|" + getActionSymbol(rule, action));
+                content.add("^.^|" + getActionSymbol(rule, action));
 
             }
 
@@ -147,7 +147,7 @@ private List<String> createHeader(int ruleCount) {
         List<String> content = new ArrayList<>();
         content.add("2+|");
         for (int i = 0; i < ruleCount; i++) {
-            content.add(String.format("^|R%02d", i + 1));
+            content.add(String.format("^.^|R%02d", i + 1));
         }
         return content;
     }

src/main/java/com/uniqueck/asciidoctorj/lfet/LFETBlockMacroProcessor.java

@@ -4,7 +4,6 @@
 import org.asciidoctor.ast.StructuralNode;
 import org.asciidoctor.extension.BlockMacroProcessor;
 import org.asciidoctor.extension.Name;
-import org.asciidoctor.jruby.internal.AsciidoctorCoreException;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -43,6 +42,7 @@ public Object process(StructuralNode parent, String target, Map<String, Object>
                 content.addAll(new LFETAsciiDocTableGenerator(decisionTableFile).generate());
                 break;
             case ACTIVITY_DIAGRAM:
+                // content.addAll(IActivityDiagramGenerator.newGenerator(decisionTableFile).generate());
                 break;
             default:
                 throw new AsciiDoctorDecisionTableRuntimeException("style '" + getStyle(attributes) + "' is not supported");

src/main/java/com/uniqueck/asciidoctorj/lfet/puml/activity/ActivityDiagramGenerator.java

@@ -22,12 +22,15 @@ class ActivityDiagramGenerator extends AbstractLFETTraceLogging implements IDeci
     private Element currentCondition;
     private Iterator<Element> rulesIt;
 
+    ActivityDiagramGenerator(File lfetFile) {
+        this.lfetFile = lfetFile;
+    }
+
     @Override
-    public String generate(String lfetFile) {
+    public List<String> generate() {
         this.sb = new ArrayList<>();
-        this.lfetFile = new File(lfetFile);
         new DecisionTableToPlantUMLActivityDiagramRules().execute(this);
-        return sb.stream().collect(Collectors.joining(System.lineSeparator()));
+        return sb;
     }
 
 
@@ -122,8 +125,7 @@ public void doGetFirstConditionOfFirstRule() {
 
     @Override
     public void doGetFirstRule() {
-        List<Element> rules = getRootElement().getChild("Rules").getChildren("Rule");
-        firstRule = rules.get(0);
+        firstRule = rulesIt.next();
     }
 
     @Override
@@ -145,7 +147,7 @@ public void doAddEndif() {
 
     @Override
     public void doAddElse() {
-        sb.add("else");
+        sb.add("else (false)");
     }
 
     @Override

src/main/java/com/uniqueck/asciidoctorj/lfet/puml/activity/ConditionDiagramGenerator.java

@@ -73,7 +73,7 @@ public boolean isHasMoreConditions() {
 
     @Override
     public void doIfWithConditionTitleAndLabelYes() {
-        add("if (" + getConditionTitle() + ") then (yes) ");
+        add("if (" + getConditionTitle() + ") then (yes)");
     }
 
     @Override

src/main/java/com/uniqueck/asciidoctorj/lfet/puml/activity/IActivityDiagramGenerator.java

@@ -1,10 +1,13 @@
 package com.uniqueck.asciidoctorj.lfet.puml.activity;
 
+import java.io.File;
+import java.util.List;
+
 public interface IActivityDiagramGenerator {
 
-    static IActivityDiagramGenerator newGenerator() {
-        return new ActivityDiagramGenerator();
+    static IActivityDiagramGenerator newGenerator(File lfetFile) {
+        return new ActivityDiagramGenerator(lfetFile);
     }
 
-    String generate(String lfetFile);
+    List<String> generate();
 }