- refactored naming of modifier section #4448
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 26 May 2015 09:40:10 +0000 (09:40 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 26 May 2015 09:40:10 +0000 (09:40 +0000)
.gitattributes
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateModifierElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/FeatureDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesCollectionSection.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateModifierCollectionSection.java with 88% similarity]

index 31cdf58..3167e48 100644 (file)
@@ -1772,7 +1772,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/voc
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateModifierCollectionSection.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesCollectionSection.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionSection.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StatisticalMeasureCollectionElement.java -text
index 1eed12f..8734cd9 100644 (file)
@@ -313,7 +313,7 @@ import eu.etaxonomy.taxeditor.ui.section.vocabulary.FeatureDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.vocabulary.MeasurementUnitCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.vocabulary.MeasurementUnitCollectionSection;
 import eu.etaxonomy.taxeditor.ui.section.vocabulary.NamedAreaDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.vocabulary.StateModifierCollectionSection;
+import eu.etaxonomy.taxeditor.ui.section.vocabulary.RecommendedModifierVocabulariesCollectionSection;
 import eu.etaxonomy.taxeditor.ui.section.vocabulary.StateVocabularyCollectionElement;
 import eu.etaxonomy.taxeditor.ui.section.vocabulary.StateVocabularyCollectionSection;
 import eu.etaxonomy.taxeditor.ui.section.vocabulary.StatisticalMeasureCollectionElement;
@@ -2278,8 +2278,8 @@ public class CdmFormFactory extends FormToolkit {
         return section;
     }
 
-    public StateModifierCollectionSection createStateModifierCollectionSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){
-        StateModifierCollectionSection section = new StateModifierCollectionSection(this, conversation, parentElement, style);
+    public RecommendedModifierVocabulariesCollectionSection createRecommendedModifierVocabulariesCollectionSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){
+        RecommendedModifierVocabulariesCollectionSection section = new RecommendedModifierVocabulariesCollectionSection(this, conversation, parentElement, style);
         addAndAdaptSection(parentElement, section);
         return section;
     }
