From b856ff9a8c94e0e9a7282822fce088d2d5f3142d Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Tue, 26 May 2015 08:28:06 +0000
Subject: [PATCH] - moved OriginalLabelData to specimen details section
(#4776)
---
.../occurrence/DerivedUnitBaseDetailElement.java | 6 ++++++
.../taxeditor/view/detail/DetailsViewer.java | 16 +++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index e67aaaf80..7c589fe50 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -24,6 +24,7 @@ import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
+import eu.etaxonomy.taxeditor.ui.element.OriginalLabelDataElement;
import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
@@ -56,6 +57,8 @@ public class DerivedUnitBaseDetailElement extends
private SourceCollectionDetailSection section_source;
+ private OriginalLabelDataElement textOriginalLabel;
+
/**
*
* Constructor for DerivedUnitBaseDetailElement.
@@ -113,6 +116,9 @@ public class DerivedUnitBaseDetailElement extends
section_source = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE);
section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
section_source.setEntity(entity);
+
+ textOriginalLabel = formFactory.createOriginalLabelDataElement(formElement);
+ textOriginalLabel.setEntity(getEntity());
}
/** {@inheritDoc} */
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 67ec1c0d5..bd6ce27ad 100644
--- 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
@@ -90,7 +90,6 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.EmptySection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitGeneralDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.OriginalLabelDataSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.association.TaxonAssociationDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaQualityDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaSampleGeneralDetailSection;
@@ -227,7 +226,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
}
else{
Set descriptionMarkers = ((DescriptionBase>) input).getMarkers();
-
+
Boolean isUseDescription = false;
for (Marker marker : descriptionMarkers) {
if (marker.getMarkerType()!= null && marker.getMarkerType().getUuid().equals(UsageTermCollection.uuidUseMarkerType)) {
@@ -246,7 +245,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
}
} else if (input instanceof DescriptionElementBase) {
Set descriptionMarkers = ((DescriptionElementBase) input).getInDescription().getMarkers();
-
+
Boolean isUseDescription = false;
for (Marker marker : descriptionMarkers) {
if (marker.getMarkerType()!= null && marker.getMarkerType().getUuid().equals(UsageTermCollection.uuidUseMarkerType)) {
@@ -650,11 +649,6 @@ public class DetailsViewer extends AbstractCdmDataViewer {
DerivedUnitBaseDetailSection derivedUnitBaseDetailSection = formFactory.createDerivedUnitBaseDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
addPart(derivedUnitBaseDetailSection);
- formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-
- OriginalLabelDataSection originalLabelDataSection = formFactory.createOriginalLabelDataSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
- addPart(originalLabelDataSection);
-
//for editors working with facades
if(AbstractUtility.getActivePart() instanceof IDerivedUnitFacadePart){
formFactory.createHorizontalSeparator(parent, SWT.BORDER);
@@ -676,7 +670,11 @@ public class DetailsViewer extends AbstractCdmDataViewer {
TaxonAssociationDetailSection taxonAssociationDetailSection = formFactory.createTaxonAssociationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
addPart(taxonAssociationDetailSection);
}
-
+
+// formFactory.createHorizontalSeparator(parent, SWT.BORDER);
+// IdentifierDetailSection identifierDetailSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
+// addPart(identifierDetailSection);
+
}
private void createFieldUnitSection(RootElement parent) {
--
2.34.1