remove structural modifier combo

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java
index c54578e78058dffc785179e218bffe30eb4ff365..3ac875a3c146ec6a116237eb6378d7760611fe76 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java
@@ -14,15 +14,12 @@ import org.eclipse.swt.widgets.Text;
 
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.Character;
-import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.model.term.Representation;
-import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermBasePropertyTester;
 import eu.etaxonomy.taxeditor.model.ColorResources;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
-import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -46,7 +43,7 @@ public class CharacterDetailElement extends AbstractCdmDetailElement<Character>
 
     private RepresentationElement element_Representation;
 
-    private TermComboElement<DefinedTerm> comboStructuralModifier;
+   // private TermComboElement<DefinedTerm> comboStructuralModifier;
 
     private CheckboxElement supportsQuantitativeData;
 
@@ -116,7 +113,7 @@ public class CharacterDetailElement extends AbstractCdmDetailElement<Character>
            text_property.setLayoutData(LayoutConstants.FILL());
            text_property.setForeground(ColorResources.getColor(Resources.BLACK));
 
-        comboStructuralModifier = formFactory.createDefinedTermComboElement(TermType.StructureModifier, formElement, "Structural Modifier", entity.getStructureModifier(), style);
+     //   comboStructuralModifier = formFactory.createDefinedTermComboElement(TermType.StructureModifier, formElement, "Structural Modifier", entity.getStructureModifier(), style);
 
         ratioTo = formFactory.createRemovableTextField(formElement, "Ratio to", CharacterNodeDetailElement.getRatioToText(entity), style);
 
@@ -174,9 +171,9 @@ public class CharacterDetailElement extends AbstractCdmDetailElement<Character>
 
        @Override
        public void handleEvent(Object eventSource) {
-           if(eventSource == comboStructuralModifier){
-               getEntity().setStructureModifier(comboStructuralModifier.getSelection());
-           }
+//         if(eventSource == comboStructuralModifier){
+//             getEntity().setStructureModifier(comboStructuralModifier.getSelection());
+//         }
            if(eventSource == ratioTo){
                if (!ratioTo.isState()){
                    getEntity().setRatioToStructure(null);
@@ -298,7 +295,7 @@ public class CharacterDetailElement extends AbstractCdmDetailElement<Character>
        public void fillFields() {
                if (getEntity()!= null) {
                        element_Representation.setTerm(getEntity(), isEnabled());
-                       comboStructuralModifier.setSelection(getEntity().getStructureModifier());
+//                     comboStructuralModifier.setSelection(getEntity().getStructureModifier());
                        supportsQuantitativeData.setSelection(getEntity().isSupportsQuantitativeData());
                        supportsCategoricalData.setSelection(getEntity().isSupportsCategoricalData());;
                        availableForTaxon.setSelection(getEntity().isAvailableForTaxon());
@@ -308,12 +305,12 @@ public class CharacterDetailElement extends AbstractCdmDetailElement<Character>
                        sectionMeasurementUnits.setEntity(getEntity());
                        sectionStatisticalMeasures.setEntity(getEntity());
                        sectionModifierVocabularies.setEntity(getEntity());
-                       
+
                        text_structure.setText(CharacterNodeDetailElement.getStructureText(getEntity()));
                        text_property.setText(CharacterNodeDtoDetailElement.getPropertyText(getEntity()));
                        ratioTo.setText(CharacterNodeDetailElement.getRatioToText(getEntity()));
                }
-               
+
        }
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDtoDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDtoDetailElement.java
index bfca2e8596afb941e39c20c6b1e271eec21ee4f3..e2b5ef3df1bb7e47241242f0aee56ac7c462b934 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDtoDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDtoDetailElement.java
@@ -15,12 +15,9 @@ import org.eclipse.swt.widgets.Text;
 
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.Character;
-import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.model.term.Representation;
-import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.persistence.dto.CharacterDto;
 import eu.etaxonomy.cdm.persistence.dto.FeatureDto;
-import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermBasePropertyTester;
 import eu.etaxonomy.taxeditor.event.EventUtility;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
@@ -28,7 +25,6 @@ import eu.etaxonomy.taxeditor.model.ColorResources;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
-import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -56,7 +52,7 @@ public class CharacterDtoDetailElement extends AbstractCdmDetailElement<Characte
 
     protected RepresentationElement element_Representation;
 
-    private TermComboElement<DefinedTerm> comboStructuralModifier;
+  //  private TermComboElement<DefinedTerm> comboStructuralModifier;
 
     private CheckboxElement supportsQuantitativeData;
 
@@ -122,7 +118,7 @@ public class CharacterDtoDetailElement extends AbstractCdmDetailElement<Characte
            text_property.setLayoutData(LayoutConstants.FILL());
            text_property.setForeground(ColorResources.getColor(Resources.BLACK));
 
-        comboStructuralModifier = formFactory.createDefinedTermComboElementDto(TermType.StructureModifier, formElement, "Structural Modifier", entity.getStructureModifier(), style);
+     //   comboStructuralModifier = formFactory.createDefinedTermComboElementDto(TermType.StructureModifier, formElement, "Structural Modifier", entity.getStructureModifier(), style);
 
 //        if (labelText_ratioTo != null){
 //            labelText_ratioTo.dispose();
@@ -200,9 +196,9 @@ public class CharacterDtoDetailElement extends AbstractCdmDetailElement<Characte
 
        @Override
        public void handleEvent(Object eventSource) {
-           if(eventSource == comboStructuralModifier){
-               getEntity().setStructureModifier(TermDto.fromTerm(comboStructuralModifier.getSelection()));
-           }
+//         if(eventSource == comboStructuralModifier){
+//             getEntity().setStructureModifier(TermDto.fromTerm(comboStructuralModifier.getSelection()));
+//         }
            if(eventSource == ratioTo){
                if (!ratioTo.isState()){
                    getEntity().setRatioTo(null);
@@ -334,7 +330,7 @@ public class CharacterDtoDetailElement extends AbstractCdmDetailElement<Characte
        public void fillFields() {
                if (getEntity() != null) {
                        element_Representation.setTermDto(getEntity(), true);
-                       comboStructuralModifier.setSelectionDto(getEntity().getStructureModifier());
+                       //comboStructuralModifier.setSelectionDto(getEntity().getStructureModifier());
                        supportsQuantitativeData.setSelection(getEntity().isSupportsQuantitativeData());
                        supportsCategoricalData.setSelection(getEntity().isSupportsCategoricalData());
                        availableForTaxon.setSelection(getEntity().isAvailableForTaxon());
@@ -348,7 +344,7 @@ public class CharacterDtoDetailElement extends AbstractCdmDetailElement<Characte
                        text_property.setText(getEntity().getProperty().getPath());
                        ratioTo.setText(getEntity().getRatioTo() != null? getEntity().getRatioTo().getPath():null);
                }
-               
+
        }
 
 }