updates for 3.3 model changes. Phase two commit, which contains method changes /...

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
index 6db78f03df6db3863012bada0fca6d41e774b62c..74b3ff406ccfef11e45314e24b660548da919178 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
@@ -190,7 +190,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
                ITreeNode parentNode = CdmStore.getService(IClassificationService.class).getTreeNodeByUuid(parentNodeUuid);
                
                Taxon newTaxon = Taxon.NewInstance(name, parentNode.getReference());
                ITreeNode parentNode = CdmStore.getService(IClassificationService.class).getTreeNodeByUuid(parentNodeUuid);
                
                Taxon newTaxon = Taxon.NewInstance(name, parentNode.getReference());

-               TaxonNode newTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference(), null);
+               TaxonNode newTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference());

                
                // add the new taxon to the editors persistence context
                UUID newTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).save(newTaxonNode);
                
                // add the new taxon to the editors persistence context
                UUID newTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).save(newTaxonNode);

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
index fa39cab531a7475977055a068e3e35e49c88d1bb..ff4ff1fbd7f631b477dbb34b92aa8cd2add47955 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
@@ -84,7 +84,7 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
                monitor.worked(20);
                
                synonym.setSec(null);
                monitor.worked(20);
                
                synonym.setSec(null);

-               newNode = parentNode.addChildTaxon(newTaxon, null, null, null);
+               newNode = parentNode.addChildTaxon(newTaxon, null, null);

                
                if(synonymsInHomotypicalGroup != null){
                        Taxon taxon = newNode.getTaxon();
                
                if(synonymsInHomotypicalGroup != null){
                        Taxon taxon = newNode.getTaxon();

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
index d8a7e961a08b6ec0272ccee98a57288b2af381dd..6f85e52026102d7a92f78b23e5c5f204effb231b 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
@@ -49,9 +49,9 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
                        }\r
                }\r
                else if (element instanceof CategoricalData) {\r
                        }\r
                }\r
                else if (element instanceof CategoricalData) {\r

-                       if (!((CategoricalData) element).getStates().isEmpty()) {\r
+                       if (!((CategoricalData) element).getStateData().isEmpty()) {\r

                                boolean isUseCategoryAbsent = true;\r
                                boolean isUseCategoryAbsent = true;\r

-                               for (StateData statedata : ((CategoricalData) element).getStates()) {\r
+                               for (StateData statedata : ((CategoricalData) element).getStateData()) {\r

                                        if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) {\r
                                                text = text + statedata.getState().getTitleCache() + ";";\r
                                                isUseCategoryAbsent = false;\r
                                        if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) {\r
                                                text = text + statedata.getState().getTitleCache() + ";";\r
                                                isUseCategoryAbsent = false;\r


@@ -62,7 +62,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
                                }\r
                                \r
                                boolean isUseSubCategoryAbsent = true;\r
                                }\r
                                \r
                                boolean isUseSubCategoryAbsent = true;\r

-                               for (StateData statedata : ((CategoricalData) element).getStates()) {\r
+                               for (StateData statedata : ((CategoricalData) element).getStateData()) {\r

                                        if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useSubCategoryVocabularyLabel)) {\r
                                                text = text + statedata.getState().getTitleCache() + ";";\r
                                                isUseSubCategoryAbsent = false;\r
                                        if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useSubCategoryVocabularyLabel)) {\r
                                                text = text + statedata.getState().getTitleCache() + ";";\r
                                                isUseSubCategoryAbsent = false;\r

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java
index f3dae1afbf4e3ea4c650d881cccbd12c5e3c4e7f..c30009bd6b0f4a63eeb0754e7aac43b3d5e796ca 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java
@@ -49,10 +49,10 @@ public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTestBase {
                newParentTaxon = Taxon.NewInstance(null, null);
                
                tree = Classification.NewInstance(null);
                newParentTaxon = Taxon.NewInstance(null, null);
                
                tree = Classification.NewInstance(null);

-               oldParentTaxonNode = tree.addChildTaxon(oldParentTaxon, null, null, null);
-               newParentTaxonNode = tree.addChildTaxon(newParentTaxon, null, null, null);
+               oldParentTaxonNode = tree.addChildTaxon(oldParentTaxon, null, null);
+               newParentTaxonNode = tree.addChildTaxon(newParentTaxon, null, null);

                
                

-               taxonNode = oldParentTaxonNode.addChildTaxon(taxon, null, null, null);
+               taxonNode = oldParentTaxonNode.addChildTaxon(taxon, null, null);

                
                operation = null;//new MoveTaxonOperation("Move Taxon To Different Parent", undoContext, taxonNode, newParentTaxonNode, postOperation);
        }
                
                operation = null;//new MoveTaxonOperation("Move Taxon To Different Parent", undoContext, taxonNode, newParentTaxonNode, postOperation);
        }

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
index 6bf1a5deb460e829737a2e5d53fed52ad04ee70e..5fc9af8317ea992fee407ef71c761f9f0c02b9e1 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
@@ -86,8 +86,7 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation {
                try {
                        for (TaxonNode taxonNode : taxonNodes){
                                TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode, 
                try {
                        for (TaxonNode taxonNode : taxonNodes){
                                TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode, 

-                                               newParentTreeNode.getReference(), newParentTreeNode.getMicroReference(), 
-                                               taxonNode.getSynonymToBeUsed());
+                                               newParentTreeNode.getReference(), newParentTreeNode.getMicroReference());

                                taxonNodes.add(newTaxonNode);
                                monitor.worked(2);
                        }
                                taxonNodes.add(newTaxonNode);
                                monitor.worked(2);
                        }

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
index 3ae83c87f0de4d181344c62d10041351c660d707..0bd7e6d0027f0166eee038ebcbf1784a582081cc 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
@@ -92,7 +92,7 @@ public class CreateTaxonNode extends AbstractPersistentPostOperation {
                        // add the taxon
                        bind();
                        monitor.worked(20);
                        // add the taxon
                        bind();
                        monitor.worked(20);

-                       childTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference(), null);
+                       childTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference());

                
                        monitor.worked(40);
 
                
                        monitor.worked(40);
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java
index 2b9a5293353b9835b8b685f0c390618ae041d0d5..cf7c1442f034bd99bb516944a044f6af6dd9eef8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java
@@ -14,7 +14,6 @@ import java.util.List;
 \r
 import eu.etaxonomy.cdm.model.location.Continent;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 \r
 import eu.etaxonomy.cdm.model.location.Continent;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r

-import eu.etaxonomy.cdm.model.location.TdwgArea;\r

 import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;\r
 \r
 /**\r
 import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;\r
 \r
 /**\r


@@ -25,8 +24,7 @@ import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;
 public class NamedAreaEditorInput extends AbstractDefinedTermEditorInput<NamedArea> {\r
 \r
        private List<String> termClasses = Arrays.asList(new String[]{\r
 public class NamedAreaEditorInput extends AbstractDefinedTermEditorInput<NamedArea> {\r
 \r
        private List<String> termClasses = Arrays.asList(new String[]{\r

-                       NamedArea.class.getName(), \r
-                       TdwgArea.class.getName(),\r
+                       NamedArea.class.getName(),                      \r

                        WaterbodyOrCountry.class.getName(),\r
                        Continent.class.getName()\r
        });\r
                        WaterbodyOrCountry.class.getName(),\r
                        Continent.class.getName()\r
        });\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
index f0e65cbd5134ab5f0ac512e08deb4e2c2c07da35..e05e0490693200044f22084906e3766f1d7dca99 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@ -45,7 +45,7 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
                        ITreeNode parent = getParentTreeNode();
                        Taxon taxon = taxonNodePage.getTaxon();
                        try{
                        ITreeNode parent = getParentTreeNode();
                        Taxon taxon = taxonNodePage.getTaxon();
                        try{

-                               TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference(), null);
+                               TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());

                                generatedTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(taxonNode);
                        }catch(IllegalArgumentException e){
                                StoreUtil.warningDialog("Taxon already exists in classfication", getClass(), e.getMessage());
                                generatedTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(taxonNode);
                        }catch(IllegalArgumentException e){
                                StoreUtil.warningDialog("Taxon already exists in classfication", getClass(), e.getMessage());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
index b93e2d40e6640de022df4f6ed61d088f41bbf913..70976a68be2a88553faf7b9462ee4703b8837934 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
@@ -80,7 +80,7 @@ public class DerivedUnitSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected void initModel() {
        /** {@inheritDoc} */
        @Override
        protected void initModel() {

-               model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitBaseUuidAndTitleCache();
+               model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitUuidAndTitleCache();

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java
index 9b65a213b5b84a20ea3f4a5762e5acce250ec5c8..c7bbf281382b34f6aa4e6adc40ce2dbd39cafbb9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java
@@ -87,7 +87,7 @@ public class FieldObservationSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected void initModel() {
        /** {@inheritDoc} */
        @Override
        protected void initModel() {

-               model = CdmStore.getService(IOccurrenceService.class).getFieldObservationUuidAndTitleCache();
+               model = CdmStore.getService(IOccurrenceService.class).getFieldUnitUuidAndTitleCache();

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
index 6eddaad0adb84f37fd45b5c9e4da49011f765631..baae5fe0b3f555275cfd2e4c14ef1d01b23415d3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
@@ -48,7 +48,8 @@ public class DescribedSpecimenSection extends AbstractEntityCollectionSection<Ta
        @Override
        public Collection<SpecimenOrObservationBase> getCollection(
                        TaxonDescription entity) {
        @Override
        public Collection<SpecimenOrObservationBase> getCollection(
                        TaxonDescription entity) {

-               return entity.getDescribedSpecimenOrObservations();
+               //FIXME:3.3MC
+               return entity.getDescribedSpecimenOrObservation();

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
index 07ea14414b9aa3c88558e624fa9d4b73ce8f1016..71a182699f1af7628e3f7175d52f3a304995925a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
@@ -45,7 +45,7 @@ public class StateDataSection extends AbstractEntityCollectionSection<Categorica
        /** {@inheritDoc} */
        @Override
        public Collection<StateData> getCollection(CategoricalData entity) {
        /** {@inheritDoc} */
        @Override
        public Collection<StateData> getCollection(CategoricalData entity) {

-               return entity.getStates();
+               return entity.getStateData();

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */


@@ -57,13 +57,13 @@ public class StateDataSection extends AbstractEntityCollectionSection<Categorica
        /** {@inheritDoc} */
        @Override
        public void addElement(StateData element) {
        /** {@inheritDoc} */
        @Override
        public void addElement(StateData element) {

-               getEntity().addState(element);
+               getEntity().addStateData(element);

        }
 
        /** {@inheritDoc} */
        @Override
        public void removeElement(StateData element) {
        }
 
        /** {@inheritDoc} */
        @Override
        public void removeElement(StateData element) {

-               getEntity().removeState(element);
+               getEntity().removeStateData(element);

        }
 
        /** {@inheritDoc} */
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
index 38eabcf2ea28696c934bef3911a361504d53d177..235110c7a7927f637ce2ed0c2f772f19e75dcf0e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
@@ -89,7 +89,7 @@ public class GatheringEventDetailElement extends
                text_collectingMethod = formFactory.createTextWithLabelElement(
                                formElement, "Collecting Method", entity.getCollectingMethod(),
                                style);
                text_collectingMethod = formFactory.createTextWithLabelElement(
                                formElement, "Collecting Method", entity.getCollectingMethod(),
                                style);

-
+               //FIXME:3.3MC

                number_distanceToGround = formFactory
                                .createIntegerTextWithLabelElement(formElement,
                                                "Distance To Ground (m)", entity.getDistanceToGround(),
                number_distanceToGround = formFactory
                                .createIntegerTextWithLabelElement(formElement,
                                                "Distance To Ground (m)", entity.getDistanceToGround(),

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 8f913790f91b1748b6c7d38df7ffbf46ac27e9fe..dd90d161447c34f63b010c1b40f0f7f390aab6b7 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
@@ -137,8 +137,8 @@ public class UseRecordDetailElement extends
         * @return\r
         */\r
        private State stateSelection(String comboCategory) {\r
         * @return\r
         */\r
        private State stateSelection(String comboCategory) {\r

-               if (!getEntity().getStates().isEmpty()) {\r
-                       for (StateData statedata : getEntity().getStates()) {\r
+               if (!getEntity().getStateData().isEmpty()) {\r
+                       for (StateData statedata : getEntity().getStateData()) {\r

                                if (statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {\r
                                        String testString = statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText();\r
                                        if(testString.equals(comboCategory)) {\r
                                if (statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {\r
                                        String testString = statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText();\r
                                        if(testString.equals(comboCategory)) {\r


@@ -219,8 +219,8 @@ public class UseRecordDetailElement extends
        \r
                        }\r
                }\r
        \r
                        }\r
                }\r

-               else if (!getEntity().getStates().isEmpty()) {\r
-                       for (StateData stateData : getEntity().getStates()) {\r
+               else if (!getEntity().getStateData().isEmpty()) {\r
+                       for (StateData stateData : getEntity().getStateData()) {\r

                                if (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {\r
                                        if ((stateData.getState() != null) && (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()).getText() == UsageTermCollection.useCategoryVocabularyLabel)) {\r
                                                for (State term : listOfTerms) {\r
                                if (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {\r
                                        if ((stateData.getState() != null) && (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()).getText() == UsageTermCollection.useCategoryVocabularyLabel)) {\r
                                                for (State term : listOfTerms) {\r


@@ -297,8 +297,8 @@ public class UseRecordDetailElement extends
                        if (combo_UseCategory.getSelection() != null) {\r
                                boolean isChanged = false;\r
                                boolean isUseCategoryChanged = false;\r
                        if (combo_UseCategory.getSelection() != null) {\r
                                boolean isChanged = false;\r
                                boolean isUseCategoryChanged = false;\r

-                               if (!getEntity().getStates().isEmpty()) {\r
-                                       for (StateData useCategoryStateDataCheck : getEntity().getStates()) {\r
+                               if (!getEntity().getStateData().isEmpty()) {\r
+                                       for (StateData useCategoryStateDataCheck : getEntity().getStateData()) {\r

                                                Map<Language, LanguageString> modText = useCategoryStateDataCheck.getModifyingText();\r
                                                if(modText.get(CdmStore.getDefaultLanguage()) != null && modText.get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) {\r
                                                        if(!useCategoryStateDataCheck.getState().getTitleCache().equals(combo_UseCategory.getSelection().getTitleCache())) {\r
                                                Map<Language, LanguageString> modText = useCategoryStateDataCheck.getModifyingText();\r
                                                if(modText.get(CdmStore.getDefaultLanguage()) != null && modText.get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) {\r
                                                        if(!useCategoryStateDataCheck.getState().getTitleCache().equals(combo_UseCategory.getSelection().getTitleCache())) {\r


@@ -307,7 +307,7 @@ public class UseRecordDetailElement extends
                                                        \r
                                                }\r
                                        }\r
                                                        \r
                                                }\r
                                        }\r

-                                       ListIterator<StateData> itrExistingStates = getEntity().getStates().listIterator();\r
+                                       ListIterator<StateData> itrExistingStates = getEntity().getStateData().listIterator();\r

                                        while(itrExistingStates.hasNext()) {\r
                                                StateData existingStateData = itrExistingStates.next();\r
                                                Map<Language, LanguageString> modifyingText = existingStateData\r
                                        while(itrExistingStates.hasNext()) {\r
                                                StateData existingStateData = itrExistingStates.next();\r
                                                Map<Language, LanguageString> modifyingText = existingStateData\r


@@ -336,15 +336,15 @@ public class UseRecordDetailElement extends
                                                        .NewInstance(combo_UseCategory.getSelection());\r
                                        stateData.setState(combo_UseCategory.getSelection());\r
                                        stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useCategoryVocabularyLabel);\r
                                                        .NewInstance(combo_UseCategory.getSelection());\r
                                        stateData.setState(combo_UseCategory.getSelection());\r
                                        stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useCategoryVocabularyLabel);\r

-                                       getEntity().addState(stateData);\r
+                                       getEntity().addStateData(stateData);\r

                                }\r
                                \r
                                combo_UseSubCategory.setEnabled(true);\r
        \r
                        }\r
                        else {\r
                                }\r
                                \r
                                combo_UseSubCategory.setEnabled(true);\r
        \r
                        }\r
                        else {\r

-                               if (!getEntity().getStates().isEmpty()) {\r
-                                       Iterator<StateData> itr = getEntity().getStates().iterator();\r
+                               if (!getEntity().getStateData().isEmpty()) {\r
+                                       Iterator<StateData> itr = getEntity().getStateData().iterator();\r

                                        while(itr.hasNext()) {\r
                                                StateData stateToRemove = itr.next();\r
                                                itr.remove();\r
                                        while(itr.hasNext()) {\r
                                                StateData stateToRemove = itr.next();\r
                                                itr.remove();\r


@@ -361,8 +361,8 @@ public class UseRecordDetailElement extends
                if (eventSource == combo_UseSubCategory) {\r
                        if (combo_UseSubCategory.getSelection() != null) {\r
                                boolean isChanged = false;\r
                if (eventSource == combo_UseSubCategory) {\r
                        if (combo_UseSubCategory.getSelection() != null) {\r
                                boolean isChanged = false;\r

-                               if (!getEntity().getStates().isEmpty()) {\r
-                                       ListIterator<StateData> itrExistingStates = getEntity().getStates().listIterator();\r
+                               if (!getEntity().getStateData().isEmpty()) {\r
+                                       ListIterator<StateData> itrExistingStates = getEntity().getStateData().listIterator();\r

                                        while(itrExistingStates.hasNext()) {\r
                                                StateData existingStateData = itrExistingStates.next();\r
                                                Map<Language, LanguageString> modifyingText = existingStateData\r
                                        while(itrExistingStates.hasNext()) {\r
                                                StateData existingStateData = itrExistingStates.next();\r
                                                Map<Language, LanguageString> modifyingText = existingStateData\r


@@ -387,12 +387,12 @@ public class UseRecordDetailElement extends
                                                        .NewInstance(combo_UseSubCategory.getSelection());\r
                                        stateData.setState(combo_UseSubCategory.getSelection());\r
                                        stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useSubCategoryVocabularyLabel);\r
                                                        .NewInstance(combo_UseSubCategory.getSelection());\r
                                        stateData.setState(combo_UseSubCategory.getSelection());\r
                                        stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useSubCategoryVocabularyLabel);\r

-                                       getEntity().addState(stateData);\r
+                                       getEntity().addStateData(stateData);\r

                                }\r
        \r
                        } else {\r
                                }\r
        \r
                        } else {\r

-                               if (!getEntity().getStates().isEmpty()) {\r
-                                       Iterator<StateData> itrStateData = getEntity().getStates().iterator();\r
+                               if (!getEntity().getStateData().isEmpty()) {\r
+                                       Iterator<StateData> itrStateData = getEntity().getStateData().iterator();\r

                                        while(itrStateData.hasNext()) {\r
                                                StateData existingStateData = itrStateData.next();\r
                                                Map<Language, LanguageString> modifyingText = existingStateData\r
                                        while(itrStateData.hasNext()) {\r
                                                StateData existingStateData = itrStateData.next();\r
                                                Map<Language, LanguageString> modifyingText = existingStateData\r


@@ -568,8 +568,8 @@ public class UseRecordDetailElement extends
                                if (selectedUseCategory != null) {\r
                                        combo_UseSubCategory.setTerms(setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false),selectedUseCategory));\r
                                \r
                                if (selectedUseCategory != null) {\r
                                        combo_UseSubCategory.setTerms(setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false),selectedUseCategory));\r
                                \r

-                                       if (!getEntity().getStates().isEmpty()) {\r
-                                               Iterator<StateData> itrExistingState = getEntity().getStates().iterator();\r
+                                       if (!getEntity().getStateData().isEmpty()) {\r
+                                               Iterator<StateData> itrExistingState = getEntity().getStateData().iterator();\r

                                                while(itrExistingState.hasNext()) {\r
                                                        StateData existingStateData = (StateData) itrExistingState.next();\r
                                                        Map<Language, LanguageString> modifyingText = existingStateData.getModifyingText();\r
                                                while(itrExistingState.hasNext()) {\r
                                                        StateData existingStateData = (StateData) itrExistingState.next();\r
                                                        Map<Language, LanguageString> modifyingText = existingStateData.getModifyingText();\r