- moved OriginalLabelData section to 2nd position

   - made text field fill horizontally

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/OriginalLabelDataElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/OriginalLabelDataElement.java
index e5753d1cac0dba1bd10f14682a1e93101b8e89bc..48c30ed7df9380d53bc4b4f078bf2a9d0c2a5e85 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/OriginalLabelDataElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/OriginalLabelDataElement.java
@@ -20,8 +20,6 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  */
 public class OriginalLabelDataElement extends AbstractCdmDetailElement<DerivedUnitFacade> {
 
-    private TextWithLabelElement textOriginalLabelData;
-
     /**
      * @param formFactory
      * @param formElement
@@ -41,9 +39,8 @@ public class OriginalLabelDataElement extends AbstractCdmDetailElement<DerivedUn
     @Override
     protected void createControls(ICdmFormElement formElement,
             DerivedUnitFacade entity, int style) {
-        new OriginalLabelDataField(formElement.getLayoutComposite(), style, entity.innerDerivedUnit(), getFormFactory());
-//        textOriginalLabelData = formFactory.createTextWithLabelElement(formElement,
-//                "Original Label Data", entity.innerDerivedUnit().getOriginalLabelInfo(), SWT.MULTI);
+        OriginalLabelDataField originalLabelDataField = new OriginalLabelDataField(formElement.getLayoutComposite(), style, entity.innerDerivedUnit(), getFormFactory());
+        originalLabelDataField.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
     }
 
     /*
@@ -55,9 +52,6 @@ public class OriginalLabelDataElement extends AbstractCdmDetailElement<DerivedUn
      */
     @Override
     public void handleEvent(Object eventSource) {
-        if (eventSource == textOriginalLabelData) {
-            getEntity().innerDerivedUnit().setOriginalLabelInfo(textOriginalLabelData.getText());
-        }
     }
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index bfe64abd77b1e20b89a5968f0469efb0b1c29a91..bf7088c7109b9d01546993cc2eb6ecba7fc98098 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@ -675,13 +675,13 @@ public class DetailsViewer extends AbstractCdmDataViewer {
 
             formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
-            DerivedUnitBaseDetailSection derivedUnitBaseDetailSection = formFactory.createDerivedUnitBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-            addPart(derivedUnitBaseDetailSection);
+            OriginalLabelDataSection originalLabelDataSection = formFactory.createOriginalLabelDataSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
+            addPart(originalLabelDataSection);
 
             formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
-            OriginalLabelDataSection originalLabelDataSection = formFactory.createOriginalLabelDataSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
-            addPart(originalLabelDataSection);
+            DerivedUnitBaseDetailSection derivedUnitBaseDetailSection = formFactory.createDerivedUnitBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
+            addPart(derivedUnitBaseDetailSection);
 
             formFactory.createHorizontalSeparator(parent, SWT.BORDER);