simple name details: evaluation of author settings should be done only in authorship...

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
index b42722589aa6440c55fae75a0697099cef488df7..9449b7785ef6115df0213cc97e03e9abfb41c1c8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
@@ -124,7 +124,7 @@ public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE
          ignoreMethods.add("setUseClassification");
          ignoreMethods.add("setRegisterAuditing");
          pageConfiguration = ContextInjectionFactory.make(GenericConfiguratorWizardPageE4.class, context);
-         pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelSpecimenUpdateWizard_ConfiguratorWizard_label);
+         pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelTaxonUpdateWizard_ConfiguratorWizard_label);
          addPage(pageConfiguration);
     }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
index e9ea6c22d589468c21ddc5e6fdcee4123814ddf1..13c0fe786443ff053296064ad6f8870933c5f83c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
@@ -14,7 +14,6 @@ import java.util.Arrays;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
 import eu.etaxonomy.cdm.model.name.IBacterialName;
-import eu.etaxonomy.cdm.model.name.INonViralName;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.taxeditor.l10n.Messages;
@@ -34,7 +33,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement
  * @author n.hoffmann
  * @created May 20, 2010
  */
-public class NonViralNameDetailElement 
+public class NonViralNameDetailElement
                extends AbstractIdentifiableEntityDetailElement<TaxonName>  {
 
        private NameDetailSection section_name;
@@ -66,7 +65,7 @@ public class NonViralNameDetailElement
                text_nameApprobation = formFactory.createTextWithLabelElement(formElement, "Name Approbation", entity.getNameApprobation(),style);
             }
             textLsid = formFactory.createLsidWithExceptionLabelElement(formElement, "Lsid", entity.getLsid(), style);
-            
+
 
         }else{
                if (PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_CACHE)){
@@ -87,7 +86,7 @@ public class NonViralNameDetailElement
                        textLsid = formFactory.createLsidWithExceptionLabelElement(formElement, "Lsid", entity.getLsid(), style);
 
                }
-               
+
 
         }
 
@@ -96,12 +95,12 @@ public class NonViralNameDetailElement
            section_name.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
            addControl(section_name);
            addElement(section_name);
-           if (isAdvancedView || PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP)){
+//         if (isAdvancedView || PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP)){
            section_author = formFactory.createAuthorshipDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
            section_author.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
            addControl(section_author);
            addElement(section_author);
-           }
+//         }
            //TODO RL
            if (isAdvancedView || PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_HYBRID)){
           section_hybrid = formFactory.createHybridDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE);
@@ -123,7 +122,7 @@ public class NonViralNameDetailElement
 //             if(combo_nomenclaturalCode!=null){
 //                 combo_nomenclaturalCode.setEnabled(false);
 //             }
-               
+
                if(toggleable_cache!=null){
                    toggleable_cache.setEnabled(getEntity().isProtectedTitleCache() || getEntity().isProtectedFullTitleCache());
                    setIrrelevant(toggleable_cache.getState(),
@@ -191,7 +190,7 @@ public class NonViralNameDetailElement
                        boolean change = checkForDeletableParts(combo_nomenclaturalCode.getSelection());
                        if (change){
                                getEntity().setNameType(combo_nomenclaturalCode.getSelection());
-                               
+
                                this.updateContent();
                                section_hybrid.setEntity(getEntity());
                                section_author.setEntity(getEntity());
@@ -219,7 +218,7 @@ public class NonViralNameDetailElement
                        }else {
                                return true;
                        }
-                       
+
                }
                if (actualCode.equals(NomenclaturalCode.ICNB)){
                        if (getEntity().getNameApprobation() != null || getEntity().getSubGenusAuthorship() != null){
@@ -231,7 +230,7 @@ public class NonViralNameDetailElement
                        }else{
                                return true;
                        }
-                       
+
                }
                if (actualCode.equals(NomenclaturalCode.Fungi)){
                        if (getEntity().isAnamorphic() ){
@@ -252,7 +251,7 @@ public class NonViralNameDetailElement
                        }else{
                                return true;
                        }
-                       
+
                }
                if (actualCode.equals(NomenclaturalCode.ICNAFP)){
                        return true;