Merge branch 'release/5.19.0'
authorjenkins <jenkins-int@bgbm.org>
Thu, 28 Jan 2021 12:56:07 +0000 (13:56 +0100)
committerjenkins <jenkins-int@bgbm.org>
Thu, 28 Jan 2021 12:56:07 +0000 (13:56 +0100)
391 files changed:
.gitignore
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle_de.properties
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IEntityContainer.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IEntityCreator.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IEntityPersistenceService.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/IBulkEditorConstants.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/IBulkEditorSortProvider.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorSearchE4.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/ConvertPerson2TeamHandlerE4.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForIdentifiableEntityE4.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/sortprovider/AbstractDateComparator.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/sortprovider/AbstractSortProvider.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/sortprovider/CdmBaseSortProvider.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/sortprovider/IdentifiableEntitySortProvider.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/sortprovider/ReferenceSortProvider.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/operation/SetMarkerFlagOperation.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorGeneralPreferencePage.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/preference/BulkEditorMarkerPreferencePage.java
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/TimestampingHttpInvokerRequestExecutor.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySessionEnabled.java
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/fragment.e4xmi
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/ChooseFromMultipleTaxonNodesDialog.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetComposite.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetNavigator.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDragListener.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/handler/AddFeatureToCharacterTreeHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/AbstractIdentificationEditorInput.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/IPolytomousKeyEditorPage.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyGraphContentProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyLabelProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListContentProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListLabelProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/e4/handler/DeleteNodeHandlerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/IContainerConstants.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/LineBreakListener.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/LineWrapSupport.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorComparator.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionColumnAccessor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/DistributionEditorPart.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/TaxonDistributionDtoComparator.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/edit/CdmComboBoxViewerCellEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptContentProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptLabelProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/AddTissueSampleHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementDragListener.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementDropAdapter.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementTransfer.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewerSorter.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DeleteHandlerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/AddDerivedUnitFacadeMediaOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonNameDescriptionOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionElementsOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewLabelProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageDownInListHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageUpInListHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesContentProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateConceptRelationOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteConceptRelationOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteDescriptionElementOperationTest.java
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperationTest.java
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.local/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.local/pom.xml
eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/CdmServer.java
eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceCredentialsWizardPage.java
eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceSQLServerWizardPage.java
eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java
eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/datasource/wizard/CdmDataSourceWizard.java
eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/CdmMetaDataAwareDataSourceContainer.java
eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/view/datasource/handler/DataSourceMenuPropertyTester.java
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/pom.xml
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular/pom.xml
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditorInput.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/AlignmentEditorE4.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/LoadPherogramHandlerE4.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/ShowPherogramHandlerE4.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/CDMSequenceMatrixAdapter.java
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/e4/PolytomousKeyViewPartE4.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TaxonNavigatorE4.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/LinkWithTaxonHandlerE4.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetSecundumForSubtreeOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/UpdateSubtreeOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CloneClassificationOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/build.properties
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/PrintUtil.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/internal/PrintpublisherPlugin.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/AbstractPublishWizardPage.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/DirectPublishingWizard.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/PublishWizardODF.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/PublishWizardPDF.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/PublishWizardTaxPub.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/PublishWizardXML.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectDirectoryWizardPage.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectFeatureTreeWizardPage.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectOptionsWizardPage.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
eu.etaxonomy.taxeditor.store/fragment.e4xmi
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/CdmEntitySessionInput.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/OpenDefinedTermEditorHandlerE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/AbstractDefinedTermEditorInput.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/event/WorkbenchEventConstants.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizard.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java with 86% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizardPage.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeDtoTransfer.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureNodeDtoTransfer.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeTransfer.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureNodeTransfer.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeContentProvider.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java with 96% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeLabelProvider.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeLabelProvider.java with 97% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreePropertyTester.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreePropertyTester.java with 84% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/CharacterTreeEditor.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDtoEditorComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ICharacterEditor.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ITermTreeEditor.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/IFeatureTreeEditor.java with 90% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/NamedAreaTreeEditor.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/PresenceAbsenceTreeEditor.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/PropertyTreeEditor.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/RankTreeEditor.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/StructureTreeEditor.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDragListener.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDragListener.java with 84% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDtoDragListener.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDtoDragListener.java with 88% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDropAdapter.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDropAdapter.java with 96% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDtoDropAdapter.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDtoDropAdapter.java with 96% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditor.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/AbstractTermTreeEditor.java with 84% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditorComposite.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditorComposite.java with 91% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AbstractAddTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AbstractAddFeatureHandler.java with 84% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildFeatureHandler.java with 87% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddFeatureHandler.java with 96% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CopyTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CopyFeatureHandler.java with 83% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateTermTreeHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java with 74% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/OpenTermTreeEditorHandler.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/PasteFeatureHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveFeatureHandler.java with 83% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermTreeHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveFeatureTreeHandler.java with 82% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportOntologyHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportWordHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportWordHandler.java with 93% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddFeatureOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddOntologyTermOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/CreateFeatureTreeOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/MoveFeatureOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/update/P2Util.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/update/SearchPluginHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWithReferenceWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ImportFromFileDataSourceWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/abcd/AbcdImportWizardE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/distribution/ExcelDistributionUpdateWizardE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/specimen/SpecimenCdmExcelImportWizardE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/excel/taxa/ExcelNormalExplicitTaxaImportWizardE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/owl/OwlImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/ris/RISImportWizardE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/sdd/SddImportWizardE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/in/tcs/TcsImportWizardE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/owl/OwlTermExportComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdSourceSelectionPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/EndnoteImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelDistributionUpdateWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelNormalExplicitTaxaImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbExportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/RISImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SddImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/SpecimenCdmExcelImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/TcsExportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/TcsImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ColorResources.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractDescriptionPostOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostTaxonOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/AbcdImportPreference.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferenceCache.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageEditorPreferencePage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/Resources.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/AppModelId.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/UseObjectStore.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/AbstractComboElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/VocabularyComboElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredIdentifierSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NameSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NamedAreaSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorTeamSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalPersonAuthorSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamOrPersonBaseSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractCdmFormElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractRelevanceFormElement.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BigDecimalWithLabelElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CacheRelevance.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CacheRelevanceHelper.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmPropertyChangeEvent.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CheckboxElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ICacheRelevantFormElement.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IEnableableFormElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IEntityElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IRelevantFormElement.java [deleted file]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ISelectable.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TimePeriodElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TimePeriodElementBase.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ToggleableTextElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/VerbatimTimePeriodElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/AbstractCdmComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElementController.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementController.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/IOpenUrlEnabled.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlReferencePage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/DefaultCdmBaseComparator.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ICdmDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ITaxonBaseDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/EditTaxonNodeWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/SourceComparator.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterNodeDtoDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaMetaElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TypeDesignationSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/operation/DeleteTypeDesignationOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldUnitGeneralDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AbstractUnboundEntityCollectionSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaQualityDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SampleDesignationTextDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceReferenceCollectionDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonOfRelationshipElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerContextMenuE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenProviderSelectionWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SaveImportedSpecimenActionE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenImportViewE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenProviderSelectionWizardPageE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchResultComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearchResultComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/webimport/termimport/requests/AbstractTerminologyServiceRequest.java
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/pom.xml
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/operation/BaseOperationTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/MockSessionOwner.java
eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.workbench/pom.xml
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenExternalAboutPlatformHandler.java
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenExternalParserHelpHandler.java
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/handler/OpenAdminPreferencesHandler.java
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 813b6161efc51e402a667b6d95ed100ee377ff90..6d5518a4830d7b433126763087bfc75c9d64f005 100644 (file)
@@ -134,3 +134,4 @@ eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-42.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-*.jar
 eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war
 eu.etaxonomy.taxeditor.local/lib/postgresql-42.*.jar
+eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp-*.war
index 1541628dc52416a42693151aab6d1b708fb445ac..ead93c010cfbd1a9e073f70b694828ddff14174a 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index 118d81f7661cb4e42d266556f8d4e14b1184aa3a..f842589d6e202e11d7a565f40f8209f78f7826d2 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>5.18.2</version>
+    <version>5.19.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index f46354e15dbfed7ae2cb4a85fda4a6cce8affc1a..f80f3e7281cce1c3eb912a0355ef40076f9e5f61 100644 (file)
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.taxeditor.perspective;
 
 import org.eclipse.ui.IFolderLayout;
@@ -17,17 +16,9 @@ import eu.etaxonomy.taxeditor.editor.AppModelId;
 /**
  * @author a.oppermann
  * @created Nov 18, 2014
- * @version 1.0
  */
 public class ChecklistPerspective extends Default {
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui
-        * .IPageLayout)
-        */
        @Override
        public void createInitialLayout(IPageLayout layout) {
                IFolderLayout navigationFolder = layout.createFolder("navigation",
@@ -49,6 +40,5 @@ public class ChecklistPerspective extends Default {
         layout.addPlaceholder(MEDIA_VIEW, IPageLayout.RIGHT, 0.5f, FACTUAL_DATA_VIEW);
 
         createAdditionalFolder(layout, layout.getEditorArea());
-
        }
-}
+}
\ No newline at end of file
index aa509b29801edb44a9485efbe31a514ff97a0a39..b3902c24c9885788f3590167a7b10bb372503dd8 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index 8080ba314bcdb6df63bebd60cc3a43bb95ff3fb0..dc818df61f2ae862466ae3ced8e5b8fc426c4d01 100644 (file)
@@ -15,7 +15,7 @@ command.label.1 = Markiere als Kandidat(en) f\u00fcr Duplikatenentfernung
 command.label.2 = Entferne Kandidat f\u00fcr Duplikatenentfernung
 command.label.3 = Dedupliziere Gruppe
 command.label.4 = L\u00f6schen
-command.label.5 = Umwandeln in Person
+command.label.5 = In Person umwandeln
 command.label.6 = Umwandeln in Team
 command.name = Gruppen zusammenfügen
 command.name.0 = Setze als Ziel für Gruppenzusammenfügung
index c5ebbc09e29ee5a094a5a12304df7179b7ecfaaa..227e03b4c86d7fa521dc51019712d81b34c568e9 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>5.18.2</version>
+               <version>5.19.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index bfa3825607f8aea23febb6ff6ea6547ee03493e3..e4776f2edbb211cbaf1e4e8e6d290c66bc28762b 100644 (file)
@@ -15,16 +15,12 @@ import java.util.Set;
  *
  * @author p.ciardelli
  * @created 25.06.2009
- * @version 1.0
  * @param <T>
  */
 public interface IEntityContainer<T> {
 
        /**
         * <p>getEntity</p>
-        *
-        * @param <T> a T object.
-        * @return a T object.
         */
        T getEntity();
 
@@ -32,22 +28,16 @@ public interface IEntityContainer<T> {
 
        /**
         * <p>getEditableText</p>
-        *
-        * @return a {@link java.lang.String} object.
         */
        String getEditableText();
 
        /**
         * <p>getAttachedEntities</p>
-        *
-        * @return a {@link java.util.Set} object.
         */
        Set<T> getAttachedEntities();
 
        /**
         * <p>markAsMerged</p>
-        *
-        * @param mergeTarget a T object.
         */
        void markAsMerged(T mergeTarget);
 
@@ -86,8 +76,6 @@ public interface IEntityContainer<T> {
 
        /**
         * <p>setText</p>
-        *
-        * @param text a {@link java.lang.String} object.
         */
        void setText(String text);
 
index 4601d246c6a6d98e379b16fa7ded4710d4e5031a..f48ab36cf150203cbf8a30971ea58aaad6d9336a 100644 (file)
@@ -6,18 +6,15 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.annotatedlineeditor;
 
 import java.util.Map;
 
-
 /**
  * <p>IEntityCreator interface.</p>
  *
  * @author p.ciardelli
  * @created 03.07.2009
- * @version 1.0
  */
 public interface IEntityCreator<T> {
 
@@ -25,10 +22,9 @@ public interface IEntityCreator<T> {
         * <p>createEntity</p>
         *
         * @param text a {@link java.lang.String} object.
-        * @param <T> a T object.
         * @return a T object.
         */
-       T createEntity(String text);
+       public T createEntity(String text);
 
        /**
         * <p>createEntity</p>
@@ -37,7 +33,7 @@ public interface IEntityCreator<T> {
         * @param text a {@link java.lang.String} object.
         * @return a T object.
         */
-       T createEntity(Object key, String text);
+       public T createEntity(Object key, String text);
 
        /**
         * Get a map of keys for all objects that can be created by this entity creator
@@ -45,14 +41,12 @@ public interface IEntityCreator<T> {
         *
         * @return a {@link java.util.Map} object.
         */
-       Map<? extends Object, String> getKeyLabelPairs();
+       public Map<? extends Object, String> getKeyLabelPairs();
 
        /**
         * Return a flag indicating whether this creator also saves the entities
         *
         * @return true or false
         */
-       boolean savesEntity();
-
-
-}
+       public boolean savesEntity();
+}
\ No newline at end of file
index 4f058352884d2ed86ed523361c7f5aaeb7a3d394..73d43d55e7d8a5d2fe485d8653cad8fa72b97c6e 100644 (file)
@@ -6,13 +6,11 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.annotatedlineeditor;
 
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
 
-
 /**
  * Performs the retrieving and saving of a list of entities edited by a <code>ListEditor</code>,
  * interacting with the persistence layer.
@@ -21,17 +19,14 @@ import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableExcepti
  *
  * @author p.ciardelli
  * @created 07.07.2009
- * @version 1.0
  */
 public interface IEntityPersistenceService<T> {
 
        /**
         * <p>create</p>
-        *
-        * @param entity a {@link java.lang.Object} object.
         * @return a boolean.
         */
-       T create(T entity);
+       public T create(T entity);
 
        /**
         * <p>save</p>
@@ -39,7 +34,7 @@ public interface IEntityPersistenceService<T> {
         * @param entity a {@link java.lang.Object} object.
         * @return a boolean.
         */
-       T save(T entity);
+       public T save(T entity);
 
        /**
         * <p>merge</p>
@@ -48,7 +43,7 @@ public interface IEntityPersistenceService<T> {
         * @param mergeTarget a {@link java.lang.Object} object.
         * @return a boolean.
         */
-       boolean merge(T entity, T mergeTarget);
+       public boolean merge(T entity, T mergeTarget);
 
        /**
         * <p>delete</p>
@@ -57,5 +52,5 @@ public interface IEntityPersistenceService<T> {
         * @return a boolean.
         * @throws ReferencedObjectUndeletableException
         */
-       boolean delete(T entity, DeleteConfiguratorBase config) throws ReferencedObjectUndeletableException;
-}
+       public boolean delete(T entity, DeleteConfiguratorBase config) throws ReferencedObjectUndeletableException;
+}
\ No newline at end of file
index 149f93ef4e3c7852cc127532e48059211c34537a..04eecd3a20d932fab0bdf9d43197caa45a3a7625 100644 (file)
@@ -6,18 +6,16 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor;
 
-
 /**
  * <p>IBulkEditorConstants interface.</p>
  *
  * @author p.ciardelli
  * @created 03.07.2009
- * @version 1.0
  */
 public interface IBulkEditorConstants {
+       
        /** Constant <code>TYPE_MERGE_TARGET="merge_target_annotation"</code> */
        public static final String TYPE_MERGE_TARGET = "merge_target_annotation";
        /** Constant <code>TYPE_MERGE_CANDIDATE="merge_candidate_annotation"</code> */
@@ -31,4 +29,4 @@ public interface IBulkEditorConstants {
        public static final String DYNAMIC_OPEN_OBJECT_ID = "taxeditor-bulkeditor.dynamicnewobjectcommand";
        /** Constant <code>DYNAMIC_DELETE_OBJECT_ID="taxeditor-bulkeditor.dynamicdeleteobjec"{trunked}</code> */
        public static final String DYNAMIC_DELETE_OBJECT_ID = "taxeditor-bulkeditor.dynamicdeleteobjectcommand";
-}
+}
\ No newline at end of file
index 3c9798d36a8449bf0df874d6e3700d32291ad1cd..d54758a8c15e5b60fe936c585ed9f8bb115aeb7c 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor;
 
 import java.util.Comparator;
@@ -16,16 +15,12 @@ import java.util.Set;
 /**
  * @author n.hoffmann
  * @created Dec 14, 2010
- * @version 1.0
  */
 public interface IBulkEditorSortProvider<T> {
 
-       /**
-        * 
-        */
        public Map<String, Comparator<T>> getComparators();     
        
        public Set<String> getComparatorNames();
        
        public Comparator<T> getComparatorByName(String name);
-}
+}
\ No newline at end of file
index 9f05028976a19bf9aee5d290c4b031b0a0ca0a85..eed74188bf7ae0e0b9af700be5eabcd4933563e1 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.command;
 
 import org.apache.log4j.Logger;
@@ -22,13 +21,11 @@ import eu.etaxonomy.taxeditor.bulkeditor.input.TaxonEditorInput;
 /**
  * @author p.ciardelli
  * @created 21.09.2009
- * @version 1.0
  */
 public class BulkEditorPropertyTester extends PropertyTester {
 
     @SuppressWarnings("unused")
-    private static final Logger logger = Logger
-                       .getLogger(BulkEditorPropertyTester.class);
+    private static final Logger logger = Logger.getLogger(BulkEditorPropertyTester.class);
 
        private static final String IS_MERGING_ENABLED = "isMergingEnabled";
 
@@ -68,4 +65,4 @@ public class BulkEditorPropertyTester extends PropertyTester {
         }
                return false;
        }
-}
+}
\ No newline at end of file
index 37d29f2e73fbef54784d04aeca0c1c32494fab51..b554cc06aa53fb92bca4055214953b32f0c26ac9 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.e4;
 
 import java.io.FileOutputStream;
