AT: commiting latest changes to the Palm Use data extension
authora.theys <a.theys@localhost>
Thu, 16 Feb 2012 10:36:24 +0000 (10:36 +0000)
committera.theys <a.theys@localhost>
Thu, 16 Feb 2012 10:36:24 +0000 (10:36 +0000)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java

index 12db542ea04713779f74b7e499487e5cad691099..702d4f88219fd5244a73fc7a24a89a0acc60e807 100644 (file)
@@ -5,41 +5,23 @@ import java.util.Iterator;
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
-import java.util.UUID;\r
-\r
 import org.apache.log4j.Logger;\r
 import org.eclipse.swt.events.SelectionEvent;\r
 import org.eclipse.swt.events.SelectionListener;\r
-import org.eclipse.ui.forms.widgets.Section;\r
-\r
-import eu.etaxonomy.cdm.api.service.IMarkerService;\r
-import eu.etaxonomy.cdm.api.service.IService;\r
-import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\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.common.MarkerType;\r
-import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.description.CategoricalData;\r
-import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\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.cdm.remote.controller.VocabularyController;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
-import eu.etaxonomy.taxeditor.store.TermManager;\r
 import eu.etaxonomy.taxeditor.store.TermStore;\r
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;\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.CdmFormFactory.EntityDetailType;\r
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;\r
 import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementDetailElement;\r
-import eu.etaxonomy.taxeditor.ui.section.description.StateDataSection;\r
-import eu.etaxonomy.taxeditor.ui.section.description.detail.AbstractDetailedDescriptionDetailElement;\r
 \r
 //public class UseRecordDetailElement extends AbstractDetailedDescriptionDetailElement<CategoricalData> {\r
 public class UseRecordDetailElement extends\r
@@ -173,245 +155,6 @@ public class UseRecordDetailElement extends
                return termsToAdd;\r
        }\r
        \r
