ref #9266: some layout issues and label renaming

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java
index 1e8eb877befe19a7e8e518391ea750045d21af46..89e60f32dba7171dfbe68a64c890b27c31316501 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java
@@ -49,7 +49,7 @@ public class NomenclaturalReferenceDetailSection extends
 
        @Override
        public String getHeading() {
-               return "Nomenclatural Reference";
+               return "Nomenclatural Source";
        }
 
        @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalSourceElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalSourceElement.java
index 4353bf816ae0bfd0fe6a7dcf85019da4c9d77732..41532d66cb822211bcf316896802072bfb879c02 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalSourceElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalSourceElement.java
@@ -8,6 +8,7 @@
 */
 package eu.etaxonomy.taxeditor.ui.section.reference;
 
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
@@ -75,28 +76,19 @@ public class NomenclaturalSourceElement extends OriginalSourceElement {
         }
         selection_NomRef.setBackground(this.getPersistentBackground());
         microReference = formFactory.createTextWithLabelElement(formElement, "Details", entity != null? entity.getCitationMicroReference(): "", style);
-        microReference.setIndent(10);
+        microReference.setIndent(15);
         for (ICdmFormElement element: selection_NomRef.getElements()){
             element.setBackground(getPersistentBackground());
         }
+        Label sep = formFactory.createLabel(formElement.getLayoutComposite(), "");
+        sep.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
 
         select_nameUsedInSource = formFactory.createSelectionElement(TaxonName.class, formElement, "Original spelling", entity != null? ((DescriptionElementSource)entity).getNameUsedInSource(): null, EntitySelectionElement.ALL, style);
 
-
-//        if (PreferencesUtil.getBooleanValue(PreferencePredicate.ShowNamespaceInSource.getKey())){
-//            text_idNamespace = formFactory.createTextWithLabelElement(formElement, "ID Namespace", entity != null?entity.getIdNamespace():null, style);
-//        }
-//        if (PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSource.getKey())){
-//            text_idInSource = formFactory.createTextWithLabelElement(formElement, "ID in Source", entity != null?entity.getIdInSource():null, style);
-//        }
-//
-//        text_originaleNameString = formFactory.createTextWithLabelElement(
-//                formElement, "Original Information", entity != null?entity.getOriginalNameString():null, SWT.NULL);
-
         externalLinks = formFactory.createExternalLinksSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(ExternalLinksSection.class, DescriptionElementSource.class.getCanonicalName()));
         externalLinks.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 3));
         externalLinks.setEntity(entity);
-        externalLinks.setText("Link to protologue");
+        externalLinks.setText("Protologue/original publication");
         externalLinks.setEmptySectionString("No protologue yet.");
 
         addControl(externalLinks);
@@ -106,7 +98,6 @@ public class NomenclaturalSourceElement extends OriginalSourceElement {
         TableWrapData layoutData = LayoutConstants.FILL_HORIZONTALLY(2, 1);
         layoutData.indent = 10;
 
-
         advancedSection.setLayoutData(layoutData);
         advancedSection.setBackground(this.getPersistentBackground());
         advancedSection.setEntity(entity);