@@ -292,6 +291,9 @@ public class BulkEditorE4 implements IPartContentHasDetails, IConversationEnable
                     SpecimenOrObservationBase changedSpecimen = (SpecimenOrObservationBase)sel.getFirstElement();
                     getEditorInput().addSaveCandidate(changedSpecimen);
                     input.replaceInModel(changedSpecimen);
+                } else if (firstElement instanceof Media){
+                    getEditorInput().addSaveCandidate((Media)element);
+                    input.replaceInModel((Media)element);
                 }
             }else if(element instanceof Group){
                  Group oldGroup = ((GroupEditorInput)input).getEntityFromModel((Group)element);
index 9dd79c2685e82127a0ec8af4a380b7f9c5bb3182..522fd932c0e1b92e7cdc71475e76061d8e8afe10 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.e4;
 
 import java.io.File;
@@ -47,7 +46,6 @@ import eu.etaxonomy.taxeditor.workbench.WorkbenchUtility;
  * @author e.-m.lee
  * @author n.hoffmann
  * @created 17.08.2009
- * @version 1.0
  */
 public class BulkEditorSearchE4 {
 
@@ -67,7 +65,6 @@ public class BulkEditorSearchE4 {
 
        private Button btnManageState;
 
-
        public Object ORDER_BY = new Object();
 
        public BulkEditorSearchE4(BulkEditorE4Composite editor, Composite parent, int style) {
@@ -149,7 +146,6 @@ public class BulkEditorSearchE4 {
                }
        }
 
-
        /**
         * Creates the search textfield.
         */
@@ -223,4 +219,4 @@ public class BulkEditorSearchE4 {
                        text.setFocus();
                }
        }
-}
+}
\ No newline at end of file
index 75d82fa8f9d3143bc7d50427757d3f08e3e0e160..40d7b89d4e9308727c6be0d875b88726097150c2 100644 (file)
@@ -64,7 +64,7 @@ public class ConvertPerson2TeamHandlerE4 {
             } catch (IllegalArgumentException e) {
                 MessagingUtils.errorDialog("Can not convert Person into a Team", null, e.getLocalizedMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID,e, true);
             } catch (MergeException e) {
-                MessagingUtils.informationDialog("Convert not possible", "Person can not be transformed into team as it is already part of a team.");
+                MessagingUtils.informationDialog("Convert not possible", "Person can not be transformed into team. Probably it is referenced in a way that allows only persons. Check referencing objects view for details.");
             }
             if (result != null &&result.isOk()){
                 team = (Team)result.getCdmEntity();
index 912d00d3cf5c659b3eff668a8f362d70ee6a57ee..794b58642d354cbead4748f181c23ff3336fde45 100644 (file)
@@ -1,3 +1,11 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
 package eu.etaxonomy.taxeditor.bulkeditor.handler.defaultHandler;
 
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
@@ -17,17 +25,11 @@ import eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenHandlerBaseE4
 
 public class OpenBulkEditorForIdentifiableEntityE4 extends DefaultOpenHandlerBaseE4<Object>{
 
-    /**
-     * {@inheritDoc}
-     */
 //    @Override
 //    protected IdentifiableEntity getEntity(UUID uuid) {
 //        return CdmStore.getCommonService().find(IdentifiableEntity.class, uuid);
 //    }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected void open(Object entity, Shell shell, EPartService partService) {
         @SuppressWarnings("rawtypes")
@@ -40,9 +42,6 @@ public class OpenBulkEditorForIdentifiableEntityE4 extends DefaultOpenHandlerBas
         BulkEditorUtil.openBulkEditor(input, modelService, partService, application);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected boolean canExecute(Object entity) {
         if (entity instanceof UuidAndTitleCache){
index 105a612763bce68c5f2fdddcc41feba52afbdd90..13c811b6f382cf300f573974acda1cd6edcacc66 100644 (file)
@@ -55,10 +55,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created 25.06.2009
  */
 public abstract class AbstractBulkEditorInput<T extends CdmBase>
-        extends CdmEntitySessionInput
+        extends CdmEntitySessionInput<T>
         implements IEntityPersistenceService<T> {
 
-
     private static final String PROPERTY_PROTECTED_TITLECACHE = "Protect TitleCache";
     private static final String TYPE_PROPERTY = Messages.BulkEditorE4_TYPE;
     private static final String ID_PROPERTY = "Id"; //$NON-NLS-1$
@@ -91,12 +90,12 @@ public abstract class AbstractBulkEditorInput<T extends CdmBase>
            this.conversation = CdmStore.createConversation();
        }
 
-       static public AbstractBulkEditorInput NewInstance(BulkEditorInputType inputType) {
+       static public AbstractBulkEditorInput<?> NewInstance(BulkEditorInputType inputType) {
 
                return BulkEditorInputType.getInput(inputType);
        }
 
-       public static AbstractBulkEditorInput NewInstance(IdentifiableEntity entity) {
+       public static AbstractBulkEditorInput<?> NewInstance(IdentifiableEntity entity) {
 
                BulkEditorInputType inputType = BulkEditorInputType.getByType(entity.getClass());
 
@@ -107,7 +106,7 @@ public abstract class AbstractBulkEditorInput<T extends CdmBase>
                return editorInput;
        }
 
-       public static AbstractBulkEditorInput NewInstance(Class clazz, UUID uuid) {
+       public static AbstractBulkEditorInput<?> NewInstance(Class clazz, UUID uuid) {
 
         BulkEditorInputType inputType = BulkEditorInputType.getByType(clazz);
 
@@ -227,19 +226,28 @@ public abstract class AbstractBulkEditorInput<T extends CdmBase>
        public void performSearch(final BulkEditorQuery bulkEditorQuery, IStructuredSelection selection) {
            //cancel previous search job
            if(searchJob!=null && searchJob.getState()!=Job.NONE){
-               searchJob.cancel();
+               boolean isCanceled = searchJob.cancel();
+               if (!isCanceled){
+                   while (!isCanceled){
+                   try {
+                       Thread.sleep(200);
+                   } catch (InterruptedException e) {
+                   }
+                   isCanceled = searchJob.cancel();
+                   }
+               }
                searchJob = null;
-               /*
-                * wait for a little while for the job to finish
-                * to avoid asynchronously loaded results of the
-                * previous search being shown in the next search
-                * (not critical but explicitly waiting for the job to finish
-                * could run into an endless loop by mistake)
-                */
-               try {
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-            }
+//             /*
+//              * wait for a little while for the job to finish
+//              * to avoid asynchronously loaded results of the
+//              * previous search being shown in the next search
+//              * (not critical but explicitly waiting for the job to finish
+//              * could run into an endless loop by mistake)
+//              */
+//             try {
+//                Thread.sleep(500);
+//            } catch (InterruptedException e) {
+//            }
            }
         model.clear();
         markedMergeCandidates.clear();
@@ -454,7 +462,6 @@ public abstract class AbstractBulkEditorInput<T extends CdmBase>
         return getModel();
     }
 
-
     @Override
     public Map<Object, List<String>> getPropertyPathsMap() {
         // TODO Auto-generated method stub
index d35b6b31447c43baee1a3e93b2d396c3e36e4458..d0248e045cffad43d2925dd4940b56e1b67fe847 100644 (file)
@@ -35,16 +35,12 @@ import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
-
 /**
  * @author p.ciardelli
  * @created 25.06.2009
- * @version 1.0
  */
 public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase> {
 
-       private static final long serialVersionUID = 3387950621617078479L;
-
        public static final String ID = "bulkeditor.input.author";
 
        private static AgentEditorInput instance;
index c1c7623bc621ee76bbefa32d9345f32bf194da43..1ea0722c7d0c19aa4471074f6a9a6695f4b20898 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.input;
 
 import java.util.ArrayList;
@@ -39,7 +38,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author n.hoffmann
  * @created Mar 9, 2011
- * @version 1.0
  */
 public class GroupEditorInput extends AbstractBulkEditorInput<Group> {
 
@@ -75,7 +73,6 @@ public class GroupEditorInput extends AbstractBulkEditorInput<Group> {
                    MessagingUtils.messageDialog(Messages.GROUP_CREATOR_Name_not_accepted, getClass(), Messages.GROUP_CREATOR_Name_not_accepted_message);
                    return null;
                }
-
        }
 
        @Override
@@ -142,6 +139,4 @@ public class GroupEditorInput extends AbstractBulkEditorInput<Group> {
     public void setSaveUserCandidates(Set<User> saveUserCandidates) {
         this.saveUserCandidates = saveUserCandidates;
     }
-
-
-}
+}
\ No newline at end of file
index 5673019d83a5e01312340f3afef122b67f009771..60d6b698b82c7ad35ed5793031cbbc78b7d778eb 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.input;
 
 import java.util.ArrayList;
@@ -24,12 +23,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author n.hoffmann
  * @created Oct 19, 2010
- * @version 1.0
  */
 public class NameRelationshipEditorInput extends AbstractBulkEditorInput<NameRelationship> {
 
-       private static final long serialVersionUID = -7453923697752787687L;
-
        public static final String ID = "bulkeditor.input.nameRelationship";
 
        private static NameRelationshipEditorInput instance;
@@ -102,5 +98,4 @@ public class NameRelationshipEditorInput extends AbstractBulkEditorInput<NameRel
     public void merge() {
 
     }
-
-}
+}
\ No newline at end of file
index f71a0e2ea9ab065bb621c112f7290faa111c126d..d63ea8629e2c9039833f55470e4881d70e575b3b 100644 (file)
@@ -1,3 +1,11 @@
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy\r
+* http://www.e-taxonomy.eu\r
+*\r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
 package eu.etaxonomy.taxeditor.bulkeditor.input;\r
 \r
 import java.util.ArrayList;\r
index 08465a8e2e183baf506fafee5950b0cc8078069a..589e7869e4cf9c930cf6330b9d6c98bb00a90e95 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.input;
 
 import java.util.ArrayList;
@@ -30,7 +29,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author n.hoffmann
  * @created Mar 9, 2011
- * @version 1.0
  */
 public class UserEditorInput extends AbstractBulkEditorInput<User> {
 
@@ -79,7 +77,6 @@ public class UserEditorInput extends AbstractBulkEditorInput<User> {
                return CdmStore.getSearchManager().findUsers(configurator);
        }
 
-
        @Override
        protected IEntityCreator<User> createEntityCreator() {
                return new UserCreator();
@@ -105,5 +102,4 @@ public class UserEditorInput extends AbstractBulkEditorInput<User> {
        public Comparator<User> getTitleComparator(){
         return new UserNameComparator();
     }
-
-}
+}
\ No newline at end of file
index 5f0d01cf20ad0124120472e5fadbd8df49f71220..26761d62024df9cdc359d487aa98bde454de60e1 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
 
 import java.util.HashMap;
@@ -28,23 +27,16 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author n.hoffmann
  * @created Mar 9, 2011
- * @version 1.0
  */
 public class UserCreator  implements IEntityCreator<User>{
 
     public static final String USER = "User"; //$NON-NLS-1$
 
-    /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.String)
-        */
        @Override
        public User createEntity(String text) {
                return createEntity(null, text);
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.Object, java.lang.String)
-        */
        @Override
        public User createEntity(Object key, String text) {
 
@@ -69,9 +61,6 @@ public class UserCreator  implements IEntityCreator<User>{
 
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#getKeyLabelPairs()
-        */
        @Override
        public Map<Object, String> getKeyLabelPairs() {
                Map<Object, String> result = new HashMap<Object, String>();
@@ -84,5 +73,4 @@ public class UserCreator  implements IEntityCreator<User>{
                // TODO Auto-generated method stub
                return false;
        }
-
-}
+}
\ No newline at end of file
index fd1219a69262d94544814a13d0e9bf0414139eeb..5b835bf3468a1aa0d6d85e3f5b3947d76b923704 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider;
 
 import java.util.Comparator;
@@ -18,7 +17,6 @@ import eu.etaxonomy.cdm.model.common.ICdmBase;
 /**
  * @author n.hoffmann
  * @created Dec 14, 2010
- * @version 1.0
  */
 public abstract class AbstractDateComparator<T extends ICdmBase> implements Comparator<T>{
 
index f0487bde5263002d4b7bcc1ec63df55c6575739d..edfb6f95db0c9cf342339757dcffe6c7d1c378a0 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider;
 
 import java.util.Comparator;
@@ -19,34 +18,23 @@ import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider;
 /**
  * @author n.hoffmann
  * @created Dec 14, 2010
- * @version 1.0
  */
 public class AbstractSortProvider<T> implements IBulkEditorSortProvider<T> {
 
-       Map<String, Comparator<T>> comparators = new HashMap<String, Comparator<T>>();
+       protected Map<String, Comparator<T>> comparators = new HashMap<>();
        
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider#getComparators()
-        */
        @Override
        public Map<String, Comparator<T>> getComparators() {
                return comparators;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider#getComparatorNames()
-        */
        @Override
        public Set<String> getComparatorNames() {
                return comparators.keySet();
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider#getComparatorByName(java.lang.String)
-        */
        @Override
        public Comparator<T> getComparatorByName(String name) {
                return comparators.get(name);
        }
-
-}
+}
\ No newline at end of file
index bae9767533388f9b33ab6ce7d92b96fd257a03db..5f0bd7145997953d1bd5bf7aef1fb2283f74e0c1 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider;
 
 import org.joda.time.DateTime;
@@ -16,26 +15,18 @@ import eu.etaxonomy.cdm.model.common.ICdmBase;
 /**
  * @author n.hoffmann
  * @created Dec 14, 2010
- * @version 1.0
  */
 public class CdmBaseSortProvider<T extends ICdmBase> extends AbstractSortProvider<T> {
 
-       /**
-        * 
-        */
        public CdmBaseSortProvider() {
                comparators.put("Created When", new CreatedDateComparator());
        }
        
        private class CreatedDateComparator extends AbstractDateComparator<T>{
 
-               /* (non-Javadoc)
-                * @see eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.AbstractDateComparator#getDate(eu.etaxonomy.cdm.model.common.ICdmBase)
-                */
                @Override
                protected DateTime getDate(T object) {
                        return object.getCreated();
-               }
-               
+               }       
        }
-}
+}
\ No newline at end of file
index cdeeeba62a521daf242ea7e1d5a5cce4180a326b..b13e6d974149ea0d9cda3c2ed7599598db976bb3 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider;
 
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
@@ -14,12 +13,10 @@ import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 /**
  * @author n.hoffmann
  * @created Dec 14, 2010
- * @version 1.0
  */
 public class IdentifiableEntitySortProvider<T extends IIdentifiableEntity> extends AbstractSortProvider<T> {
 
        public IdentifiableEntitySortProvider(){
                comparators.put("Title Cache", new TitleCacheComparator<T>());
        }
-       
-}
+}
\ No newline at end of file
index ebdc23b07969a5ee26300ce904b720f0eb777103..b9d0efefead09c20d4d78a739cf638a057fddfdd 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider;
 
 import java.util.Comparator;
@@ -17,13 +16,9 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 /**
  * @author n.hoffmann
  * @created Dec 14, 2010
- * @version 1.0
  */
 public class ReferenceSortProvider extends AbstractSortProvider<Reference> {
 
-       /**
-        *
-        */
        public ReferenceSortProvider() {
                comparators.put("Type", new ReferenceTypeComparator());
                comparators.put("Year", new ReferenceYearComparator());
@@ -31,18 +26,11 @@ public class ReferenceSortProvider extends AbstractSortProvider<Reference> {
 
        private class ReferenceYearComparator implements Comparator<Reference> {
 
-               /**
-                * @param o1
-                * @return
-                */
                private String getYearString(Reference o) {
                        TimePeriod datePublished = o == null ? null : o.getDatePublished();
                        return datePublished == null? null : datePublished.toString();
                }
 
-               /* (non-Javadoc)
-                * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-                */
                @Override
         public int compare(Reference o1, Reference o2) {
                        String yearString1 = getYearString(o1);
@@ -63,15 +51,11 @@ public class ReferenceSortProvider extends AbstractSortProvider<Reference> {
 
                        }
                        return returnVal;
-
                }
        }
 
        private class ReferenceTypeComparator implements Comparator<Reference> {
 
-               /* (non-Javadoc)
-                * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-                */
                @Override
         public int compare(Reference o1, Reference o2) {
                        String typeString1 = o1.getClass().toString();
@@ -95,6 +79,4 @@ public class ReferenceSortProvider extends AbstractSortProvider<Reference> {
                        }
                }
        }
-
-
-}
+}
\ No newline at end of file
index 4c30e13fb595c242560211a73e622e8c711a8661..aaa7a234a7822e670359aecb3fa782d9f9fdfa96 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.operation;
 
 import java.util.Set;
@@ -26,7 +25,6 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 /**
  * @author n.hoffmann
  * @created Dec 13, 2010
- * @version 1.0
  */
 public class SetMarkerFlagOperation extends AbstractPostTaxonOperation {
 
@@ -34,11 +32,6 @@ public class SetMarkerFlagOperation extends AbstractPostTaxonOperation {
        private MarkerType markerType;
        private boolean value;
 
-       /**
-        * @param label
-        * @param undoContext
-        * @param postOperationEnabled
-        */
        public SetMarkerFlagOperation(String label, IUndoContext undoContext,
                        Set<IAnnotatableEntity> annotatableEntities, MarkerType markerType, boolean value,
                        IPostOperationEnabled postOperationEnabled) {
@@ -48,9 +41,6 @@ public class SetMarkerFlagOperation extends AbstractPostTaxonOperation {
                this.value = value;
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        @Override
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
@@ -64,18 +54,12 @@ public class SetMarkerFlagOperation extends AbstractPostTaxonOperation {
                return postExecute(null);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
                return execute(monitor, info);
        }
-
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
+       
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
@@ -87,5 +71,4 @@ public class SetMarkerFlagOperation extends AbstractPostTaxonOperation {
                
                return postExecute(null);
        }
-
-}
+}
\ No newline at end of file
index c75e94cac608640ee9cebed142319fe8f7819512..925cd2c69e3629d1b4f99043e72af807ee613e8c 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.preference;
 
 import org.eclipse.jface.preference.BooleanFieldEditor;
@@ -19,7 +18,6 @@ import eu.etaxonomy.taxeditor.preference.menu.FieldEditorPreferencePageE4;
 /**
  * @author n.hoffmann
  * @created Dec 13, 2010
- * @version 1.0
  */
 public class BulkEditorGeneralPreferencePage extends FieldEditorPreferencePageE4 {
 
@@ -29,5 +27,4 @@ public class BulkEditorGeneralPreferencePage extends FieldEditorPreferencePageE4
                 Messages.BulkEditorGeneralPreferencePage,
                 getFieldEditorParent()));
     }
-
-}
+}
\ No newline at end of file
index 0c0d8786708bf0c07355a9f74c9dfd45e21eac37..18ba123bfcdfdf8dfa0da4a24396870ac11fd8af 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.bulkeditor.preference;
 
 import org.eclipse.jface.preference.BooleanFieldEditor;
@@ -21,11 +20,9 @@ import eu.etaxonomy.taxeditor.store.TermStore;
 /**
  * @author p.ciardelli
  * @created 17.08.2009
- * @version 1.0
  */
 public class BulkEditorMarkerPreferencePage extends FieldEditorPreferencePageE4 {
 
-
     @Override
     protected void createFieldEditors() {
         if(CdmStore.isActive()){
@@ -37,4 +34,4 @@ public class BulkEditorMarkerPreferencePage extends FieldEditorPreferencePageE4
         }
 
     }
-}
+}
\ No newline at end of file
index a32f813f9224bd6e6ce30bafe2989ecbf99309f6..f483cf9fed1a2f92c40bab0afc5ed6f951bfb854 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
 Eclipse-BundleShape: dir
 Export-Package: com.sun.istack.internal.tools,
  com.sun.istack.internal.ws,
@@ -35,6 +35,11 @@ Export-Package: com.sun.istack.internal.tools,
  eu.etaxonomy.cdm.common,
  eu.etaxonomy.cdm.common.media,
  eu.etaxonomy.cdm.common.monitor,
+ eu.etaxonomy.cdm.compare.common,
+ eu.etaxonomy.cdm.compare.location,
+ eu.etaxonomy.cdm.compare.name,
+ eu.etaxonomy.cdm.compare.taxon,
+ eu.etaxonomy.cdm.compare.term,
  eu.etaxonomy.cdm.config,
  eu.etaxonomy.cdm.database,
  eu.etaxonomy.cdm.database.types,
@@ -558,13 +563,13 @@ Require-Bundle: org.eclipse.osgi,
 Bundle-ClassPath: .,
  lib/apache-log4j-extras-1.2.17.jar,
  lib/aspectjrt-1.9.6.jar,
- lib/cdmlib-commons-5.18.0.jar,
- lib/cdmlib-ext-5.18.0.jar,
- lib/cdmlib-io-5.18.0.jar,
- lib/cdmlib-model-5.18.0.jar,
- lib/cdmlib-persistence-5.18.0.jar,
- lib/cdmlib-cache-5.18.0.jar,
- lib/cdmlib-services-5.18.0.jar,
+ lib/cdmlib-commons-5.19.0.jar,
+ lib/cdmlib-ext-5.19.0.jar,
+ lib/cdmlib-io-5.19.0.jar,
+ lib/cdmlib-model-5.19.0.jar,
+ lib/cdmlib-persistence-5.19.0.jar,
+ lib/cdmlib-cache-5.19.0.jar,
+ lib/cdmlib-services-5.19.0.jar,
  lib/commons-beanutils-1.9.4.jar,
  lib/commons-codec-1.15.jar,
  lib/commons-collections-3.2.2.jar,
index 3e2c6eebefea772e8d238181385190d536cce4a7..9e0035ce70dab162fe9aa982a163f067279e0a28 100644 (file)
@@ -3,12 +3,12 @@ bin.includes = META-INF/,\
                lib/apache-log4j-extras-1.2.17.jar,\
                lib/aspectjrt-1.9.6.jar,\
                lib/aspectjweaver-1.9.6.jar,\
-               lib/cdmlib-commons-5.18.0.jar,\
-               lib/cdmlib-ext-5.18.0.jar,\
-               lib/cdmlib-io-5.18.0.jar,\
-               lib/cdmlib-model-5.18.0.jar,\
-               lib/cdmlib-persistence-5.18.0.jar,\
-               lib/cdmlib-services-5.18.0.jar,\
+               lib/cdmlib-commons-5.19.0.jar,\
+               lib/cdmlib-ext-5.19.0.jar,\
+               lib/cdmlib-io-5.19.0.jar,\
+               lib/cdmlib-model-5.19.0.jar,\
+               lib/cdmlib-persistence-5.19.0.jar,\
+               lib/cdmlib-services-5.19.0.jar,\
                lib/commons-beanutils-1.9.4.jar,\
                lib/commons-codec-1.15.jar,\
                lib/commons-collections-3.2.2.jar,\
@@ -89,7 +89,7 @@ bin.includes = META-INF/,\
                lib/lucene-analyzers-common-5.4.1.jar,\
                lib/lucene-sandbox-5.4.1.jar,\
                lib/lucene-suggest-5.4.1.jar,\
-               lib/cdmlib-cache-5.18.0.jar,\
+               lib/cdmlib-cache-5.19.0.jar,\
                lib/org.swtchart_0.10.0.v20160212.jar,\
                lib/commons-collections4-4.4.jar,\
                lib/commons-math3-3.6.1.jar,\
index 723565695b353d07f4d18c6d13a1cbf974b73e8b..2a97d65aa28288acb6b72284ce650d136645ebf3 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>5.18.2</version>\r
+    <version>5.19.0</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
         <repository>\r
         <id>repository.springsource.release</id>\r
         <name>SpringSource GA Repository</name>\r
-        <url>http://repo.springsource.org/release</url>\r
+        <url>https://repo.springsource.org/release</url>\r
     </repository>\r
   </repositories>\r
   <dependencies>\r
index 8dcb934156ea4c1d83d4446ce1a3bcbaa7d85d94..33ebd9822deec6e56229f1600ef66ee33e50b2af 100644 (file)
@@ -13,7 +13,7 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Dictionary;
@@ -214,7 +214,7 @@ public class CdmApplicationState {
                     File file = null;
                     try {
                         String urlString = FileLocator.resolve(fileURL).toExternalForm().replace(" ", "%20");
-                        file = new File(new URI(urlString));
+                        file = new File(new URI(urlString).getJavaUri());
                         JarFile jarFile = new JarFile(file);
                         Manifest manifest = jarFile.getManifest();
                         Attributes attributes = manifest.getMainAttributes();
index a6b3105618602096be1358d351b7e670aab2b3c1..7dd57e825bcfed180bfa8db638737dd845a7b33b 100644 (file)
@@ -80,7 +80,6 @@ public class TimestampingHttpInvokerRequestExecutor extends HttpComponentsHttpIn
         if(requestURI != null){
             RemoteExecutionTimestampsUtil.setLastServiceMethod(requestURI.toString());
         }
-
     }
 
     private void setExecutionResponseHttpHeaderTimestamp(HttpResponse respone){
@@ -106,4 +105,4 @@ public class TimestampingHttpInvokerRequestExecutor extends HttpComponentsHttpIn
                 .setConnectionReuseStrategy(new NoConnectionReuseStrategy()) // see #8812
                 .build();
     }
-}
+}
\ No newline at end of file
index be2e46c7c867f14f8a89b5851200c849ee6ab366..c0c1e30df95bbf79817fb1053ba6a1e92478cdd2 100644 (file)
@@ -1,16 +1,24 @@
+/**
+* Copyright (C) 2015 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
 package eu.etaxonomy.taxeditor.session;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.common.ICdmBase;
 
-public interface ICdmEntitySessionEnabled {
+public interface ICdmEntitySessionEnabled<T extends ICdmBase> {
 
     public ICdmEntitySession getCdmEntitySession();
 
-    public <T extends CdmBase> Collection<T> getRootEntities();
+    public Collection<T> getRootEntities();
 
     public Map<Object, List<String>> getPropertyPathsMap();
 
index 1baf6489988aecb66158de1c6608b6b1b30f0fe4..0be6d87bd0707394f2eeac0a3604c01ea0ac60aa 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
index 8b7ddfa051d70f08f34873baf0f3eb78ba66ddf2..5ff77708821f936891075c9ee3d09fdaafe00701 100644 (file)
       <handlers xmi:id="_mjo-gOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.CreateDescriptiveDataSetHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.CreateDescriptiveDataSetHandler" command="_XO7eUOSjEee9gvnH2Eirpw"/>
       <handlers xmi:id="_yQHcoOS3EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.deleteDescriptiveDataSet" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.DeleteDescriptiveDataSetHandler" command="_uPmNgOS3EeeKONG__xkGZg"/>
       <menus xsi:type="menu:PopupMenu" xmi:id="__S3vQN87Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.popupmenu.descriptiveDataSetNavigator">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_UUfGcOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.newdescriptivedataset" label="%handledmenuitem.label.13" tooltip="%handledmenuitem.tooltip.1" command="_XO7eUOSjEee9gvnH2Eirpw"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_UUfGcOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.newdescriptivedataset" label="%menu.label" tooltip="%handledmenuitem.tooltip.1" command="_XO7eUOSjEee9gvnH2Eirpw"/>
         <children xsi:type="menu:MenuSeparator" xmi:id="_ZD5bgLIfEeqvn5lIFwyIRw" elementId="eu.etaxonomy.taxeditor.editor.menuseparator.31"/>
         <children xsi:type="menu:DynamicMenuContribution" xmi:id="_BRxE4N88Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSetNavigator.dynamicmenucontribution.cdmViewer" label="%dynamicmenucontribution.label.2" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.CdmViewerContextMenuE4"/>
         <children xsi:type="menu:MenuSeparator" xmi:id="_aFtd0LIfEeqvn5lIFwyIRw" elementId="eu.etaxonomy.taxeditor.editor.menuseparator.32"/>
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_JSt1kOS4EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.deleteDescriptiveDataSet" label="%handledmenuitem.label.14" tooltip="%handledmenuitem.tooltip.2" command="_uPmNgOS3EeeKONG__xkGZg"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_JSt1kOS4EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.deleteDescriptiveDataSet" label="%command.commandname.9" tooltip="%handledmenuitem.tooltip.2" command="_uPmNgOS3EeeKONG__xkGZg"/>
       </menus>
       <toolbar xmi:id="_gz3CkPycEeeOqKfc2I-67A" elementId="eu.etaxonomy.taxeditor.editor.toolbar.2"/>
     </elements>
index 3b29a00c3f4251ba2ce637e225bfc01848869bdd..ae9c764a7447d65676da7d2d2ae822a49b67e0a4 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>5.18.2</version>
+    <version>5.19.0</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 3cef27580de37047ac1a5ef5b15a4c6fc4061306..a28be226d741090e231ed6396a10cacfc612d7bd 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.editor;
 
 import java.util.ArrayList;
@@ -29,7 +28,6 @@ import eu.etaxonomy.taxeditor.editor.l10n.Messages;
  *
  * @author n.hoffmann
  * @created 19.03.2009
- * @version 1.0
  */
 public class ChooseFromMultipleTaxonNodesDialog extends ListDialog {
 
@@ -71,7 +69,7 @@ public class ChooseFromMultipleTaxonNodesDialog extends ListDialog {
                public Object[] getElements(Object inputElement) {
                        Set<TaxonNode> taxonNodes = (Set<TaxonNode>) inputElement;
                                
-                               List<Classification> classifications = new ArrayList<Classification>(); 
+                               List<Classification> classifications = new ArrayList<>(); 
                                
                                for(TaxonNode node : taxonNodes){
                                        classifications.add(node.getClassification());
@@ -90,4 +88,4 @@ public class ChooseFromMultipleTaxonNodesDialog extends ListDialog {
                        
                }               
        }
-}
+}
\ No newline at end of file
index 695c5f684b277ce6e8ea9f89c5f3df339ec69137..9b9bd9f1a36c7a409220204083a7fb91d4e085f2 100644 (file)
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.taxeditor.editor;
 
 import java.util.Collection;
@@ -66,7 +65,6 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
  *
  * @author n.hoffmann
  * @created 20.01.2009
- * @version 1.0
  */
 public class EditorUtil extends AbstractUtility {
 
@@ -236,7 +234,6 @@ public class EditorUtil extends AbstractUtility {
             }
         }
 
-
         Collection<MPart> parts = partService.getParts();
         //check if part is already opened
         for (MPart part : parts) {
@@ -266,8 +263,6 @@ public class EditorUtil extends AbstractUtility {
             showMedia(modelService, partService);
             mediaVisible = false;
         }
-
-
     }
 
     public static void showMedia(EModelService modelService, EPartService partService) {
@@ -527,7 +522,6 @@ public class EditorUtil extends AbstractUtility {
         }
     }
 
-
     public static void closeObsoleteDescriptiveDatasetEditor(UUID datasetUuid, EPartService partService){
 
         Collection<MPart> parts = partService.getParts();
@@ -547,7 +541,6 @@ public class EditorUtil extends AbstractUtility {
         }
     }
 
-
     public static void closePart(String partID, EPartService partService){
 
         Collection<MPart> parts = partService.getParts();
@@ -567,5 +560,4 @@ public class EditorUtil extends AbstractUtility {
                editor.init(input);
         }
     }
-
-}
+}
\ No newline at end of file
index 93c252b6a2965ffa0d5aa96e20d89aacbd224965..bb5d7453eb4afe8bb72bccbc9a623a69be484549 100644 (file)
@@ -29,7 +29,7 @@ import eu.etaxonomy.cdm.model.term.TermTree;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditorComposite;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditorComposite;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.ui.combo.term.TermUuidComboViewer;
 import eu.etaxonomy.taxeditor.util.TaxonTreeNodeContentProvider;
@@ -44,7 +44,7 @@ public class DescriptiveDataSetComposite extends Composite {
     private Text txtDescriptiveDataSet;
     private TermUuidComboViewer comboRankMin;
     private TermUuidComboViewer comboRankMax;
-    private FeatureTreeEditorComposite<Feature> featureTreeEditorComposite;
+    private TermTreeEditorComposite<Feature> TermTreeEditorComposite;
     private TreeViewer taxonNodeTree;
     private List<TermDto> areas = new ArrayList<>();
     private Text textAreaText;
@@ -135,8 +135,8 @@ public class DescriptiveDataSetComposite extends Composite {
         btnChooseArea = new Button(composite, SWT.NONE);
         btnChooseArea.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
 
-        featureTreeEditorComposite = new FeatureTreeEditorComposite<>(this, SWT.NONE);
-        featureTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+        TermTreeEditorComposite = new TermTreeEditorComposite<>(this, SWT.NONE);
+        TermTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
     }
 
     @Override
@@ -161,15 +161,15 @@ public class DescriptiveDataSetComposite extends Composite {
         comboRankMax.setElement(max);
     }
 
-    public FeatureTreeEditorComposite<Feature> getFeatureTreeEditorComposite() {
-        return featureTreeEditorComposite;
+    public TermTreeEditorComposite<Feature> getTermTreeEditorComposite() {
+        return TermTreeEditorComposite;
     }
 
     public TermTree<Feature> getCharacters(){
-        return featureTreeEditorComposite.getFeatureTree();
+        return TermTreeEditorComposite.getFeatureTree();
     }
     public void setCharacters(TermTree<Feature> characters) {
-        featureTreeEditorComposite.setSelectedTree(characters);
+        TermTreeEditorComposite.setSelectedTree(characters);
     }
 
     public TreeViewer getTaxonNodeTree() {
index dcc2acd05db9faeed5a3bd4e4aeb804af0a9458e..cd470efc8b799a742801445909b84abba94264fe 100644 (file)
@@ -89,8 +89,9 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
  * @since Nov 21, 2017
  *
  */
-public class DescriptiveDataSetEditor implements IE4SavablePart, IConversationEnabled, ICdmEntitySessionEnabled,
-IPartContentHasDetails, IPartContentHasSupplementalData, IDirtyMarkable, IDescriptiveDataSetEditor {
+public class DescriptiveDataSetEditor implements IE4SavablePart, IConversationEnabled, 
+               ICdmEntitySessionEnabled<DescriptiveDataSet>, IPartContentHasDetails, 
+               IPartContentHasSupplementalData, IDirtyMarkable, IDescriptiveDataSetEditor {
 
     private DescriptiveDataSetComposite composite;
 
@@ -174,7 +175,7 @@ IPartContentHasDetails, IPartContentHasSupplementalData, IDirtyMarkable, IDescri
             }
         });
 
-        composite.getFeatureTreeEditorComposite().init("Character Tree",
+        composite.getTermTreeEditorComposite().init("Character Tree",
                 TermType.Character,
                 null,
                 null,
index 5477b444d31577c5ea7f0d7a15d357118d5bcc9a..59ec521c504f549c8d6b1d19c4c52ebaf46cc055 100644 (file)
@@ -34,6 +34,7 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IMemento;
 
@@ -55,7 +56,8 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @date 12.12.2017
  *
  */
-public class DescriptiveDataSetNavigator implements IConversationEnabled, ICdmEntitySessionEnabled, IContextListener{
+public class DescriptiveDataSetNavigator 
+               implements IConversationEnabled, ICdmEntitySessionEnabled<DescriptiveDataSet>, IContextListener{
 
     private ListViewer viewer;
 
@@ -91,6 +93,7 @@ public class DescriptiveDataSetNavigator implements IConversationEnabled, ICdmEn
                 return super.getText(element);
             }
         });
+        viewer.setComparator(new ViewerComparator());
 
         viewer.addDoubleClickListener(new IDoubleClickListener() {
 
@@ -162,40 +165,25 @@ public class DescriptiveDataSetNavigator implements IConversationEnabled, ICdmEn
         refresh();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void update(CdmDataChangeMap arg0) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public ICdmEntitySession getCdmEntitySession() {
         return cdmEntitySession;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
-    public <T extends CdmBase> Collection<T> getRootEntities() {
+    public Collection<DescriptiveDataSet> getRootEntities() {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Map<Object, List<String>> getPropertyPathsMap() {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public ConversationHolder getConversationHolder() {
         return conversation;
@@ -227,25 +215,16 @@ public class DescriptiveDataSetNavigator implements IConversationEnabled, ICdmEn
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
         // TODO Auto-generated method stub
 
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextStop(IMemento memento, IProgressMonitor monitor) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextStart(IMemento memento, IProgressMonitor monitor) {
         if(viewer!=null && viewer.getControl()!=null && !viewer.getControl().isDisposed()){
@@ -253,18 +232,11 @@ public class DescriptiveDataSetNavigator implements IConversationEnabled, ICdmEn
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextRefresh(IProgressMonitor monitor) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
     }
-
-}
+}
\ No newline at end of file
index f183b56e126ca434d5de7521b117cf9390f6065a..a23430e6f84719a3d5cf876063223d4ddd4a49b9 100644 (file)
@@ -24,14 +24,14 @@ import org.eclipse.swt.widgets.Display;
 import eu.etaxonomy.cdm.model.description.Character;
 import eu.etaxonomy.cdm.model.term.TermNode;
 import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureNodeDragListener;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermNodeDragListener;
 
 /**
  * @author pplitzner
  * @since Jun 2, 2017
  *
  */
-public class CharacterDragListener extends FeatureNodeDragListener {
+public class CharacterDragListener extends TermNodeDragListener {
 
     private TreeViewer structureViewer;
     private TreeViewer propertyViewer;
index 0b5bf5eeb86219469a5c4f164bdacc66ad327c8b..c4cd6896795b5275d441fdf0d519133aa442303e 100644 (file)
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.term.TermTree;
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
 import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoDropAdapter;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeDtoDropAdapter;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @date Jun 1, 2017
  *
  */
-public class CharacterDropAdapter extends FeatureTreeDtoDropAdapter {
+public class CharacterDropAdapter extends TermTreeDtoDropAdapter {
 
        private CharacterEditor characterEditor;
 
index cc783189eb7a4945e37882e1ad9c0d85ce1cf9c8..59dadba17f0cfe468da359dd542f942afba77caa 100644 (file)
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2017 EDIT
 * European Distributed Institute of Taxonomy
@@ -85,13 +84,13 @@ import eu.etaxonomy.taxeditor.editor.definedterm.FeatureTreeViewerComparator;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
-import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureNodeDtoDragListener;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoDropAdapter;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
 import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoEditorComposite;
 import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermNodeDtoDragListener;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeDtoDropAdapter;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
@@ -112,10 +111,10 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4ViewerPart;
  * Editor for combining structure and property terms to characters.
  * @author pplitzner
  * @date 24.05.2017
- *
  */
 public class CharacterEditor implements ICharacterEditor, IConversationEnabled, ISelectionChangedListener,
-        ModifyListener, IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData, IDirtyMarkable, IE4SavablePart {
+        ModifyListener, IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData, 
+        IDirtyMarkable, IE4SavablePart {
 
     private FeatureTreeDtoEditorComposite characterTreeEditorComposite;
     private final FormToolkit formToolkit = new FormToolkit(Display.getDefault());
@@ -265,8 +264,8 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
         });
 
         characterTreeEditorComposite = addFeatureTreeEditor(composite_3);
-        initFeatureTreeComposite(TermType.Character, characterTreeEditorComposite, new FeatureNodeDtoDragListener(characterTreeEditorComposite.getViewer()),
-                new FeatureTreeDtoDropAdapter(this, characterTreeEditorComposite.getViewer(), sync),
+        initFeatureTreeComposite(TermType.Character, characterTreeEditorComposite, new TermNodeDtoDragListener(characterTreeEditorComposite.getViewer()),
+                new TermTreeDtoDropAdapter(this, characterTreeEditorComposite.getViewer(), sync),
                 null);
 
         characterTreeEditorComposite.getLabel_title().setText(Messages.CharacterEditor_CHARACTERS);
@@ -290,16 +289,16 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
 
         TreeViewer viewer = new TreeViewer(composite);
         viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-        viewer.setContentProvider(new FeatureTreeContentProvider());
-        viewer.setLabelProvider(new FeatureTreeLabelProvider());
+        viewer.setContentProvider(new TermTreeContentProvider());
+        viewer.setLabelProvider(new TermTreeLabelProvider());
         viewer.setComparator(new FeatureTreeViewerComparator());
         viewer.addSelectionChangedListener(this);
-        viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, AbstractTermTreeEditor.TREE_PROPERTY_PATH));
+        viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, TermTreeEditor.TREE_PROPERTY_PATH));
         btnRefresh.addSelectionListener(new SelectionAdapter() {
 
             @Override
             public void widgetSelected(SelectionEvent e) {
-                viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, AbstractTermTreeEditor.TREE_PROPERTY_PATH));
+                viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, TermTreeEditor.TREE_PROPERTY_PATH));
                 refresh(viewer);
             }
         });
@@ -307,24 +306,24 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
     }
 
     private <T extends DefinedTermBase> FeatureTreeDtoEditorComposite<T> addFeatureTreeEditor(Composite composite_3) {
-        FeatureTreeDtoEditorComposite<T> featureTreeEditorComposite = new FeatureTreeDtoEditorComposite<>(composite_3, SWT.NONE);
-        featureTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-        return featureTreeEditorComposite;
+        FeatureTreeDtoEditorComposite<T> TermTreeEditorComposite = new FeatureTreeDtoEditorComposite<>(composite_3, SWT.NONE);
+        TermTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+        return TermTreeEditorComposite;
     }
 
     private void initFeatureTreeComposite(
             TermType termType,
-            FeatureTreeDtoEditorComposite featureTreeEditorComposite,
-            FeatureNodeDtoDragListener featureNodeDragListener,
-            FeatureTreeDtoDropAdapter featureNodeDropAdapter,
+            FeatureTreeDtoEditorComposite TermTreeEditorComposite,
+            TermNodeDtoDragListener featureNodeDragListener,
+            TermTreeDtoDropAdapter featureNodeDropAdapter,
             Transfer[] transfers) {
 
-        featureTreeEditorComposite.init(
+        TermTreeEditorComposite.init(
                 featureNodeDragListener,
                 featureNodeDropAdapter,
                 transfers,
                 this,
-                new FeatureTreeChooserListener(featureTreeEditorComposite, termType),
+                new FeatureTreeChooserListener(TermTreeEditorComposite, termType),
                 this);
     }
 
@@ -539,21 +538,21 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
     }
 
     private class FeatureTreeChooserListener extends SelectionAdapter{
-        private FeatureTreeDtoEditorComposite<Feature> featureTreeEditorComposite;
+        private FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite;
         private TermType termType;
 
-        public FeatureTreeChooserListener(FeatureTreeDtoEditorComposite<Feature> featureTreeEditorComposite, TermType termType) {
+        public FeatureTreeChooserListener(FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite, TermType termType) {
             super();
-            this.featureTreeEditorComposite = featureTreeEditorComposite;
+            this.TermTreeEditorComposite = TermTreeEditorComposite;
             this.termType = termType;
         }
 
         @Override
         public void widgetSelected(SelectionEvent e) {
-            TermTree tree = FeatureTreeSelectionDialog.select(featureTreeEditorComposite.getDisplay().getActiveShell(), null, termType);
+            TermTree tree = FeatureTreeSelectionDialog.select(TermTreeEditorComposite.getDisplay().getActiveShell(), null, termType);
             if(tree!=null){
                 cdmEntitySession.load(tree, true);
-                featureTreeEditorComposite.setSelectedTree(tree);
+                TermTreeEditorComposite.setSelectedTree(tree);
             }
         }
     }
index fa6559459672e47ecdae4c8f13e76ab2b6e0698a..1e1939396a9fa852f648e16a987a550818b8fdf0 100644 (file)
@@ -22,14 +22,14 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.character.CharacterEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler;
+import eu.etaxonomy.taxeditor.featuretree.e4.handler.AddTermHandler;
 
 /**
  * @author pplitzner
  * @since Jul 12, 2017
  *
  */
-public class AddFeatureToCharacterTreeHandler extends AddFeatureHandler {
+public class AddFeatureToCharacterTreeHandler extends AddTermHandler {
 
     @Execute
     @Override
index b9834db79754cd1d477f106485b6c0755b2200c1..8acf54d5e417aea8a1ccd01a73bd07b0a8be7664 100644 (file)
@@ -69,10 +69,10 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
  * Character matrix editor for editing specimen/taxon descriptions in a table
  * @author pplitzner
  * @since Nov 26, 2017
- *
  */
 public class CharacterMatrixPart implements IE4SavablePart, IConversationEnabled, IDirtyMarkable,
-ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetails{
+               ICdmEntitySessionEnabled<DescriptiveDataSet>, IPartContentHasSupplementalData, 
+               IPartContentHasDetails {
 
     private static final List<String> WS_PROPERTY_PATH = Arrays.asList(new String[] {
             "descriptions", //$NON-NLS-1$
index 484468a317d82bd7010c1cb5e369b994e7ad8b6d..5ac327a050acd4ba2a4cfb21ded7404937c1e7ff 100644 (file)
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.taxeditor.editor.e4;
 
 import java.util.ArrayList;
@@ -61,12 +60,12 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
-
 /**
  * @author pplitzner
  * @date Aug 24, 2017
  */
-public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConversationEnabled {
+public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>
+               implements IConversationEnabled {
 
     private static final String INCORRECT_STATE = Messages.TaxonEditorInput_INCORRECT_STATE;
 
@@ -79,7 +78,6 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
     private List<TaxonBase> toSaveNewConcepts = new ArrayList<>();
     private List<TaxonName> toSaveNewNames = new ArrayList<>();
 
-
     private Set<AbstractPostOperation> operations = new HashSet<>();
 
     private TaxonEditorInputDataChangeBehaviourE4 dataChangeBehavior;
@@ -364,57 +362,43 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
             delete(entry.getKey(), entry.getValue());
         }
         toDeletes.clear();
-        for(AbstractPostOperation<?> entry:operations){
-            IStatus status = Status.CANCEL_STATUS;
-            final IAdaptable uiInfoAdapter = WorkspaceUndoUtil
-                    .getUIInfoAdapter(AbstractUtility.getShell());
-            String operationlabel = entry.getLabel();
-            try {
-                entry.addContext(IOperationHistory.GLOBAL_UNDO_CONTEXT);
-                status = entry.execute(new NullProgressMonitor(), uiInfoAdapter);
-            } catch (ExecutionException e) {
-
-                MessagingUtils.operationDialog(AbstractUtility.class, e, TaxeditorStorePlugin.PLUGIN_ID, operationlabel, null);
-
-            }
 
-            String statusString = status.equals(Status.OK_STATUS) ? "completed"
-                    : "cancelled";
-
-            IPostOperationEnabled postOperationEnabled = entry
-                    .getPostOperationEnabled();
-            if (postOperationEnabled != null) {
-                postOperationEnabled.onComplete();
-            }
-
-
-            //AbstractUtility.executeOperation(entry,sync);
-        }
-
-        operations.clear();
         for (Synonym syn: toSaveNewSynonyms){
-            for (HybridRelationship rel : syn.getName().getHybridChildRelations()){
-//                if (!rel.getParentName().isPersited()) {
+            if (syn.getName() != null){
+                for (HybridRelationship rel : syn.getName().getHybridChildRelations()){
                     toSaveNewNames.add(rel.getParentName());
-//                }
-//                    if (!rel.getHybridName().isPersited()) {
-                   toSaveNewNames.add(rel.getHybridName());
-//                }
-
+                    toSaveNewNames.add(rel.getHybridName());
+                }
             }
         }
 
         for (TaxonBase<?> concept: toSaveNewConcepts){
-            for (HybridRelationship rel : concept.getName().getHybridChildRelations()){
-//                if (!rel.getParentName().isPersited()) {
+            if (concept.getName() != null){
+                for (HybridRelationship rel : concept.getName().getHybridChildRelations()){
                     toSaveNewNames.add(rel.getParentName());
-//                }
-//                if (!rel.getHybridName().isPersited()) {
                     toSaveNewNames.add(rel.getHybridName());
-//                }
+                }
+            }
+        }
 
+        //handle cascading for hybrid relationshis
+        //accepted taxa
+        if (taxonNode.getTaxon().getName() != null){
+            for (HybridRelationship rel : taxonNode.getTaxon().getName().getHybridChildRelations()){
+                toSaveNewNames.add(rel.getParentName());
+                toSaveNewNames.add(rel.getHybridName());
+            }
+        }
+        //synonyms
+        for (TaxonName synonymName : taxonNode.getTaxon().getSynonymNames()){
+            if (synonymName != null){
+                for (HybridRelationship rel : synonymName.getHybridChildRelations()){
+                    toSaveNewNames.add(rel.getParentName());
+                    toSaveNewNames.add(rel.getHybridName());
+                }
             }
         }
+
         if (!toSaveNewNames.isEmpty()){
             CdmStore.getService(INameService.class).merge(toSaveNewNames, true);
         }
@@ -425,8 +409,31 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
         toSaveNewNames.clear();
         toSaveNewConcepts.clear();
 
+
         CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true);
 
+        for(AbstractPostOperation<?> entry:operations){
+            IStatus status = Status.CANCEL_STATUS;
+            final IAdaptable uiInfoAdapter = WorkspaceUndoUtil
+                    .getUIInfoAdapter(AbstractUtility.getShell());
+            String operationlabel = entry.getLabel();
+            try {
+                entry.addContext(IOperationHistory.GLOBAL_UNDO_CONTEXT);
+                status = entry.execute(new NullProgressMonitor(), uiInfoAdapter);
+            } catch (ExecutionException e) {
+                MessagingUtils.operationDialog(AbstractUtility.class, e, TaxeditorStorePlugin.PLUGIN_ID, operationlabel, null);
+            }
+
+            IPostOperationEnabled postOperationEnabled = entry
+                    .getPostOperationEnabled();
+            if (postOperationEnabled != null) {
+                postOperationEnabled.onComplete();
+            }
+
+            //AbstractUtility.executeOperation(entry,sync);
+        }
+
+        operations.clear();
 
     }
 
@@ -482,7 +489,9 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
                 "synonyms.name.relationsToThisName.fromName", //$NON-NLS-1$
                 "synonyms.name.nomenclaturalReference.inReference.authorship", //$NON-NLS-1$
                 "synonyms.name.nomenclaturalReference.authorship", //$NON-NLS-1$
-                "synonyms.name.homotypicalGroup.typifiedNames.taxonBases.synonyms" //$NON-NLS-1$
+                "synonyms.name.homotypicalGroup.typifiedNames.taxonBases.synonyms", //$NON-NLS-1$
+                "relationsFromThisTaxon",//$NON-NLS-1$
+                "relationsToThisTaxon"//$NON-NLS-1$
         });
 
         return taxonBasePropertyPaths;
@@ -496,4 +505,4 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
     public void addToSaveNewName(TaxonName newName) {
         this.toSaveNewNames.add(newName);
     }
-}
+}
\ No newline at end of file
index 4410ca481516ca1799481c8ee03423af050896ce..a6edaaa2832c1545e252109e4a61d7b020deb022 100644 (file)
@@ -26,10 +26,11 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  * @author cmathew
  * @created Mar 28, 2013
- *
  */
-
-public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IConversationEnabled {
+public class CdmAuthorityEditorInput 
+               extends CdmEntitySessionInput<Group> 
+               implements IConversationEnabled {
+       
        private ConversationHolder conversation;
        private Group group;
 
@@ -60,28 +61,21 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IC
 
                return null;
        }
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostDataChangeObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap)
-        */
+
        @Override
        public void update(CdmDataChangeMap changeEvents) {
                // TODO Auto-generated method stub
-
        }
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
-        */
+
        @Override
        public ConversationHolder getConversationHolder() {
                return this.conversation;
        }
+       
        public String getName() {
                return group.getName();
        }
 
-       /* (non-Javadoc)
-        * @see java.lang.Object#equals(java.lang.Object)
-        */
        @Override
        public boolean equals(Object object) {
                if (object instanceof CdmAuthorityEditorInput
@@ -93,29 +87,17 @@ public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IC
                return super.equals(object);
        }
 
-       /**
-        * Getter method for group member.
-        *
-        * @return
-        */
        public Group getGroup() {
                return this.group;
        }
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getRootEntities()
-     */
+       
     @Override
     public Collection<Group> getRootEntities() {
         return Arrays.asList(group);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
-     */
     @Override
     public void merge() {
         group = CdmStore.getService(IGroupService.class).merge(group, true).getMergedEntity();
-
     }
-}
+}
\ No newline at end of file
index fa36d382f493269d7e55d4c3cfb0356fc9db42c9..bd28dd2e901dd22071e6f1a6ad63f9d430507637 100644 (file)
@@ -1,6 +1,11 @@
 /**
- *
- */
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
 package eu.etaxonomy.taxeditor.editor.key;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
@@ -11,7 +16,6 @@ import eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput;
 
 /**
  * @author n.hoffmann
- *
  */
 public abstract class AbstractIdentificationEditorInput<T extends IIdentificationKey>
                extends CdmEntitySessionInput implements IConversationEnabled {
@@ -34,14 +38,10 @@ public abstract class AbstractIdentificationEditorInput<T extends IIdentificatio
        public void update(CdmDataChangeMap changeEvents) {
        }
 
-       /* (non-Javadoc)
-        * @see java.lang.Object#equals(java.lang.Object)
-        */
        @Override
        public boolean equals(Object obj) {
                // TODO Auto-generated method stub
                boolean result = super.equals(obj);
                return result;
        }
-
-}
+}
\ No newline at end of file
index 8444e3a866f21a5af77fc4839850d73f86cf3f2b..9f1a0b444404657f4a11a2f83bdcecdc9d443730 100644 (file)
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.taxeditor.editor.key.polytomous;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
@@ -14,8 +13,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 /**
  * @author n.hoffmann
  * @created Apr 20, 2011
- * @version 1.0
  */
 public interface IPolytomousKeyEditorPage extends IPostOperationEnabled {
 
-}
+}
\ No newline at end of file
index 8610264132be3f5e758686b67c72c2da6864428a..d0d30b43cd93ce2ae3dc49f588f17592710e4096 100644 (file)
@@ -1,6 +1,11 @@
 /**
- *
- */
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
 package eu.etaxonomy.taxeditor.editor.key.polytomous;
 
 import java.util.ArrayList;
@@ -18,7 +23,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
  * @author n.hoffmann
- *
  */
 public class PolytomousKeyEditorInput extends AbstractIdentificationEditorInput<PolytomousKey> {
 
@@ -42,7 +46,6 @@ public class PolytomousKeyEditorInput extends AbstractIdentificationEditorInput<
 //        this.name = name;
 //    }
 
-
     public static PolytomousKeyEditorInput NewInstance(UUID polytomousKeyUuid) throws Exception{
         try{
             ConversationHolder conversation = CdmStore.createConversation();
@@ -52,15 +55,11 @@ public class PolytomousKeyEditorInput extends AbstractIdentificationEditorInput<
         }
     }
 
-
     @Override
     public PolytomousKey getKey() {
         return key;
     }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
     @Override
     public boolean equals(Object object) {
         if (object instanceof PolytomousKeyEditorInput
@@ -72,21 +71,14 @@ public class PolytomousKeyEditorInput extends AbstractIdentificationEditorInput<
         return super.equals(object);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getRootEntities()
-     */
     @Override
     public  List<PolytomousKey> getRootEntities() {
         return Arrays.asList(key);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
-     */
     @Override
     public void merge() {
        key = CdmStore.getService(IPolytomousKeyService.class).merge(key,true).getMergedEntity();
-
     }
 
     @Override
@@ -99,5 +91,4 @@ public class PolytomousKeyEditorInput extends AbstractIdentificationEditorInput<
          propertyPathsMap.put("children", polytomousKeyNodePropertyPaths); //$NON-NLS-1$
          return propertyPathsMap;
     }
-
-}
+}
\ No newline at end of file
index 8fdae73ce74d023c4fc1dd2a268e04b8e0fceb14..b8d99052c3739d85f443925759b76671c761e302 100644 (file)
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.taxeditor.editor.key.polytomous;
 
 import java.util.ArrayList;
@@ -21,10 +20,8 @@ import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
 
 /**
- *
  * @author n.hoffmann
  * @created Mar 30, 2011
- * @version 1.0
  */
 public class PolytomousKeyGraphContentProvider implements IGraphContentProvider {
 
@@ -81,5 +78,4 @@ public class PolytomousKeyGraphContentProvider implements IGraphContentProvider
        public Object getDestination(Object relationship) {
                return ((PolytomousKeyRelationship) relationship).getDestination();
        }
-
-}
+}
\ No newline at end of file
index 069b08036826cf7cd3283ae0f89bb038bb6cfba0..971d871469fc7aff72735d60372ae0f7c0678752 100644 (file)
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.taxeditor.editor.key.polytomous;
 
 import java.util.Map;
@@ -30,7 +29,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  * @author n.hoffmann
  * @created Mar 30, 2011
- * @version 1.0
  */
 public class PolytomousKeyLabelProvider extends LabelProvider implements
                IEntityStyleProvider {
@@ -95,105 +93,49 @@ public class PolytomousKeyLabelProvider extends LabelProvider implements
                return EMPTY;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.zest.core.viewers.IEntityStyleProvider#fisheyeNode(java.lang
-        * .Object)
-        */
        @Override
        public boolean fisheyeNode(Object arg0) {
                // TODO Auto-generated method stub
                return false;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.zest.core.viewers.IEntityStyleProvider#getBackgroundColour
-        * (java.lang.Object)
-        */
        @Override
        public Color getBackgroundColour(Object arg0) {
                // TODO Auto-generated method stub
                return null;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.zest.core.viewers.IEntityStyleProvider#getBorderColor(java
-        * .lang.Object)
-        */
        @Override
        public Color getBorderColor(Object arg0) {
                // TODO Auto-generated method stub
                return null;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.zest.core.viewers.IEntityStyleProvider#getBorderHighlightColor
-        * (java.lang.Object)
-        */
        @Override
        public Color getBorderHighlightColor(Object arg0) {
                // TODO Auto-generated method stub
                return null;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.zest.core.viewers.IEntityStyleProvider#getBorderWidth(java
-        * .lang.Object)
-        */
        @Override
        public int getBorderWidth(Object arg0) {
                return 0;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.zest.core.viewers.IEntityStyleProvider#getForegroundColour
-        * (java.lang.Object)
-        */
        @Override
        public Color getForegroundColour(Object arg0) {
                // TODO Auto-generated method stub
                return null;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.zest.core.viewers.IEntityStyleProvider#getNodeHighlightColor
-        * (java.lang.Object)
-        */
        @Override
        public Color getNodeHighlightColor(Object arg0) {
                // TODO Auto-generated method stub
                return null;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.zest.core.viewers.IEntityStyleProvider#getTooltip(java.lang
-        * .Object)
-        */
        @Override
        public IFigure getTooltip(Object arg0) {
                return null;
        }
-}
+}
\ No newline at end of file
index 52e84529d8395576560e6aacc3f980cc71066469..01452c5523dd2fb8a52e776f59da08a4635a957b 100644 (file)
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.taxeditor.editor.key.polytomous;
 
 import java.util.ArrayList;
@@ -21,38 +20,18 @@ import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 /**
  * @author n.hoffmann
  * @created Apr 4, 2011
- * @version 1.0
  */
 public class PolytomousKeyListContentProvider implements
                IStructuredContentProvider {
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-        */
        @Override
        public void dispose() {
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface
-        * .viewers.Viewer, java.lang.Object, java.lang.Object)
-        */
        @Override
        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java
-        * .lang.Object)
-        */
        @Override
        public Object[] getElements(Object inputElement) {
                if (inputElement instanceof PolytomousKeyEditorInput) {
@@ -80,4 +59,4 @@ public class PolytomousKeyListContentProvider implements
                        }
                }
        }
-}
+}
\ No newline at end of file
index 8e865047b105f855cdc295ca99629f9797d04a39..cff206b25b9b24b40840d4bda6267670260fd0b6 100644 (file)
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.taxeditor.editor.key.polytomous;
 
 import java.util.Map;
@@ -33,7 +32,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author n.hoffmann
  * @created Apr 18, 2011
- * @version 1.0
  */
 public class PolytomousKeyListLabelProvider extends StyledCellLabelProvider {
 
@@ -209,5 +207,4 @@ public class PolytomousKeyListLabelProvider extends StyledCellLabelProvider {
        private boolean isParentRoot(PolytomousKeyNode node) {
                return getParent(node) == null;
        }
-
-}
+}
\ No newline at end of file
index 641d8b2b175bedafec831d79abdc922fdad9da49..3e726b6db9666872e2737790396ec73926e7de60 100644 (file)
@@ -35,7 +35,6 @@ import eu.etaxonomy.taxeditor.operation.e4.RemotingCdmHandlerE4;
 /**
  * @author n.hoffmann
  * @created Dec 6, 2010
- * @version 1.0
  */
 public class DeleteNodeHandlerE4 extends RemotingCdmHandlerE4 {
 
@@ -136,9 +135,6 @@ public class DeleteNodeHandlerE4 extends RemotingCdmHandlerE4 {
     public void onComplete() {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     protected Object getTrigger() {
         return this;
@@ -152,5 +148,4 @@ public class DeleteNodeHandlerE4 extends RemotingCdmHandlerE4 {
         menuItem.setVisible(canExecute);
         return canExecute;
     }
-
 }
\ No newline at end of file
index 55fb7a9c1711254964e0ef969ffe37f8002d95c5..21d2a86c319828b3c57915bb3cea89045d5d17fb 100644 (file)
@@ -193,7 +193,6 @@ public class Messages extends NLS {
     public static String KeyEditor_LIST;
     public static String KeyEditor_SAVING;
     public static String MediaViewPart_MEDIA;
-    public static String MisapplicationContainer_SEC_REF_REQUIRED;
     public static String MoveDerivateOperation_MOVE_NOT_POSSIBLE;
     public static String MoveDerivateOperation_MOVE_TO_NOT_POSSIBLE;
     public static String MoveDescriptionElementsHandler_CHOOSE_ACC_TAXON;
index 6cd92a4c93c933b503315295bb3bfecc31e685c3..75ba1346b7a760865b70f126ac401f7013910b03 100644 (file)
@@ -165,7 +165,6 @@ ConceptContainer_SEC_REQUIRED=This taxon requires a sec. reference.
 EditorAnnotation_ERROR=Error: 
 EditorAnnotation_WARNING=Warning: 
 IContainerConstants_CLICK_ADD_NAME=Click to add name
-MisapplicationContainer_SEC_REF_REQUIRED=This misapplication requires a sec. reference.
 SynonymContainer_SYNONYM_NULL_NAME=Synonym with a null name detected. This should never happen.
 NameEditorDropTargetListener_CHANGE=Change
 NameEditorDropTargetListener_CHANGE_ACC_TAXON=Change accepted Taxon
@@ -187,7 +186,7 @@ ChangeConceptToSynonymOperation_MULTI_REPS_MESSAGE=There are multiple relations
 ChangeSynonymToAcceptedTaxonOperation_INCONSISTENT_DATA=Operation may lead to inconsistent data
 ChangeSynonymToAcceptedTaxonOperation_NOT_IMPLEMENTED=Not yet implemented
 ChangeSynonymToAcceptedTaxonOperation_DifferentSec=Different Secundum Reference
-ChangeSynonymToAcceptedTaxonOperation_DifferentSec_Message=The new taxon and the parent does not have the same secundum reference.
+ChangeSynonymToAcceptedTaxonOperation_DifferentSec_Message=The new taxon and the parent do not have the same secundum reference.
 CharacterEditor_CANNOT_PERFORM_MESSAGE=You have to select a structure, a property and a character tree to perform this action.
 CharacterEditor_CANNOT_PERFORM_TITLE=Cannot perform action
 CharacterEditor_CHARACTERS=Characters:
index 17e615777a2ecf4363e5bbb6e62cf7ba2e8681ae..530d52b80f76db9e8874bfbe13cad3ba073748fa 100644 (file)
@@ -164,7 +164,6 @@ ConceptContainer_SEC_REQUIRED=Dieses Taxon ben
 EditorAnnotation_ERROR=Error: 
 EditorAnnotation_WARNING=Warnung: 
 IContainerConstants_CLICK_ADD_NAME=Klicken, um Namen hinzuzufügen
-MisapplicationContainer_SEC_REF_REQUIRED=Diese Fehlanwendung benötigt eine sec. Referenz.
 SynonymContainer_SYNONYM_NULL_NAME=Synonym mit einem null-Namen entdeckt. Das sollte nicht passieren.
 NameEditorDropTargetListener_CHANGE=Ändern
 NameEditorDropTargetListener_CHANGE_ACC_TAXON=Ändere akzeptiertes Taxon
index 550ec6f7e60a297aab11260375735dcc3cc12e62..ae606c645ebc0911970f4d66011b93d88ef1cca3 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.editor.name.container;
 
 import org.eclipse.swt.graphics.Image;
@@ -17,12 +16,9 @@ import eu.etaxonomy.taxeditor.model.ImageResources;
 /**
  * @author n.hoffmann
  * @created Jan 20, 2011
- * @version 1.0
  */
 public interface IContainerConstants {
-       /**
-        *
-        */
+
        public static final int SELECTED_FOCUS = 1;
        /** Constant <code>SELECTED_NO_FOCUS=2</code> */
        public static final int SELECTED_NO_FOCUS = 2;
index 969e7ae7b9482ea54618ac22055555198a6a03e5..f47fbbeed4c6315e32d38e82ccd4e45dbc95d479 100644 (file)
@@ -6,15 +6,11 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.editor.name.container;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Scanner;
 
 import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.VerifyEvent;
 import org.eclipse.swt.events.VerifyListener;
 
@@ -42,12 +38,9 @@ import org.eclipse.swt.events.VerifyListener;
  *
  * @author p.ciardelli
  * @created 19.05.2008
- * @version 1.0
  */
-
 public abstract class LineBreakListener implements VerifyListener{
 
-
        private static String LINE_BREAK = System.getProperty("line.separator"); //$NON-NLS-1$
        
        
@@ -108,4 +101,4 @@ public abstract class LineBreakListener implements VerifyListener{
         * @param text a {@link java.lang.String} object.
         */
        abstract public void handleSplitText(String text);
-}
+}
\ No newline at end of file
index ec83e5f59cc787ae378fac2f606f87cbc7957c51..670ca6c319da0ad6c11669c7af47253087233c77 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.editor.name.container;
 
 import org.apache.log4j.Logger;
@@ -27,7 +26,6 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
  *
  * @author p.ciardelli
  * @created 19.05.2008
- * @version 1.0
  */
 public class LineWrapSupport {
        private static final Logger logger = Logger
@@ -84,7 +82,6 @@ public class LineWrapSupport {
         * 
         * @author p.ciardelli
         * @created 21.05.2008
-        * @version 1.0
         */
        class LineWrapListener implements ModifyListener {
 
@@ -92,4 +89,4 @@ public class LineWrapSupport {
                        checkLineCount();
                }
        }
-}
+}
\ No newline at end of file
index 09e6ecde7a153071bfe089429d5c826e44a295bb..2c46c32722a520e52e58bcc1f9a7404d27773123 100644 (file)
@@ -6,7 +6,6 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-
 package eu.etaxonomy.taxeditor.editor.name.e4;
 
 import java.util.ArrayList;
@@ -40,7 +39,6 @@ import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTarget;
@@ -115,13 +113,12 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
     private ManagedForm managedForm;
     private ScrolledForm scrolledForm;
     private Composite parent;
-    private ISelectionProvider simpleSelectionProvider;
     @Inject
     private EModelService modelService;
 
     @Inject
     private EPartService partService;
-    private TaxonBase selection;
+    private TaxonBase<?> selection;
 
     private ConversationHolder conversation;
 
@@ -172,7 +169,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         createManagedForm(parent);
 
         TaxeditorPartService.getInstance().addListener(TaxeditorPartService.PART_ACTIVATED, this);
-
     }
 
     protected void createManagedForm(Composite composite) {
@@ -237,7 +233,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         parent.pack();
         managedForm.refresh();
         managedForm.reflow(true);
-
     }
 
     @Override
@@ -284,8 +279,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         // check permissions
         boolean doEnable = permissionsSatisfied();
         managedForm.getForm().setEnabled(doEnable);
-
-
     }
 
     @Override
@@ -295,7 +288,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
             TaxonNode taxonNode = input.getTaxonNode();
             doEnable = CdmStore.currentAuthentiationHasPermission(taxonNode,
                     RequiredPermissions.TAXON_EDIT);
-
         }
         return doEnable;
     }
@@ -414,7 +406,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
 
             // Otherwise declare this step as done.
             monitor.worked(1);
-
         }
         input.setSync(sync);
         input.merge();
@@ -663,8 +654,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         setEnabled(false, disabledColor);
     }
 
-
-
     protected void setEnabled(boolean enabled, Color background) {
 
         for (AbstractGroupedContainerE4<?> groupedContainer : getGroupedContainers()) {
@@ -762,9 +751,8 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
             this.redraw(false, true, true, true);
             this.setDirty();
             if (cdmbase instanceof TaxonBase) {
-                this.selection = (TaxonBase) cdmbase;
+                this.selection = (TaxonBase<?>) cdmbase;
             }
-
         }
     }
 
@@ -809,9 +797,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
                 // check for match in type designations
                 .anyMatch(unit -> typeDesignationSpecimens.contains(unit))) {
             EditorUtil.updateEditor(this.input.getTaxonNode(), this);
-
         }
-
     }
 
     @Override
@@ -825,4 +811,4 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
     public TaxonNode getTaxonNode() {
         return input.getTaxonNode();
     }
-}
+}
\ No newline at end of file
index de28d1da49d5bf8f1cc68d873146df7178dea821..6b5eae4df0bb843456c11d13267c68341198a19b 100755 (executable)
@@ -20,8 +20,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;
 import eu.etaxonomy.cdm.strategy.cache.TaggedText;
-import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.container.EditorAnnotation;
 import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
 import eu.etaxonomy.taxeditor.editor.name.e4.container.MisappliedGroupE4.ConceptType;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -101,10 +99,6 @@ public class ConceptContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 
        @Override
        public void showAnnotations() {
-               if(getData().getSec() == null){
-                       getNameViewer().addAnnotation(
-                                       new EditorAnnotation(0, Messages.MisapplicationContainer_SEC_REF_REQUIRED));
-               }
                super.showAnnotations();
        }
 
index 0cb60348c3ad622c4746976a9c3db15a0934757c..e65ac197c54643748003aa42a51d348e93c655ed 100755 (executable)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.editor.view.checklist;
 
 import org.eclipse.jface.viewers.Viewer;
@@ -17,7 +16,6 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 /**
  * @author a.oppermann
  * @created 30.04.2014
- * @version 1.0
  */
 public class ChecklistEditorComparator extends ViewerComparator {
 
@@ -42,9 +40,6 @@ public class ChecklistEditorComparator extends ViewerComparator {
                }
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-        */
        @Override
        public int compare(Viewer viewer, Object e1, Object e2) {
          Taxon d1 = (Taxon) e1;
@@ -64,4 +59,4 @@ public class ChecklistEditorComparator extends ViewerComparator {
                }
                return result;
        }
-}
+}
\ No newline at end of file
index 795b45df28fcb9b6a5e366c2cbdff4d1c61bb313..52712944e8a1fc9ab0fce4d5bd123577749f055b 100644 (file)
@@ -28,25 +28,23 @@ import eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
- *
  * @author a.oppermann
  * @date 25.04.2014
- *
  */
-public class ChecklistEditorInput extends CdmEntitySessionInput implements IPersistable {
+public class ChecklistEditorInput extends CdmEntitySessionInput<TaxonNode> implements IPersistable {
 
     /**
      * The selected classification
      */
     private TaxonNode taxonNode = null;
 
-    private List<TaxonBase> taxa = new ArrayList();
+    private List<TaxonBase> taxa = new ArrayList<>();
 
     private Classification classification = null;
 
     private final ConversationHolder conversation;
 
-    private List<TaxonBase> taxaToSave = new ArrayList();
+    private List<TaxonBase> taxaToSave = new ArrayList<>();
 
 
     /**
@@ -64,10 +62,6 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
 
     }
 
-
-    /**
-     * @param taxonNode2
-     */
     private void getChildTaxa(TaxonNode taxonNode2) {
        taxonNode2.removeNullValueFromChildren();
        if (taxonNode2.hasChildNodes()){
@@ -77,8 +71,6 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
                getChildTaxa(node);
            }
        }
-
-
     }
 
     /**
@@ -94,8 +86,6 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
 
     }
 
-
-
     public List<TaxonBase> getTaxa() {
                return taxa;
        }
@@ -108,33 +98,18 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
         }
     }
 
-
-    /**
-     * @return the taxonNode
-     */
     public TaxonNode getTaxonNode() {
         return taxonNode;
     }
 
-    /**
-     * @return classification
-     */
     public Classification getClassification(){
        return classification;
     }
 
-//    /**
-//     * @return the conversationHolder
-//     */
 //    public ConversationHolder getConversationHolder() {
 //        return conversationHolder;
 //    }
 
-
-
-//    /* (non-Javadoc)
-//     * @see java.lang.Object#hashCode()
-//     */
 //    @Override
 //    public int hashCode() {
 //        final int prime = 31;
@@ -144,9 +119,6 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
 //        return result;
 //    }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
@@ -176,9 +148,6 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
         return true;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento)
-     */
     @Override
     public void saveState(IMemento memento) {
         UUID uuid = classification.getUuid();
@@ -192,17 +161,11 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
         CdmStore.getService(ITaxonService.class).merge(taxaToSave, true);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getRootEntities()
-     */
     @Override
     public List<TaxonNode> getRootEntities() {
         return Arrays.asList(taxonNode);
     }
 
-    /**
-     * @return the conversation
-     */
     public ConversationHolder getConversation() {
         return conversation;
     }
@@ -231,13 +194,11 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
         return taxonBasePropertyPaths;
     }
 
-
        public void setTaxa(List<TaxonBase> taxonList) {
                this.taxa = taxonList;
 
        }
 
-
     /**
      * @param element
      */
@@ -254,4 +215,4 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IPers
 //     super.dispose();
 //    }
 
-}
+}
\ No newline at end of file
index 7b7f949883d2e67571284e74d2f66f76971affad..79e86e20e808a0096952a2ca7b28d7663c605d45 100755 (executable)
@@ -15,9 +15,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
-
-import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.nebula.widgets.nattable.data.IColumnPropertyAccessor;
 
 import eu.etaxonomy.cdm.api.service.dto.TaxonDistributionDTO;
@@ -29,26 +26,20 @@ import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.taxeditor.event.EventUtility;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 
-
 /**
  * @author k.luther
  * @since 28.11.2018
- *
  */
 public class DistributionColumnAccessor implements IColumnPropertyAccessor<TaxonDistributionDTO> {
-    private DistributionEditor editor;
+
     public static final String DEFAULT_ENTRY = "";
-    @Inject
-    private IEventBroker eventBroker;
+
+    private DistributionEditor editor;
 
     public DistributionColumnAccessor(DistributionEditor editor) {
         this.editor = editor;
     }
 
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Object getDataValue(TaxonDistributionDTO rowObject, int columnIndex) {
 //     editor.setActualNameCache(rowObject.getNameCache());
@@ -92,35 +83,21 @@ public class DistributionColumnAccessor implements IColumnPropertyAccessor<Taxon
 
     }
 
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public int getColumnCount() {
         return editor.getPropertyToLabelMap().size();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public String getColumnProperty(int columnIndex) {
         return editor.getPropertyToLabelMap().get(columnIndex);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public int getColumnIndex(String propertyName){
         return editor.getPropertyToLabelMap().indexOf(propertyName);
     }
 
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void setDataValue(TaxonDistributionDTO taxonWrapper, int columnIndex, Object newValue) {
         if (newValue instanceof StatusHelper){
@@ -176,7 +153,5 @@ public class DistributionColumnAccessor implements IColumnPropertyAccessor<Taxon
             }
 
             EventUtility.postEvent(WorkbenchEventConstants.REFRESH_DETAILS, true);
-
     }
-
-}
+}
\ No newline at end of file
index 0754fe5f0b7a531e094ae15421a1c8d03a13f451..35ff115c3477cbf903f84467ef8357ee9e40927b 100755 (executable)
@@ -20,11 +20,8 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.UUID;
 
-import javax.inject.Inject;
-
 import org.apache.commons.collections4.map.LinkedMap;
 import org.apache.log4j.Logger;
-import org.eclipse.e4.ui.services.EMenuService;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.wizard.WizardDialog;
@@ -76,6 +73,9 @@ import ca.odell.glazedlists.EventList;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.api.service.dto.TaxonDescriptionDTO;
 import eu.etaxonomy.cdm.api.service.dto.TaxonDistributionDTO;
+import eu.etaxonomy.cdm.compare.term.OrderedTermComparator;
+import eu.etaxonomy.cdm.compare.term.TermIdInVocabularyComparator;
+import eu.etaxonomy.cdm.compare.term.TermLanguageComparator;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
@@ -86,13 +86,9 @@ import eu.etaxonomy.cdm.model.metadata.TermOrder;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.model.term.OrderedTermBase;
-import eu.etaxonomy.cdm.model.term.OrderedTermComparator;
 import eu.etaxonomy.cdm.model.term.Representation;
-import eu.etaxonomy.cdm.model.term.TermIdInVocabularyComparator;
-import eu.etaxonomy.cdm.model.term.TermLanguageComparator;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.IDistributionEditor;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -101,16 +97,16 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.preference.wizard.AvailableDistributionWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.ReferenceSelectionDialog;
 
 /**
  * @author k.luther
  * @since 27.11.2018
- *
  */
 public class DistributionEditor extends Composite implements IDistributionEditor{
 
+    @SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(DistributionEditor.class);
 
     private static final String DISTRIBUTION_EDITOR = "Distribution Editor"; //$NON-NLS-1$
     private static final String LOADING_TAXA = Messages.ChecklistEditor_LOAD_TAXA;
@@ -122,52 +118,39 @@ public class DistributionEditor extends Composite implements IDistributionEditor
     static final String RANK_COLUMN = "collector_column";//$NON-NLS-1$
     static final String SYNONYM_COLUMN = "synonym_column";//$NON-NLS-1$
 
-    private static final Logger logger = Logger.getLogger(DistributionEditor.class);
-    @Inject
-    private EMenuService menuService;
+
     private NatTable natTable;
     private Label statusLabel;
     private Label statusLabelSourceReference;
     private Reference defaultSource;
 
-    private Map<Integer, NamedArea> areaToColumnIndexMap= new HashMap();
+    private Map<Integer, NamedArea> areaToColumnIndexMap= new HashMap<>();
     private int firstDataColumnIndex;
 
     private ListDataProvider<TaxonDistributionDTO> bodyDataProvider;
     private LinkedMap<String, String> propertyToLabelMap = new LinkedMap<>();
 
     private boolean isShowRank = false;
-    private Integer countNodes;
     private Text searchText;
 
-    Button button3;
-    Button button2;
-
-    EventList<TaxonDistributionDTO> taxonList;
-    String actualNameCache = null;
-    Map<UUID,Map<NamedArea,Set<DescriptionElementBase>>> taxonDistributionMap = new HashMap<>();
+    private Button button3;
+    private Button button2;
 
-    List<TaxonDistributionDTO> descriptionsToSave = new ArrayList<>();
+    protected EventList<TaxonDistributionDTO> taxonList;
+    private String actualNameCache;
+    protected Map<UUID,Map<NamedArea,Set<DescriptionElementBase>>> taxonDistributionMap = new HashMap<>();
 
+    protected List<TaxonDistributionDTO> descriptionsToSave = new ArrayList<>();
 
-    SortedSet<DefinedTermBase> areas;
-    DistributionEditorPart part;
-    BodyLayerStack<TaxonDistributionDTO> bodyLayerStack;
+    protected SortedSet<DefinedTermBase> areas;
+    protected DistributionEditorPart part;
+    private BodyLayerStack<TaxonDistributionDTO> bodyLayerStack;
     private FreezeLayer freezeLayer;
     private ConfigRegistry configRegistry;
     private AbstractLayer topMostLayer;
 
     private SelectionLayer selectionLayer;
 
-
-
- //  private FixedSummaryRowLayer summaryRowLayer;
-
-
-    /**
-     * @param parent
-     * @param style
-     */
     public DistributionEditor(Composite parent, DistributionEditorPart part) {
         super(parent, SWT.NULL);
         isShowRank = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowRankInDistributionEditor.getKey());
@@ -178,8 +161,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         Composite topComposite = new Composite(parent, SWT.NONE);
         createTopComposite(topComposite);
 
-
-
         natTable = new NatTable(parent, false);
         parent.pack();
 
@@ -225,12 +206,10 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         return areaToColumnIndexMap;
     }
 
-
     public void setAreaToColumnIndexMap(Map<Integer, NamedArea> areaToColumnIndexMap) {
         this.areaToColumnIndexMap = areaToColumnIndexMap;
     }
 
-
     public List<TaxonDistributionDTO> getDescriptionsToSave() {
         return descriptionsToSave;
     }
@@ -239,8 +218,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         this.descriptionsToSave = descriptionsToSave;
     }
 
-
-
     private void createStatusBar(Composite composite) {
         GridData gridData = new GridData();
         gridData.horizontalSpan = 2;
@@ -266,8 +243,7 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         statusLabelSourceReference.setLayoutData(gridData);
 
         if (defaultSource != null){
-            statusLabelSourceReference.setText(Messages.DistributionEditor_defaultSource + defaultSource.getAbbrevTitle() != null? defaultSource.getAbbrevTitle() : defaultSource.getAbbrevTitleCache());
-
+            statusLabelSourceReference.setText(Messages.DistributionEditor_defaultSource + (defaultSource.getAbbrevTitle() != null? defaultSource.getAbbrevTitle() : defaultSource.getAbbrevTitleCache()));
         }
 
         button3 = new Button(composite, SWT.PUSH );
@@ -290,13 +266,12 @@ public class DistributionEditor extends Composite implements IDistributionEditor
                 }
                 statusLabelSourceReference.setText(defaultSourceStr);
 
-                button3.setBackground(EditorUtil.getColor(Resources.COLOR_CONTROL_SELECTED));
+                button3.setBackground(AbstractUtility.getColor(Resources.COLOR_CONTROL_SELECTED));
                 button3.setEnabled(false);
                 button2.setText(Messages.ChecklistEditor_DEFAULT_SOURCE);
             }
 
         });
