feat(report): add common rules table

Add and fill the common rules table in the report. Therefore use Todo to hold the actual common rule - project level obligation. Signed-off-by: Markus Herpich <[email protected]>
eclipse-sw360 · Jun 26, 2019 · 477019b · 477019b
1 parent 79eaabd
commit 477019b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/...censeinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java b/...censeinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java
@@ -24,6 +24,10 @@
 import org.eclipse.sw360.datahandler.thrift.components.ComponentService;
 import org.eclipse.sw360.datahandler.thrift.components.Release;
 import org.eclipse.sw360.datahandler.thrift.components.ReleaseLink;
+import org.eclipse.sw360.datahandler.common.SW360Utils;
+import org.eclipse.sw360.datahandler.thrift.SW360Exception;
+import org.eclipse.sw360.datahandler.thrift.ThriftClients;
+import org.eclipse.sw360.datahandler.thrift.components.Release;
 import org.eclipse.sw360.datahandler.thrift.licenseinfo.*;
 import org.eclipse.sw360.datahandler.thrift.licenses.License;
 import org.eclipse.sw360.datahandler.thrift.licenses.LicenseService;
@@ -180,6 +184,8 @@ private void fillReportDocument(
             fillCommonRulesTable(document, project);
             fillAdditionalRequirementsTable(document, obligationResults);
 
+            fillCommonRulesTable(document, project);
+
             // because of the impossible API component subsections must be the last thing in the docx file
             // the rest of the sections must be generated after this
             writeComponentSubsections(document, projectLicenseInfoResults, obligationResults);

diff --git a/libraries/lib-datahandler/src/main/thrift/projects.thrift b/libraries/lib-datahandler/src/main/thrift/projects.thrift
@@ -14,6 +14,7 @@ include "attachments.thrift"
 include "vendors.thrift"
 include "components.thrift"
 include "sw360.thrift"
+include "commonobligations.thrift"
 include "licenses.thrift"
 
 namespace java org.eclipse.sw360.datahandler.thrift.projects