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 e04c6ce887b95cbf9126f0edf11ffe66d7a9a425..dedddb5edaf973d390484697a943adc295ee22bd 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <?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"/>
        <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 9b3bdb885075552aeb10a0ff5dee3fbf536fba04..eb8c8a337199e62054b43b7774fe03fde1be3696 100644 (file)
--- 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.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,
  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/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
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index d81510db5c7d2f321b6bde5b6628f501b556cb1f..9cc61fac8123009bdc25e69f10ab773b737d34f2 100644 (file)
--- 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/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/
 
 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 (file)
index 0000000..896a4a1
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 13f0cab6dd474735cb940767f6be78615fddca9d..fb019b5744fd1b26e8ca5c0f0a6fedf3a9c698ef 100644 (file)
--- 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 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;
 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
         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);
             // configure the job
             job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
             job.setUser(true);