Fixed #418 Empty AQL expressions generate empty lines.

plugins/org.obeonetwork.m2doc/src/org/obeonetwork/m2doc/generator/M2DocEvaluator.java

@@ -698,33 +698,57 @@ private XWPFParagraph insertObject(XWPFParagraph paragraph, Object object, XWPFR
                 insertMImage(imageParagraph, imageRun, (MImage) object);
                 res = imageParagraph;
             } else {
+                // nothing to do here
                 res = paragraph;
             }
         } else if (object instanceof MText) {
-            res = (XWPFParagraph) insertMText(paragraph, run, (MText) object).getParent();
+            if (((MText) object).getText() != null && !((MText) object).getText().isEmpty()) {
+                res = (XWPFParagraph) insertMText(paragraph, run, (MText) object).getParent();
+            } else {
+                // nothing to do here
+                res = paragraph;
+            }
         } else if (object instanceof MTable) {
-            if (!((MTable) object).getRows().isEmpty()) {
+            if (!((MTable) object).getRows().isEmpty() && ((MTable) object).getColumnsCount() != 0) {
                 XWPFRun tableRun = run;
                 tableRun.getCTR().getInstrTextList().clear();
                 insertMTable(tableRun, (MTable) object);
                 res = (XWPFParagraph) tableRun.getParent();
             } else {
+                // nothing to do here
                 res = paragraph;
             }
         } else if (object instanceof MPagination) {
             res = insertMPagination(paragraph, run, (MPagination) object);
         } else if (object instanceof MParagraph) {
             res = insertMParagraph(generatedDocument, (MParagraph) object, run);
         } else if (object instanceof IBody) {
-            final XWPFRun bodyRun = insertFieldRunReplacement(paragraph, run, "");
-            res = insertBody((XWPFParagraph) bodyRun.getParent(), (IBody) object);
+            if (!((IBody) object).getBodyElements().isEmpty()) {
+                final XWPFRun bodyRun = insertFieldRunReplacement(paragraph, run, "");
+                res = insertBody((XWPFParagraph) bodyRun.getParent(), (IBody) object);
+            } else {
+                // nothing to do here
+                res = paragraph;
+            }
         } else if (object instanceof GenerationResult) {
-            final XWPFRun generationRun = insertFieldRunReplacement(paragraph, run, "");
-            res = insertGenerationResult((XWPFParagraph) generationRun.getParent(), (GenerationResult) object);
+            if (!((GenerationResult) object).getBody().getBodyElements().isEmpty()) {
+                final XWPFRun generationRun = insertFieldRunReplacement(paragraph, run, "");
+                res = insertGenerationResult((XWPFParagraph) generationRun.getParent(), (GenerationResult) object);
+            } else {
+                // nothing to do here
+                res = paragraph;
+            }
         } else if (object == null) {
-            res = (XWPFParagraph) insertFieldRunReplacement(paragraph, run, "").getParent();
+            // nothing to do here
+            res = paragraph;
         } else {
-            res = (XWPFParagraph) insertFieldRunReplacement(paragraph, run, object.toString()).getParent();
+            final String stringValue = object.toString();
+            if (stringValue != null && !stringValue.isEmpty()) {
+                res = (XWPFParagraph) insertFieldRunReplacement(paragraph, run, stringValue).getParent();
+            } else {
+                // nothing to do here
+                res = paragraph;
+            }
         }
 
         return res;
@@ -744,9 +768,9 @@ private XWPFParagraph insertGenerationResult(XWPFParagraph paragraph, Generation
             result.addMessage(message);
         }
 
-        final XWPFParagraph insertBody = insertBody(paragraph, generationResult.getBody());
-        currentGeneratedParagraph = insertBody;
-        return insertBody;
+        final XWPFParagraph res = insertBody(paragraph, generationResult.getBody());
+        currentGeneratedParagraph = res;
+        return res;
     }
 
     /**

tests/org.obeonetwork.m2doc.tests/resources/template/emptyContent/emptyContent-expected-ast.txt

@@ -0,0 +1,14 @@
+
+=== HEADER ===
+
+=== BODY ===
+
+  A simple demonstration of a template :
+  [query: .myTemplate(2)]
+  End of demonstration.
+=== FOOTER ===
+
+=== TEMPLATES ===
+
+template myTemplate (a : java.lang.Integer)
+  [query: null]

tests/org.obeonetwork.m2doc.tests/resources/template/emptyContent/emptyContent.genconf

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="ASCII"?>
+<genconf:Generation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genconf="http://www.obeonetwork.org/m2doc/genconf/1.0" name="nominal" templateFileName="nominal-template.docx" resultFileName="nominal-actual-generation.docx" validationFileName="nominal-actual-validation.docx"/>