fix #9032: layout issues in feature details view
authorKatja Luther <k.luther@bgbm.org>
Tue, 16 Jun 2020 07:35:15 +0000 (09:35 +0200)
committerKatja Luther <k.luther@bgbm.org>
Tue, 16 Jun 2020 07:37:18 +0000 (09:37 +0200)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/FeatureDetailElement.java

index adc7a214f060419512557d5425243d208be98102..82dd46455605319eda6b59ecaa86f62d6b2b24be 100644 (file)
@@ -8,11 +8,14 @@
 */\r
 package eu.etaxonomy.taxeditor.ui.section.vocabulary;\r
 \r
+import org.eclipse.ui.forms.widgets.TableWrapData;\r
+\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;\r
 import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;\r
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.element.LabelElement;\r
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;\r
 \r
 /**\r
@@ -67,14 +70,16 @@ public class FeatureDetailElement extends DefinedTermDetailElement<Feature> {
        protected void createControls(ICdmFormElement formElement, Feature entity, int style) {\r
            super.createControls(formElement, entity, style);\r
            this.parentFormElement = formElement;\r
-           supportsTextData = formFactory.createCheckbox(formElement, "Supports Text Data", entity.isSupportsTextData(), style);\r
-           supportsQuantitativeData = formFactory.createCheckbox(formElement, "Supports Quantitative Data", entity.isSupportsQuantitativeData(), style);\r
-           supportsDistribution = formFactory.createCheckbox(formElement, "Supports Distribution", entity.isSupportsDistribution(), style);\r
-           supportsIndividualAssociation = formFactory.createCheckbox(formElement, "Supports Individual Association", entity.isSupportsIndividualAssociation(), style);\r
-           supportsTaxonInteraction = formFactory.createCheckbox(formElement, "Supports Taxon Interaction", entity.isSupportsTaxonInteraction(), style);\r
-           supportsCategoricalData = formFactory.createCheckbox(formElement, "Supports Categorical Data", entity.isSupportsCategoricalData(), style);\r
-           supportsCommonTaxonName = formFactory.createCheckbox(formElement, "Supports Common Taxon Name", entity.isSupportsCommonTaxonName(), style);\r
-           supportsTemporalData = formFactory.createCheckbox(formElement, "Supports Temporal Data", entity.isSupportsTemporalData(), style);\r
+           LabelElement supportsLabel = formFactory.createLabel(formElement, "Supports");\r
+           supportsLabel.setBold();\r
+           supportsTextData = formFactory.createCheckbox(formElement, "Text Data", entity.isSupportsTextData(), style);\r
+           supportsCategoricalData = formFactory.createCheckbox(formElement, "Categorical Data", entity.isSupportsCategoricalData(), style);\r
+           supportsQuantitativeData = formFactory.createCheckbox(formElement, "Quantitative Data", entity.isSupportsQuantitativeData(), style);\r
+           supportsDistribution = formFactory.createCheckbox(formElement, "Distribution", entity.isSupportsDistribution(), style);\r
+           supportsIndividualAssociation = formFactory.createCheckbox(formElement, "Individual Association", entity.isSupportsIndividualAssociation(), style);\r
+           supportsTaxonInteraction = formFactory.createCheckbox(formElement, "Taxon Interaction", entity.isSupportsTaxonInteraction(), style);\r
+           supportsCommonTaxonName = formFactory.createCheckbox(formElement, "Common Taxon Name", entity.isSupportsCommonTaxonName(), style);\r
+           supportsTemporalData = formFactory.createCheckbox(formElement, "Temporal Data", entity.isSupportsTemporalData(), style);\r
 \r
         if (supportsCategoricalData.getSelection()) {\r
             sectionStateVocabularies = formFactory.createStateVocabulariesSection(getConversationHolder(),\r
@@ -101,9 +106,17 @@ public class FeatureDetailElement extends DefinedTermDetailElement<Feature> {
             sectionModifierVocabularies.setEntity(getEntity());\r
         }\r
 \r
-        availableForTaxon = formFactory.createCheckbox(formElement, "Available for Taxon", entity.isAvailableForTaxon(), style);\r
-        availableForTaxonName = formFactory.createCheckbox(formElement, "Available for Taxon Name", entity.isAvailableForTaxonName(), style);\r
-        availableForSpecimenOrObservation = formFactory.createCheckbox(formElement, "Available for Occurrence", entity.isAvailableForOccurrence(), style);\r
+        LabelElement noLabel = formFactory.createLabel(formElement, "");\r
+\r
+        TableWrapData data = LayoutConstants.FILL_HORIZONTALLY(2, 1);\r
+        data.maxHeight = 3;\r
+        noLabel.setLayout(data);\r
+        LabelElement availableLabel = formFactory.createLabel(formElement, "Available for");\r
+        availableLabel.setBold();\r
+\r
+        availableForTaxon = formFactory.createCheckbox(formElement, "Taxon", entity.isAvailableForTaxon(), style);\r
+        availableForTaxonName = formFactory.createCheckbox(formElement, "Taxon Name", entity.isAvailableForTaxonName(), style);\r
+        availableForSpecimenOrObservation = formFactory.createCheckbox(formElement, "Occurrence", entity.isAvailableForOccurrence(), style);\r
     }\r
 \r
        /* (non-Javadoc)\r