-
     }
 
     private void applyStyles(){
@@ -308,7 +283,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         configuration.cHeaderBgColor = GUIHelper.getColor(211, 211, 211);
         configuration.rHeaderBgColor = GUIHelper.getColor(211, 211, 211);
         natTable.addConfiguration(configuration);
-
     }
 
     private void configureNatTable(ConfigRegistry configRegistry,
@@ -318,8 +292,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
          */
         natTable.setConfigRegistry(configRegistry);
 
-
-
         //add default configuration because autoconfigure is set to false in constructor
         natTable.addConfiguration(new DefaultNatTableStyleConfiguration());
 
@@ -348,7 +320,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         // add custom configuration for data conversion and add column labels to viewport layer
         topMostLayer.addConfiguration(new DistributionCellEditorDataConversionConfiguration(this));
 
-
         applyStyles();
         natTable.configure();
     }
@@ -357,7 +328,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         /**
          * layers
          */
-
         createLayers();
 
         /**
@@ -378,21 +348,17 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         this.layout();
         natTable.doCommand(new ClientAreaResizeCommand(natTable));
       //  boolean ok = natTable.doCommand(new ClientAreaResizeCommand(natTable));
-
     }
 
-
     private void createLayers() {
 
         DistributionColumnAccessor columnPropertyAccessor = new DistributionColumnAccessor(this);
-
         DistributionEditorConfigLabelAccumulator labelAccumulator = new DistributionEditorConfigLabelAccumulator(this);
-        bodyLayerStack = new BodyLayerStack<>(taxonList, columnPropertyAccessor, new TaxonDistributionDtoComparator(), labelAccumulator);
 
+//        bodyLayerStack = new BodyLayerStack<>(taxonList, columnPropertyAccessor, new TaxonDistributionDtoComparator(), labelAccumulator);
+        bodyLayerStack = new BodyLayerStack<>(taxonList, columnPropertyAccessor, null, labelAccumulator);
         bodyDataProvider = bodyLayerStack.getBodyDataProvider();
 
-
-
         propertyToLabelMap.put(TAXON_COLUMN, Messages.ChecklistEditor_TAXON);
         if (isShowRank){
             propertyToLabelMap.put(RANK_COLUMN, Messages.ChecklistEditor_RANK);
@@ -405,8 +371,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         initLabels();
         this.selectionLayer = bodyLayerStack.getSelectionLayer();
 
-
-
         freezeLayer = new FreezeLayer(selectionLayer);
         final CompositeFreezeLayer compositeFreezeLayer = new CompositeFreezeLayer(
                 freezeLayer,  bodyLayerStack.getViewPortLayer(), selectionLayer);
@@ -417,7 +381,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         // is working correctly
         compositeFreezeLayer.setRegionName(GridRegion.BODY);
 
-
         IDataProvider columnHeaderDataProvider =
                 new DefaultColumnHeaderDataProvider(propertyToLabelMap.values().toArray(new String[] {}), propertyToLabelMap);
         DataLayer columnHeaderDataLayer = new DefaultColumnHeaderDataLayer(columnHeaderDataProvider);
@@ -436,8 +399,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
                         columnHeaderDataLayer.getDataProvider(),
                         configRegistry);
 
-
-
      // build the row header layer stack
         IDataProvider rowHeaderDataProvider = new DefaultRowHeaderDataProvider(bodyDataProvider);
         DataLayer rowHeaderDataLayer = new DefaultRowHeaderDataLayer(rowHeaderDataProvider);
@@ -446,8 +407,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
             compositeFreezeLayer,
             selectionLayer);
 
-
-
         IDataProvider cornerDataProvider =
                 new DefaultCornerDataProvider(
                     columnHeaderDataProvider,
@@ -465,17 +424,9 @@ public class DistributionEditor extends Composite implements IDistributionEditor
                 cornerLayer);
 
         natTable.setLayer(gridLayer);
-
-
         topMostLayer = compositeFreezeLayer;
-
-
     }
 
-    /**
-     * @param parent
-     * @return
-     */
     private Text createSearchBar(Composite parent) {
 
         Button button1 = new Button(parent, SWT.PUSH );
@@ -485,14 +436,13 @@ public class DistributionEditor extends Composite implements IDistributionEditor
 
         button1.setLayoutData(gridData2);
 
-
         button1.setText(Messages.ChecklistEditor_DIST_STATUS);
         button1.setToolTipText(Messages.ChecklistEditor_DIST_STATUS_TOOLTIP);
         button1.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
                 AvailableDistributionWizard availableDistributionWizard = new AvailableDistributionWizard();
-                WizardDialog dialog = new WizardDialog(StoreUtil.getShell(),
+                WizardDialog dialog = new WizardDialog(AbstractUtility.getShell(),
                         availableDistributionWizard);
 
                 int open = dialog.open();
@@ -522,18 +472,13 @@ public class DistributionEditor extends Composite implements IDistributionEditor
                 }
                 statusLabelSourceReference.setText(defaultSourceStr);
 
-                button2.setBackground(EditorUtil.getColor(Resources.COLOR_CONTROL_SELECTED));
+                button2.setBackground(AbstractUtility.getColor(Resources.COLOR_CONTROL_SELECTED));
 //                EventUtility.postEvent(WorkbenchEventConstants.REFRESH_DETAILS, true);
                 button3.setEnabled(true);
                 button2.setText(Messages.ChecklistEditor_SWITCH_DEFAULT_SOURCE);
             }