-       private Modifier plantPartSelection() {\r
-               /*if(!getEntity().getModifiers().isEmpty()) {\r
-                       for (Modifier modifier : getEntity().getModifiers()) {\r
-                               if (modifier.getMarkers() != null) {\r
-                                       for (Marker marker : modifier.getMarkers()) {\r
-                                               if(marker.getMarkerType().getTitleCache().equals("Plant Part")) {\r
-                                                       return modifier;\r
-                                               }\r
-                                               else {\r
-                                                       return null;\r
-                                               }\r
-                                       }\r
-                               }\r
-                               else {\r
-                                       return null;\r
-                               }\r
-                                       \r
-                       }\r
-               } else {\r
-                       return null;\r
-               }\r
-               return null;*/\r
-               //for testing purposes\r
-               int countMods = 0;\r
-               Modifier modiftoreturn = Modifier.NewInstance();\r
-               if (!getEntity().getModifiers().isEmpty()) {\r
-                       for (Modifier modifier : getEntity().getModifiers()){\r
-                               if(countMods == 0) {\r
-                                       modiftoreturn = modifier;\r
-                               }\r
-                               countMods++;\r
-                       }\r
-                       return modiftoreturn;\r
-               }\r
-               return null;\r
-               \r
-       }\r
-       \r
-       private Modifier countrySelection() {\r
-               /*if(!getEntity().getModifiers().isEmpty()) {\r
-               for (Modifier modifier : getEntity().getModifiers()) {\r
-                       if (modifier.getMarkers() != null) {\r
-                               for (Marker marker : modifier.getMarkers()) {\r
-                                       if(marker.getMarkerType().getTitleCache().equals("Country")) {\r
-                                               return modifier;\r
-                                       }\r
-                                       else {\r
-                                               return null;\r
-                                       }\r
-                               }\r
-                       }\r
-                       else {\r
-                               return null;\r
-                       }\r
-                               \r
-               }\r
-       } else {\r
-               return null;\r
-       }\r
-       return null;*/\r
-       //for testing purposes\r
-       int countMods = 0;\r
-       Modifier modiftoreturn = Modifier.NewInstance();\r
-       if (!getEntity().getModifiers().isEmpty()) {\r
-               for (Modifier modifier : getEntity().getModifiers()){\r
-                       if(countMods == 1) {\r
-                               modiftoreturn = modifier;\r
-                       }\r
-                       countMods++;\r
-               }\r
-               return modiftoreturn;\r
-       }\r
-       return null;\r
-       }\r
-       \r
-       private Modifier humanGroupSelection() {\r
-               /*if(!getEntity().getModifiers().isEmpty()) {\r
-               for (Modifier modifier : getEntity().getModifiers()) {\r
-                       if (modifier.getMarkers() != null) {\r
-                               for (Marker marker : modifier.getMarkers()) {\r
-                                       if(marker.getMarkerType().getTitleCache().equals("Human Group")) {\r
-                                               return modifier;\r
-                                       }\r
-                                       else {\r
-                                               return null;\r
-                                       }\r
-                               }\r
-                       }\r
-                       else {\r
-                               return null;\r
-                       }\r
-                               \r
-               }\r
-       } else {\r
-               return null;\r
-       }\r
-       return null;*/\r
-       //for testing purposes\r
-       int countMods =0;\r
-       Modifier modiftoreturn = Modifier.NewInstance();\r
-       if (!getEntity().getModifiers().isEmpty()) {\r
-               for (Modifier modifier : getEntity().getModifiers()){\r
-                       if (countMods == 2) {\r
-                               modiftoreturn = modifier;\r
-                       }\r
-                       countMods++;\r
-               }\r
-               return modiftoreturn;\r
-       }\r
-       return null;\r
-       }\r
-       \r
-       private Modifier ethnicGroupSelection() {\r
-               /*if(!getEntity().getModifiers().isEmpty()) {\r
-               for (Modifier modifier : getEntity().getModifiers()) {\r
-                       if (modifier.getMarkers() != null) {\r
-                               for (Marker marker : modifier.getMarkers()) {\r
-                                       if(marker.getMarkerType().getTitleCache().equals("Human Group")) {\r
-                                               return modifier;\r
-                                       }\r
-                                       else {\r
-                                               return null;\r
-                                       }\r
-                               }\r
-                       }\r
-                       else {\r
-                               return null;\r
-                       }\r
-                               \r
-               }\r
-       } else {\r
-               return null;\r
-       }\r
-       return null;*/\r
-       //for testing purposes\r
-       int countMods =0;\r
-       Modifier modiftoreturn = Modifier.NewInstance();\r
-       if (!getEntity().getModifiers().isEmpty()) {\r
-               for (Modifier modifier : getEntity().getModifiers()){\r
-                       if (countMods == 3) {\r
-                               modiftoreturn = modifier;\r
-                       }\r
-                       countMods++;\r
-               }\r
-               return modiftoreturn;\r
-       }\r
-       return null;\r
-       }\r
-\r
-       private State useCategorySelection() {\r
-               /*if (!getEntity().getStates().isEmpty()) {\r
-                       for (StateData statedata : getEntity().getStates()) {\r
-                               if (statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {\r
-                                       if(statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText() == "Use Category") {\r
-                                               if(statedata.getState() !=null) {\r
-                                                       return statedata.getState();\r
-                                               }\r
-                                       }\r
-                               }                               \r
-                       }\r
-               }\r
-               else {\r
-                       return null;\r
-               }\r
-               return null;*/\r
-               //for testing purposes\r
-               int countStates =0;\r
-               for (StateData state : getEntity().getStates()) {\r
-                       if (countStates == 0) {\r
-                               return state.getState();\r
-                       }\r
-                       countStates++;\r
-               }\r
-               return null;\r
-       }\r
-       \r
-\r
-       \r
-       private State useSubCategorySelection() {\r
-               /*if (!getEntity().getStates().isEmpty() && combo_UseCategory.getSelection() != null) {\r
-                       for (StateData statedata : getEntity().getStates()) {\r
-                               if (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {\r
-                                       if(statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText() == "Use SubCategory") {\r
-                                               if(statedata.getState() !=null) {\r
-                                                       return statedata.getState();\r
-                                               }\r
-                                               \r
-                                       }\r
-                               }                               \r
-                       }\r
-               }\r
-               else {\r
-                       return null;\r
-               }\r
-               return null;*/\r
-               //for testing purposes\r
-               int countStates =0;\r
-               for (StateData state : getEntity().getStates()) {\r
-                       if ((countStates == 1)) {\r
-                               return state.getState();\r
-                       }\r
-                       countStates++;\r
-               }\r
-               return null;\r
-               \r
-       }\r
-\r
-       \r
-       \r
-       \r
-       private List<Modifier> setPlantPartsComboTerms(List<Modifier> listOfTerms) {\r
-               List<Modifier> termsToAdd = new ArrayList<Modifier>();\r
-               for (Modifier term : listOfTerms) {\r
-\r
-                       if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals("Plant Part"))) {\r
-                               termsToAdd.add(term);\r
-                       }\r
-                       else if ((term.getVocabulary() != null) && (term.getVocabulary().getTitleCache().equals("Plant Part"))) {\r
-                               termsToAdd.add(term);\r
-                       }\r
-               }\r
-               \r
-               return termsToAdd;\r
-       }\r
-       \r
-       private List<Modifier> setCountryComboTerms(List <Modifier> listOfTerms) {\r
-               List<Modifier> termsToAdd = new ArrayList<Modifier>();\r
-               for (Modifier term : listOfTerms) {\r
-\r
-                       if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals("Country"))) {\r
-                               termsToAdd.add(term);\r
-                       }\r
-                       else if ((term.getVocabulary() != null) && (term.getVocabulary().getTitleCache().equals("Country"))) {\r
-                               termsToAdd.add(term);\r
-                       }\r
-               }\r
-               \r
-               return termsToAdd;\r
-       }\r
 \r
 \r
        private List<State> setUseCategoryComboTerms(List<State> listOfTerms) {\r
@@ -507,23 +250,6 @@ public class UseRecordDetailElement extends
                return termsToAdd;\r
        }\r
 \r
