From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Thu, 22 Nov 2018 08:33:35 +0000 (+0100)
Subject: ref #7837 Add docx export to feature tree context menu
X-Git-Tag: 5.5.0^2~313
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/ad042febb389ce3994078eb0daad4878c4f2d5d1

ref #7837 Add docx export to feature tree context menu
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index e04c6ce88..dedddb5ed 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/docx4j-3.3.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-math3-3.6.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.swtchart_0.10.0.v20160212.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/redmine-java-api-3.1.0.jar"/>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 9b3bdb885..eb8c8a337 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -75,6 +75,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.io.csv.redlist.demo,
  eu.etaxonomy.cdm.io.csv.redlist.out,
  eu.etaxonomy.cdm.io.descriptive.owl.out,
+ eu.etaxonomy.cdm.io.descriptive.word.out,
  eu.etaxonomy.cdm.io.distribution.excelupdate,
  eu.etaxonomy.cdm.io.dwca.in,
  eu.etaxonomy.cdm.io.dwca.jaxb,
@@ -873,5 +874,6 @@ Bundle-ClassPath: .,
  lib/lucene-suggest-5.4.1.jar,
  lib/redmine-java-api-3.1.0.jar,
  lib/org.swtchart_0.10.0.v20160212.jar,
- lib/commons-math3-3.6.1.jar
+ lib/commons-math3-3.6.1.jar,
+ lib/docx4j-3.3.5.jar
 Import-Package: eu.etaxonomy.cdm.api.application
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index d81510db5..9cc61fac8 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -224,7 +224,8 @@ bin.includes = META-INF/,\
                lib/cdmlib-cache-5.5.0-SNAPSHOT.jar,\
                lib/redmine-java-api-3.1.0.jar,\
                lib/org.swtchart_0.10.0.v20160212.jar,\
-               lib/commons-math3-3.6.1.jar
+               lib/commons-math3-3.6.1.jar,\
+               lib/docx4j-3.3.5.jar
 
 jars.compile.order = .
 output.. = bin/
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-3.3.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-3.3.5.jar
new file mode 100644
index 000000000..896a4a184
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/docx4j-3.3.5.jar differ
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportHandler.java
index 13f0cab6d..fb019b574 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportHandler.java
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.progress.IProgressConstants;
 
-import eu.etaxonomy.cdm.io.descriptive.owl.out.OwlExportConfigurator;
+import eu.etaxonomy.cdm.io.descriptive.word.out.WordExportConfigurator;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.taxeditor.featuretree.e4.FeatureNodeDropAdapter;
 import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditor;
@@ -60,7 +60,7 @@ public class FeatureTreeExportHandler {
         String directoryString = dialog.open();
         if(directoryString!=null){
             // create job
-            Job job = CdmStore.getExportManager().createIOServiceJob(OwlExportConfigurator.NewInstance(null, null, selectedFeatureTree), new File(directoryString+"/owl.owl"));
+            Job job = CdmStore.getExportManager().createIOServiceJob(WordExportConfigurator.NewInstance(null, null, selectedFeatureTree), new File(directoryString+"/"+selectedFeatureTree.getTitleCache()+".docx"));
             // configure the job
             job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
             job.setUser(true);