From 49a64920d20e616c151ce11732b48f14bd183850 Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Wed, 10 Jul 2013 13:38:30 +0000 Subject: [PATCH] Aligning Editor with 3.3 model changes. First phase commit which updates only the classes. Branch not compilable at the moment. --- ...tractAddDerivedUnitFacadeMediaHandler.java | 6 +- .../AddDerivedUnitFacadeMediaOperation.java | 6 +- .../entitycreator/OccurrenceCreator.java | 39 +++--- eu.etaxonomy.taxeditor.cdmlib/.classpath | 32 ++--- .../META-INF/MANIFEST.MF | 34 +++--- .../build.properties | 34 +++--- .../taxeditor/editor/UseObjectManager.java | 22 ++-- .../view/media/MediaContentProvider.java | 6 +- .../media/handler/AddImageGalleryHandler.java | 10 -- .../editor/view/uses/UsesLabelProvider.java | 14 +-- .../creating_multiple_datasources.html | 4 +- .../show_hide_options_of_drop-down_menus.html | 2 +- .../input/DefinedTermEditorInputFactory.java | 5 +- .../input/ModifierEditorInput.java | 11 +- .../taxeditor/model/DescriptionHelper.java | 2 +- .../model/NomenclaturalCodeHelper.java | 8 +- .../newWizard/NewDerivedUnitBaseWizard.java | 10 +- .../newWizard/NewFieldObservationWizard.java | 6 +- .../newWizard/NewNonViralNameWizard.java | 2 +- .../taxeditor/preference/IPreferenceKeys.java | 1 - .../preference/menu/StageMenuPreferences.java | 9 +- .../taxeditor/store/SearchManager.java | 4 +- .../selection/DerivedUnitSelectionDialog.java | 14 +-- .../FieldObservationSelectionDialog.java | 18 +-- .../selection/SelectionDialogFactory.java | 12 +- .../taxeditor/ui/element/CdmFormFactory.java | 23 ++-- .../description/DerivedUnitElement.java | 6 +- .../description/DescribedSpecimenSection.java | 4 +- .../DescriptionElementSourceElement.java | 2 +- .../DescriptionElementSourceSection.java | 2 +- .../section/description/ModifierElement.java | 13 +- .../section/description/ModifierSection.java | 14 +-- .../ui/section/description/ScopeElement.java | 12 +- .../ui/section/description/ScopeSection.java | 14 +-- .../IndividualsAssociationDetailElement.java | 8 +- .../section/key/ScopeRestrictionSection.java | 14 +-- .../ui/section/name/NameDetailElement.java | 2 +- .../name/SpecimenTypeDesignationElement.java | 9 +- .../DerivedUnitFacadeDetailElement.java | 10 +- .../DerivedUnitFacadeDetailSection.java | 4 +- .../DeterminationEventDetailElement.java | 7 +- .../FieldObservationDetailElement.java | 12 +- .../SpecimenCollectionDetailElement.java | 15 ++- .../SpecimenCollectionDetailSection.java | 14 +-- .../section/supplemental/RightsElement.java | 6 +- .../userecords/UseRecordDetailElement.java | 113 +++++++++--------- .../ui/selection/EditFromSelectionWizard.java | 6 +- .../taxeditor/view/detail/CdmSectionPart.java | 6 +- .../taxeditor/view/detail/DetailsViewer.java | 6 +- .../TermsDataSet-with_auditing_info.xml | 2 +- .../etaxonomy/cdm/database/TermsDataSet.xml | 2 +- pom.xml | 2 +- 52 files changed, 315 insertions(+), 324 deletions(-) diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java index fe74a3d13..a1b78438c 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java @@ -21,7 +21,7 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; import eu.etaxonomy.taxeditor.bulkeditor.derivedunit.operation.AddDerivedUnitFacadeMediaOperation; @@ -55,10 +55,10 @@ public abstract class AbstractAddDerivedUnitFacadeMediaHandler extends AbstractH if(selection instanceof IStructuredSelection){ Object element = ((IStructuredSelection) selection).getFirstElement(); - if(element instanceof DerivedUnitBase){ + if(element instanceof DerivedUnit){ try{ - AbstractPostOperation operation = new AddDerivedUnitFacadeMediaOperation(event.getCommand().getName(), BulkEditorUtil.getUndoContext(), (DerivedUnitBase) element, getMode(), postOperationEnabled); + AbstractPostOperation operation = new AddDerivedUnitFacadeMediaOperation(event.getCommand().getName(), BulkEditorUtil.getUndoContext(), (DerivedUnit) element, getMode(), postOperationEnabled); BulkEditorUtil.executeOperation(operation); } catch (NotDefinedException e) { BulkEditorUtil.warn(getClass(), "Command name not set."); diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java index 179f2a5f5..5b5e8e213 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java @@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.description.SpecimenDescription; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -36,7 +36,7 @@ public class AddDerivedUnitFacadeMediaOperation extends public static final int DERIVED_UNIT_MEDIA = 0; public static final int FIELD_OBJECT_MEDIA = 1; - private DerivedUnitBase derivedUnit; + private DerivedUnit derivedUnit; private int mode; /** @@ -44,7 +44,7 @@ public class AddDerivedUnitFacadeMediaOperation extends * @param undoContext * @param postOperationEnabled */ - public AddDerivedUnitFacadeMediaOperation(String label, IUndoContext undoContext, DerivedUnitBase derivedUnit, + public AddDerivedUnitFacadeMediaOperation(String label, IUndoContext undoContext, DerivedUnit derivedUnit, int mode, IPostOperationEnabled postOperationEnabled) { super(label, undoContext, postOperationEnabled); diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java index f77a675bc..9e86e4208 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java @@ -17,11 +17,7 @@ import org.apache.log4j.Logger; import eu.etaxonomy.cdm.model.molecular.DnaSample; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; -import eu.etaxonomy.cdm.model.occurrence.FieldObservation; -import eu.etaxonomy.cdm.model.occurrence.Fossil; -import eu.etaxonomy.cdm.model.occurrence.LivingBeing; -import eu.etaxonomy.cdm.model.occurrence.Observation; -import eu.etaxonomy.cdm.model.occurrence.Specimen; +import eu.etaxonomy.cdm.model.occurrence.FieldUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; @@ -42,28 +38,28 @@ public class OccurrenceCreator implements /** {@inheritDoc} */ @Override public SpecimenOrObservationBase createEntity(String text) { - return createEntity(Specimen.class, text); + return createEntity(DerivedUnit.class, text); } /** {@inheritDoc} */ @Override public SpecimenOrObservationBase createEntity(Object key, String text) { SpecimenOrObservationBase specimenOrObservation = null; - - if (FieldObservation.class.equals((key))) { - specimenOrObservation = FieldObservation.NewInstance(); + //FIXME:3.3MC + if (FieldUnit.class.equals((key))) { + specimenOrObservation = FieldUnit.NewInstance(); + } else if (DerivedUnit.class.equals((key))) { + specimenOrObservation = DerivedUnit.NewInstance(); + } else if (DerivedUnit.class.equals((key))) { + specimenOrObservation = DerivedUnit.NewInstance(); + } else if (DerivedUnit.class.equals((key))) { + specimenOrObservation = DerivedUnit.NewInstance(); } else if (DerivedUnit.class.equals((key))) { specimenOrObservation = DerivedUnit.NewInstance(); - } else if (LivingBeing.class.equals((key))) { - specimenOrObservation = LivingBeing.NewInstance(); - } else if (Observation.class.equals((key))) { - specimenOrObservation = Observation.NewInstance(); - } else if (Specimen.class.equals((key))) { - specimenOrObservation = Specimen.NewInstance(); } else if (DnaSample.class.equals((key))) { specimenOrObservation = DnaSample.NewInstance(); - } else if (Fossil.class.equals((key))) { - specimenOrObservation = Fossil.NewInstance(); + } else if (DerivedUnit.class.equals((key))) { + specimenOrObservation = DerivedUnit.NewInstance(); } if (specimenOrObservation != null) { @@ -83,10 +79,11 @@ public class OccurrenceCreator implements public Map getKeyLabelPairs() { Map result = new HashMap(); - result.put(Specimen.class, "Specimen"); - result.put(Observation.class, "Observation"); - result.put(LivingBeing.class, "Living Being"); - result.put(Fossil.class, "Fossil"); + //FIXME:3.3MC + result.put(DerivedUnit.class, "Specimen"); + result.put(DerivedUnit.class, "Observation"); + result.put(DerivedUnit.class, "Living Being"); + result.put(DerivedUnit.class, "Fossil"); result.put(DerivedUnit.class, "Derived Unit"); // Omitted at the moment see #2266 diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 0cb8793aa..f2f431199 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -25,22 +25,6 @@ - - - - - - - - - - - - - - - - @@ -204,5 +188,21 @@ + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 761591e11..14a720436 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -416,22 +416,6 @@ Bundle-ClassPath: ., lib/batik-util-1.7.jar, lib/batik-xml-1.7.jar, lib/c3p0-0.9.2.jar, - lib/cdmlib-commons-3.2.3-SNAPSHOT-sources.jar, - lib/cdmlib-commons-3.2.3-SNAPSHOT.jar, - lib/cdmlib-ext-3.2.3-SNAPSHOT-sources.jar, - lib/cdmlib-ext-3.2.3-SNAPSHOT.jar, - lib/cdmlib-io-3.2.3-SNAPSHOT-sources.jar, - lib/cdmlib-io-3.2.3-SNAPSHOT.jar, - lib/cdmlib-model-3.2.3-SNAPSHOT-sources.jar, - lib/cdmlib-model-3.2.3-SNAPSHOT.jar, - lib/cdmlib-persistence-3.2.3-SNAPSHOT-sources.jar, - lib/cdmlib-persistence-3.2.3-SNAPSHOT.jar, - lib/cdmlib-print-3.2.3-SNAPSHOT-sources.jar, - lib/cdmlib-print-3.2.3-SNAPSHOT.jar, - lib/cdmlib-remote-3.2.3-SNAPSHOT-sources.jar, - lib/cdmlib-remote-3.2.3-SNAPSHOT.jar, - lib/cdmlib-services-3.2.3-SNAPSHOT-sources.jar, - lib/cdmlib-services-3.2.3-SNAPSHOT.jar, lib/cglib-nodep-2.2.2.jar, lib/com.springsource.org.aopalliance-1.0.0.jar, lib/com.springsource.org.apache.commons.logging-1.1.1.jar, @@ -594,4 +578,20 @@ Bundle-ClassPath: ., lib/yjp-controller-api-redist-9.0.8.jar, lib/google-api-translate-java-0.92.jar, lib/odfdom-0.8.jar, - lib/h2mig_pagestore_addon.jar + lib/h2mig_pagestore_addon.jar, + lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar, + lib/cdmlib-commons-3.3.0-SNAPSHOT.jar, + lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar, + lib/cdmlib-ext-3.3.0-SNAPSHOT.jar, + lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar, + lib/cdmlib-io-3.3.0-SNAPSHOT.jar, + lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar, + lib/cdmlib-model-3.3.0-SNAPSHOT.jar, + lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar, + lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar, + lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar, + lib/cdmlib-print-3.3.0-SNAPSHOT.jar, + lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar, + lib/cdmlib-remote-3.3.0-SNAPSHOT.jar, + lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar, + lib/cdmlib-services-3.3.0-SNAPSHOT.jar diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties index f2d0e9890..4144cf7fc 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/build.properties +++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties @@ -22,22 +22,6 @@ bin.includes = META-INF/,\ lib/batik-util-1.7.jar,\ lib/batik-xml-1.7.jar,\ lib/c3p0-0.9.2.jar,\ - lib/cdmlib-commons-3.2.3-SNAPSHOT-sources.jar,\ - lib/cdmlib-commons-3.2.3-SNAPSHOT.jar,\ - lib/cdmlib-ext-3.2.3-SNAPSHOT-sources.jar,\ - lib/cdmlib-ext-3.2.3-SNAPSHOT.jar,\ - lib/cdmlib-io-3.2.3-SNAPSHOT-sources.jar,\ - lib/cdmlib-io-3.2.3-SNAPSHOT.jar,\ - lib/cdmlib-model-3.2.3-SNAPSHOT-sources.jar,\ - lib/cdmlib-model-3.2.3-SNAPSHOT.jar,\ - lib/cdmlib-persistence-3.2.3-SNAPSHOT-sources.jar,\ - lib/cdmlib-persistence-3.2.3-SNAPSHOT.jar,\ - lib/cdmlib-print-3.2.3-SNAPSHOT-sources.jar,\ - lib/cdmlib-print-3.2.3-SNAPSHOT.jar,\ - lib/cdmlib-remote-3.2.3-SNAPSHOT-sources.jar,\ - lib/cdmlib-remote-3.2.3-SNAPSHOT.jar,\ - lib/cdmlib-services-3.2.3-SNAPSHOT-sources.jar,\ - lib/cdmlib-services-3.2.3-SNAPSHOT.jar,\ lib/cglib-nodep-2.2.2.jar,\ lib/com.springsource.org.aopalliance-1.0.0.jar,\ lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\ @@ -200,5 +184,21 @@ bin.includes = META-INF/,\ lib/yjp-controller-api-redist-9.0.8.jar,\ lib/google-api-translate-java-0.92.jar,\ lib/odfdom-0.8.jar,\ - lib/h2mig_pagestore_addon.jar + lib/h2mig_pagestore_addon.jar,\ + lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,\ + lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,\ + lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-io-3.3.0-SNAPSHOT.jar,\ + lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-model-3.3.0-SNAPSHOT.jar,\ + lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,\ + lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-print-3.3.0-SNAPSHOT.jar,\ + lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,\ + lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,\ + lib/cdmlib-services-3.3.0-SNAPSHOT.jar diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java index b4dafb7e7..bfe4e7369 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java @@ -18,12 +18,12 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.service.IFeatureTreeService; import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.api.service.IVocabularyService; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.MarkerType; import eu.etaxonomy.cdm.model.common.TermVocabulary; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.FeatureNode; import eu.etaxonomy.cdm.model.description.FeatureTree; -import eu.etaxonomy.cdm.model.description.Modifier; import eu.etaxonomy.cdm.model.description.State; import eu.etaxonomy.taxeditor.model.ContextListenerAdapter; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -122,20 +122,20 @@ public class UseObjectManager extends ContextListenerAdapter{ private void createHumanGroupVocabulary(IProgressMonitor monitor,ConversationHolder conversation) { - TermVocabulary humanGroupVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary); + TermVocabulary humanGroupVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary); if (humanGroupVocabulary == null){ monitor.subTask("create human group vocabulary"); URI termSourceUri = null; try { - termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier"); + termSourceUri = new URI("eu.etaxonomy.cdm.model.description.DefinedTerm"); } catch (URISyntaxException e) { e.printStackTrace(); } humanGroupVocabulary = TermVocabulary.NewInstance(UsageTermCollection.humanGroupLabel, UsageTermCollection.humanGroupLabel, null, termSourceUri); humanGroupVocabulary.setUuid(UsageTermCollection.uuidHumanGroupVocabulary); - Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); + DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); newDummyModifier.setUuid(UsageTermCollection.uuidHumanGroupDummy); - Modifier newSubDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); + DefinedTerm newSubDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); newSubDummyModifier.setUuid(UsageTermCollection.uuidEthnicGroupDummy); newDummyModifier.addIncludes(newSubDummyModifier); humanGroupVocabulary.addTerm(newDummyModifier); @@ -146,18 +146,18 @@ public class UseObjectManager extends ContextListenerAdapter{ private void createPlantVocabulary(IProgressMonitor monitor, ConversationHolder conversation) { - TermVocabulary plantPartVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary); + TermVocabulary plantPartVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary); if (plantPartVocabulary == null){ monitor.subTask("create plant part vocabulary"); URI termSourceUri = null; try { - termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier"); + termSourceUri = new URI("eu.etaxonomy.cdm.model.description.DefinedTerm"); } catch (URISyntaxException e) { e.printStackTrace(); } plantPartVocabulary = TermVocabulary.NewInstance(UsageTermCollection.plantPartLabel, UsageTermCollection.plantPartLabel, null, termSourceUri); plantPartVocabulary.setUuid(UsageTermCollection.uuidPlantPartVocabulary); - Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); + DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); newDummyModifier.setUuid(UsageTermCollection.uuidPlantPartDummy); plantPartVocabulary.addTerm(newDummyModifier); CdmStore.getService(IVocabularyService.class).saveOrUpdate(plantPartVocabulary); @@ -167,18 +167,18 @@ public class UseObjectManager extends ContextListenerAdapter{ private void createCountryVocabulary(IProgressMonitor monitor, ConversationHolder conversation) { - TermVocabulary countryVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary); + TermVocabulary countryVocabulary = (TermVocabulary) CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary); if (countryVocabulary == null){ monitor.subTask("create country vocabulary"); URI termSourceUri = null; try { - termSourceUri = new URI("eu.etaxonomy.cdm.model.description.Modifier"); + termSourceUri = new URI("eu.etaxonomy.cdm.model.description.DefinedTerm"); } catch (URISyntaxException e) { e.printStackTrace(); } countryVocabulary = TermVocabulary.NewInstance(UsageTermCollection.countryLabel, UsageTermCollection.countryLabel, null, termSourceUri); countryVocabulary.setUuid(UsageTermCollection.uuidCountryVocabulary); - Modifier newDummyModifier = Modifier.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); + DefinedTerm newDummyModifier = DefinedTerm.NewInstance(UsageTermCollection.notAvailableLabel, UsageTermCollection.notAvailableLabel, null); newDummyModifier.setUuid(UsageTermCollection.uuidCountryDummy); countryVocabulary.addTerm(newDummyModifier); CdmStore.getService(IVocabularyService.class).saveOrUpdate(countryVocabulary); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java index 94643dbcc..bddcfbfea 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java @@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.description.SpecimenDescription; import eu.etaxonomy.cdm.model.media.Media; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; @@ -63,9 +63,9 @@ public class MediaContentProvider implements ITreeContentProvider{ return getImages((DescriptionBase) parentElement).toArray(); } } - else if (parentElement instanceof DerivedUnitBase){ + else if (parentElement instanceof DerivedUnit){ try { - DerivedUnitFacade facade = DerivedUnitFacade.NewInstance((DerivedUnitBase) parentElement); + DerivedUnitFacade facade = DerivedUnitFacade.NewInstance((DerivedUnit) parentElement); // TODO at the moment we always create image galleries because the facade is like so. // this should definitely change and we want to use normal getters and setters here diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java index 234dfb238..a18a10293 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java @@ -7,22 +7,12 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.common.NotDefinedException; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; -import eu.etaxonomy.cdm.model.description.Feature; -import eu.etaxonomy.cdm.model.description.SpecimenDescription; -import eu.etaxonomy.cdm.model.description.TextData; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; -import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateTaxonDescriptionOperation; 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 1858c850a..d8a7e961a 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 @@ -15,11 +15,11 @@ import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.jface.viewers.StyledString; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.Language; import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.description.CategoricalData; import eu.etaxonomy.cdm.model.description.DescriptionBase; -import eu.etaxonomy.cdm.model.description.Modifier; import eu.etaxonomy.cdm.model.description.StateData; import eu.etaxonomy.cdm.model.description.TextData; import eu.etaxonomy.taxeditor.model.FeatureNodeContainer; @@ -76,13 +76,13 @@ public class UsesLabelProvider extends ColumnLabelProvider implements text = text + UsageTermCollection.notAvailableLabel + ";" + UsageTermCollection.notAvailableLabel + ";"; } if (!((CategoricalData) element).getModifiers().isEmpty()) { - for (Modifier modifier: ((CategoricalData) element).getModifiers()){ + for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){ modifier.getPartOf(); modifier.getVocabulary(); } boolean isPlantPartAbsent = true; - for (Modifier modifier: ((CategoricalData) element).getModifiers()){ + for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){ if(GetVocabularyType(modifier, UsageTermCollection.plantPartLabel)) { text = text + modifier.getTitleCache()+ ";"; isPlantPartAbsent = false; @@ -94,7 +94,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements } boolean isHumanGroupAbsent = true; - for (Modifier modifier: ((CategoricalData) element).getModifiers()){ + for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){ if(GetVocabularyType(modifier, UsageTermCollection.humanGroupLabel)) { text = text + modifier.getTitleCache()+ ";"; isHumanGroupAbsent = false; @@ -105,7 +105,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements } boolean isEthnicGroupAbsent = true; - for (Modifier modifier: ((CategoricalData) element).getModifiers()){ + for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){ if(GetVocabularyType(modifier, UsageTermCollection.ethnicGroupLabel)) { text = text + modifier.getTitleCache()+ ";"; isEthnicGroupAbsent = false; @@ -116,7 +116,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements } boolean isCountryAbsent = true; - for (Modifier modifier: ((CategoricalData) element).getModifiers()){ + for (DefinedTerm modifier: ((CategoricalData) element).getModifiers()){ if(GetVocabularyType(modifier, UsageTermCollection.countryLabel)) { text = text + modifier.getTitleCache()+ ";"; isCountryAbsent = false; @@ -164,7 +164,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements * @param vocabularyExpected * @return */ - private boolean GetVocabularyType(Modifier term, String vocabularyExpected) { + private boolean GetVocabularyType(DefinedTerm term, String vocabularyExpected) { if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(vocabularyExpected))) { return true; } diff --git a/eu.etaxonomy.taxeditor.help/html/gettingstarted/creating_multiple_datasources.html b/eu.etaxonomy.taxeditor.help/html/gettingstarted/creating_multiple_datasources.html index e0c765462..ed033aadb 100644 --- a/eu.etaxonomy.taxeditor.help/html/gettingstarted/creating_multiple_datasources.html +++ b/eu.etaxonomy.taxeditor.help/html/gettingstarted/creating_multiple_datasources.html @@ -34,7 +34,7 @@ The "Create New Datasource" panel will appear. The "Enter credentials for embedded H2 database" pop-up box will open.
  • Enter a Database name (for example the name of a user or a taxonomic group).
    • -
  • Select ICBN or ICZN as appropriate.
    • +
  • Select ICNAFP or ICZN as appropriate.
  • Click Finish.

    • @@ -45,4 +45,4 @@ The "Create New Datasource" panel will appear.

    The new Datasource will appear in the Datasource panel:

    The process to create new datasources can be repeated as many times as desired.

    - \ No newline at end of file + diff --git a/eu.etaxonomy.taxeditor.help/html/gettingstarted/show_hide_options_of_drop-down_menus.html b/eu.etaxonomy.taxeditor.help/html/gettingstarted/show_hide_options_of_drop-down_menus.html index 95549cea6..5a03b8094 100644 --- a/eu.etaxonomy.taxeditor.help/html/gettingstarted/show_hide_options_of_drop-down_menus.html +++ b/eu.etaxonomy.taxeditor.help/html/gettingstarted/show_hide_options_of_drop-down_menus.html @@ -25,7 +25,7 @@
  • Matching: Experimental feature, not yet fully functional.
  • Taxonomic: Name Relationships Type: for example "misspelling for", "basionym for".
  • Name Type Designation Status: for example "monotypy", "present designation"
    • -
  • Nomenclatural Code: ICBN or ICZN.
    • +
  • Nomenclatural Code: ICNAFP or ICZN.
  • Nomenclatural Status Type: for example "invalid", "conserved".
  • Ranks: for example "cultivar", "tribe".
  • Specimen Type Designation Status: for example "epitype", "holotype".
    • diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java index cdb5b68dd..595ad43f5 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/DefinedTermEditorInputFactory.java @@ -11,11 +11,12 @@ package eu.etaxonomy.taxeditor.editor.definedterm.input; import org.eclipse.ui.IEditorInput; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.ExtensionType; import eu.etaxonomy.cdm.model.common.MarkerType; import eu.etaxonomy.cdm.model.description.Feature; -import eu.etaxonomy.cdm.model.description.Modifier; + import eu.etaxonomy.cdm.model.description.State; import eu.etaxonomy.cdm.model.location.NamedArea; import eu.etaxonomy.cdm.model.location.NamedAreaLevel; @@ -52,7 +53,7 @@ public class DefinedTermEditorInputFactory { if (clazz == State.class){ return new StateEditorInput(); } - if (clazz == Modifier.class){ + if (clazz == DefinedTerm.class){ return new ModifierEditorInput(); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java index da3b7727e..1914be740 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/ModifierEditorInput.java @@ -12,7 +12,8 @@ package eu.etaxonomy.taxeditor.editor.definedterm.input; import java.util.Arrays; import java.util.List; -import eu.etaxonomy.cdm.model.description.Modifier; +import eu.etaxonomy.cdm.model.common.DefinedTerm; + /** @@ -20,10 +21,10 @@ import eu.etaxonomy.cdm.model.description.Modifier; * @date Jan 24, 2012 * */ -public class ModifierEditorInput extends AbstractDefinedTermEditorInput { +public class ModifierEditorInput extends AbstractDefinedTermEditorInput { private List termClasses = Arrays.asList(new String[]{ - Modifier.class.getName() + DefinedTerm.class.getName() }); /* (non-Javadoc) @@ -46,8 +47,8 @@ public class ModifierEditorInput extends AbstractDefinedTermEditorInput { +public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard { /** {@inheritDoc} */ @Override @@ -57,11 +56,12 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard { +public class NewFieldObservationWizard extends AbstractNewEntityWizard { /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard#createNewEntity() */ /** {@inheritDoc} */ @Override - protected FieldObservation createNewEntity() { + protected FieldUnit createNewEntity() { return null; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java index 9ab033f49..6e6ec0886 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java @@ -38,7 +38,7 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard @Override protected NonViralName createNewEntity() { NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode(); - if(code.equals(NomenclaturalCode.ICBN)){ + if(code.equals(NomenclaturalCode.ICNAFP )){ return BotanicalName.NewInstance(null); }else if(code.equals(NomenclaturalCode.ICZN)){ return ZoologicalName.NewInstance(null); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java index a2382fcee..7254819d9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java @@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.preference; import eu.etaxonomy.cdm.model.common.IDefinedTerm; -import eu.etaxonomy.cdm.model.occurrence.FieldObservation; /** *

    IPreferenceKeys interface.

    diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java index 82c370725..566e9a736 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPreferences.java @@ -10,7 +10,8 @@ package eu.etaxonomy.taxeditor.preference.menu; -import eu.etaxonomy.cdm.model.description.Stage; +import eu.etaxonomy.cdm.model.common.DefinedTerm; + /** *

    StageMenuPreferences class.

    @@ -19,7 +20,7 @@ import eu.etaxonomy.cdm.model.description.Stage; * @created Jun 25, 2010 * @version 1.0 */ -public class StageMenuPreferences extends AbstractMenuPreferences { +public class StageMenuPreferences extends AbstractMenuPreferences { /** *

    Constructor for StageMenuPreferences.

    @@ -35,8 +36,8 @@ public class StageMenuPreferences extends AbstractMenuPreferences { */ /** {@inheritDoc} */ @Override - protected Class getTermClass() { - return Stage.class; + protected Class getTermClass() { + return DefinedTerm.class; } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java index 2d514fa8a..8c15ccbc5 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java @@ -34,7 +34,7 @@ import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.cdm.model.common.UuidAndTitleCache; import eu.etaxonomy.cdm.model.name.NameRelationship; import eu.etaxonomy.cdm.model.name.TaxonNameBase; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.model.taxon.TaxonBase; @@ -150,7 +150,7 @@ public class SearchManager { // by default we do not show field observations. This may be configured via preferences boolean showFieldObservations = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.BULK_EDITOR_OCCURRENCE_SHOW_FIELD_OBSERVATIONS); if(! showFieldObservations){ - configurator.setClazz(DerivedUnitBase.class); + configurator.setClazz(DerivedUnit.class); } if(checkLargeResult(CdmStore.getService(IOccurrenceService.class).countByTitle(configurator))){ return CdmStore.getService(IOccurrenceService.class).findByTitle(configurator).getRecords(); 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 b09d6821d..b93e2d40e 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 @@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Shell; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.service.IOccurrenceService; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard; @@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil; * @version 1.0 */ public class DerivedUnitSelectionDialog extends - AbstractFilteredCdmResourceSelectionDialog { + AbstractFilteredCdmResourceSelectionDialog { /** *

    select

    @@ -42,7 +42,7 @@ public class DerivedUnitSelectionDialog extends * @param unit a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object. * @return a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object. */ - public static DerivedUnitBase select(Shell shell, ConversationHolder conversation, DerivedUnitBase unit){ + public static DerivedUnit select(Shell shell, ConversationHolder conversation, DerivedUnit unit){ DerivedUnitSelectionDialog dialog = new DerivedUnitSelectionDialog(shell, conversation, "Choose Unit", false, DerivedUnitSelectionDialog.class.getCanonicalName(), unit); return getSelectionFromDialog(dialog); @@ -59,19 +59,19 @@ public class DerivedUnitSelectionDialog extends * @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object. */ protected DerivedUnitSelectionDialog(Shell shell, ConversationHolder conversation, String title, - boolean multi, String settings, DerivedUnitBase cdmObject) { + boolean multi, String settings, DerivedUnit cdmObject) { super(shell, conversation, title, multi, settings, cdmObject); } /** {@inheritDoc} */ @Override - protected DerivedUnitBase getPersistentObject(UUID uuid) { + protected DerivedUnit getPersistentObject(UUID uuid) { Object object = CdmStore.getService(IOccurrenceService.class).load(uuid); SpecimenOrObservationBase specimenObservationBase = (SpecimenOrObservationBase) HibernateProxyHelper.deproxy(object); - if(specimenObservationBase instanceof DerivedUnitBase){ - return (DerivedUnitBase) specimenObservationBase; + if(specimenObservationBase instanceof DerivedUnit){ + return (DerivedUnit) specimenObservationBase; } StoreUtil.error(this.getClass(), "Selected unit is not a derived unit", null); return null; 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 acd322f89..9b65a213b 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 @@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Shell; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.service.IOccurrenceService; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; -import eu.etaxonomy.cdm.model.occurrence.FieldObservation; +import eu.etaxonomy.cdm.model.occurrence.FieldUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; import eu.etaxonomy.taxeditor.newWizard.NewFieldObservationWizard; @@ -32,17 +32,17 @@ import eu.etaxonomy.taxeditor.store.StoreUtil; * @version 1.0 */ public class FieldObservationSelectionDialog extends - AbstractFilteredCdmResourceSelectionDialog { + AbstractFilteredCdmResourceSelectionDialog { /** *

    select

    * * @param shell a {@link org.eclipse.swt.widgets.Shell} object. * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object. - * @param observation a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object. - * @return a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object. + * @param observation a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object. + * @return a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object. */ - public static FieldObservation select(Shell shell, ConversationHolder conversation, FieldObservation observation){ + public static FieldUnit select(Shell shell, ConversationHolder conversation, FieldUnit observation){ FieldObservationSelectionDialog dialog = new FieldObservationSelectionDialog(shell, conversation, "Choose Derived Unit", false, FieldObservationSelectionDialog.class.getCanonicalName(), observation); return getSelectionFromDialog(dialog); @@ -60,7 +60,7 @@ public class FieldObservationSelectionDialog extends */ protected FieldObservationSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, String settings, - FieldObservation cdmObject) { + FieldUnit cdmObject) { super(shell, conversation, title, multi, settings, cdmObject); } @@ -69,13 +69,13 @@ public class FieldObservationSelectionDialog extends */ /** {@inheritDoc} */ @Override - protected FieldObservation getPersistentObject(UUID uuid) { + protected FieldUnit getPersistentObject(UUID uuid) { Object object = CdmStore.getService(IOccurrenceService.class).load(uuid); SpecimenOrObservationBase specimenObservationBase = (SpecimenOrObservationBase) HibernateProxyHelper.deproxy(object); - if(specimenObservationBase instanceof FieldObservation){ - return (FieldObservation) specimenObservationBase; + if(specimenObservationBase instanceof FieldUnit){ + return (FieldUnit) specimenObservationBase; } StoreUtil.error(this.getClass(), "Selected object is not a field observation", null); return null; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java index cf59a0617..fed776ba3 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java @@ -27,8 +27,8 @@ import eu.etaxonomy.cdm.model.description.PolytomousKeyNode; import eu.etaxonomy.cdm.model.location.NamedArea; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.occurrence.Collection; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; -import eu.etaxonomy.cdm.model.occurrence.FieldObservation; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; +import eu.etaxonomy.cdm.model.occurrence.FieldUnit; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.model.taxon.Classification; import eu.etaxonomy.cdm.model.taxon.Synonym; @@ -87,11 +87,11 @@ public class SelectionDialogFactory { "This functionality is not implemented yet."); return null; } - if(clazz.equals(DerivedUnitBase.class)){ - return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnitBase) curentSelection); + if(clazz.equals(DerivedUnit.class)){ + return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnit) curentSelection); } - if(clazz.equals(FieldObservation.class)){ - return (T) FieldObservationSelectionDialog.select(shell, conversation, (FieldObservation) curentSelection); + if(clazz.equals(FieldUnit.class)){ + return (T) FieldObservationSelectionDialog.select(shell, conversation, (FieldUnit) curentSelection); } if(clazz.equals(NamedArea.class)){ return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) curentSelection); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java index 068c03b9e..1ff3d6d68 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java @@ -46,8 +46,9 @@ import eu.etaxonomy.cdm.model.agent.Team; import eu.etaxonomy.cdm.model.common.Annotation; import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.common.Credit; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.DefinedTermBase; -import eu.etaxonomy.cdm.model.common.DescriptionElementSource; +import eu.etaxonomy.cdm.model.description.DescriptionElementSource; import eu.etaxonomy.cdm.model.common.Extension; import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl; import eu.etaxonomy.cdm.model.common.Group; @@ -67,9 +68,7 @@ import eu.etaxonomy.cdm.model.description.Distribution; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.IndividualsAssociation; import eu.etaxonomy.cdm.model.description.KeyStatement; -import eu.etaxonomy.cdm.model.description.Modifier; import eu.etaxonomy.cdm.model.description.QuantitativeData; -import eu.etaxonomy.cdm.model.description.Scope; import eu.etaxonomy.cdm.model.description.StateData; import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue; import eu.etaxonomy.cdm.model.description.TaxonInteraction; @@ -88,7 +87,6 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent; -import eu.etaxonomy.cdm.model.occurrence.Specimen; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonNode; @@ -2048,12 +2046,13 @@ public class CdmFormFactory extends FormToolkit { } else if (entity instanceof IdentifiableSource) { element = new IdentifiableSourceElement(this, parentElement, (IdentifiableSource) entity, removeListener, style); - } else if (entity instanceof Scope) { - element = new ScopeElement(this, parentElement, (Scope) entity, + } else if (entity instanceof DefinedTerm) { + //FIXME:3.3MC + element = new ScopeElement(this, parentElement, (DefinedTerm) entity, removeListener, style); - } else if (entity instanceof Modifier) { + } else if (entity instanceof DefinedTerm) { element = new ModifierElement(this, parentElement, - (Modifier) entity, removeListener, style); + (DefinedTerm) entity, removeListener, style); } else if (entity instanceof Reference) { element = new DescriptionSourceElement(this, parentElement, (Reference) entity, removeListener, style); @@ -2074,6 +2073,7 @@ public class CdmFormFactory extends FormToolkit { parentElement, (StatisticalMeasurementValue) entity, removeListener, style); } else if (entity instanceof DerivedUnit) { + //FIXME:3.3MC element = new DerivedUnitElement(this, parentElement, (DerivedUnit) entity, removeListener, style); } else if (entity instanceof NamedArea) { @@ -2081,10 +2081,11 @@ public class CdmFormFactory extends FormToolkit { (NamedArea) entity, removeListener, style); } else if (entity instanceof DeterminationEvent) { element = new DeterminationEventDetailElement(this, parentElement, - (DeterminationEvent) entity, removeListener, style); - } else if (entity instanceof Specimen) { + (DeterminationEvent) entity, removeListener, style); + } else if (entity instanceof DerivedUnit) { + //FIXME:3.3MC element = new SpecimenCollectionDetailElement(this, parentElement, - (Specimen) entity, removeListener, style); + (DerivedUnit) entity, removeListener, style); } else if (entity instanceof User) { element = new MemberDetailElement(this, parentElement, (User) entity, removeListener, style); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java index f05ea9dd5..d1ccc47b6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java @@ -12,7 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.description; import org.eclipse.swt.events.SelectionListener; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; public class DerivedUnitElement extends AbstractEntityCollectionElement { - private EntitySelectionElement selection_derivedUnit; + private EntitySelectionElement selection_derivedUnit; /** *

    @@ -71,7 +71,7 @@ public class DerivedUnitElement extends @Override public void createControls(ICdmFormElement element, int style) { selection_derivedUnit = formFactory.createSelectionElement( - DerivedUnitBase.class, getConversationHolder(), element, + DerivedUnit.class, getConversationHolder(), element, "Specimen", null, EntitySelectionElement.SELECTABLE | EntitySelectionElement.EDITABLE, style); } 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 374fd04b7..6eddaad0a 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 @@ -14,7 +14,7 @@ import java.util.Collection; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.description.TaxonDescription; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.ui.dialog.selection.DerivedUnitSelectionDialog; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -54,7 +54,7 @@ public class DescribedSpecimenSection extends AbstractEntityCollectionSection { +public class ModifierElement extends AbstractEntityCollectionElement { - private TermComboElement combo_modifier; + private TermComboElement combo_modifier; /** *

    Constructor for ModifierElement.

    @@ -40,14 +41,14 @@ public class ModifierElement extends AbstractEntityCollectionElement { * @param style a int. */ public ModifierElement(CdmFormFactory formFactory, - AbstractFormSection section, Modifier entity, + AbstractFormSection section, DefinedTerm entity, SelectionListener removeListener, int style) { super(formFactory, section, entity, removeListener, null, style); } /** {@inheritDoc} */ @Override - public void setEntity(Modifier entity) { + public void setEntity(DefinedTerm entity) { this.entity = entity; combo_modifier.setSelection(entity); } @@ -55,7 +56,7 @@ public class ModifierElement extends AbstractEntityCollectionElement { /** {@inheritDoc} */ @Override public void createControls(ICdmFormElement element, int style) { - combo_modifier = formFactory.createTermComboElement(Modifier.class, element, "Modifier", getEntity(), style); + combo_modifier = formFactory.createTermComboElement(DefinedTerm.class, element, "Modifier", getEntity(), style); } /** {@inheritDoc} */ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java index 3025ad0b3..23538753e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java @@ -13,8 +13,8 @@ package eu.etaxonomy.taxeditor.ui.section.description; import java.util.Collection; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.description.IModifiable; -import eu.etaxonomy.cdm.model.description.Modifier; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; @@ -26,7 +26,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; * @created Sep 15, 2010 * @version 1.0 */ -public class ModifierSection extends AbstractEntityCollectionSection { +public class ModifierSection extends AbstractEntityCollectionSection { /** *

    Constructor for ModifierSection.

    @@ -44,25 +44,25 @@ public class ModifierSection extends AbstractEntityCollectionSection getCollection(IModifiable entity) { + public Collection getCollection(IModifiable entity) { return entity.getModifiers(); } /** {@inheritDoc} */ @Override - public Modifier createNewElement() { - return Modifier.NewInstance(); + public DefinedTerm createNewElement() { + return DefinedTerm.NewInstance(); } /** {@inheritDoc} */ @Override - public void addElement(Modifier element) { + public void addElement(DefinedTerm element) { getEntity().addModifier(element); } /** {@inheritDoc} */ @Override - public void removeElement(Modifier element) { + public void removeElement(DefinedTerm element) { getEntity().removeModifier(element); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java index 448b567c1..db8e4ea2b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java @@ -12,7 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.description; import org.eclipse.swt.events.SelectionListener; -import eu.etaxonomy.cdm.model.description.Scope; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -26,9 +26,9 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement; * @created Mar 18, 2010 * @version 1.0 */ -public class ScopeElement extends AbstractEntityCollectionElement { +public class ScopeElement extends AbstractEntityCollectionElement { - private TermComboElement combo_scope; + private TermComboElement combo_scope; /** *

    Constructor for ScopeElement.

    @@ -40,14 +40,14 @@ public class ScopeElement extends AbstractEntityCollectionElement { * @param style a int. */ public ScopeElement(CdmFormFactory cdmFormFactory, - AbstractFormSection section, Scope element, + AbstractFormSection section, DefinedTerm element, SelectionListener removeListener, int style) { super(cdmFormFactory, section, element, removeListener, null, style); } /** {@inheritDoc} */ @Override - public void setEntity(Scope entity) { + public void setEntity(DefinedTerm entity) { this.entity = entity; combo_scope.setSelection(entity); } @@ -55,7 +55,7 @@ public class ScopeElement extends AbstractEntityCollectionElement { /** {@inheritDoc} */ @Override public void createControls(ICdmFormElement element, int style) { - combo_scope = formFactory.createTermComboElement(Scope.class, element, "Scope", null, style); + combo_scope = formFactory.createTermComboElement(DefinedTerm.class, element, "Scope", null, style); } /** {@inheritDoc} */ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java index 04038711c..550625aad 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java @@ -13,7 +13,7 @@ package eu.etaxonomy.taxeditor.ui.section.description; import java.util.Collection; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.model.description.Scope; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; @@ -26,7 +26,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; * @created Mar 18, 2010 * @version 1.0 */ -public class ScopeSection extends AbstractEntityCollectionSection { +public class ScopeSection extends AbstractEntityCollectionSection { /** *

    Constructor for ScopeSection.

    @@ -42,19 +42,19 @@ public class ScopeSection extends AbstractEntityCollectionSection getCollection(TaxonDescription entity) { + public Collection getCollection(TaxonDescription entity) { return entity.getScopes(); } @@ -72,7 +72,7 @@ public class ScopeSection extends AbstractEntityCollectionSection { private TextWithLabelElement text_description; - private EntitySelectionElement selection_derivedUnit; + private EntitySelectionElement selection_derivedUnit; /** *

    @@ -67,9 +67,9 @@ public class IndividualsAssociationDetailElement extends protected void createControls(ICdmFormElement formElement, IndividualsAssociation entity, int style) { selection_derivedUnit = formFactory - .createSelectionElement(DerivedUnitBase.class, + .createSelectionElement(DerivedUnit.class, getConversationHolder(), formElement, "Unit", - CdmBase.deproxy(entity.getAssociatedSpecimenOrObservation(),DerivedUnitBase.class), + CdmBase.deproxy(entity.getAssociatedSpecimenOrObservation(),DerivedUnit.class), EntitySelectionElement.ALL, style); text_description = formFactory.createMultilineTextWithLabel( diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java index dcc723ef6..b0517d16e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java @@ -6,8 +6,8 @@ package eu.etaxonomy.taxeditor.ui.section.key; import java.util.Collection; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.description.PolytomousKey; -import eu.etaxonomy.cdm.model.description.Scope; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; @@ -16,7 +16,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; * @author n.hoffmann * */ -public class ScopeRestrictionSection extends AbstractEntityCollectionSection { +public class ScopeRestrictionSection extends AbstractEntityCollectionSection { public ScopeRestrictionSection(CdmFormFactory formFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) { @@ -24,22 +24,22 @@ public class ScopeRestrictionSection extends AbstractEntityCollectionSection getCollection(PolytomousKey entity) { + public Collection getCollection(PolytomousKey entity) { return entity.getScopeRestrictions(); } @Override - public Scope createNewElement() { - return Scope.NewInstance(); + public DefinedTerm createNewElement() { + return DefinedTerm.NewInstance(); } @Override - public void addElement(Scope element) { + public void addElement(DefinedTerm element) { getEntity().addScopeRestriction(element); } @Override - public void removeElement(Scope element) { + public void removeElement(DefinedTerm element) { getEntity().removeScopeRestriction(element); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java index f628e9e26..7d2c60b4d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java @@ -123,7 +123,7 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement { private TermComboElement combo_typeStatus; - private EntitySelectionElement selection_typeSpecimen; + private EntitySelectionElement selection_typeSpecimen; private TextWithLabelElement text_specimenTypeText; /** @@ -69,7 +68,7 @@ public class SpecimenTypeDesignationElement extends @Override public void createControls(ICdmFormElement formElement, int style) { selection_typeSpecimen = formFactory - .createSelectionElement(DerivedUnitBase.class, + .createSelectionElement(DerivedUnit.class, getConversationHolder(), formElement, "Specimen", null, EntitySelectionElement.ALL, style); combo_typeStatus = formFactory @@ -102,7 +101,7 @@ public class SpecimenTypeDesignationElement extends // TODO this is a simple workaround to enter type specimen as text // strings if (getEntity().getTypeSpecimen() == null) { - Specimen typeSpecimen = Specimen.NewInstance(); + DerivedUnit typeSpecimen = DerivedUnit.NewInstance(); getEntity().setTypeSpecimen(typeSpecimen); } getEntity().getTypeSpecimen().setTitleCache( diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java index 937ee2113..dc63ae2e4 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java @@ -15,7 +15,7 @@ import org.eclipse.ui.forms.widgets.Section; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; @@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; * @created Jun 17, 2010 * @version 1.0 */ -public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement { +public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement { private DerivedUnitFacade facade; @@ -58,7 +58,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement { +public class DerivedUnitFacadeDetailSection extends AbstractCdmDetailSection { /** *

    Constructor for DerivedUnitFacadeDetailSection.

    diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java index 92c0533da..0b624b6c8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java @@ -12,8 +12,9 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence; import org.eclipse.swt.events.SelectionListener; + +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent; -import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; @@ -34,7 +35,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; public class DeterminationEventDetailElement extends AbstractEventDetailElement { - private TermComboElement combo_determinationModifier; + private TermComboElement combo_determinationModifier; private CheckboxElement checkbox_preferredFlag; private EntitySelectionElement selection_taxonBase; @@ -105,7 +106,7 @@ public class DeterminationEventDetailElement extends selection_agent.setLabel("Determined by"); - combo_determinationModifier = formFactory.createTermComboElement(DeterminationModifier.class, + combo_determinationModifier = formFactory.createTermComboElement(DefinedTerm.class, element, "Modifier", null, style); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java index d2467e24a..482d8c6a3 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java @@ -11,8 +11,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.cdm.model.description.Sex; -import eu.etaxonomy.cdm.model.description.Stage; +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -40,9 +39,9 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement combo_sex; + private TermComboElement combo_sex; - private TermComboElement combo_lifeStage; + private TermComboElement combo_lifeStage; /** *

    Constructor for FieldObservationDetailElement.

    @@ -66,8 +65,9 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement { + AbstractEntityCollectionElement { - private EntitySelectionElement selection_derivedUnit; + private EntitySelectionElement selection_derivedUnit; /** *

    @@ -53,7 +52,7 @@ public class SpecimenCollectionDetailElement extends * a int. */ public SpecimenCollectionDetailElement(CdmFormFactory formFactory, - AbstractFormSection section, Specimen entity, + AbstractFormSection section, DerivedUnit entity, SelectionListener removeListener, int style) { super(formFactory, section, entity, removeListener, null, style); } @@ -67,7 +66,7 @@ public class SpecimenCollectionDetailElement extends */ /** {@inheritDoc} */ @Override - public void setEntity(Specimen entity) { + public void setEntity(DerivedUnit entity) { this.entity = entity; selection_derivedUnit.setEntity(entity); } @@ -83,7 +82,7 @@ public class SpecimenCollectionDetailElement extends @Override public void createControls(ICdmFormElement element, int style) { selection_derivedUnit = formFactory - .createSelectionElement(DerivedUnitBase.class, + .createSelectionElement(DerivedUnit.class, getConversationHolder(), element, "Derived Unit", null, EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE, style); } @@ -99,7 +98,7 @@ public class SpecimenCollectionDetailElement extends @Override public void handleEvent(Object eventSource) { if (eventSource == selection_derivedUnit) { - this.setEntity((Specimen) selection_derivedUnit.getSelection()); + this.setEntity((DerivedUnit) selection_derivedUnit.getSelection()); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java index d4c0910df..59682023b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java @@ -14,7 +14,7 @@ import java.util.Collection; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.cdm.model.occurrence.Specimen; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; @@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection; * @version 1.0 */ public class SpecimenCollectionDetailSection extends - AbstractEntityCollectionSection { + AbstractEntityCollectionSection { /** *

    Constructor for SpecimenCollectionDetailSection.

    @@ -47,7 +47,7 @@ public class SpecimenCollectionDetailSection extends */ /** {@inheritDoc} */ @Override - public Collection getCollection(DerivedUnitFacade entity) { + public Collection getCollection(DerivedUnitFacade entity) { return entity.getDuplicates(); } @@ -56,8 +56,8 @@ public class SpecimenCollectionDetailSection extends */ /** {@inheritDoc} */ @Override - public Specimen createNewElement() { - return Specimen.NewInstance(); + public DerivedUnit createNewElement() { + return DerivedUnit.NewInstance(); } /* (non-Javadoc) @@ -65,7 +65,7 @@ public class SpecimenCollectionDetailSection extends */ /** {@inheritDoc} */ @Override - public void addElement(Specimen element) { + public void addElement(DerivedUnit element) { getEntity().addDuplicate(element); } @@ -74,7 +74,7 @@ public class SpecimenCollectionDetailSection extends */ /** {@inheritDoc} */ @Override - public void removeElement(Specimen element) { + public void removeElement(DerivedUnit element) { getEntity().removeDuplicate(element); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java index 376afb8ec..e748ba816 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java @@ -7,7 +7,7 @@ import org.eclipse.swt.events.SelectionListener; import eu.etaxonomy.cdm.model.agent.AgentBase; import eu.etaxonomy.cdm.model.media.Rights; -import eu.etaxonomy.cdm.model.media.RightsTerm; +import eu.etaxonomy.cdm.model.media.RightsType; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; */ public class RightsElement extends AbstractEntityCollectionElement { - private TermComboElement combo_rightsType; + private TermComboElement combo_rightsType; private EntitySelectionElement selection_agent; private TextWithLabelElement text; @@ -67,7 +67,7 @@ public class RightsElement extends AbstractEntityCollectionElement { @Override public void createControls(ICdmFormElement element, int style) { combo_rightsType = formFactory.createTermComboElement( - RightsTerm.class, this, "Rights Type", null, style); + RightsType.class, this, "Rights Type", null, style); selection_agent = formFactory.createSelectionElement( AgentBase.class, getConversationHolder(), this, "Agent", null, EntitySelectionElement.ALL, style); 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 32d02813f..8f913790f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java @@ -17,11 +17,12 @@ import java.util.Set; import org.apache.log4j.Logger; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; + +import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.Language; import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.common.Marker; import eu.etaxonomy.cdm.model.description.CategoricalData; -import eu.etaxonomy.cdm.model.description.Modifier; import eu.etaxonomy.cdm.model.description.State; import eu.etaxonomy.cdm.model.description.StateData; import eu.etaxonomy.taxeditor.editor.UsageTermCollection; @@ -48,10 +49,10 @@ public class UseRecordDetailElement extends private TermComboElement combo_UseCategory; private TermComboElement combo_UseSubCategory; - private TermComboElement combo_PlantPart; - private TermComboElement combo_Country; - private TermComboElement combo_HumanGroup; - private TermComboElement combo_EthnicGroup; + private TermComboElement combo_PlantPart; + private TermComboElement combo_Country; + private TermComboElement combo_HumanGroup; + private TermComboElement combo_EthnicGroup; public UseRecordDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) { @@ -66,11 +67,11 @@ public class UseRecordDetailElement extends combo_UseCategory = formFactory.createTermComboElement(State.class, this, UsageTermCollection.useCategoryVocabularyLabel, null, style); combo_UseCategory.addSelectionListener(this); combo_UseSubCategory = formFactory.createTermComboElement(State.class, this, UsageTermCollection.useSubCategoryVocabularyLabel, null, style); - combo_PlantPart = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.plantPartLabel, null, style); - combo_HumanGroup = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.humanGroupLabel, null, style); + combo_PlantPart = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.plantPartLabel, null, style); + combo_HumanGroup = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.humanGroupLabel, null, style); combo_HumanGroup.addSelectionListener(this); - combo_EthnicGroup = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.ethnicGroupLabel, null, style); - combo_Country = formFactory.createTermComboElement(Modifier.class, this, UsageTermCollection.countryLabel, null, style); + combo_EthnicGroup = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.ethnicGroupLabel, null, style); + combo_Country = formFactory.createTermComboElement(DefinedTerm.class, this, UsageTermCollection.countryLabel, null, style); List termsUseCategory = setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false)); @@ -88,19 +89,19 @@ public class UseRecordDetailElement extends combo_UseSubCategory.setEnabled(false); } - List plantPartsToAdd = setModifierComboTerms(TermStore.getTerms(Modifier.class, null, false), UsageTermCollection.plantPartLabel); + List plantPartsToAdd = setModifierComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), UsageTermCollection.plantPartLabel); combo_PlantPart.setTerms(plantPartsToAdd); combo_PlantPart.setSelection(modifierSelection(UsageTermCollection.plantPartLabel)); - List countriesToAdd = setModifierComboTerms(TermStore.getTerms(Modifier.class, null, false), UsageTermCollection.countryLabel); + List countriesToAdd = setModifierComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), UsageTermCollection.countryLabel); combo_Country.setTerms(countriesToAdd); combo_Country.setSelection(modifierSelection(UsageTermCollection.countryLabel)); - List humanGroupToAdd = setModifierComboTerms(TermStore.getTerms(Modifier.class, null, false), UsageTermCollection.humanGroupLabel); + List humanGroupToAdd = setModifierComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), UsageTermCollection.humanGroupLabel); combo_HumanGroup.setTerms(humanGroupToAdd); combo_HumanGroup.setSelection(modifierSelection(UsageTermCollection.humanGroupLabel)); - List ethnicGroupToAdd = setEthnicGroupComboTerms(TermStore.getTerms(Modifier.class, null, false), combo_HumanGroup.getSelection()); + List ethnicGroupToAdd = setEthnicGroupComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), combo_HumanGroup.getSelection()); if (ethnicGroupToAdd != null) { combo_EthnicGroup.setTerms(ethnicGroupToAdd); combo_EthnicGroup.setSelection(modifierSelection(UsageTermCollection.ethnicGroupLabel)); @@ -116,9 +117,9 @@ public class UseRecordDetailElement extends * @param comboCategory * @return */ - private Modifier modifierSelection(String comboCategory) { + private DefinedTerm modifierSelection(String comboCategory) { if(!getEntity().getModifiers().isEmpty()) { - for (Modifier modifier : getEntity().getModifiers()) { + for (DefinedTerm modifier : getEntity().getModifiers()) { if(GetVocabularyType(modifier, comboCategory)) { return modifier; } @@ -161,9 +162,9 @@ public class UseRecordDetailElement extends * @param modType * @return */ - private List setModifierComboTerms(List listOfTerms, String modType) { - List termsToAdd = new ArrayList(); - for (Modifier term : listOfTerms) { + private List setModifierComboTerms(List listOfTerms, String modType) { + List termsToAdd = new ArrayList(); + for (DefinedTerm term : listOfTerms) { if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(modType))) { termsToAdd.add(term); @@ -250,11 +251,11 @@ public class UseRecordDetailElement extends * @param selectedHumangroup * @return */ - private List setEthnicGroupComboTerms(List listOfTerms, - Modifier selectedHumangroup) { - List termsToAdd = new ArrayList(); + private List setEthnicGroupComboTerms(List listOfTerms, + DefinedTerm selectedHumangroup) { + List termsToAdd = new ArrayList(); if (combo_HumanGroup.getSelection() != null) { - for (Modifier term : listOfTerms) { + for (DefinedTerm term : listOfTerms) { if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(selectedHumangroup.getTitleCache()))) { termsToAdd.add(term); @@ -265,11 +266,11 @@ public class UseRecordDetailElement extends } } else if (!getEntity().getModifiers().isEmpty()) { - for (Modifier modifier : getEntity().getModifiers()) { + for (DefinedTerm modifier : getEntity().getModifiers()) { if (modifier.getMarkers() != null) { for (Marker marker : modifier.getMarkers()) { if(marker.getMarkerType().getTitleCache().equals(UsageTermCollection.humanGroupLabel)) { - for (Modifier term : listOfTerms) { + for (DefinedTerm term : listOfTerms) { if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(modifier.getTitleCache()))) { termsToAdd.add(modifier); } else if ((term.getVocabulary() != null) && (term.getVocabulary().getTitleCache().equals(modifier.getTitleCache()))) { @@ -408,22 +409,22 @@ public class UseRecordDetailElement extends } if (eventSource == combo_PlantPart) { if (combo_PlantPart.getSelection() != null) { - Iterator itrExistingModifiers = getEntity().getModifiers().iterator(); + Iterator itrExistingModifiers = getEntity().getModifiers().iterator(); while (itrExistingModifiers.hasNext()) { - Modifier modifier = itrExistingModifiers.next(); + DefinedTerm modifier = itrExistingModifiers.next(); if(GetVocabularyType(modifier, UsageTermCollection.plantPartLabel)) { itrExistingModifiers.remove(); } } - Modifier plantPart = combo_PlantPart.getSelection(); + DefinedTerm plantPart = combo_PlantPart.getSelection(); getEntity().addModifier(plantPart); } else { - Set modifiers = getEntity().getModifiers(); + Set modifiers = getEntity().getModifiers(); if(!modifiers.isEmpty()) { - Iterator itr = modifiers.iterator(); + Iterator itr = modifiers.iterator(); while (itr.hasNext()) { - Modifier currentMod = itr.next(); + DefinedTerm currentMod = itr.next(); if(GetVocabularyType(currentMod, UsageTermCollection.plantPartLabel)) { itr.remove(); } @@ -434,22 +435,22 @@ public class UseRecordDetailElement extends } if (eventSource == combo_Country) { if (combo_Country.getSelection() != null) { - Iterator itrExistingModifiers = getEntity().getModifiers().iterator(); + Iterator itrExistingModifiers = getEntity().getModifiers().iterator(); while (itrExistingModifiers.hasNext()) { - Modifier modifier = itrExistingModifiers.next(); + DefinedTerm modifier = itrExistingModifiers.next(); if(GetVocabularyType(modifier, UsageTermCollection.countryLabel)) { itrExistingModifiers.remove(); } } - Modifier country = combo_Country.getSelection(); + DefinedTerm country = combo_Country.getSelection(); getEntity().addModifier(country); } else { - Set modifiers = getEntity().getModifiers(); + Set modifiers = getEntity().getModifiers(); if(!modifiers.isEmpty()) { - Iterator itr = modifiers.iterator(); + Iterator itr = modifiers.iterator(); while (itr.hasNext()) { - Modifier currentMod = itr.next(); + DefinedTerm currentMod = itr.next(); if(GetVocabularyType(currentMod, UsageTermCollection.countryLabel)) { itr.remove(); } @@ -460,39 +461,39 @@ public class UseRecordDetailElement extends if (eventSource == combo_HumanGroup) { if (combo_HumanGroup.getSelection() != null) { boolean isHumanGroupChanged = true; - for (Modifier modToCheck: getEntity().getModifiers()) { + for (DefinedTerm modToCheck: getEntity().getModifiers()) { if(modToCheck.equals(combo_HumanGroup.getSelection()) && (GetVocabularyType(modToCheck, UsageTermCollection.humanGroupLabel))) { isHumanGroupChanged = false; } } - Iterator itrExistingModifiers = getEntity().getModifiers().iterator(); + Iterator itrExistingModifiers = getEntity().getModifiers().iterator(); while (itrExistingModifiers.hasNext()) { - Modifier modifier = itrExistingModifiers.next(); + DefinedTerm modifier = itrExistingModifiers.next(); if((GetVocabularyType(modifier, UsageTermCollection.humanGroupLabel) || GetVocabularyType(modifier, UsageTermCollection.ethnicGroupLabel)) && isHumanGroupChanged) { itrExistingModifiers.remove(); } } if(isHumanGroupChanged){ - Modifier humanGroup = combo_HumanGroup.getSelection(); + DefinedTerm humanGroup = combo_HumanGroup.getSelection(); getEntity().addModifier(humanGroup); } combo_EthnicGroup.setEnabled(true); } else { - Set modifiers = getEntity().getModifiers(); + Set modifiers = getEntity().getModifiers(); if(!modifiers.isEmpty()) { - Iterator itr = modifiers.iterator(); + Iterator itr = modifiers.iterator(); while (itr.hasNext()) { - Modifier currentMod = itr.next(); + DefinedTerm currentMod = itr.next(); if(GetVocabularyType(currentMod, UsageTermCollection.humanGroupLabel) || GetVocabularyType(currentMod, UsageTermCollection.ethnicGroupLabel)) { itr.remove(); } } } - List emptyListToResetComboBox = new ArrayList(); - Modifier emptyMod = Modifier.NewInstance(); + List emptyListToResetComboBox = new ArrayList(); + DefinedTerm emptyMod = DefinedTerm.NewInstance(); emptyListToResetComboBox.add(emptyMod); combo_EthnicGroup.setTerms(emptyListToResetComboBox); combo_EthnicGroup.setEnabled(false); @@ -501,23 +502,23 @@ public class UseRecordDetailElement extends } if (eventSource == combo_EthnicGroup) { if (combo_EthnicGroup.getSelection() != null) { - Iterator itrExistingModifiers = getEntity().getModifiers().iterator(); + Iterator itrExistingModifiers = getEntity().getModifiers().iterator(); while (itrExistingModifiers.hasNext()) { - Modifier modifier = itrExistingModifiers.next(); + DefinedTerm modifier = itrExistingModifiers.next(); if(GetVocabularyType(modifier, combo_HumanGroup.getSelection().getTitleCache())) { itrExistingModifiers.remove(); } } - Modifier ethnicGroup = combo_EthnicGroup.getSelection(); + DefinedTerm ethnicGroup = combo_EthnicGroup.getSelection(); getEntity().addModifier(ethnicGroup); } else { - Set modifiers = getEntity().getModifiers(); + Set modifiers = getEntity().getModifiers(); if(!modifiers.isEmpty()) { - Iterator itr = modifiers.iterator(); + Iterator itr = modifiers.iterator(); while (itr.hasNext()) { - Modifier currentMod = itr.next(); + DefinedTerm currentMod = itr.next(); if(GetVocabularyType(currentMod, UsageTermCollection.ethnicGroupLabel)) { itr.remove(); } @@ -536,7 +537,7 @@ public class UseRecordDetailElement extends * @param vocabularyExpected * @return */ - private boolean GetVocabularyType(Modifier term, String vocabularyExpected) { + private boolean GetVocabularyType(DefinedTerm term, String vocabularyExpected) { if ((term.getPartOf() != null) && (term.getPartOf().getTitleCache().equals(vocabularyExpected))) { return true; } @@ -585,13 +586,13 @@ public class UseRecordDetailElement extends } for (Object object: combo_HumanGroup.getControls()) { if (object == eventSource) { - Modifier selectedHumanGroup = combo_HumanGroup.getSelection(); + DefinedTerm selectedHumanGroup = combo_HumanGroup.getSelection(); if (selectedHumanGroup != null) { - combo_EthnicGroup.setTerms(setEthnicGroupComboTerms(TermStore.getTerms(Modifier.class, null, false), selectedHumanGroup)); + combo_EthnicGroup.setTerms(setEthnicGroupComboTerms(TermStore.getTerms(DefinedTerm.class, null, false), selectedHumanGroup)); if (!getEntity().getModifiers().isEmpty()) { - Iterator iterModifiers = getEntity().getModifiers().iterator(); + Iterator iterModifiers = getEntity().getModifiers().iterator(); while (iterModifiers.hasNext()) { - Modifier existingModifier = iterModifiers.next(); + DefinedTerm existingModifier = iterModifiers.next(); if(GetVocabularyType(existingModifier, UsageTermCollection.ethnicGroupLabel)) { combo_EthnicGroup.setSelection(modifierSelection(UsageTermCollection.ethnicGroupLabel)); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java index 7c2da263c..caebbee49 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java @@ -26,7 +26,7 @@ import eu.etaxonomy.cdm.model.common.ICdmBase; import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.occurrence.Collection; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.taxeditor.model.TextHelper; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; @@ -95,12 +95,12 @@ public class EditFromSelectionWizard extends Wizard implements addPage(new NonViralNameWizardPage(formFactory, selectionElement.getConversationHolder(), (NonViralName) entity)); - } else if (entity instanceof DerivedUnitBase) { + } else if (entity instanceof DerivedUnit) { DerivedUnitFacade facade; try { facade = DerivedUnitFacade.NewInstance( - (DerivedUnitBase) entity, + (DerivedUnit) entity, PreferencesUtil.getDerivedUnitConfigurator()); } catch (DerivedUnitFacadeNotSupportedException e) { // we should never get here diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java index eeddbac30..2443ae63e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java @@ -17,7 +17,7 @@ import org.eclipse.ui.forms.SectionPart; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; import eu.etaxonomy.cdm.model.description.PolytomousKeyNode; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.model.IElementHasDetails; import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship; @@ -79,11 +79,11 @@ public class CdmSectionPart extends SectionPart implements .setTaxonBase((TaxonBase) input); return true; } - if ((input instanceof DerivedUnitBase) + if ((input instanceof DerivedUnit) && (formSection instanceof IDerivedUnitFacadeDetailSection)) { try { - input = DerivedUnitFacade.NewInstance((DerivedUnitBase) input, + input = DerivedUnitFacade.NewInstance((DerivedUnit) input, PreferencesUtil.getDerivedUnitConfigurator()); } catch (DerivedUnitFacadeNotSupportedException e) { StoreUtil.error(getClass(), e); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java index ac6c878be..074becff9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java @@ -38,7 +38,7 @@ import eu.etaxonomy.cdm.model.description.PolytomousKey; import eu.etaxonomy.cdm.model.description.PolytomousKeyNode; import eu.etaxonomy.cdm.model.media.Media; import eu.etaxonomy.cdm.model.name.NonViralName; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; @@ -139,9 +139,9 @@ public class DetailsViewer extends AbstractCdmDataViewer { */ @Override public void setInput(Object input) { - if (input instanceof DerivedUnitBase) { + if (input instanceof DerivedUnit) { try { - input = DerivedUnitFacade.NewInstance((DerivedUnitBase) input, + input = DerivedUnitFacade.NewInstance((DerivedUnit) input, PreferencesUtil.getDerivedUnitConfigurator()); } catch (DerivedUnitFacadeNotSupportedException e) { StoreUtil.error(getClass(), e); diff --git a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml index 63c1e666a..7d0868eff 100644 --- a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml +++ b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml @@ -5273,7 +5273,7 @@ - + diff --git a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml index 63c1e666a..7d0868eff 100644 --- a/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml +++ b/eu.etaxonomy.taxeditor.store/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet.xml @@ -5273,7 +5273,7 @@ - + diff --git a/pom.xml b/pom.xml index 19b9ed633..33505614c 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 1.6 UTF-8 - 3.2.3-SNAPSHOT + 3.3.0-SNAPSHOT 0.14.0 3.2.3-SNAPSHOT -- 2.34.1