-       \r
-       private List<Modifier> setHumanGroupComboTerms(List<Modifier> listOfTerms) {\r
-               List<Modifier> termsToAdd = new ArrayList<Modifier>();\r
-               for (Modifier term : listOfTerms) {\r
-\r
-                       if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals("Human Group"))) {\r
-                               termsToAdd.add(term);\r
-                       }\r
-                       else if ((term.getVocabulary() != null) && (term.getPartOf() == null) && (term.getVocabulary().getTitleCache().equals("Human Group"))) {\r
-                               termsToAdd.add(term);\r
-                       }\r
-               }\r
-               \r
-               return termsToAdd;\r
-       }\r
-\r
-\r
        /** {@inheritDoc} */\r
        @Override\r
        public void handleEvent(Object eventSource) {\r
@@ -551,23 +277,7 @@ public class UseRecordDetailElement extends
                                                                getEntity().addState(stateData);\r
                                                                isChanged = true;\r
                                                        } \r
-                                                       /*else {\r
-                                                               StateData stateData = StateData\r
-                                                                               .NewInstance(combo_UseCategory.getSelection());\r
-                                                               stateData.setState(combo_UseCategory.getSelection());\r
-                                                               //stateData.addModifyingText("Use Category", CdmStore.getDefaultLanguage());\r
-                                                               stateData.putModifyingText(CdmStore.getDefaultLanguage(),"Use Category");\r
-                                                               getEntity().addState(stateData);\r
-                                                       }\r
-       \r
-                                               } else {\r
-                                                       StateData stateData = StateData\r
-                                                                       .NewInstance(combo_UseCategory.getSelection());\r
-                                                       stateData.setState(combo_UseCategory.getSelection());\r
-                                                       //stateData.addModifyingText("Use Category", CdmStore.getDefaultLanguage());\r
-                                                       stateData.putModifyingText(CdmStore.getDefaultLanguage(), "Use Category");\r
-                                                       getEntity().addState(stateData);\r
-                                               }*/\r
+                                                       \r
                                                }\r
                                        }\r
                                }\r
