smaller changes in io wizards and navigator menu

diff --git a/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi b/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
index 37b5e5e97f96b7c97bb0e9273112dfbcee01ef11..b28de1ba7c88923f706e53790326b5c25ab3654f 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
@@ -51,7 +51,9 @@
         <children xsi:type="menu:HandledMenuItem" xmi:id="_9hdNkJIvEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.fixclassificationhierarchy" label="%command.label.fixClassificationHierarchy" command="_jXX0YJIxEeeJAdt8ZUxyaw"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_ivOrwJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.cloneclassification" label="Clone Classification" command="_nOOxMJIxEeeJAdt8ZUxyaw"/>
         <children xsi:type="menu:MenuSeparator" xmi:id="_ktyqMJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.menuseparator.1"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_lALasJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.accTaxonToSynonym" label="%command.label.6" command="_p7Oi8JIxEeeJAdt8ZUxyaw"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_lALasJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.accTaxonToSynonym" label="%command.label.6" command="_p7Oi8JIxEeeJAdt8ZUxyaw">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_v0c4YFerEeiKs7VTbRzV-A" coreExpressionId="isTaxonBase"/>
+        </children>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_nh_3MJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.moveTaxon" label="%command.label.7" command="_w4RNkJIxEeeJAdt8ZUxyaw"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_o1PAsJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.handledmenuitem.movefactualdata" label="%command.label.moveFactualData" command="_3PRy8JIxEeeJAdt8ZUxyaw"/>
         <children xsi:type="menu:MenuSeparator" xmi:id="_rBdnsJIwEeeJAdt8ZUxyaw" elementId="eu.etaxonomy.taxeditor.navigation.menuseparator.2"/>

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java
index 91226da9ac245aa650493a89d41643dd711ec90d..c402ab6c388fa5d412a99fc2fecb942aadbd2ae8 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java
@@ -7,22 +7,22 @@
  */
 package eu.etaxonomy.taxeditor.navigation.navigator;
 
-import java.util.ArrayList;
 import java.util.Collection;
 
 import org.eclipse.core.expressions.PropertyTester;
 
