Aligning Editor with 3.3 model changes. First phase commit which updates only the...

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / userecords / UseRecordDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
index 32d02813fde7407d31e8f174597c2776627c0b7f..8f913790f91b1748b6c7d38df7ffbf46ac27e9fe 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
@@ -17,11 +17,12 @@ import java.util.Set;
 import org.apache.log4j.Logger;\r
 import org.eclipse.swt.events.SelectionEvent;\r
 import org.eclipse.swt.events.SelectionListener;\r
+\r
+import eu.etaxonomy.cdm.model.common.DefinedTerm;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.common.LanguageString;\r
 import eu.etaxonomy.cdm.model.common.Marker;\r
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
-import eu.etaxonomy.cdm.model.description.Modifier;\r
 import eu.etaxonomy.cdm.model.description.State;\r
 import eu.etaxonomy.cdm.model.description.StateData;\r
 import eu.etaxonomy.taxeditor.editor.UsageTermCollection;\r
@@ -48,10 +49,10 @@ public class UseRecordDetailElement extends
 \r
        private TermComboElement<State> combo_UseCategory;\r
        private TermComboElement<State> combo_UseSubCategory;\r
-       private TermComboElement<Modifier> combo_PlantPart;\r
-       private TermComboElement<Modifier> combo_Country;\r
-       private TermComboElement<Modifier> combo_HumanGroup;\r
-       private TermComboElement<Modifier> combo_EthnicGroup;\r
+       private TermComboElement<DefinedTerm> combo_PlantPart;\r
+       private TermComboElement<DefinedTerm> combo_Country;\r
+       private TermComboElement<DefinedTerm> combo_HumanGroup;\r
+       private TermComboElement<DefinedTerm> combo_EthnicGroup;\r
 \r
        public UseRecordDetailElement(CdmFormFactory formFactory,\r
                        ICdmFormElement formElement) {\r
@@ -66,11 +67,11 @@ public class UseRecordDetailElement extends
                combo_UseCategory = formFactory.createTermComboElement(State.class,     this, UsageTermCollection.useCategoryVocabularyLabel, null, style);\r
                combo_UseCategory.addSelectionListener(this);\r
                combo_UseSubCategory = formFactory.createTermComboElement(State.class, this, UsageTermCollection.useSubCategoryVocabularyLabel, null, style);\r
-               combo_PlantPart = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.plantPartLabel, null, style);\r
-               combo_HumanGroup = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.humanGroupLabel, null, style);\r
+               combo_PlantPart = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.plantPartLabel, null, style);\r
+               combo_HumanGroup = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.humanGroupLabel, null, style);\r
                combo_HumanGroup.addSelectionListener(this);\r
-               combo_EthnicGroup = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.ethnicGroupLabel, null, style);\r
-               combo_Country   = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.countryLabel, null, style);\r
+               combo_EthnicGroup = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.ethnicGroupLabel, null, style);\r
+               combo_Country   = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.countryLabel, null, style);\r
                \r
 \r
                List<State> termsUseCategory = setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false));\r
@@ -88,19 +89,19 @@ public class UseRecordDetailElement extends
                        combo_UseSubCategory.setEnabled(false);\r
                }\r
                \r
-               List<Modifier> plantPartsToAdd = setModifierComboTerms(TermStore.getTerms(Modifier.class, null, false), UsageTermCollection.plantPartLabel);\r
+               List<DefinedTerm> plantPartsToAdd = setModifierComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), UsageTermCollection.plantPartLabel);\r
                combo_PlantPart.setTerms(plantPartsToAdd);\r
                combo_PlantPart.setSelection(modifierSelection(UsageTermCollection.plantPartLabel));\r
                \r
-               List<Modifier> countriesToAdd = setModifierComboTerms(TermStore.getTerms(Modifier.class, null, false), UsageTermCollection.countryLabel);\r
+               List<DefinedTerm> countriesToAdd = setModifierComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), UsageTermCollection.countryLabel);\r
                combo_Country.setTerms(countriesToAdd);\r
                combo_Country.setSelection(modifierSelection(UsageTermCollection.countryLabel));\r
                \r
-               List<Modifier> humanGroupToAdd = setModifierComboTerms(TermStore.getTerms(Modifier.class, null, false), UsageTermCollection.humanGroupLabel);\r
+               List<DefinedTerm> humanGroupToAdd = setModifierComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), UsageTermCollection.humanGroupLabel);\r
                combo_HumanGroup.setTerms(humanGroupToAdd);\r
                combo_HumanGroup.setSelection(modifierSelection(UsageTermCollection.humanGroupLabel));\r
                \r