@@ -619,23 +329,7 @@ public class UseRecordDetailElement extends
                                                                getEntity().addState(stateData);\r
                                                                isChanged = true;\r
                                                        } \r
-                                                       /*else {\r
-                                                               StateData stateData = StateData\r
-                                                                               .NewInstance(combo_UseSubCategory.getSelection());\r
-                                                               stateData.setState(combo_UseSubCategory.getSelection());\r
-                                                               //stateData.addModifyingText("Use SubCategory", CdmStore.getDefaultLanguage());\r
-                                                               stateData.putModifyingText(CdmStore.getDefaultLanguage(),"Use SubCategory");\r
-                                                               getEntity().addState(stateData);\r
-                                                       }\r
-       \r
-                                               } else {\r
-                                                       StateData stateData = StateData\r
-                                                                       .NewInstance(combo_UseSubCategory.getSelection());\r
-                                                       stateData.setState(combo_UseSubCategory.getSelection());\r
-                                                       //stateData.addModifyingText("Use SubCategory", CdmStore.getDefaultLanguage());\r
-                                                       stateData.putModifyingText(CdmStore.getDefaultLanguage(), "Use SubCategory");\r
-                                                       getEntity().addState(stateData);\r
-                                               }*/\r
+                                                       \r
                                                }\r
                                        }\r
                                }\r
@@ -644,11 +338,6 @@ public class UseRecordDetailElement extends
                                        StateData stateData = StateData\r
                                                        .NewInstance(combo_UseSubCategory.getSelection());\r
                                        stateData.setState(combo_UseSubCategory.getSelection());\r
-                                       //stateData.addModifyingText("Use SubCategory", CdmStore.getDefaultLanguage());\r
-                                       //LanguageString languageString = LanguageString.NewInstance("Use SubCategory", CdmStore.getDefaultLanguage());\r
-                                       //IService object = (IService) CdmStore.getCurrentApplicationConfiguration().getBean(IService.class.getName());\r
-                                       //object.save(languageString);\r
-                                       //stateData.putModifyingText(languageString);\r
                                        stateData.putModifyingText(CdmStore.getDefaultLanguage(), "Use SubCategory");\r
                                        getEntity().addState(stateData);\r
                                }\r
@@ -680,50 +369,13 @@ public class UseRecordDetailElement extends
                                                        getEntity().addModifier(combo_PlantPart.getSelection());\r
                                                        isChanged = true;\r
                                                }\r
