Improved PrintPublisher Wizard; Integrated SpecimenCdmExcel import

[taxeditor.git] / eu.etaxonomy.taxeditor.printpublisher / src / main / java / eu / etaxonomy / taxeditor / printpublisher / handler / GeneratePdfHandler.java

diff --git a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
index 75184c9f772468c8e2a7af66190523f756d89fc2..d91caa0d90d7af90749bd064b70f9384c5738b6a 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
+++ b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
@@ -15,7 +15,6 @@ import java.util.UUID;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
@@ -27,6 +26,7 @@ import eu.etaxonomy.cdm.print.PublishConfigurator;
 import eu.etaxonomy.cdm.print.out.pdf.PdfOutputModule;
 import eu.etaxonomy.cdm.print.out.xml.XMLOutputModule;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
+import eu.etaxonomy.taxeditor.printpublisher.PrintUtil;
 import eu.etaxonomy.taxeditor.printpublisher.wizard.DirectPublishingWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -62,36 +62,15 @@ public class GeneratePdfHandler extends AbstractHandler {
                
                configurator.setDoPublishEntireBranches(false);
                
-               configurator.addOutputModule(new XMLOutputModule());
                configurator.addOutputModule(new PdfOutputModule());
-       
-       
-       
-       // while testing
-//             configurator.setFeatureTree(UUID.fromString("168df0c6-6429-484c-b26f-ded1f7e44bd9"));
-//             configurator.setExportFolder(new File("/Users/n.hoffmann/tmp/"));
-//             
-//             ConversationHolder conversation = CdmStore.createConversation();
-//             conversation.close();
-////           try{
-//                     Publisher.publish(configurator);
-////                   conversation.commit();
-////           }finally{
-////                   conversation.close();
-////           }
-       
-       
-               // enable this when not testing
+               configurator.addOutputModule(new XMLOutputModule());
+               
                DirectPublishingWizard wizard = new DirectPublishingWizard(configurator);
                WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), wizard);
                
-               int result = dialog.open();
+               dialog.open();
                
-               if(result == Status.OK || result == Status.CANCEL){
-                       return null;
-               }else{
-                       throw new RuntimeException("An error occurred during print publishing.");
-               }
+               return null;
        }
        
        private Element getTaxonNodeElement(TaxonEditorInput input){