including changes from cdmlib-print

diff --git a/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java b/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
index d674201b0e1735be564e701f10709bfe0f516898..b4faa64d845d02d856edbb8ae0362e6366a96a1c 100644 (file)
--- a/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
+++ b/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
@@ -98,7 +98,7 @@ public class GeneratePdfHandler extends AbstractHandler {
                
                UUID taxonNodeUuid = input.getTaxonNode().getUuid();
                
-               IXMLEntityFactory factory = configurator.getFactory();
+               IXMLEntityFactory factory = configurator.getFactory(null);
                
                Element taxonNodeElement = factory.getTaxonNode(taxonNodeUuid);
                

diff --git a/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectFeatureTreeWizardPage.java b/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectFeatureTreeWizardPage.java
index a41472a1d8c11b20180839565170480a636a6615..a412db27be3a1b757f92ac017efb70b2a3588ac6 100644 (file)
--- a/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectFeatureTreeWizardPage.java
+++ b/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectFeatureTreeWizardPage.java
@@ -131,7 +131,7 @@ public class SelectFeatureTreeWizardPage extends AbstractPublishWizardPage imple
         * Refreshes the input of the viewer
         */
        public void refresh() {
-               IXMLEntityFactory factory = getConfigurator().getFactory();
+               IXMLEntityFactory factory = getConfigurator().getFactory(null);
 
                List<Element> featureTrees = factory.getFeatureTrees();
                List<Element> realFeatureTrees = new ArrayList<Element>();

diff --git a/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java b/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java
index a66d90cd261908df6c41a519a48f7ea5124dbd2c..5d2c4513837cd481d997e66ad00185031ae9b7d1 100644 (file)
--- a/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java
+++ b/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java
@@ -94,7 +94,7 @@ public class SelectTaxaWizardPage extends AbstractPublishWizardPage {
 
                                @Override
                                public void run(IProgressMonitor monitor) {
-                                       IXMLEntityFactory factory = getConfigurator().getFactory();
+                                       IXMLEntityFactory factory = getConfigurator().getFactory(null);
                                        final List<Element> classifications = factory.getClassifications();
                                        
                                        Display.getDefault().asyncExec(new Runnable(){
@@ -141,7 +141,7 @@ public class SelectTaxaWizardPage extends AbstractPublishWizardPage {
                        else if(parentElement instanceof Element){
                                Element element = (Element) parentElement;
                                
-                               IXMLEntityFactory factory = getConfigurator().getFactory();
+                               IXMLEntityFactory factory = getConfigurator().getFactory(null);
                                
                                return factory != null ? factory.getChildNodes(element).toArray() : new Object[]{};
                                
@@ -184,7 +184,7 @@ public class SelectTaxaWizardPage extends AbstractPublishWizardPage {
                                Element xmlElement = (Element) element;
                                EntityType entityType = XMLHelper.getEntityType(xmlElement);
                                if(EntityType.TAXON_NODE.equals(entityType)){
-                                       xmlElement = getConfigurator().getFactory().getTaxonForTaxonNode(xmlElement);
+                                       xmlElement = getConfigurator().getFactory(null).getTaxonForTaxonNode(xmlElement);
                                }                               
                                return XMLHelper.getTitleCache(xmlElement);
                        }