-               List<Modifier> ethnicGroupToAdd = setEthnicGroupComboTerms(TermStore.getTerms(Modifier.class, null, false), combo_HumanGroup.getSelection());\r
+               List<DefinedTerm> ethnicGroupToAdd = setEthnicGroupComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), combo_HumanGroup.getSelection());\r
                if (ethnicGroupToAdd != null) {\r
                        combo_EthnicGroup.setTerms(ethnicGroupToAdd);\r
                        combo_EthnicGroup.setSelection(modifierSelection(UsageTermCollection.ethnicGroupLabel));\r
@@ -116,9 +117,9 @@ public class UseRecordDetailElement extends
         * @param comboCategory\r
         * @return\r
         */\r
-       private Modifier modifierSelection(String comboCategory) {\r
+       private DefinedTerm modifierSelection(String comboCategory) {\r
                if(!getEntity().getModifiers().isEmpty()) {\r
-                       for (Modifier modifier : getEntity().getModifiers()) {\r
+                       for (DefinedTerm modifier : getEntity().getModifiers()) {\r
                                if(GetVocabularyType(modifier, comboCategory)) {\r
                                        return modifier;\r
                                }\r
@@ -161,9 +162,9 @@ public class UseRecordDetailElement extends
         * @param modType\r
         * @return\r
         */\r
-       private List<Modifier> setModifierComboTerms(List<Modifier> listOfTerms, String modType) {\r
-               List<Modifier> termsToAdd = new ArrayList<Modifier>();\r
-               for (Modifier term : listOfTerms) {\r
+       private List<DefinedTerm> setModifierComboTerms(List<DefinedTerm> listOfTerms, String modType) {\r
+               List<DefinedTerm> termsToAdd = new ArrayList<DefinedTerm>();\r
+               for (DefinedTerm term : listOfTerms) {\r
 \r
                        if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(modType))) {\r
                                termsToAdd.add(term);\r
@@ -250,11 +251,11 @@ public class UseRecordDetailElement extends
         * @param selectedHumangroup\r
         * @return\r
         */\r
-       private List<Modifier> setEthnicGroupComboTerms(List<Modifier> listOfTerms,\r
-                       Modifier selectedHumangroup) {\r
-               List<Modifier> termsToAdd = new ArrayList<Modifier>();\r
+       private List<DefinedTerm> setEthnicGroupComboTerms(List<DefinedTerm> listOfTerms,\r
+                       DefinedTerm selectedHumangroup) {\r
+               List<DefinedTerm> termsToAdd = new ArrayList<DefinedTerm>();\r
                if (combo_HumanGroup.getSelection() != null) {\r
-                       for (Modifier term : listOfTerms) {\r
+                       for (DefinedTerm term : listOfTerms) {\r
        \r
                                if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(selectedHumangroup.getTitleCache()))) {\r
                                        termsToAdd.add(term);\r
@@ -265,11 +266,11 @@ public class UseRecordDetailElement extends
                        }\r
                }\r
                else if (!getEntity().getModifiers().isEmpty()) {\r
-                       for (Modifier modifier : getEntity().getModifiers()) {\r
+                       for (DefinedTerm modifier : getEntity().getModifiers()) {\r
                                if (modifier.getMarkers() != null) {\r
                                        for (Marker marker : modifier.getMarkers()) {\r
                                                if(marker.getMarkerType().getTitleCache().equals(UsageTermCollection.humanGroupLabel)) {\r
-                                                       for (Modifier term : listOfTerms) {\r
+                                                       for (DefinedTerm term : listOfTerms) {\r
                                                                if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(modifier.getTitleCache()))) {\r
                                                                        termsToAdd.add(modifier);\r
                                                                } else if ((term.getVocabulary() != null) && (term.getVocabulary().getTitleCache().equals(modifier.getTitleCache()))) {\r
@@ -408,22 +409,22 @@ public class UseRecordDetailElement extends
                }\r
                if (eventSource == combo_PlantPart) {\r
                        if (combo_PlantPart.getSelection() != null) {\r
-                               Iterator<Modifier> itrExistingModifiers = getEntity().getModifiers().iterator();\r
+                               Iterator<DefinedTerm> itrExistingModifiers = getEntity().getModifiers().iterator();\r
                                while (itrExistingModifiers.hasNext()) {\r
-                                       Modifier modifier = itrExistingModifiers.next();\r
+                                       DefinedTerm modifier = itrExistingModifiers.next();\r
                                        if(GetVocabularyType(modifier, UsageTermCollection.plantPartLabel)) {\r
                                                itrExistingModifiers.remove();\r
                                        }\r
                                                \r
                                }       \r
-                               Modifier plantPart = combo_PlantPart.getSelection();\r
+                               DefinedTerm plantPart = combo_PlantPart.getSelection();\r
                                getEntity().addModifier(plantPart);\r
                        } else {\r
-                               Set<Modifier> modifiers = getEntity().getModifiers();\r
+                               Set<DefinedTerm> modifiers = getEntity().getModifiers();\r
                                if(!modifiers.isEmpty()) {\r
-                                       Iterator<Modifier> itr = modifiers.iterator();\r
+                                       Iterator<DefinedTerm> itr = modifiers.iterator();\r
                                        while (itr.hasNext()) {\r
-                                               Modifier currentMod = itr.next();\r
+                                               DefinedTerm currentMod = itr.next();\r
                                                if(GetVocabularyType(currentMod, UsageTermCollection.plantPartLabel)) {\r
                                                        itr.remove();\r
                                                }\r
@@ -434,22 +435,22 @@ public class UseRecordDetailElement extends
                }\r
                if (eventSource == combo_Country) {\r
                        if (combo_Country.getSelection() != null) {\r
-                               Iterator<Modifier> itrExistingModifiers = getEntity().getModifiers().iterator();\r
+                               Iterator<DefinedTerm> itrExistingModifiers = getEntity().getModifiers().iterator();\r
                                while (itrExistingModifiers.hasNext()) {\r
-                                       Modifier modifier = itrExistingModifiers.next();\r
+                                       DefinedTerm modifier = itrExistingModifiers.next();\r
                                        if(GetVocabularyType(modifier, UsageTermCollection.countryLabel)) {\r
                                                itrExistingModifiers.remove();\r
                                        }\r
                                                \r
                                }\r
-                               Modifier country = combo_Country.getSelection();\r
+                               DefinedTerm country = combo_Country.getSelection();\r
                                getEntity().addModifier(country);\r
                        } else {\r
-                               Set<Modifier> modifiers = getEntity().getModifiers();\r
+                               Set<DefinedTerm> modifiers = getEntity().getModifiers();\r
                                if(!modifiers.isEmpty()) {\r
-                                       Iterator<Modifier> itr = modifiers.iterator();\r
+                                       Iterator<DefinedTerm> itr = modifiers.iterator();\r
                                        while (itr.hasNext()) {\r
-                                               Modifier currentMod = itr.next();\r
+                                               DefinedTerm currentMod = itr.next();\r
                                                if(GetVocabularyType(currentMod, UsageTermCollection.countryLabel)) {\r
                                                        itr.remove();\r
                                                }\r
@@ -460,39 +461,39 @@ public class UseRecordDetailElement extends
                if (eventSource == combo_HumanGroup) {\r
                        if (combo_HumanGroup.getSelection() != null) {\r
                                boolean isHumanGroupChanged = true;\r
-                               for (Modifier modToCheck: getEntity().getModifiers()) {\r
+                               for (DefinedTerm modToCheck: getEntity().getModifiers()) {\r
                                        if(modToCheck.equals(combo_HumanGroup.getSelection()) && (GetVocabularyType(modToCheck, UsageTermCollection.humanGroupLabel))) {\r
                                                isHumanGroupChanged = false;\r
                                }\r
                                \r
                                        \r
                                }\r
-                               Iterator<Modifier> itrExistingModifiers = getEntity().getModifiers().iterator();\r
+                               Iterator<DefinedTerm> itrExistingModifiers = getEntity().getModifiers().iterator();\r
                                while (itrExistingModifiers.hasNext()) {\r
-                                       Modifier modifier = itrExistingModifiers.next();\r
+                                       DefinedTerm modifier = itrExistingModifiers.next();\r
                                        if((GetVocabularyType(modifier, UsageTermCollection.humanGroupLabel) || GetVocabularyType(modifier, UsageTermCollection.ethnicGroupLabel)) && isHumanGroupChanged) {\r
                                                itrExistingModifiers.remove();\r
                                        }\r
                                                \r
                                }       \r
                                if(isHumanGroupChanged){\r
-                                       Modifier humanGroup = combo_HumanGroup.getSelection();\r
+                                       DefinedTerm humanGroup = combo_HumanGroup.getSelection();\r
                                        getEntity().addModifier(humanGroup);\r
                                }\r
                                combo_EthnicGroup.setEnabled(true);\r
                        } else {\r
-                               Set<Modifier> modifiers = getEntity().getModifiers();\r
+                               Set<DefinedTerm> modifiers = getEntity().getModifiers();\r
                                if(!modifiers.isEmpty()) {\r
-                                       Iterator<Modifier> itr = modifiers.iterator();\r
+                                       Iterator<DefinedTerm> itr = modifiers.iterator();\r
                                        while (itr.hasNext()) {\r
-                                               Modifier currentMod = itr.next();\r
+                                               DefinedTerm currentMod = itr.next();\r
                                                if(GetVocabularyType(currentMod, UsageTermCollection.humanGroupLabel) || GetVocabularyType(currentMod, UsageTermCollection.ethnicGroupLabel)) {\r
                                                        itr.remove();\r
                                                }\r
                                        }\r
                                }\r
-                               List<Modifier> emptyListToResetComboBox = new ArrayList<Modifier>();\r
-                               Modifier emptyMod = Modifier.NewInstance();\r
+                               List<DefinedTerm> emptyListToResetComboBox = new ArrayList<DefinedTerm>();\r
+                               DefinedTerm emptyMod = DefinedTerm.NewInstance();\r
                                emptyListToResetComboBox.add(emptyMod);\r
                                combo_EthnicGroup.setTerms(emptyListToResetComboBox);\r
                                combo_EthnicGroup.setEnabled(false);\r
@@ -501,23 +502,23 @@ public class UseRecordDetailElement extends
                }\r
                if (eventSource == combo_EthnicGroup) {\r
                        if (combo_EthnicGroup.getSelection() != null) {\r
-                               Iterator<Modifier> itrExistingModifiers = getEntity().getModifiers().iterator();\r
+                               Iterator<DefinedTerm> itrExistingModifiers = getEntity().getModifiers().iterator();\r
                                        while (itrExistingModifiers.hasNext()) {\r
-                                               Modifier modifier = itrExistingModifiers.next();\r
+                                               DefinedTerm modifier = itrExistingModifiers.next();\r
                                                if(GetVocabularyType(modifier, combo_HumanGroup.getSelection().getTitleCache())) {\r
                                                        itrExistingModifiers.remove();\r
                                                }\r
                                                \r
                                        }       \r
-                                       Modifier ethnicGroup = combo_EthnicGroup.getSelection();\r
+                                       DefinedTerm ethnicGroup = combo_EthnicGroup.getSelection();\r
                                        getEntity().addModifier(ethnicGroup);\r
                        } else {\r
-                               Set<Modifier> modifiers = getEntity().getModifiers();\r
+                               Set<DefinedTerm> modifiers = getEntity().getModifiers();\r
                                if(!modifiers.isEmpty()) {\r
                                        \r
-                                       Iterator<Modifier> itr = modifiers.iterator();\r
+                                       Iterator<DefinedTerm> itr = modifiers.iterator();\r
                                        while (itr.hasNext()) {\r
-                                               Modifier currentMod = itr.next();\r
+                                               DefinedTerm currentMod = itr.next();\r
                                                if(GetVocabularyType(currentMod, UsageTermCollection.ethnicGroupLabel)) {\r
                                                        itr.remove();\r
                                                }\r
@@ -536,7 +537,7 @@ public class UseRecordDetailElement extends
         * @param vocabularyExpected\r
         * @return\r
         */\r
-       private boolean GetVocabularyType(Modifier term, String vocabularyExpected) {\r
+       private boolean GetVocabularyType(DefinedTerm term, String vocabularyExpected) {\r
                if ((term.getPartOf() != null)  && (term.getPartOf().getTitleCache().equals(vocabularyExpected))) {\r
                        return true;\r
                }\r
@@ -585,13 +586,13 @@ public class UseRecordDetailElement extends
                }\r
                for (Object object: combo_HumanGroup.getControls()) {\r
                        if (object == eventSource) {\r
-                               Modifier selectedHumanGroup = combo_HumanGroup.getSelection();\r
+                               DefinedTerm selectedHumanGroup = combo_HumanGroup.getSelection();\r
                                if (selectedHumanGroup != null) {\r
-                                       combo_EthnicGroup.setTerms(setEthnicGroupComboTerms(TermStore.getTerms(Modifier.class, null, false), selectedHumanGroup));\r
+                                       combo_EthnicGroup.setTerms(setEthnicGroupComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), selectedHumanGroup));\r
                                        if (!getEntity().getModifiers().isEmpty()) {\r
-                                               Iterator<Modifier> iterModifiers = getEntity().getModifiers().iterator();\r
+                                               Iterator<DefinedTerm> iterModifiers = getEntity().getModifiers().iterator();\r
                                                while (iterModifiers.hasNext()) {\r
-                                                       Modifier existingModifier = iterModifiers.next();\r
+                                                       DefinedTerm existingModifier = iterModifiers.next();\r
                                                        if(GetVocabularyType(existingModifier, UsageTermCollection.ethnicGroupLabel)) {\r
                                                                combo_EthnicGroup.setSelection(modifierSelection(UsageTermCollection.ethnicGroupLabel));\r
                                                        }\r