From 8e4118ad1d2ef52f81545d6ee0855daac5b970da Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Tue, 26 May 2015 09:40:10 +0000
Subject: [PATCH] - refactored naming of modifier section #4448
---
.gitattributes | 2 +-
.../taxeditor/ui/element/CdmFormFactory.java | 6 ++---
.../description/StateModifierElement.java | 6 ++---
.../vocabulary/FeatureDetailElement.java | 24 +++++++++----------
...odifierVocabulariesCollectionSection.java} | 10 ++++----
5 files changed, 24 insertions(+), 24 deletions(-)
rename eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/{StateModifierCollectionSection.java => RecommendedModifierVocabulariesCollectionSection.java} (88%)
diff --git a/.gitattributes b/.gitattributes
index 31cdf5895..3167e48d3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -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
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 1eed12f36..8734cd94a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -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;
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateModifierElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateModifierElement.java
index 34a7893d6..65ae5a33f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateModifierElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateModifierElement.java
@@ -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 vocabulary = comboStateVocabulary.getSelection();
feature.addRecommendedModifierEnumeration(vocabulary);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/FeatureDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/FeatureDetailElement.java
index 9bd5d8282..0ccf6e484 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/FeatureDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/FeatureDetailElement.java
@@ -46,7 +46,7 @@ public class FeatureDetailElement extends DefinedTermDetailElement {
private StatisticalMeasureCollectionSection sectionStatisticalMeasures;
- private StateModifierCollectionSection sectionStateModifiers;;
+ private RecommendedModifierVocabulariesCollectionSection sectionModifierVocabularies;
/**
* @param formFactory
@@ -88,9 +88,9 @@ public class FeatureDetailElement extends DefinedTermDetailElement {
sectionStatisticalMeasures.setEntity(getEntity());
}
if(supportsCategoricalData.getSelection() || supportsQuantitativeData.getSelection()){
- sectionStateModifiers = formFactory.createStateModifierCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);
- sectionStateModifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
- sectionStateModifiers.setEntity(getEntity());
+ sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);
+ sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+ sectionModifierVocabularies.setEntity(getEntity());
}
}
@@ -115,9 +115,9 @@ public class FeatureDetailElement extends DefinedTermDetailElement {
sectionStatisticalMeasures.setEntity(getEntity());
if(!supportsCategoricalData.getSelection()){
- sectionStateModifiers = formFactory.createStateModifierCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);
- sectionStateModifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
- sectionStateModifiers.setEntity(getEntity());
+ sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);
+ sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+ sectionModifierVocabularies.setEntity(getEntity());
}
}
else{
@@ -125,7 +125,7 @@ public class FeatureDetailElement extends DefinedTermDetailElement {
removeElementsAndControls(sectionMeasurementUnits);
removeElementsAndControls(sectionStatisticalMeasures);
if(!supportsCategoricalData.getSelection()){
- removeElementsAndControls(sectionStateModifiers);
+ removeElementsAndControls(sectionModifierVocabularies);
}
}
}
@@ -147,16 +147,16 @@ public class FeatureDetailElement extends DefinedTermDetailElement {
sectionStateVocabularies.setEntity(getEntity());
if(!supportsQuantitativeData.getSelection()){
- sectionStateModifiers = formFactory.createStateModifierCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);
- sectionStateModifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
- sectionStateModifiers.setEntity(getEntity());
+ sectionModifierVocabularies = formFactory.createRecommendedModifierVocabulariesCollectionSection(getConversationHolder(), parentFormElement, ExpandableComposite.TWISTIE);
+ sectionModifierVocabularies.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+ sectionModifierVocabularies.setEntity(getEntity());
}
}
else{
if(sectionStateVocabularies!=null){
removeElementsAndControls(sectionStateVocabularies);
if(!supportsQuantitativeData.getSelection()){
- removeElementsAndControls(sectionStateModifiers);
+ removeElementsAndControls(sectionModifierVocabularies);
}
}
}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateModifierCollectionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesCollectionSection.java
similarity index 88%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateModifierCollectionSection.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesCollectionSection.java
index c8ba3aa2d..3cbe73aea 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateModifierCollectionSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/RecommendedModifierVocabulariesCollectionSection.java
@@ -25,11 +25,11 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AbstractUnboundEntityCol
* @date Apr 27, 2015
*
*/
-public class StateModifierCollectionSection extends AbstractUnboundEntityCollectionSection> {
+public class RecommendedModifierVocabulariesCollectionSection extends AbstractUnboundEntityCollectionSection> {
- 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";
}
--
2.34.1