-                                               /*if (modifier.getMarkers() != null) {\r
-                                                       for (Marker marker : modifier.getMarkers()) {\r
-                                                               if (marker.getMarkerType().getTitleCache().equals("Plant Part")) {\r
-                                                                       getEntity().removeModifier(modifier);\r
-                                                                       Modifier plantPart = combo_PlantPart.getSelection();\r
-                                                                       plantPart.addMarker(marker);\r
-                                                                       getEntity().addModifier(plantPart);\r
-                                                                       isChanged = true;\r
-                                                                       //getEntity().addModifier(combo_PlantPart.getSelection());\r
-                                                               } \r
-                                                               /*else {\r
-                                                                       \r
-                                                                       Marker markerPlantPart = Marker.NewInstance(markerType, false);\r
-                                                                       Modifier plantPart = combo_PlantPart.getSelection();\r
-                                                                       plantPart.addMarker(markerPlantPart);\r
-                                                                       getEntity().addModifier(plantPart);\r
-                                                                       //getEntity().addModifier(combo_PlantPart.getSelection());\r
-                                                               }\r
-                                                                       \r
-                                                                       \r
-                                                       }\r
-                                                               \r
-                                               }\r
-                                               /*else {\r
-                                                       //MarkerType markerType = MarkerType.NewInstance("Plant Part", "Plant Part", null);\r
-                                                       Marker marker = Marker.NewInstance(markerType, false);\r
-                                                       Modifier plantPart = combo_PlantPart.getSelection();\r
-                                                       plantPart.addMarker(marker);\r
-                                                       getEntity().addModifier(plantPart);\r
-                                                       //getEntity().addModifier(combo_PlantPart.getSelection());\r
-                                               }*/\r
-                                                       \r
+                                               \r
                                        }       \r
                                }\r
                                if(isChanged == false) {\r
-                                       //MarkerType markerType = MarkerType.NewInstance("Plant Part", "Plant Part", null);\r
-                                       //Marker marker = Marker.NewInstance(markerType, false);\r
-                                       //CdmStore.getService(IMarkerService.class).saveOrUpdate(marker);\r
+                                       \r
                                        Modifier plantPart = combo_PlantPart.getSelection();\r
-                                       //plantPart.addMarker(marker);\r
-                                       //CdmStore.getService(ITermService.class).saveOrUpdate(plantPart);\r
                                        getEntity().addModifier(plantPart);\r
-                                       \r
-                                       //getEntity().addModifier(combo_PlantPart.getSelection());\r
                                }\r
                        } else {\r
                                Set<Modifier> modifiers = getEntity().getModifiers();\r
@@ -741,7 +393,6 @@ public class UseRecordDetailElement extends
                if (eventSource == combo_Country) {\r
                        if (combo_Country.getSelection() != null) {\r
                                boolean isChanged = false;\r
-                               //MarkerType markerType = MarkerType.NewInstance("Country", "Country", null);\r
                                Set<Modifier> modifiers = getEntity().getModifiers();\r
                                if(!modifiers.isEmpty()) {\r
                                        for (Modifier modifier : modifiers) {\r
@@ -750,47 +401,12 @@ public class UseRecordDetailElement extends
                                                        getEntity().addModifier(combo_Country.getSelection());\r
                                                        isChanged = true;\r
                                                }\r
-                                               /*if (modifier.getMarkers() != null) {\r
-                                                       for (Marker marker : modifier.getMarkers()) {\r
-                                                               if (marker.getMarkerType().getTitleCache().equals("Country")) {\r
-                                                                       getEntity().removeModifier(modifier);\r
-                                                                       Modifier country = combo_Country.getSelection();\r
-                                                                       country.addMarker(marker);\r
-                                                                       getEntity().addModifier(country);\r
-                                                                       isChanged = true;\r
-                                                                       //getEntity().addModifier(combo_Country.getSelection());\r
-                                                               } \r
-                                                               /*else {\r
-                                                                       \r
-                                                                       Marker markerCountry = Marker.NewInstance(markerType, false);\r
-                                                                       Modifier country = combo_Country.getSelection();\r
-                                                                       country.addMarker(markerCountry);\r
-                                                                       getEntity().addModifier(country);\r
-                                                                       //getEntity().addModifier(combo_Country.getSelection());\r
-                                                               }\r
-                                                                       \r
-                                                                       \r
-                                                       }\r
-                                                               \r
-                                               }*/\r
-                                               /*else {\r
-                                                       //MarkerType markerType = MarkerType.NewInstance("Country", "Country", null);\r
-                                                       Marker marker = Marker.NewInstance(markerType, false);\r
-                                                       Modifier country = combo_Country.getSelection();\r
-                                                       country.addMarker(marker);\r
-                                                       getEntity().addModifier(country);\r
-                                                       //getEntity().addModifier(combo_Country.getSelection());\r
-                                               }*/\r
-                                                       \r
+                                               \r
                                        }       \r
                                }\r
                                if (isChanged == false) {\r
-                                       //MarkerType markerType = MarkerType.NewInstance("Country", "Country", null);\r
-                                       //Marker marker = Marker.NewInstance(markerType, false);\r
                                        Modifier country = combo_Country.getSelection();\r
-                                       //country.addMarker(marker);\r
                                        getEntity().addModifier(country);\r
-                                       //getEntity().addModifier(combo_Country.getSelection());\r
                                }\r
                        } else {\r
                                Set<Modifier> modifiers = getEntity().getModifiers();\r
@@ -802,13 +418,11 @@ public class UseRecordDetailElement extends
                                                }\r
                                        }\r
                                }\r
