New name now retrieved from PreferenceUtils according to preferred nom. code.

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/AddQuickNameAction.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/AddQuickNameAction.java
index 70a877d94803305e40b5bca15e70240a366d8a27..9b4a7aa4b728566bb20447ec3cc2f09e3d8e1aef 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/AddQuickNameAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/AddQuickNameAction.java
@@ -14,13 +14,16 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;\r
 \r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
+import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
+import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
 import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
 import eu.etaxonomy.taxeditor.UiUtil;\r
 import eu.etaxonomy.taxeditor.navigation.TaxonomicTreeViewer;\r
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
 import eu.etaxonomy.taxeditor.propertysheet.PropertySourceAdapter;\r
 \r
 /**\r
@@ -56,11 +59,9 @@ public class AddQuickNameAction extends Action {
        public void run() {\r
                \r
                // Create empty Taxon, add it to its parent\r
-               if (UiUtil.getNameCodePreference().equals(ITaxEditorConstants.CODE_PREFERENCE_ICZN)) {\r
-                       quickNameTaxon = Taxon.NewInstance(ZoologicalName.NewInstance(Rank.GENUS()), parentTaxon.getSec());\r
-               } else {\r
-                       quickNameTaxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.GENUS()), parentTaxon.getSec());\r
-               }\r
+               NonViralName name = PreferencesUtil.getInstanceOfPreferredNameClass();\r
+               ReferenceBase sec = parentTaxon.getSec();\r
+               quickNameTaxon = Taxon.NewInstance(name, sec);\r
                parentTaxon.addTaxonomicChild(quickNameTaxon, null, null);\r
                \r
                TaxEditorPlugin.getDefault().addSessionTaxon(quickNameTaxon);\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenNewChildNameEditorAction.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenNewChildNameEditorAction.java
index f64e5b06b2b9759c80ea80b845f96ed3fb02c163..f27ec8ad6f9cb7d0964aabd4898d77cc3d16e413 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenNewChildNameEditorAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/OpenNewChildNameEditorAction.java
@@ -14,12 +14,14 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.resource.ImageDescriptor;\r
 \r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
+import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
+import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
 import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
-import eu.etaxonomy.taxeditor.UiUtil;\r
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
 \r
 /**\r
  * Opens a name editor for a new taxon with a parent taxon\r
@@ -54,11 +56,10 @@ public class OpenNewChildNameEditorAction extends Action {
        \r
        public void run() {\r
                \r
-               if (UiUtil.getNameCodePreference().equals(ITaxEditorConstants.CODE_PREFERENCE_ICZN)) {\r
-                       taxon = Taxon.NewInstance(ZoologicalName.NewInstance(Rank.GENUS()), parentTaxon.getSec());\r
-               } else {\r
-                       taxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.GENUS()), parentTaxon.getSec());\r
-               }\r
+               NonViralName name = PreferencesUtil.getInstanceOfPreferredNameClass();\r
+               ReferenceBase sec = parentTaxon.getSec();\r
+               taxon = Taxon.NewInstance(name, sec);\r
+               \r
                parentTaxon.addTaxonomicChild(taxon, null, null);\r
                \r
                new OpenTaxonEditorAction(taxon).run();\r