.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
index 6413b370a80655630cd91ed70092f440a4a59267..b2db92a4dae8923216190704d8b6eddf0ebc8644 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
@@ -89,17 +89,8 @@ public class MultiPageTaxonEditor extends FormEditor implements IConversationEna
                        addPage(Page.NAME.getIndex(), new TaxonNameEditor(this), getEditorInput());\r
                        setPageText(Page.NAME.getIndex(), Page.NAME.getTitle());\r
                        \r
-//                     // TODO lazy create\r
-//                     addPage(Page.DESCRIPTIVE.getIndex(), new TaxonDescriptionEditor(this), getEditorInput());\r
-//                     setPageText(Page.DESCRIPTIVE.getIndex(), Page.DESCRIPTIVE.getTitle());\r
-                       \r
-//                     // TODO lazy create\r
-//                     addPage(Page.IMAGE.getIndex(), new TaxonImageEditor(this), getEditorInput());\r
-//                     setPageText(Page.IMAGE.getIndex(), Page.IMAGE.getTitle());\r
-\r
                        // TODO lazy create\r
                        addPage(Page.DESCRIPTIVE.getIndex(), new TaxonDescriptionTreeEditor(this), getEditorInput());\r
-//                     addPage(Page.DESCRIPTIVE_NEW.getIndex(), new TaxonDescriptionTreeEditor(this));\r
                        setPageText(Page.DESCRIPTIVE.getIndex(), Page.DESCRIPTIVE.getTitle());\r
                        \r
                        EditorUtil.showPropertySheet();\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
index a9886176bfd9478acda3bb1db5fc99cff77b2ee7..9cd38bd286960b3282d83fab4341388158488cf4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
@@ -26,6 +26,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -93,8 +94,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
     public static TaxonEditorInput NewEmptyInstance(UUID parentNodeUuid){
        ConversationHolder conversation = CdmStore.NewTransactionalConversation();
                
-               TaxonNameBase<?, ?> name = NomenclaturalCodeHelper.getInstanceOfPreferredNameClass();
-               
+               TaxonNameBase<?, ?> name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
                TaxonNode parentTaxonNode = CdmStore.getTaxonService().getTaxonNodeByUuid(parentNodeUuid);
                
                Taxon newTaxon = null;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java
index e2f440817abb792e618bb8ff0e9e9cc40aa0af9f..86829286bb0afd6e04f2c685597c25bb74de3745 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java
@@ -48,6 +48,7 @@ public class TaxonEditorInputFactory implements IElementFactory {
         String taxonNodeUuid = memento.getString(TAXON_NODE_UUID);\r
         if (taxonNodeUuid == null || CdmStore.getTaxonService().getTaxonNodeByUuid(UUID.fromString(taxonNodeUuid)) == null) {\r
                logger.warn("Couldn't find taxon node with UUID " + taxonNodeUuid);\r
+//             return MementoOutOfSyncInput.NewInstance(memento);\r
                return null;\r
         }\r
         logger.info("Creating taxon node from memento w UUID " + taxonNodeUuid);\r