-                               \r
                        }\r
                }\r
                if (eventSource == combo_HumanGroup) {\r
                        if (combo_HumanGroup.getSelection() != null) {\r
                                boolean isChanged = false;\r
-                               //MarkerType markerType = MarkerType.NewInstance("Human Group", "Human Group", null);\r
                                Set<Modifier> modifiers = getEntity().getModifiers();\r
                                if(!modifiers.isEmpty()) {\r
                                        for (Modifier modifier : modifiers) {\r
@@ -817,47 +431,11 @@ public class UseRecordDetailElement extends
                                                        getEntity().addModifier(combo_HumanGroup.getSelection());\r
                                                        isChanged = true;\r
                                                }\r
-                                               /*if (modifier.getMarkers() != null) {\r
-                                                       for (Marker marker : modifier.getMarkers()) {\r
-                                                               if (marker.getMarkerType().getTitleCache().equals("Human Group")) {\r
-                                                                       getEntity().removeModifier(modifier);\r
-                                                                       Modifier humanGroup = combo_HumanGroup.getSelection();\r
-                                                                       humanGroup.addMarker(marker);\r
-                                                                       getEntity().addModifier(humanGroup);\r
-                                                                       isChanged = true;\r
-                                                                       //getEntity().addModifier(combo_HumanGroup.getSelection());\r
-                                                               } \r
-                                                               /*else {\r
-                                                                       \r
-                                                                       Marker markerHumanGroup = Marker.NewInstance(markerType, false);\r
-                                                                       Modifier humanGroup = combo_HumanGroup.getSelection();\r
-                                                                       humanGroup.addMarker(markerHumanGroup);\r
-                                                                       getEntity().addModifier(humanGroup);\r
-                                                                       //getEntity().addModifier(combo_HumanGroup.getSelection());\r
-                                                               }\r
-                                                                       \r
-                                                                       \r
-                                                       }\r
-                                                               \r
-                                               }*/\r
-                                               /*else {\r
-                                                       //MarkerType markerType = MarkerType.NewInstance("Human Group", "Human Group", null);\r
-                                                       Marker marker = Marker.NewInstance(markerType, false);\r
-                                                       Modifier humanGroup = combo_HumanGroup.getSelection();\r
-                                                       humanGroup.addMarker(marker);\r
-                                                       getEntity().addModifier(humanGroup);\r
-                                                       //getEntity().addModifier(combo_HumanGroup.getSelection());\r
-                                               }*/\r
-                                                       \r
                                        }       \r
                                }\r
                                if(isChanged == false){\r
-                                       //MarkerType markerType = MarkerType.NewInstance("Human Group", "Human Group", null);\r
-                                       //Marker marker = Marker.NewInstance(markerType, false);\r
                                        Modifier humanGroup = combo_HumanGroup.getSelection();\r
-                                       //humanGroup.addMarker(marker);\r
                                        getEntity().addModifier(humanGroup);\r
-                                       //getEntity().addModifier(combo_HumanGroup.getSelection());\r
                                }\r
                                combo_EthnicGroup.setEnabled(true);\r
                        } else {\r
@@ -870,18 +448,6 @@ public class UseRecordDetailElement extends
                                                        itr.remove();\r
                                                }\r
                                        }\r
