From: n.hoffmann Date: Tue, 1 Mar 2011 17:32:39 +0000 (+0000) Subject: reverted changes from r11473 X-Git-Tag: rcp.ss-first-working-version~189 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/30be6e114fa3d7a50b932fc8411f57bd27b6c282 reverted changes from r11473 --- 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 b4faa64d8..d674201b0 100644 --- 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(null); + IXMLEntityFactory factory = configurator.getFactory(); 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 a412db27b..a41472a1d 100644 --- 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(null); + IXMLEntityFactory factory = getConfigurator().getFactory(); List featureTrees = factory.getFeatureTrees(); List realFeatureTrees = new ArrayList(); 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 b940a46a1..3f1ac596d 100644 --- 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(null); + IXMLEntityFactory factory = getConfigurator().getFactory(); final List 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(null); + IXMLEntityFactory factory = getConfigurator().getFactory(); return factory != null ? factory.getChildNodes(element).toArray() : new Object[]{}; @@ -181,7 +181,7 @@ public class SelectTaxaWizardPage extends AbstractPublishWizardPage { Element xmlElement = (Element) element; EntityType entityType = XMLHelper.getEntityType(xmlElement); if(EntityType.TAXON_NODE.equals(entityType)){ - xmlElement = getConfigurator().getFactory(null).getTaxonForTaxonNode(xmlElement); + xmlElement = getConfigurator().getFactory().getTaxonForTaxonNode(xmlElement); } return XMLHelper.getTitleCache(xmlElement); }