-
         });
 
-
-
-
-
         parent.pack();
         return searchText;
     }
@@ -544,7 +489,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
     * <b>Notice:</b> for data update please use <b>refresh()</b>
     *
     */
-   @SuppressWarnings({ "unchecked", "rawtypes" })
    public void reload(){
        this.areaToColumnIndexMap.clear();
        this.areas.clear();
@@ -553,9 +497,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
        natTable.redraw();
     }
 
-    /**
-     * @param parent
-     */
     private void createTopComposite(Composite parent) {
         GridLayout gridLayout = new GridLayout(3, false);
         gridLayout.marginWidth = 0;
@@ -575,44 +516,39 @@ public class DistributionEditor extends Composite implements IDistributionEditor
             this.taxonList = new BasicEventList<>();
         }
        taxonList.stream().forEach(wrapper->DistributionEditor.this.taxonList.add(wrapper));
-       statusLabel.setText(ELEMENT_COUNT + (taxonList != null ? taxonList.size() : UNKNOWN));
+       statusLabel.setText(ELEMENT_COUNT + taxonList.size());
        createTaxonDistributionMap();
     }
 
     protected void createTaxonDistributionMap() {
         Iterator<TaxonDistributionDTO> iterator = this.taxonList.iterator();
-           while (iterator.hasNext()){
-               TaxonDistributionDTO dto = iterator.next();
-               TaxonDescriptionDTO descriptionDto = dto.getDescriptionsWrapper();
-               for (TaxonDescription desc: descriptionDto.getDescriptions()){
-                   if(this.part.getCdmEntitySession()!=null){
-                       this.part.getCdmEntitySession().load(desc, true);
-                   }
-                   for (DescriptionElementBase descElement: desc.getElements()){
-                       if (descElement instanceof Distribution){
-                           Map<NamedArea, Set<DescriptionElementBase>> distributionsMap = taxonDistributionMap.get(dto.getTaxonUuid());
-
-                           if (distributionsMap == null){
-                               distributionsMap = new HashMap();
-                               taxonDistributionMap.put(dto.getTaxonUuid(), distributionsMap);
-                           }
-                           Set<DescriptionElementBase> distributions = distributionsMap.get(((Distribution) descElement).getArea());
-                           if (distributions == null){
-                               distributions = new HashSet();
-                               distributionsMap.put(((Distribution)descElement).getArea(), distributions);
-                           }
-                           distributions.add(descElement);
-
-                       }
-                   }
-               }
-           }
+        while (iterator.hasNext()){
+            TaxonDistributionDTO dto = iterator.next();
+            TaxonDescriptionDTO descriptionDto = dto.getDescriptionsWrapper();
+            for (TaxonDescription desc: descriptionDto.getDescriptions()){
+                if(this.part.getCdmEntitySession()!=null){
+                    this.part.getCdmEntitySession().load(desc, true);
+                }
+                for (DescriptionElementBase descElement: desc.getElements()){
+                    if (descElement instanceof Distribution){
+                        Map<NamedArea, Set<DescriptionElementBase>> distributionsMap = taxonDistributionMap.get(dto.getTaxonUuid());
+
+                        if (distributionsMap == null){
+                            distributionsMap = new HashMap<>();
+                            taxonDistributionMap.put(dto.getTaxonUuid(), distributionsMap);
+                        }
+                        Set<DescriptionElementBase> distributions = distributionsMap.get(((Distribution) descElement).getArea());
+                        if (distributions == null){
+                            distributions = new HashSet<>();
+                            distributionsMap.put(((Distribution)descElement).getArea(), distributions);
+                        }
+                        distributions.add(descElement);
+                    }
+                }
+            }
+        }
     }
 