-                                       \r
-                                       \r
-                                       /*for (Modifier modifier : modifiers) {\r
-                                               if(GetVocabularyType(modifier, "Human Group")) {\r
-                                                       getEntity().removeModifier(modifier);\r
-                                               \r
-                                               }\r
-                                               if(GetVocabularyType(modifier, "Ethnic Group")) {\r
-                                                       getEntity().removeModifier(modifier);\r
-                                               \r
-                                               }\r
-                                       }*/\r
                                }\r
                                List<Modifier> emptyListToResetComboBox = new ArrayList<Modifier>();\r
                                Modifier emptyMod = Modifier.NewInstance();\r
@@ -894,7 +460,6 @@ public class UseRecordDetailElement extends
                if (eventSource == combo_EthnicGroup) {\r
                        if (combo_EthnicGroup.getSelection() != null) {\r
                                boolean isChanged = false;\r
-                               //MarkerType markerType = MarkerType.NewInstance("Ethnic Group", "Ethnic Group", null);\r
                                Set<Modifier> modifiers = getEntity().getModifiers();\r
                                if(!modifiers.isEmpty()) {\r
                                        for (Modifier modifier : modifiers) {\r
@@ -903,47 +468,11 @@ public class UseRecordDetailElement extends
                                                        getEntity().addModifier(combo_EthnicGroup.getSelection());\r
                                                        isChanged = true;\r
                                                }\r
-                                               /*if (modifier.getMarkers() != null) {\r
-                                                       for (Marker marker : modifier.getMarkers()) {\r
-                                                               if (marker.getMarkerType().getTitleCache().equals("Ethnic Group")) {\r
-                                                                       getEntity().removeModifier(modifier);\r
-                                                                       Modifier ethnicGroup = combo_EthnicGroup.getSelection();\r
-                                                                       ethnicGroup.addMarker(marker);\r
-                                                                       getEntity().addModifier(ethnicGroup);\r
-                                                                       isChanged = true;\r
-                                                                       //getEntity().addModifier(combo_EthnicGroup.getSelection());\r
-                                                               } \r
-                                                               /*else {\r
-                                                                       \r
-                                                                       Marker markerEthnicGroup = Marker.NewInstance(markerType, false);\r
-                                                                       Modifier ethnicGroup = combo_EthnicGroup.getSelection();\r
-                                                                       ethnicGroup.addMarker(markerEthnicGroup);\r
-                                                                       getEntity().addModifier(ethnicGroup);\r
-                                                                       //getEntity().addModifier(combo_EthnicGroup.getSelection());\r
-                                                               }\r
-                                                                       \r
-                                                                       \r
-                                                       }\r
-                                                               \r
-                                               }*/\r
-                                               /*else {\r
-                                                       //MarkerType markerType = MarkerType.NewInstance("Ethnic Group", "Ethnic Group", null);\r
-                                                       Marker marker = Marker.NewInstance(markerType, false);\r
-                                                       Modifier ethnicGroup = combo_EthnicGroup.getSelection();\r
-                                                       ethnicGroup.addMarker(marker);\r
-                                                       getEntity().addModifier(ethnicGroup);\r
-                                                       //getEntity().addModifier(combo_EthnicGroup.getSelection());\r
-                                               }*/\r
-                                                       \r
                                        }       \r
                                }\r
                                if(isChanged == false) {\r
-                                       //MarkerType markerType = MarkerType.NewInstance("Ethnic Group", "Ethnic Group", null);\r
-                                       //Marker marker = Marker.NewInstance(markerType, false);\r
                                        Modifier ethnicGroup = combo_EthnicGroup.getSelection();\r
-                                       //ethnicGroup.addMarker(marker);\r
                                        getEntity().addModifier(ethnicGroup);\r
-                                       //getEntity().addModifier(combo_EthnicGroup.getSelection());\r
                                }\r
                        } else {\r
                                Set<Modifier> modifiers = getEntity().getModifiers();\r
@@ -951,12 +480,9 @@ public class UseRecordDetailElement extends
                                        for (Modifier modifier : modifiers) {\r
                                                if(GetVocabularyType(modifier, "Ethnic Group")) {\r
                                                        getEntity().removeModifier(modifier);\r
-                                               \r
                                                }\r
-                                               \r
                                        }\r
                                }\r