-import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 public class TaxonNodePropertyTester extends PropertyTester {
-       
+
        private static final Object HAS_SYNONYMS = "hasSynonyms"; //$NON-NLS-1$
        private static final Object HAS_TAXA = "hasTaxa"; //$NON-NLS-1$
        private static final Object IS_CLASSIFICATION = "isClassification"; //$NON-NLS-1$
-       
+
        /** {@inheritDoc} */
-       public boolean test(Object receiver, String property, Object[] args,
+       @Override
+    public boolean test(Object receiver, String property, Object[] args,
                        Object expectedValue) {
                if (receiver instanceof Collection){
                        if (((Collection)receiver).iterator().hasNext()){
@@ -44,11 +44,11 @@ public class TaxonNodePropertyTester extends PropertyTester {
                                return false;
                        }
                }
-               if (receiver instanceof TaxonNode && IS_CLASSIFICATION.equals(property)) {
-                       TaxonNode node = (TaxonNode) receiver;
-                       return !node.hasTaxon();
+               if (receiver instanceof TaxonNodeDto && IS_CLASSIFICATION.equals(property)) {
+                       TaxonNodeDto node = (TaxonNodeDto) receiver;
+                       return node.getTaxonUuid() == null;
                }
-               
+
                return false;
        }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
index a7777b256d28849f61fbe94ae2b2f52ed7d52afb..5ed465acd9d4f8858281b2873e601511d8a8e0f7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
@@ -18,7 +18,6 @@ import java.util.List;
 import java.util.UUID;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -30,17 +29,17 @@ import org.eclipse.ui.PlatformUI;
 import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.application.ICdmRepository;
 import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
-import eu.etaxonomy.cdm.io.operation.config.CacheUpdaterConfigurator;
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
 import eu.etaxonomy.cdm.io.common.ImportConfiguratorBase;
 import eu.etaxonomy.cdm.io.common.ImportResult;
-import eu.etaxonomy.cdm.io.operation.config.SortIndexUpdaterConfigurator;
 import eu.etaxonomy.cdm.io.distribution.excelupdate.ExcelDistributionUpdateConfigurator;
 import eu.etaxonomy.cdm.io.dwca.in.DwcaImportConfigurator;
 import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
 import eu.etaxonomy.cdm.io.jaxb.JaxbImportConfigurator;
+import eu.etaxonomy.cdm.io.operation.config.CacheUpdaterConfigurator;
+import eu.etaxonomy.cdm.io.operation.config.SortIndexUpdaterConfigurator;
 import eu.etaxonomy.cdm.io.reference.endnote.in.EndnoteImportConfigurator;
 import eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator;
 import eu.etaxonomy.cdm.io.service.IIOService;
@@ -67,7 +66,7 @@ import eu.etaxonomy.taxeditor.ui.dialog.ReportTextDialog;
  * @version 1.0
  */
 public class ImportManager extends AbstractIOManager<IImportConfigurator> implements IPostMoniteredOperationEnabled {
-       
+
        String importSuccessMessage = "The import was successfull.";
        String updateSuccessMessage = "The update was successfull.";
 
@@ -565,7 +564,7 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> implem
 
 
 
-   
+
 
 
 

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 b4b581e417089fa61d3341d871f3f019010b6134..ddf2e5e3c33cff9d7e6f7649951b267ac267025c 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
@@ -34,7 +34,7 @@ import org.eclipse.jface.viewers.TreeSelection;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
 import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
 import eu.etaxonomy.taxeditor.io.e4.in.GenericConfiguratorWizardPageE4;
 import eu.etaxonomy.taxeditor.io.e4.in.ImportFromFileDataSourceWizardPageE4;
@@ -99,9 +99,9 @@ public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE
     public void init() {
                configurator =  CdmStore.getImportManager().NormalExplicitConfigurator();
                if (selection instanceof TreeSelection && !selection.isEmpty()){
-                       TaxonNode node = (TaxonNode)selection.getFirstElement();
-                       configurator.setParentUUID(node.getTaxon().getUuid());
-                       configurator.setClassificationUuid(node.getClassification().getUuid());
+                       TaxonNodeDto node = (TaxonNodeDto)selection.getFirstElement();
+                       configurator.setParentUUID(node.getTaxonUuid());
+                       configurator.setClassificationUuid(node.getClassificationUUID());
                }
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ris/RISImportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ris/RISImportWizardE4.java
index 5a0e3708ddaed77ae8995f05d4cd45df953ca4c2..fcaf0796128261fee3374211a5d9a3e4aa687463 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ris/RISImportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ris/RISImportWizardE4.java
@@ -109,7 +109,7 @@ public class RISImportWizardE4 extends AbstractImportWizardE4<RisReferenceImport
     private void addDataSourcePage(){
         dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWizardPageE4.class, context);
         dataSourcePage.setTitle("Choose Ris File");
-        dataSourcePage.setDescription("Please choose an xls file in the Distribution Update format.");
+        dataSourcePage.setDescription("Please choose a file in RIS format.");
         dataSourcePage.setExtensions(new String[]{"*.txt"});
         addPage(dataSourcePage);
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/name/CsvNameExportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/name/CsvNameExportWizardE4.java
index df54ce8bfeec00d265cfa21c3208b9168982c627..49e3c124300f3e864f2d95c5416258618276e473 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/name/CsvNameExportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/name/CsvNameExportWizardE4.java
@@ -12,13 +12,19 @@ package eu.etaxonomy.taxeditor.io.e4.out.csv.name;
 import java.io.File;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.ui.progress.IProgressConstants;
 
 import eu.etaxonomy.cdm.io.csv.caryophyllales.out.CsvNameExportConfigurator;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.io.e4.out.AbstractExportWizardE4;
 import eu.etaxonomy.taxeditor.io.wizard.ExportToFileDestinationWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -35,14 +41,19 @@ public class CsvNameExportWizardE4 extends AbstractExportWizardE4<CsvNameExportC
        protected ExportToFileDestinationWizardPage page;
 
     @Inject
-       public CsvNameExportWizardE4(IEclipseContext context) {
-           super(context);
+       public CsvNameExportWizardE4(IEclipseContext context,
+            @Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection) {
+           super(context, selection);
        }
 
        @Override
        public void init() {
                configurator = CsvNameExportConfigurator.NewInstance(null,null);
                configurator.setNamesOnly(true);
+               if (selection instanceof TreeSelection && !selection.isEmpty()){
+            TaxonNodeDto node = (TaxonNodeDto)selection.getFirstElement();
+            configurator.setClassificationUUID(node.getClassificationUUID());
+        }
        }
 
        @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/print/CsvPrintExportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/print/CsvPrintExportWizardE4.java
index ea4817864fe69d1af4f6f81a703976bc1a85df4b..95036e4cab1b40db3cdd04bf53a41209acb2e57c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/print/CsvPrintExportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/csv/print/CsvPrintExportWizardE4.java
@@ -3,8 +3,12 @@ package eu.etaxonomy.taxeditor.io.e4.out.csv.print;
 import java.io.File;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
 import eu.etaxonomy.cdm.io.common.ExportResultType;
@@ -16,8 +20,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class CsvPrintExportWizardE4 extends CsvNameExportWizardE4{
 
     @Inject
-    public CsvPrintExportWizardE4(IEclipseContext context) {
-        super(context);
+    public CsvPrintExportWizardE4(IEclipseContext context,
+            @Optional@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection) {
+        super(context, selection);
     }
 
        @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/dwca/DarwinCoreArchiveExportWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/dwca/DarwinCoreArchiveExportWizardE4.java
index 2c655d1249bd91de7cb807cd55ab8c5497874b22..5726adf50ebc71ed1c0b8a1a97e790d1950a199f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/dwca/DarwinCoreArchiveExportWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/dwca/DarwinCoreArchiveExportWizardE4.java
@@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.TreeSelection;
 
 import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
 import eu.etaxonomy.cdm.io.dwca.out.DwcaTaxExportConfigurator;
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.io.e4.out.AbstractExportWizardE4;
 import eu.etaxonomy.taxeditor.io.wizard.ExportToFileDestinationWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -55,13 +55,13 @@ public class DarwinCoreArchiveExportWizardE4 extends
 
                        while(it.hasNext()){
                                Object obj = it.next();
-                               if (obj instanceof TaxonNode){
-                                       TaxonNode node = (TaxonNode) obj;
-                                       if (node.getParent() == null){
+                               if (obj instanceof TaxonNodeDto){
+                                       TaxonNodeDto node = (TaxonNodeDto) obj;
+                                       if (node.getParentUUID() == null){
                                                if (configurator.getTaxonNodeFilter() == null){
-                                                       configurator.setTaxonNodeFilter(TaxonNodeFilter.NewClassificationInstance(node.getClassification().getUuid()));
+                                                       configurator.setTaxonNodeFilter(TaxonNodeFilter.NewClassificationInstance(node.getClassificationUUID()));
                                                }else{
-                                                       configurator.getTaxonNodeFilter().orClassification(node.getClassification().getUuid());
+                                                       configurator.getTaxonNodeFilter().orClassification(node.getClassificationUUID());
                                                }
                                        }else{
                                                if (configurator.getTaxonNodeFilter() == null){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
index 30e6ed48ba8de2bc87a8cdfd94c1146e53862eee..ec2f2f3d7cbfb66c32ffcfaecf37898b2e4d66dc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
@@ -68,51 +68,84 @@ public class TaxonRelationshipDetailElement extends AbstractCdmDetailElement<Tax
        @Override
        protected void createControls(ICdmFormElement formElement,
                        TaxonRelationship entity, int style) {
-               if (!(entity.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR()) || entity.getType().equals(TaxonRelationshipType.PRO_PARTE_MISAPPLIED_NAME_FOR())) ){
-                   combo_taxonRelationshipType = formFactory.createTermComboElement(
-                    TaxonRelationshipTypeInverseContainer.class,
-                    formElement, "Relationship Type",
-                    getTaxonRelationshipTypeInverseContainer(), style);
+               if ((entity.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR()) || entity.getType().equals(TaxonRelationshipType.PRO_PARTE_MISAPPLIED_NAME_FOR())) ){
 
-                       combo_taxonRelationshipType.setEnabled(false);
-                       selection_relatedTaxon = formFactory.createSelectionElement(
-                                       Taxon.class, //getConversationHolder(),
-                                       formElement, "Related Taxon", getRelatedTaxon(),
-                                       EntitySelectionElement.SELECTABLE, style);
-                       checkBoxDoubtful = formFactory.createCheckbox(formElement, "Relation Doubtful", entity.isDoubtful(), style);
-
-               }else{
                        taxon = entity.getFromTaxon();
 
-                       taxonElement = formFactory.createTaxonDetailSection(getConversationHolder(), formElement, null, style);
-                       taxonElement.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
-                       addControl(taxonElement);
-                       addElement(taxonElement);
-                       combo_misappliedRelationshipType = formFactory.createMisappliedRelationshipComboElement(formElement, "Relationship Type",
+            taxonElement = formFactory.createTaxonDetailSection(getConversationHolder(), formElement, null, style);
+            taxonElement.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+            addControl(taxonElement);
+            addElement(taxonElement);
+            combo_misappliedRelationshipType = formFactory.createMisappliedRelationshipComboElement(formElement, "Relationship Type",
+                    entity.getType(), style);
+
+            combo_misappliedRelationshipType.setEnabled(true);
+
+            sensuReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
+                 formElement, "Sensu",
+                taxon.getSec(), EntitySelectionElement.ALL,
+                style);
+
+            text_sensu_microreference = formFactory.createTextWithLabelElement(
+                    formElement, "Detail",
+                    taxon.getSecMicroReference(),null,
+                    SWT.WRAP);
+
+            secReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
+                    formElement, "Misappl. Sec.",
+                    entity.getCitation(), EntitySelectionElement.ALL,
+                    style);
+
+            text_secundum_microreference = formFactory.createTextWithLabelElement(
+                    formElement, "Detail",
+                    entity.getCitationMicroReference(),null,
+                    SWT.WRAP);
+            checkBoxDoubtful = formFactory.createCheckbox(formElement, "Misapplication Doubtful", entity.isDoubtful(), style);
+               }else if ((entity.getType().equals(TaxonRelationshipType.PRO_PARTE_SYNONYM_FOR()) || entity.getType().equals(TaxonRelationshipType.PARTIAL_SYNONYM_FOR())) ){
+                   taxon = entity.getFromTaxon();
+
+            taxonElement = formFactory.createTaxonDetailSection(getConversationHolder(), formElement, null, style);
+            taxonElement.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+            addControl(taxonElement);
+            addElement(taxonElement);
+            combo_misappliedRelationshipType = formFactory.createMisappliedRelationshipComboElement(formElement, "Relationship Type",
                     entity.getType(), style);
 
-                       combo_misappliedRelationshipType.setEnabled(true);
+            combo_misappliedRelationshipType.setEnabled(true);
+
+            sensuReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
+                 formElement, "Sensu",
+                taxon.getSec(), EntitySelectionElement.ALL,
+                style);
+
+            text_sensu_microreference = formFactory.createTextWithLabelElement(
+                    formElement, "Detail",
+                    taxon.getSecMicroReference(),null,
+                    SWT.WRAP);
 
-                       sensuReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
-                                formElement, "Sensu",
-                               taxon.getSec(), EntitySelectionElement.ALL,
-                               style);
+            secReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
+                    formElement, "Syn Sec.",
+                    entity.getCitation(), EntitySelectionElement.ALL,
+                    style);
 
-                       text_sensu_microreference = formFactory.createTextWithLabelElement(
-                                       formElement, "Detail",
-                                       taxon.getSecMicroReference(),null,
-                                       SWT.WRAP);
+            text_secundum_microreference = formFactory.createTextWithLabelElement(
+                    formElement, "Detail",
+                    entity.getCitationMicroReference(),null,
+                    SWT.WRAP);
+            checkBoxDoubtful = formFactory.createCheckbox(formElement, "PP Doubtful", entity.isDoubtful(), style);
 
-                       secReference = formFactory.createSelectionElement(Reference.class,//getConversationHolder(),
-                                       formElement, "Misappl. Sec.",
-                                       entity.getCitation(), EntitySelectionElement.ALL,
-                                       style);
+        }else{
+            combo_taxonRelationshipType = formFactory.createTermComboElement(
+                    TaxonRelationshipTypeInverseContainer.class,
+                    formElement, "Relationship Type",
+                    getTaxonRelationshipTypeInverseContainer(), style);
 
-                       text_secundum_microreference = formFactory.createTextWithLabelElement(
-                           formElement, "Detail",
-                           entity.getCitationMicroReference(),null,
-                           SWT.WRAP);
-                       checkBoxDoubtful = formFactory.createCheckbox(formElement, "Misapplication Doubtful", entity.isDoubtful(), style);
+            combo_taxonRelationshipType.setEnabled(false);
+            selection_relatedTaxon = formFactory.createSelectionElement(
+                    Taxon.class, //getConversationHolder(),
+                    formElement, "Related Taxon", getRelatedTaxon(),
+                    EntitySelectionElement.SELECTABLE, style);
+            checkBoxDoubtful = formFactory.createCheckbox(formElement, "Relation Doubtful", entity.isDoubtful(), style);
 
 
                }