index 34a7893..65ae5a3 100644 (file)
@@ -21,7 +21,7 @@ import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
-import eu.etaxonomy.taxeditor.ui.section.vocabulary.StateModifierCollectionSection;
+import eu.etaxonomy.taxeditor.ui.section.vocabulary.RecommendedModifierVocabulariesCollectionSection;
 
 /**
  * @author pplitzner
@@ -64,8 +64,8 @@ public class StateModifierElement extends AbstractEntityCollectionElement<TermVo
     @Override
     public void handleEvent(Object eventSource) {
         if(eventSource==comboStateVocabulary && comboStateVocabulary.getSelection()!=null){
-            if(getParentElement() instanceof StateModifierCollectionSection){
-                Feature feature = ((StateModifierCollectionSection) getParentElement()).getEntity();
+            if(getParentElement() instanceof RecommendedModifierVocabulariesCollectionSection){
+                Feature feature = ((RecommendedModifierVocabulariesCollectionSection) getParentElement()).getEntity();
                 feature.removeRecommendedModifierEnumeration(entity);
                 TermVocabulary<DefinedTerm> vocabulary = comboStateVocabulary.getSelection();
                 feature.addRecommendedModifierEnumeration(vocabulary);
index 9bd5d82..0ccf6e4 100644 (file)
@@ -46,7 +46,7 @@ public class FeatureDetailElement extends DefinedTermDetailElement<Feature> {
 \r
     private StatisticalMeasureCollectionSection sectionStatisticalMeasures;\r
 \r
-    private StateModifierCollectionSection sectionStateModifiers;;\r
+    private RecommendedModifierVocabulariesCollectionSection sectionModifierVocabularies;\r
 \r
     /**\r
         * @param formFactory\r
@@ -88,9 +88,9 @@ public class FeatureDetailElement extends DefinedTermDetailElement<Feature> {
             sectionStatisticalMeasures.setEntity(getEntity());\r
         }\r
         if(supportsCategoricalData.getSelection() || supportsQuantitativeData.getSelection()){\r
-            sectionStateModifiers = formFactory.createStateModifierCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);\r
-            sectionStateModifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));\r
-            sectionStateModifiers.setEntity(getEntity());\r
+            sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);\r
+            sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));\r
+            sectionModifierVocabularies.setEntity(getEntity());\r
         }\r
        }\r
 \r
@@ -115,9 +115,9 @@ public class FeatureDetailElement extends DefinedTermDetailElement<Feature> {
                    sectionStatisticalMeasures.setEntity(getEntity());\r
 \r
                    if(!supportsCategoricalData.getSelection()){\r
-                       sectionStateModifiers = formFactory.createStateModifierCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);\r
-                       sectionStateModifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));\r
-                       sectionStateModifiers.setEntity(getEntity());\r
+                       sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);\r
+                       sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));\r
+                       sectionModifierVocabularies.setEntity(getEntity());\r
                    }\r
                }\r
                else{\r
@@ -125,7 +125,7 @@ public class FeatureDetailElement extends DefinedTermDetailElement<Feature> {
                        removeElementsAndControls(sectionMeasurementUnits);\r
                        removeElementsAndControls(sectionStatisticalMeasures);\r
                        if(!supportsCategoricalData.getSelection()){\r
-                           removeElementsAndControls(sectionStateModifiers);\r
+                           removeElementsAndControls(sectionModifierVocabularies);\r
                        }\r
                    }\r
                }\r
@@ -147,16 +147,16 @@ public class FeatureDetailElement extends DefinedTermDetailElement<Feature> {
                    sectionStateVocabularies.setEntity(getEntity());\r
 \r
                    if(!supportsQuantitativeData.getSelection()){\r
-                       sectionStateModifiers = formFactory.createStateModifierCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);\r
-                       sectionStateModifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));\r
-                       sectionStateModifiers.setEntity(getEntity());\r
+                       sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);\r
+                       sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));\r
+                       sectionModifierVocabularies.setEntity(getEntity());\r
                    }\r
                }\r
                else{\r
                    if(sectionStateVocabularies!=null){\r
                        removeElementsAndControls(sectionStateVocabularies);\r
                        if(!supportsQuantitativeData.getSelection()){\r
-                           removeElementsAndControls(sectionStateModifiers);\r
+                           removeElementsAndControls(sectionModifierVocabularies);\r
                        }\r
                    }\r
                }\r
@@ -25,11 +25,11 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AbstractUnboundEntityCol
  * @date Apr 27, 2015
  *
  */
-public class StateModifierCollectionSection extends AbstractUnboundEntityCollectionSection<Feature, TermVocabulary<DefinedTerm>> {
+public class RecommendedModifierVocabulariesCollectionSection extends AbstractUnboundEntityCollectionSection<Feature, TermVocabulary<DefinedTerm>> {
 
-    public StateModifierCollectionSection(CdmFormFactory formFactory,
+    public RecommendedModifierVocabulariesCollectionSection(CdmFormFactory formFactory,
             ConversationHolder conversation, ICdmFormElement parentElement, int style) {
-        super(formFactory, conversation, parentElement, "Recommended state modifier", style);
+        super(formFactory, conversation, parentElement, "Recommended modifier vocabularies", style);
     }
 
     /* (non-Javadoc)
@@ -74,7 +74,7 @@ public class StateModifierCollectionSection extends AbstractUnboundEntityCollect
     /** {@inheritDoc} */
     @Override
     public String getEmptyString() {
-        return "No state modifiers yet.";
+        return "No modifiers vocabularies yet.";
     }
 
     /* (non-Javadoc)
@@ -83,7 +83,7 @@ public class StateModifierCollectionSection extends AbstractUnboundEntityCollect
     /** {@inheritDoc} */
     @Override
     protected String getTooltipString() {
-        return "Add a state modifier";
+        return "Add a modifier vocabulary";
     }