From: Cherian Mathew Date: Wed, 10 Jul 2013 14:05:38 +0000 (+0000) Subject: updates for 3.3 model changes. Phase two commit, which contains method changes /... X-Git-Tag: 3.6.0~960^2~34 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/124424d053251c1cc2c2aec27660a9b79320ce78 updates for 3.3 model changes. Phase two commit, which contains method changes / updates --- 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 6db78f03d..74b3ff406 100644 --- 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()); - 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); 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 fa39cab53..ff4ff1fbd 100644 --- 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); - newNode = parentNode.addChildTaxon(newTaxon, null, null, null); + newNode = parentNode.addChildTaxon(newTaxon, null, null); 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 d8a7e961a..6f85e5202 100644 --- 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 } } else if (element instanceof CategoricalData) { - if (!((CategoricalData) element).getStates().isEmpty()) { + if (!((CategoricalData) element).getStateData().isEmpty()) { boolean isUseCategoryAbsent = true; - for (StateData statedata : ((CategoricalData) element).getStates()) { + for (StateData statedata : ((CategoricalData) element).getStateData()) { if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) { text = text + statedata.getState().getTitleCache() + ";"; isUseCategoryAbsent = false; @@ -62,7 +62,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements } boolean isUseSubCategoryAbsent = true; - for (StateData statedata : ((CategoricalData) element).getStates()) { + for (StateData statedata : ((CategoricalData) element).getStateData()) { if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useSubCategoryVocabularyLabel)) { text = text + statedata.getState().getTitleCache() + ";"; isUseSubCategoryAbsent = false; 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 f3dae1afb..c30009bd6 100644 --- 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); - 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); } 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 6bf1a5deb..5fc9af831 100644 --- 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, - newParentTreeNode.getReference(), newParentTreeNode.getMicroReference(), - taxonNode.getSynonymToBeUsed()); + newParentTreeNode.getReference(), newParentTreeNode.getMicroReference()); 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 3ae83c87f..0bd7e6d00 100644 --- 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); - childTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference(), null); + childTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference()); 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 2b9a52933..cf7c1442f 100644 --- 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; import eu.etaxonomy.cdm.model.location.Continent; import eu.etaxonomy.cdm.model.location.NamedArea; -import eu.etaxonomy.cdm.model.location.TdwgArea; import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry; /** @@ -25,8 +24,7 @@ import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry; public class NamedAreaEditorInput extends AbstractDefinedTermEditorInput { private List termClasses = Arrays.asList(new String[]{ - NamedArea.class.getName(), - TdwgArea.class.getName(), + NamedArea.class.getName(), WaterbodyOrCountry.class.getName(), Continent.class.getName() }); 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 f0e65cbd5..e05e04906 100644 --- 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 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()); 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 b93e2d40e..70976a68b 100644 --- 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() { - model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitBaseUuidAndTitleCache(); + model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitUuidAndTitleCache(); } /** {@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 9b65a213b..c7bbf2813 100644 --- 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() { - model = CdmStore.getService(IOccurrenceService.class).getFieldObservationUuidAndTitleCache(); + model = CdmStore.getService(IOccurrenceService.class).getFieldUnitUuidAndTitleCache(); } /** {@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 6eddaad0a..baae5fe0b 100644 --- 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 getCollection( TaxonDescription entity) { - return entity.getDescribedSpecimenOrObservations(); + //FIXME:3.3MC + return entity.getDescribedSpecimenOrObservation(); } /** {@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 07ea14414..71a182699 100644 --- 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 getCollection(CategoricalData entity) { - return entity.getStates(); + return entity.getStateData(); } /** {@inheritDoc} */ @@ -57,13 +57,13 @@ public class StateDataSection extends AbstractEntityCollectionSection modText = useCategoryStateDataCheck.getModifyingText(); if(modText.get(CdmStore.getDefaultLanguage()) != null && modText.get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) { if(!useCategoryStateDataCheck.getState().getTitleCache().equals(combo_UseCategory.getSelection().getTitleCache())) { @@ -307,7 +307,7 @@ public class UseRecordDetailElement extends } } - ListIterator itrExistingStates = getEntity().getStates().listIterator(); + ListIterator itrExistingStates = getEntity().getStateData().listIterator(); while(itrExistingStates.hasNext()) { StateData existingStateData = itrExistingStates.next(); Map modifyingText = existingStateData @@ -336,15 +336,15 @@ public class UseRecordDetailElement extends .NewInstance(combo_UseCategory.getSelection()); stateData.setState(combo_UseCategory.getSelection()); stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useCategoryVocabularyLabel); - getEntity().addState(stateData); + getEntity().addStateData(stateData); } combo_UseSubCategory.setEnabled(true); } else { - if (!getEntity().getStates().isEmpty()) { - Iterator itr = getEntity().getStates().iterator(); + if (!getEntity().getStateData().isEmpty()) { + Iterator itr = getEntity().getStateData().iterator(); while(itr.hasNext()) { StateData stateToRemove = itr.next(); itr.remove(); @@ -361,8 +361,8 @@ public class UseRecordDetailElement extends if (eventSource == combo_UseSubCategory) { if (combo_UseSubCategory.getSelection() != null) { boolean isChanged = false; - if (!getEntity().getStates().isEmpty()) { - ListIterator itrExistingStates = getEntity().getStates().listIterator(); + if (!getEntity().getStateData().isEmpty()) { + ListIterator itrExistingStates = getEntity().getStateData().listIterator(); while(itrExistingStates.hasNext()) { StateData existingStateData = itrExistingStates.next(); Map modifyingText = existingStateData @@ -387,12 +387,12 @@ public class UseRecordDetailElement extends .NewInstance(combo_UseSubCategory.getSelection()); stateData.setState(combo_UseSubCategory.getSelection()); stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useSubCategoryVocabularyLabel); - getEntity().addState(stateData); + getEntity().addStateData(stateData); } } else { - if (!getEntity().getStates().isEmpty()) { - Iterator itrStateData = getEntity().getStates().iterator(); + if (!getEntity().getStateData().isEmpty()) { + Iterator itrStateData = getEntity().getStateData().iterator(); while(itrStateData.hasNext()) { StateData existingStateData = itrStateData.next(); Map modifyingText = existingStateData @@ -568,8 +568,8 @@ public class UseRecordDetailElement extends if (selectedUseCategory != null) { combo_UseSubCategory.setTerms(setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false),selectedUseCategory)); - if (!getEntity().getStates().isEmpty()) { - Iterator itrExistingState = getEntity().getStates().iterator(); + if (!getEntity().getStateData().isEmpty()) { + Iterator itrExistingState = getEntity().getStateData().iterator(); while(itrExistingState.hasNext()) { StateData existingStateData = (StateData) itrExistingState.next(); Map modifyingText = existingStateData.getModifyingText();