-
-
-
-
     private void initLabels() {
 
         int index = 2;
@@ -624,7 +560,7 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         if (areas == null){
             areas = new TreeSet<>();
         }
-        for (DefinedTermBase area: areas) {
+        for (DefinedTermBase<?> area: areas) {
             this.areaToColumnIndexMap.put(index++, (NamedArea)area);
             String areaLabel;
             //TODO: adapt to preference
@@ -655,12 +591,10 @@ public class DistributionEditor extends Composite implements IDistributionEditor
                 areaLabel = label;
             }
 
-
             //String areaLabel = area.getLabel();
             String property = area.getUuid().toString();
             propertyToLabelMap.put(property, areaLabel);
         }
-
     }
 
     private SortedSet<DefinedTermBase> loadNamedAreas() {
@@ -671,17 +605,15 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         Set<UUID> uuidList = new HashSet<UUID>();
         String[] split;
         List<String> listValue;
-        List<DefinedTermBase> termlist = new ArrayList<DefinedTermBase>();
+        List<DefinedTermBase> termlist = new ArrayList<>();
         if (values != null && values != "") { //$NON-NLS-1$
             split = values.split(";"); //$NON-NLS-1$
             listValue = Arrays.asList(split);
 
-
             UUID uuid;
             for(String s : listValue){
                 uuid = UUID.fromString(s);
                 uuidList.add(uuid);
-
             }
         }
 
@@ -693,25 +625,23 @@ public class DistributionEditor extends Composite implements IDistributionEditor
         }else{
             vocs= service.find(uuidList);
         }