-                               \r
                        }\r
                }\r
        }\r
@@ -973,30 +499,17 @@ public class UseRecordDetailElement extends
                return false;\r
        }\r
        \r
-       /*private boolean GetVocabularyType(Modifier term, String level2,String vocabularyExpected) {\r
-               if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(vocabularyExpected))) {\r
-                       return true;\r
-               }\r
-               else if ((term.getVocabulary() != null) && (term.getPartOf() == null) &&(term.getVocabulary().getTitleCache().equals(vocabularyExpected))) {\r
-                       return true;\r
-               }\r
-       return false;\r
-}*/\r
+       \r
 \r
        /** {@inheritDoc} */\r
        @Override\r
        public void setEntity(CategoricalData entity) {\r
-               // section_stateData.setEntity(entity);\r
                super.setEntity(entity);\r
        }\r
 \r
        @Override\r
        public void widgetSelected(SelectionEvent e) {\r
                Object eventSource = e.getSource();\r
-               //This is causing an error on purpose fix the if statement below\r
-               \r
-               //e.getselection();\r
-               //if(eventSource == combo_UseCategory.getControls()) {\r
                for (Object object: combo_UseCategory.getControls()) {\r
                        if (object == eventSource) {\r
                                State selectedUseCategory = combo_UseCategory.getSelection();\r
@@ -1010,7 +523,6 @@ public class UseRecordDetailElement extends
                                                                if (modifyingText.get(CdmStore.getDefaultLanguage())\r
                                                                                .getText() == "Use SubCategory") {\r
                                                                        getEntity().removeState(existingStateData);\r
-                                                                       //combo_UseSubCategory.setSelected(false);\r
                                                                        combo_UseSubCategory.setSelection(null);\r
                                                                        combo_UseSubCategory.getSelection();\r
                                                                }\r
@@ -1020,13 +532,6 @@ public class UseRecordDetailElement extends
                                        \r
                                        List<State> newSubCategories = setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false),selectedUseCategory);\r
                                        combo_UseSubCategory.setTerms(newSubCategories);\r
-                                       /*State emptyState = State.NewInstance();\r
-                                       combo_UseSubCategory.setSelection(emptyState);\r
-                                       combo_UseSubCategory.setSelection(newSubCategories.get(0));\r
-                                       combo_UseSubCategory.setSelection(null);*/\r
-                                       \r
-                                       //combo_UseSubCategory.setTerms(newSubCategories);\r
-                                       \r
                                }\r
                        }\r
                }\r
@@ -1038,21 +543,6 @@ public class UseRecordDetailElement extends
                                }\r
                        }\r
                }\r
-               /*      \r
-                       State selectedUseCategory = combo_UseCategory.getSelection();\r
-                       if (selectedUseCategory != null) {\r
-                       combo_UseSubCategory.setTerms(setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false),selectedUseCategory));\r
-\r
-                       }\r
-               //}\r
-               if (eventSource == combo_HumanGroup) {\r
-                       Modifier selectedHumanGroup = combo_HumanGroup.getSelection();\r
-                       if (selectedHumanGroup != null) {\r
-                               combo_EthnicGroup.setTerms(setEthnicGroupComboTerms(TermStore.getTerms(Modifier.class, null, false), selectedHumanGroup));\r
-                       }\r
-               }\r
-               */\r
-\r
        }\r
 \r
        @Override\r