-        for (TermVocabulary voc: vocs){
+        for (TermVocabulary<?> voc: vocs){
             termlist.addAll(service.getTerms(voc, null, null, null, null).getRecords());
         }
-        List<DefinedTermBase> filteredList = new ArrayList();
+        List<DefinedTermBase> filteredList = new ArrayList<>();
         if (valuesAreas != null && valuesAreas != "") {
             split = valuesAreas.split(";"); //$NON-NLS-1$
             listValue = Arrays.asList(split);
 
-            for (DefinedTermBase area: termlist){
+            for (DefinedTermBase<?> area: termlist){
                 if (listValue.contains(area.getUuid().toString())) {
                     filteredList.add(area);
                 }
-
             }
         }else{
             filteredList.addAll(termlist);
         }
 
-
         TermOrder sortOrder = PreferencesUtil.getSortNamedAreasInDistributionEditor();
         if (sortOrder.equals(TermOrder.Natural)){
             areas =  getTermsOrderedByVocabularyOrder(filteredList);
@@ -725,9 +655,8 @@ public class DistributionEditor extends Composite implements IDistributionEditor
     }
 
     public SortedSet<DefinedTermBase> getTermsOrderedByLabels(List<DefinedTermBase> listTerm,Language language){
-        TermLanguageComparator<?> comp = new TermLanguageComparator<>();
-        comp.setCompareLanguage(language);
-        SortedSet<DefinedTermBase> result = new TreeSet(comp);
+        TermLanguageComparator<DefinedTermBase> comp = new TermLanguageComparator<>(Language.DEFAULT(), language);
+        SortedSet<DefinedTermBase> result = new TreeSet<>(comp);
         if(listTerm != null){
             result.addAll(listTerm);
         }
@@ -736,9 +665,9 @@ public class DistributionEditor extends Composite implements IDistributionEditor
     }
 
     public SortedSet<DefinedTermBase> getTermsOrderedByIdInVocabulary(List<DefinedTermBase> namedAreas) {
-        TermIdInVocabularyComparator<?> comp = new TermIdInVocabularyComparator<>();
+        TermIdInVocabularyComparator<DefinedTermBase> comp = new TermIdInVocabularyComparator<>();
 
-        SortedSet<DefinedTermBase> result = new TreeSet(comp);
+        SortedSet<DefinedTermBase> result = new TreeSet<>(comp);
         if(namedAreas != null){
             result.addAll(namedAreas);
         }
@@ -746,15 +675,14 @@ public class DistributionEditor extends Composite implements IDistributionEditor
     }
 
     public SortedSet<DefinedTermBase> getTermsOrderedByVocabularyOrder(List<DefinedTermBase> listAreas){
-        HashMap<TermVocabulary<DefinedTermBase>, List<DefinedTermBase>> vocs = new HashMap<>();
-        OrderedTermComparator<?> comp = new OrderedTermComparator<>();
+        OrderedTermComparator<DefinedTermBase> comp = new OrderedTermComparator<>();
         boolean allOrderedTerms = true;
         List<TermVocabulary> alreadyOrderIndexNull = new ArrayList<>();
-        for (DefinedTermBase term: listAreas){
+        for (DefinedTermBase<?> term: listAreas){
             if (!(term instanceof OrderedTermBase)){
                 allOrderedTerms = false;
                 break;
-            }else if (((OrderedTermBase)term).getOrderIndex() == 0){
+            }else if (((OrderedTermBase<?>)term).getOrderIndex() == 0){
                 if(alreadyOrderIndexNull.contains(term.getVocabulary())) {
                     allOrderedTerms = false;
                     break;
@@ -766,19 +694,17 @@ public class DistributionEditor extends Composite implements IDistributionEditor
             }
         }
         if (allOrderedTerms){
-            SortedSet<DefinedTermBase> result = new TreeSet(comp.reversed());
+            SortedSet<DefinedTermBase> result = new TreeSet<>(comp.reversed());
             result.addAll(listAreas);
             return result;
         }else{
             return getTermsOrderedByLabels(listAreas, PreferencesUtil.getGlobalLanguage());
         }
-
-
     }
 
     private void registerHandlersAndListeners(AbstractLayer topMostLayer) {
         //selection listener
-        E4SelectionListener selectionListener = new DistributionCellSelectionListener(part.getSelectionService(),
+        E4SelectionListener<?> selectionListener = new DistributionCellSelectionListener(part.getSelectionService(),
                 selectionLayer, bodyDataProvider, part);
         selectionLayer.addLayerListener(selectionListener);
         selectionListener.setFullySelectedRowsOnly(false);
@@ -787,9 +713,6 @@ public class DistributionEditor extends Composite implements IDistributionEditor
       //  natTable.registerCommandHandler(toolbar.getDisplayPersistenceDialogCommandHandler());
     }
 
-    /**
-     * @return
-     */
     public IRowDataProvider<TaxonDistributionDTO> getBodyDataProvider() {
         return bodyDataProvider;
     }
@@ -810,7 +733,4 @@ public class DistributionEditor extends Composite implements IDistributionEditor
 //       loadDistributions(taxonList);
 //
 //    }
-
-
-
-}
+}
\ No newline at end of file
index 62a3ce57eaf8c27b8f737b3d2313e22bd23e0ec4..5dc908b28bffa002d6cc87dd46d6302ddd91e136 100755 (executable)
@@ -21,6 +21,7 @@ import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 
+import eu.etaxonomy.cdm.compare.taxon.TaxonNodeSortMode;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -52,6 +53,8 @@ import eu.etaxonomy.taxeditor.editor.IDistributionEditorPart;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
+import eu.etaxonomy.taxeditor.preference.NavigatorOrderEnum;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -60,10 +63,11 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 /**
  * @author k.luther
  * @since 28.11.2018
- *
  */
-public class DistributionEditorPart implements IE4SavablePart, IConversationEnabled, IDirtyMarkable,
-ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetails, IDistributionEditorPart{
+public class DistributionEditorPart
+        implements IE4SavablePart, IConversationEnabled, IDirtyMarkable,
+                       ICdmEntitySessionEnabled<DescriptionBase>, IPartContentHasSupplementalData,
+                       IPartContentHasDetails, IDistributionEditorPart {
 
     private static final List<String> TAXONNODE_PROPERTY_PATH = Arrays.asList(new String[] {
             "taxon", //$NON-NLS-1$
@@ -123,7 +127,7 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
     }
 
     public void init(UuidAndTitleCache nodeDto) {
-        List<UUID> uuidList = new ArrayList();
+        List<UUID> uuidList = new ArrayList<>();
         uuidList.add(nodeDto.getUuid());
         this.taxonList = CdmStore.getService(ITaxonNodeService.class).getTaxonDistributionDTO(uuidList, TAXONNODE_PROPERTY_PATH, true);
        // taxonList.stream().filter(taxonDistribution ->  CdmStore.currentAuthentiationHasPermission(taxonDistribution.getTaxonUuid(), RequiredPermissions.TAXONNODE_EDIT));
@@ -141,9 +145,24 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
     public void init(List<UuidAndTitleCache> uuidAndTitleCaches) {
         List<UUID> nodeUuids = new ArrayList<>();
         uuidAndTitleCaches.forEach(element -> nodeUuids.add(element.getUuid()));
-        this.taxonList = CdmStore.getService(ITaxonNodeService.class).getTaxonDistributionDTO(nodeUuids, TAXONNODE_PROPERTY_PATH, true);
-       // taxonList.stream().filter(taxonDistribution ->  CdmStore.currentAuthentiationHasPermission(taxonDistribution.getTaxonUuid(), RequiredPermissions.TAXONNODE_EDIT));
 
+        TaxonNodeSortMode sortMode = TaxonNodeSortMode.RankAndAlphabeticalOrder;
+        NavigatorOrderEnum orderValue = NavigatorOrderEnum.RankAndNameOrder;
+        try{
+            orderValue = PreferencesUtil.getSortNodes();
+        }catch(IllegalArgumentException e){
+
+        }
+
+        if (orderValue.equals(NavigatorOrderEnum.NaturalOrder)){
+            sortMode = TaxonNodeSortMode.NaturalOrder;
+        } else if (orderValue.equals(NavigatorOrderEnum.AlphabeticalOrder)){
+            sortMode = TaxonNodeSortMode.AlphabeticalOrder;
+        }else {
+            sortMode = TaxonNodeSortMode.RankAndAlphabeticalOrder;
+        }
+        this.taxonList = CdmStore.getService(ITaxonNodeService.class).getTaxonDistributionDTO(nodeUuids, TAXONNODE_PROPERTY_PATH,null, true, sortMode);
+        // taxonList.stream().filter(taxonDistribution ->  CdmStore.currentAuthentiationHasPermission(taxonDistribution.getTaxonUuid(), RequiredPermissions.TAXONNODE_EDIT));
 
         if(taxonList!=null){
             editor.loadDistributions(taxonList);
@@ -167,7 +186,6 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
             cdmEntitySession.bind();
         }
         EditorUtil.checkAndCloseFactsAndMediaParts(partService);
-
     }
 
     @Override
@@ -175,14 +193,11 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
         return editor;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void update(CdmDataChangeMap changeEvents) {
         // TODO Auto-generated method stub
-
     }
+
     @PreDestroy
     public void dispose(){
         if (conversation != null) {
@@ -194,66 +209,43 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
             cdmEntitySession = null;
         }
         dirty.setDirty(false);
-
     }
 
-
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public ICdmEntitySession getCdmEntitySession() {
-
         return cdmEntitySession;
     }
 
-
     @Override
     public List<DescriptionBase> getRootEntities() {
-        List<DescriptionBase> rootEntities = new ArrayList();
+        List<DescriptionBase> rootEntities = new ArrayList<>();
         editor.taxonList.forEach(dto -> rootEntities.addAll(dto.getDescriptionsWrapper().getDescriptions()));
         return rootEntities;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Map<Object, List<String>> getPropertyPathsMap() {
         // TODO Auto-generated method stub
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void changed(Object element) {
         if (element != null){
             dirty.setDirty(true);
         }
-
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void forceDirty() {
         // TODO Auto-generated method stub
-
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public ConversationHolder getConversationHolder() {
-
         return conversation;
     }
 
-
     @Persist
     @Override
     public void save(IProgressMonitor monitor) {
@@ -262,9 +254,9 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
     }
 
     protected void saveDistributions() {
-        Set<TaxonDistributionDTO> coll = new HashSet();
+        Set<TaxonDistributionDTO> coll = new HashSet<>();
         editor.getDescriptionsToSave().forEach(dto->coll.add(dto));
-        Set<TaxonDistributionDTO> removeList = new HashSet();
+        Set<TaxonDistributionDTO> removeList = new HashSet<>();
         for (TaxonDistributionDTO dto: coll){
             Taxon taxon = null;
             for(TaxonDescription desc: dto.getDescriptionsWrapper().getDescriptions()){
@@ -291,9 +283,6 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
         editor.getDescriptionsToSave().clear();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean isDirty() {
         return this.dirty.isDirty();
@@ -302,8 +291,4 @@ ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetail
     public void setDirty() {
         this.dirty.setDirty(true);
     }
-
-
-
-
-}
+}
\ No newline at end of file
index 407df7687bbcae655d8a099f9190290407866e86..45275e61da7b0c8aa6e4a67676ac27d94d6881f1 100755 (executable)
@@ -17,6 +17,10 @@ import java.util.UUID;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
 
+import eu.etaxonomy.cdm.compare.term.OrderedTermComparator;
+import eu.etaxonomy.cdm.compare.term.TermIdInVocabularyComparator;
+import eu.etaxonomy.cdm.compare.term.TermLanguageComparator;
+import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
@@ -25,10 +29,7 @@ import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
 import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
 import eu.etaxonomy.cdm.model.metadata.TermOrder;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
-import eu.etaxonomy.cdm.model.term.OrderedTermComparator;
 import eu.etaxonomy.cdm.model.term.Representation;
-import eu.etaxonomy.cdm.model.term.TermIdInVocabularyComparator;
-import eu.etaxonomy.cdm.model.term.TermLanguageComparator;
 import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -83,7 +84,7 @@ public class StatusComboBoxDataProvider implements IComboBoxDataProvider {
         if (!StringUtils.isBlank(statusString)){
 
             String [] statusArray = statusString.split(";");
-            List<UUID> uuidList = new ArrayList();
+            List<UUID> uuidList = new ArrayList<>();
             for (String status: statusArray){
                 uuidList.add(UUID.fromString(status));
             }
@@ -100,9 +101,9 @@ public class StatusComboBoxDataProvider implements IComboBoxDataProvider {
         TermOrder order = TermOrder.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.StatusSortedInDistributionEditor.getKey()));
 
         if (order.equals(TermOrder.IdInVoc)){
-            comp = new TermIdInVocabularyComparator();
+            comp = new TermIdInVocabularyComparator<DefinedTermBase>();
         }else if(order.equals(TermOrder.Label)){
-            comp = new TermLanguageComparator();
+            comp = new TermLanguageComparator<DefinedTermBase>(Language.DEFAULT(), Language.DEFAULT());
         }
         Collections.sort(inputList, comp);
 //        Collections.sort(inputList, Collections.reverseOrder());
@@ -118,5 +119,4 @@ public class StatusComboBoxDataProvider implements IComboBoxDataProvider {
     public int getMaxVisibleItems(){
         return maxVisibleItems;
     }
-
-}
+}
\ No newline at end of file
index afdc6d478a7e09e4c2f2f9528f7d127a45098605..2f70427ca1f8095db1e38a650350ca9c129c3997 100755 (executable)
@@ -11,44 +11,48 @@ package eu.etaxonomy.taxeditor.editor.view.checklist.e4;
 import java.util.Comparator;
 
 import eu.etaxonomy.cdm.api.service.dto.TaxonDistributionDTO;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByNameComparator;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByRankAndNameComparator;
 
 /**
  * @author k.luther
  * @since 28.11.2018
- *
  */
 public class TaxonDistributionDtoComparator implements Comparator<TaxonDistributionDTO> {
 
-    /**
-     * {@inheritDoc}
-     */
+    Comparator<TaxonNodeDto> comparator1 = new TaxonNodeDtoByRankAndNameComparator();
+    Comparator<TaxonNodeDto> comparator2 = new TaxonNodeDtoByNameComparator();
+
+    public TaxonDistributionDtoComparator(){
+        super();
+    }
+
     @Override
-    public int compare(TaxonDistributionDTO arg0, TaxonDistributionDTO arg1) {
-        if (arg0 == arg1){
-            return 0;
+    public int compare(TaxonDistributionDTO taxonDistr0, TaxonDistributionDTO taxonDistr1) {
+        //if node is higher in tree then return 1;
+        if (taxonDistr0.getTaxonNodeDto().getTreeIndex().split("#").length < taxonDistr1.getTaxonNodeDto().getTreeIndex().split("#").length){
+            return -1;
+        }else if (taxonDistr0.getTaxonNodeDto().getTreeIndex().split("#").length > taxonDistr1.getTaxonNodeDto().getTreeIndex().split("#").length){
+            return 1;
         }
 
-        if (arg0.getTaxonUuid().equals(arg1.getTaxonUuid())){
-            return 0;
+        //if parent is not the same sort by name
+        if ((taxonDistr0.getTaxonNodeDto() != null && taxonDistr1.getTaxonNodeDto() != null) && !taxonDistr0.getTaxonNodeDto().getParentUUID().equals(taxonDistr1.getTaxonNodeDto().getParentUUID()) ){
+            return comparator2.compare(taxonDistr0.getTaxonNodeDto(), taxonDistr1.getTaxonNodeDto());
         }
-
-        String name1 = arg0.getNameCache();
-        String name2 = arg1.getNameCache();
-        Integer rankTax1 = arg0.getRankOrderIndex();
-        Integer rankTax2 = arg1.getRankOrderIndex();
-//        String parentName1 = arg0.get
-        if (rankTax1 == null && rankTax2 != null){
-            return 1;
-        }else if(rankTax2 == null && rankTax1 != null){
+        // if parent is the same sort by rank and name
+        if (taxonDistr0.getTaxonNodeDto() != null && taxonDistr1.getTaxonNodeDto() != null && taxonDistr0.getTaxonNodeDto().getParentUUID().equals( taxonDistr1.getTaxonNodeDto().getParentUUID())){
+           return this.comparator1.compare(taxonDistr0.getTaxonNodeDto(), taxonDistr1.getTaxonNodeDto());
+        }else if (taxonDistr0 == taxonDistr1 || (taxonDistr0.getTaxonNodeDto() == null) && (taxonDistr1.getTaxonNodeDto() == null)){
+            return 0;
+        } else if (taxonDistr0.getTaxonNodeDto() != null && taxonDistr1.getTaxonNodeDto() == null){
             return -1;
-        }else if (rankTax1 != null && rankTax1 == rankTax2) {
-            //same rank, order by name
-            return name1.compareTo(name2);
-         }else if (rankTax1 == null && rankTax2 == null || rankTax1.equals(rankTax2)){
-             return -1;
-         }
-
-        return 0;
+        } else if (taxonDistr0.getTaxonNodeDto() == null && taxonDistr1.getTaxonNodeDto() != null){
+            return 1;
+        }else{
+            return taxonDistr0.getTaxonUuid().compareTo(taxonDistr1.getTaxonUuid());
+        }
     }
 
 }
index d8e4ffaddaa76c0a769f753e1b3ac004b5cb1799..3f34fa898651df0522d49c1663e62a52efe79acb 100755 (executable)
@@ -1,3 +1,11 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
 package eu.etaxonomy.taxeditor.editor.view.checklist.edit;
 
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
@@ -13,14 +21,11 @@ import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
  *
  * @author k.luther
  * @created 26.09.2017
- * @version 1.0
  */
 public class CdmComboBoxViewerCellEditor extends ComboBoxViewerCellEditor implements ISelectionListener, IPartContentHasDetails{
 
-       
        public CdmComboBoxViewerCellEditor(Composite parent, int style) {
                super(parent, style);
-               
        }
 
        @Override
@@ -28,5 +33,4 @@ public class CdmComboBoxViewerCellEditor extends ComboBoxViewerCellEditor implem
                System.out.println(selection.toString());
                
        }
-
-}
+}
\ No newline at end of file
index 1a7834a95ede66d53b392c8c8420ac7345567018..016a1cc3285cb659c50c05ce97b273102faea153 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.editor.view.concept;
 
 import java.util.HashMap;
@@ -22,7 +21,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 /**
  * @author n.hoffmann
  * @created Jan 24, 2011
- * @version 1.0
  */
 public class ConceptContentProvider implements IStructuredContentProvider {
 
@@ -54,5 +52,4 @@ public class ConceptContentProvider implements IStructuredContentProvider {
                }
                return new Object[0];
        }
-
-}
+}
\ No newline at end of file
index 4bcecf9e3f25afe7467177f7e5e95f94cf92b217..daa5ab54c870248f997fcbe34df569eb275ec028 100644 (file)
@@ -6,7 +6,6 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-
 package eu.etaxonomy.taxeditor.editor.view.concept;
 
 import java.util.Map.Entry;
@@ -24,8 +23,6 @@ import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer;
 
 /**
  * @author n.hoffmann
- * @created Jan 24, 2011
- * @version 1.0
  */
 public class ConceptLabelProvider extends LabelProvider implements IStyledLabelProvider {
 
index ce054a3b5f24355516fee31850e3c7ade44d33da..3c1806c334ae4cb177b2e396697684e6fa51cc1e 100644 (file)
@@ -1,3 +1,11 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
 package eu.etaxonomy.taxeditor.editor.view.derivate;
 
 import java.util.ArrayList;
@@ -93,10 +101,9 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 
 /**
  * Displays the derivate hierarchy of the specimen specified in the editor input.
- *
  */
 public class DerivateView implements IPartContentHasFactualData, IConversationEnabled,
-        ICdmEntitySessionEnabled, IDirtyMarkable, IPostOperationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, IPartContentHasMedia,
+        ICdmEntitySessionEnabled<SpecimenOrObservationBase<?>>, IDirtyMarkable, IPostOperationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, IPartContentHasMedia,
         IContextListener, IE4SavablePart, ICollapsableExpandable {
 
     private static final String SPECIMEN_EDITOR = Messages.DerivateView_SPECIMEN_EDITOR;
@@ -181,9 +188,6 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
     public DerivateView() {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void init(DerivateViewEditorInput editorInput){
         this.derivateToRootEntityMap = new HashMap<>();
         this.rootElements = new HashSet<>();
@@ -292,13 +296,12 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
         }
     }
 
-
     public void updateRootEntities(List<SpecimenOrObservationBase> derivates) {
         if(derivates!=null){
             eventBroker.post(WorkbenchEventConstants.CURRENT_ACTIVE_EDITOR, null);
             this.derivateToRootEntityMap = new HashMap<>();
             this.rootElements = new HashSet<>();
-            for (SpecimenOrObservationBase derivate : derivates) {
+            for (SpecimenOrObservationBase<?> derivate : derivates) {
 
                 if(derivate instanceof FieldUnit){
                     derivateToRootEntityMap.put(derivate, derivate);
@@ -320,15 +323,14 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
         labelProvider.updateLabelCache(rootElements);
         viewer.setInput(rootElements);
         viewer.setComparator(new ViewerComparator() {
-               @Override
-               @SuppressWarnings("unchecked")
-               public int compare(Viewer testViewer, Object e1, Object e2) {
-                       if (((TreeNode)e1).getValue() instanceof SpecimenOrObservationBase){
-                               return ((SpecimenOrObservationBase)((TreeNode)e1).getValue()).getTitleCache().compareTo(((SpecimenOrObservationBase)((TreeNode)e2).getValue()).getTitleCache());
-                       }else{
-                               return e1.toString().compareTo(e2.toString());
-                       }
-                       //return (((SpecimenOrObservationBase) e1).getTitleCache()).compareTo(((SpecimenOrObservationBase) e2).getTitleCache());
+               @Override
+            public int compare(Viewer testViewer, Object e1, Object e2) {
+                       if (((TreeNode)e1).getValue() instanceof SpecimenOrObservationBase){
+                               return ((SpecimenOrObservationBase)((TreeNode)e1).getValue()).getTitleCache().compareTo(((SpecimenOrObservationBase)((TreeNode)e2).getValue()).getTitleCache());
+                       }else{
+                               return e1.toString().compareTo(e2.toString());
+                       }
+                       //return (((SpecimenOrObservationBase) e1).getTitleCache()).compareTo(((SpecimenOrObservationBase) e2).getTitleCache());
                }
        });
 
@@ -513,7 +515,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
             obj = ((TreeNode)obj).getValue();
         }
         rootElements.remove(obj);
-        Object o = this.derivateToRootEntityMap.remove(obj);
+        this.derivateToRootEntityMap.remove(obj);
         viewer.setInput(rootElements);
     }
 
@@ -594,7 +596,7 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
             else if(selection != null){
                 Object selectedElement = selection.getFirstElement();
                 if(selectedElement instanceof TaxonNodeDto){
-                    TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).load(((TaxonNodeDto)selectedElement).getTaxonUuid());
+                    TaxonBase<?> taxonBase = CdmStore.getService(ITaxonService.class).load(((TaxonNodeDto)selectedElement).getTaxonUuid());
                     if(HibernateProxyHelper.isInstanceOf(taxonBase, Taxon.class)){
                         selectedTaxon = HibernateProxyHelper.deproxy(taxonBase, Taxon.class);
                     }
@@ -607,9 +609,9 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
                 }
             }
             if(selectedTaxon!=null){
-                Collection<SpecimenOrObservationBase> fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon(selectedTaxon, null, null);
+                Collection<FieldUnit> fieldUnits = CdmStore.getService(IOccurrenceService.class).listRootUnitsByAssociatedTaxon(FieldUnit.class, selectedTaxon, null, null);
                 Collection<UUID> uuids = new HashSet<>();
-                for (SpecimenOrObservationBase specimenOrObservationBase : fieldUnits) {
+                for (SpecimenOrObservationBase<?> specimenOrObservationBase : fieldUnits) {
                     uuids.add(specimenOrObservationBase.getUuid());
                 }
                 checkWarnThreshold(uuids);
@@ -634,9 +636,6 @@ public class DerivateView implements IPartContentHasFactualData, IConversationEn
         return viewer;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public List<SpecimenOrObservationBase<?>> getRootEntities() {
         return new ArrayList<>(rootElements);