From 9766a939c8c2318bb0a0b8c06c0b8fdebe830a71 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Wed, 10 Jun 2009 12:48:38 +0000 Subject: [PATCH] refactored folder structure --- .gitattributes | 141 ++++++------- taxeditor-store/META-INF/MANIFEST.MF | 22 +-- taxeditor-store/plugin.xml | 20 +- .../datasource/CdmDataSourceRepository.java | 2 +- .../handler/AbstractDataSourceHandler.java | 4 +- .../handler/ChangeConnectionHandler.java | 4 +- .../handler/CreateDataSourceHandler.java | 4 +- .../handler/DeleteDataSourceHandler.java | 4 +- .../handler/EditDataSourceHandler.java | 4 +- .../view/CdmDataSourceContentProvider.java | 2 +- .../view/CdmDataSourceLabelProvider.java | 6 +- .../datasource/view/CdmDataSourceView.java | 4 +- .../CdmDataSourceCredentialsWizardPage.java | 12 +- .../wizard/CdmDataSourceH2WizardPage.java | 2 +- .../wizard/CdmDataSourceMySQLWizardPage.java | 2 +- .../wizard/CdmDataSourceWizard.java | 4 +- .../wizard/CdmDataSourceWizardPage.java | 25 ++- .../FilteredCdmResourceSelectionDialog.java | 151 ++++++++++++++ .../dialogs/FilteredNameSelectionDialog.java | 69 +++++++ .../FilteredReferenceSelectionDialog.java | 72 +++++++ .../SelectionDialogDetailsLabelProvider.java | 27 +++ ...SelectionDialogSelectionLabelProvider.java | 26 +++ .../{store/model => dialogs}/UriDialog.java | 2 +- .../handler/ShowDataSourceViewHandler.java | 2 +- .../model/AbstractDataChangeBehaviour.java | 8 +- .../{store => }/model/AbstractUtility.java | 2 +- .../{store => }/model/DataChangeBridge.java | 2 +- .../{store => }/model/DescriptionUtil.java | 2 +- .../model/IDataChangeBehavior.java | 2 +- .../{store => }/model/ImageResources.java | 2 +- .../{store => }/model/ImagesUtil.java | 2 +- .../model/IterableSynonymyList.java | 2 +- .../{store => }/model/LanguageUtil.java | 2 +- .../{store => }/model/NameRelationsUtil.java | 4 +- .../taxeditor/{store => }/model/NameUtil.java | 2 +- .../{store => }/model/ReferenceUtil.java | 2 +- .../{store => }/model/Resources.java | 2 +- .../{store => }/model/SynonymUtil.java | 2 +- .../{store => }/model/TaxonTransfer.java | 2 +- .../{store => }/model/TaxonUtil.java | 2 +- .../taxeditor/{store => }/model/TimeUtil.java | 2 +- .../AbstractPersistentPostOperation.java | 2 +- .../operations/AbstractPostOperation.java | 2 +- ...hangeConceptRelationshipTypeOperation.java | 4 +- .../ChangeConceptToSynonymOperation.java | 2 +- .../ChangeHomotypicGroupOperation.java | 2 +- ...angeHomotypicalGroupBasionymOperation.java | 4 +- .../ChangeSynonymToConceptOperation.java | 2 +- ...ymToHomotypicalGroupBasionymOperation.java | 2 +- ...hangeSynonymToMisapplicationOperation.java | 2 +- .../operations/CreateChildTaxonOperation.java | 186 +++++++++--------- .../CreateConceptRelationOperation.java | 4 +- .../CreateDescriptionElementOperation.java | 2 +- .../operations/CreateImageOperation.java | 4 +- .../CreateMisapplicationOperation.java | 4 +- ...mInExisitingHomotypicalGroupOperation.java | 4 +- .../CreateSynonymInNewGroupOperation.java | 4 +- .../DeleteConceptRelationOperation.java | 4 +- .../DeleteDescriptionElementOperation.java | 2 +- .../operations/DeleteImageOperation.java | 4 +- .../DeleteMisapplicationOperation.java | 2 +- .../operations/DeleteSynonymOperation.java | 2 +- .../operations/DeleteTaxonOperation.java | 4 +- .../operations/IPostOperationEnabled.java | 2 +- .../operations/MoveTaxonOperation.java | 4 +- ...moveHomotypicalGroupBasionymOperation.java | 4 +- .../SwapSynonymAndAcceptedOperation.java | 4 +- .../{store => }/parser/CdmParserUtil.java | 4 +- .../preference/CdmPreferences.java | 2 +- .../preference/DescriptionPreferences.java | 2 +- .../preference/FeaturePreferences.java | 2 +- .../InitNomenclaturalCodePrefDialog.java | 4 +- .../preference/InitializeDbPreferences.java | 4 +- .../NomenclaturalCodePreferences.java | 4 +- .../preference/PreferencesUtil.java | 4 +- .../preference/RankMenuPreferences.java | 2 +- .../preference/TaxonomicPreferences.java | 2 +- .../etaxonomy/taxeditor/store/CdmStore.java | 67 ++++--- .../etaxonomy/taxeditor/store/StoreUtil.java | 2 +- .../AbstractTaxeditorOperationTest.java | 2 + ...eConceptRelationshipTypeOperationTest.java | 1 + .../ChangeConceptToSynonymOperationTest.java | 10 +- .../ChangeHomotypicGroupOperationTest.java | 10 +- ...HomotypicalGroupBasionymOperationTest.java | 9 +- .../ChangeSynonymToConceptOperationTest.java | 9 +- ...HomotypicalGroupBasionymOperationTest.java | 2 + ...eSynonymToMisapplicationOperationTest.java | 10 +- .../CreateConceptRelationOperationTest.java | 9 +- ...CreateDescriptionElementOperationTest.java | 1 + .../CreateMisapplicationOperationTest.java | 7 +- ...xisitingHomotypicalGroupOperationTest.java | 13 +- .../CreateSynonymInNewGroupOperationTest.java | 7 +- .../DeleteConceptRelationOperationTest.java | 9 +- ...DeleteDescriptionElementOperationTest.java | 7 +- .../DeleteMisapplicationOperationTest.java | 9 +- .../DeleteSynonymOperationTest.java | 7 +- .../operations/DeleteTaxonOperationTest.java | 7 +- .../operations/MoveTaxonOperationTest.java | 7 +- .../SwapSynonymAndAcceptedOperationTest.java | 10 +- 99 files changed, 784 insertions(+), 376 deletions(-) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/CdmDataSourceRepository.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/handler/AbstractDataSourceHandler.java (91%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/handler/ChangeConnectionHandler.java (92%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/handler/CreateDataSourceHandler.java (88%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/handler/DeleteDataSourceHandler.java (90%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/handler/EditDataSourceHandler.java (90%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/view/CdmDataSourceContentProvider.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/view/CdmDataSourceLabelProvider.java (91%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/view/CdmDataSourceView.java (97%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/wizard/CdmDataSourceCredentialsWizardPage.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/wizard/CdmDataSourceH2WizardPage.java (96%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/wizard/CdmDataSourceMySQLWizardPage.java (98%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/wizard/CdmDataSourceWizard.java (97%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/datasource/wizard/CdmDataSourceWizardPage.java (89%) create mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredCdmResourceSelectionDialog.java create mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredNameSelectionDialog.java create mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredReferenceSelectionDialog.java create mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogDetailsLabelProvider.java create mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogSelectionLabelProvider.java rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store/model => dialogs}/UriDialog.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/AbstractDataChangeBehaviour.java (71%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/AbstractUtility.java (98%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/DataChangeBridge.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/DescriptionUtil.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/IDataChangeBehavior.java (97%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/ImageResources.java (99%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/ImagesUtil.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/IterableSynonymyList.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/LanguageUtil.java (88%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/NameRelationsUtil.java (92%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/NameUtil.java (98%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/ReferenceUtil.java (91%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/Resources.java (99%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/SynonymUtil.java (99%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/TaxonTransfer.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/TaxonUtil.java (98%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/model/TimeUtil.java (97%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/AbstractPersistentPostOperation.java (97%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/AbstractPostOperation.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/ChangeConceptRelationshipTypeOperation.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/ChangeConceptToSynonymOperation.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/ChangeHomotypicGroupOperation.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/ChangeHomotypicalGroupBasionymOperation.java (92%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/ChangeSynonymToConceptOperation.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/ChangeSynonymToMisapplicationOperation.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/CreateChildTaxonOperation.java (85%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/CreateConceptRelationOperation.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/CreateDescriptionElementOperation.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/CreateImageOperation.java (92%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/CreateMisapplicationOperation.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/CreateSynonymInNewGroupOperation.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/DeleteConceptRelationOperation.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/DeleteDescriptionElementOperation.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/DeleteImageOperation.java (92%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/DeleteMisapplicationOperation.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/DeleteSynonymOperation.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/DeleteTaxonOperation.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/IPostOperationEnabled.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/MoveTaxonOperation.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/RemoveHomotypicalGroupBasionymOperation.java (92%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/operations/SwapSynonymAndAcceptedOperation.java (96%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/parser/CdmParserUtil.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/preference/CdmPreferences.java (92%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/preference/DescriptionPreferences.java (92%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/preference/FeaturePreferences.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/preference/InitNomenclaturalCodePrefDialog.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/preference/InitializeDbPreferences.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/preference/NomenclaturalCodePreferences.java (93%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/preference/PreferencesUtil.java (95%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/preference/RankMenuPreferences.java (94%) rename taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/{store => }/preference/TaxonomicPreferences.java (92%) diff --git a/.gitattributes b/.gitattributes index fc9fc1111..4c081c316 100644 --- a/.gitattributes +++ b/.gitattributes @@ -929,78 +929,83 @@ taxeditor-store/icons/unknown_no_bg.gif -text taxeditor-store/icons/warn_tsk.gif -text taxeditor-store/plugin.xml -text taxeditor-store/pom.xml -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/AbstractDataSourceHandler.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/ChangeConnectionHandler.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CreateDataSourceHandler.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DeleteDataSourceHandler.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/EditDataSourceHandler.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceContentProvider.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceLabelProvider.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceView.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceCredentialsWizardPage.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceH2WizardPage.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizard.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizardPage.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredCdmResourceSelectionDialog.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredNameSelectionDialog.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredReferenceSelectionDialog.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogDetailsLabelProvider.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogSelectionLabelProvider.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractDataChangeBehaviour.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DataChangeBridge.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IDataChangeBehavior.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImagesUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IterableSynonymyList.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/LanguageUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameRelationsUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ReferenceUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/Resources.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/SynonymUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TimeUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPersistentPostOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPostOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptRelationshipTypeOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicGroupOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicalGroupBasionymOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToMisapplicationOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateChildTaxonOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateConceptRelationOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateImageOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateMisapplicationOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInNewGroupOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteConceptRelationOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteImageOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteMisapplicationOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteTaxonOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/IPostOperationEnabled.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/RemoveHomotypicalGroupBasionymOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/SwapSynonymAndAcceptedOperation.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/CdmParserUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferences.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeaturePreferences.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitNomenclaturalCodePrefDialog.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitializeDbPreferences.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicPreferences.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/CdmDataSourceRepository.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/AbstractDataSourceHandler.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/ChangeConnectionHandler.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/CreateDataSourceHandler.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/DeleteDataSourceHandler.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/EditDataSourceHandler.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceContentProvider.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceLabelProvider.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceCredentialsWizardPage.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceMySQLWizardPage.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractDataChangeBehaviour.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DataChangeBridge.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DescriptionUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IDataChangeBehavior.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TimeUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPostOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/IPostOperationEnabled.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/parser/CdmParserUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java -text -taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java -text taxeditor-store/src/main/resources/eu/etaxonomy/cdm/defaultApplicationContext.xml -text taxeditor-store/src/main/resources/log4j.properties -text taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/CdmStoreTest.java -text diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF index 70980c9d2..bc6e7a81d 100644 --- a/taxeditor-store/META-INF/MANIFEST.MF +++ b/taxeditor-store/META-INF/MANIFEST.MF @@ -5,20 +5,18 @@ Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true Bundle-Version: 2.0.0.v20090603_1757 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin Bundle-Vendor: EDIT -Export-Package: dbscripts, - eu.etaxonomy.cdm, - eu.etaxonomy.cdm.database, +Export-Package: eu.etaxonomy.taxeditor.datasource, + eu.etaxonomy.taxeditor.datasource.handler, + eu.etaxonomy.taxeditor.datasource.view, + eu.etaxonomy.taxeditor.datasource.wizard, + eu.etaxonomy.taxeditor.dialogs, eu.etaxonomy.taxeditor.handler, + eu.etaxonomy.taxeditor.model;uses:="eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon", + eu.etaxonomy.taxeditor.operations, + eu.etaxonomy.taxeditor.parser, + eu.etaxonomy.taxeditor.preference, eu.etaxonomy.taxeditor.store, - eu.etaxonomy.taxeditor.store.datasource, - eu.etaxonomy.taxeditor.store.datasource.handler, - eu.etaxonomy.taxeditor.store.datasource.view, - eu.etaxonomy.taxeditor.store.datasource.wizard, - eu.etaxonomy.taxeditor.store.internal, - eu.etaxonomy.taxeditor.store.model;uses:="eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon", - eu.etaxonomy.taxeditor.store.operations, - eu.etaxonomy.taxeditor.store.parser, - eu.etaxonomy.taxeditor.store.preference + eu.etaxonomy.taxeditor.store.internal Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",org.eclipse.core.filesystem;bundle-version="1.2.0",org.eclipse.core.resources;bundle-version="3.4.1",eu.etaxonomy.cdmLibrary;bundle-version="2.1.0",org.eclipse.ui.editors;bundle-version="3.4.0",org.eclipse.jface.text;bundle-version="3.4.1" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: junit.framework,org.junit diff --git a/taxeditor-store/plugin.xml b/taxeditor-store/plugin.xml index 8ab4736f0..37791504d 100644 --- a/taxeditor-store/plugin.xml +++ b/taxeditor-store/plugin.xml @@ -5,7 +5,7 @@ point="org.eclipse.ui.preferencePages"> @@ -22,23 +22,23 @@ @@ -46,7 +46,7 @@ @@ -111,22 +111,22 @@ name="Popup Menu Commands" point="org.eclipse.ui.commands"> diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/CdmDataSourceRepository.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/CdmDataSourceRepository.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java index 2568025b2..3f7530a43 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/CdmDataSourceRepository.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource; +package eu.etaxonomy.taxeditor.datasource; import java.io.BufferedReader; import java.io.File; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/AbstractDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/AbstractDataSourceHandler.java similarity index 91% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/AbstractDataSourceHandler.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/AbstractDataSourceHandler.java index 3d0691c20..38fdf056a 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/AbstractDataSourceHandler.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/AbstractDataSourceHandler.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.handler; +package eu.etaxonomy.taxeditor.datasource.handler; import org.apache.log4j.Logger; import org.eclipse.core.commands.AbstractHandler; @@ -17,7 +17,7 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; -import eu.etaxonomy.taxeditor.store.datasource.view.CdmDataSourceView; +import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceView; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/ChangeConnectionHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/ChangeConnectionHandler.java similarity index 92% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/ChangeConnectionHandler.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/ChangeConnectionHandler.java index 37c5f9436..6600b2afd 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/ChangeConnectionHandler.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/ChangeConnectionHandler.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.handler; +package eu.etaxonomy.taxeditor.datasource.handler; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.database.ICdmDataSource; -import eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceRepository; +import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/CreateDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CreateDataSourceHandler.java similarity index 88% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/CreateDataSourceHandler.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CreateDataSourceHandler.java index ecdac654e..a4720bd49 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/CreateDataSourceHandler.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CreateDataSourceHandler.java @@ -8,14 +8,14 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.handler; +package eu.etaxonomy.taxeditor.datasource.handler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.handlers.HandlerUtil; -import eu.etaxonomy.taxeditor.store.datasource.wizard.CdmDataSourceWizard; +import eu.etaxonomy.taxeditor.datasource.wizard.CdmDataSourceWizard; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/DeleteDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DeleteDataSourceHandler.java similarity index 90% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/DeleteDataSourceHandler.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DeleteDataSourceHandler.java index 299010792..b76660fcf 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/DeleteDataSourceHandler.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DeleteDataSourceHandler.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.handler; +package eu.etaxonomy.taxeditor.datasource.handler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.ISelection; @@ -16,7 +16,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.database.CdmPersistentDataSource; -import eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceRepository; +import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/EditDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/EditDataSourceHandler.java similarity index 90% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/EditDataSourceHandler.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/EditDataSourceHandler.java index 49b8ec3b3..4ac512c02 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/EditDataSourceHandler.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/EditDataSourceHandler.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.handler; +package eu.etaxonomy.taxeditor.datasource.handler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.jface.viewers.ISelection; @@ -17,7 +17,7 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.database.ICdmDataSource; -import eu.etaxonomy.taxeditor.store.datasource.wizard.CdmDataSourceWizard; +import eu.etaxonomy.taxeditor.datasource.wizard.CdmDataSourceWizard; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceContentProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceContentProvider.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceContentProvider.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceContentProvider.java index f39e71224..e6f728300 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceContentProvider.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceContentProvider.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.view; +package eu.etaxonomy.taxeditor.datasource.view; import java.util.List; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceLabelProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceLabelProvider.java similarity index 91% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceLabelProvider.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceLabelProvider.java index 784aeed73..6e7d8abd5 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceLabelProvider.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceLabelProvider.java @@ -8,15 +8,15 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.view; +package eu.etaxonomy.taxeditor.datasource.view; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; import eu.etaxonomy.cdm.database.ICdmDataSource; -import eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceRepository; -import eu.etaxonomy.taxeditor.store.model.ImageResources; +import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository; +import eu.etaxonomy.taxeditor.model.ImageResources; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceView.java similarity index 97% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceView.java index bcd938a6b..50d8c3226 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceView.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.view; +package eu.etaxonomy.taxeditor.datasource.view; import java.util.List; @@ -30,8 +30,8 @@ import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.part.ViewPart; import eu.etaxonomy.cdm.database.ICdmDataSource; +import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository; import eu.etaxonomy.taxeditor.store.StoreUtil; -import eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceRepository; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceCredentialsWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceCredentialsWizardPage.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceCredentialsWizardPage.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceCredentialsWizardPage.java index 14cf13af4..472a4f3ac 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceCredentialsWizardPage.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceCredentialsWizardPage.java @@ -8,8 +8,9 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.wizard; +package eu.etaxonomy.taxeditor.datasource.wizard; +import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; @@ -177,5 +178,14 @@ public abstract class CdmDataSourceCredentialsWizardPage extends WizardPage impl } public void keyPressed(KeyEvent e){} + + /* (non-Javadoc) + * @see org.eclipse.jface.wizard.WizardPage#getNextPage() + */ + @Override + public IWizardPage getNextPage() { + return null; + } + } diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceH2WizardPage.java similarity index 96% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceH2WizardPage.java index 2dad28c12..34f657769 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceH2WizardPage.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.wizard; +package eu.etaxonomy.taxeditor.datasource.wizard; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceMySQLWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java similarity index 98% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceMySQLWizardPage.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java index 80fb3ac4a..1e70d2193 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceMySQLWizardPage.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.wizard; +package eu.etaxonomy.taxeditor.datasource.wizard; import org.apache.log4j.Logger; import org.eclipse.jface.dialogs.MessageDialog; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizard.java similarity index 97% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizard.java index 751dd10a0..7f5bf49ef 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizard.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.wizard; +package eu.etaxonomy.taxeditor.datasource.wizard; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardPage; @@ -16,7 +16,7 @@ import org.eclipse.jface.wizard.WizardPage; import eu.etaxonomy.cdm.database.CdmDataSource; import eu.etaxonomy.cdm.database.DatabaseTypeEnum; import eu.etaxonomy.cdm.database.ICdmDataSource; -import eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceRepository; +import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizardPage.java similarity index 89% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizardPage.java index 994a82242..144aa1914 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizardPage.java @@ -8,10 +8,11 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.datasource.wizard; +package eu.etaxonomy.taxeditor.datasource.wizard; import java.util.ArrayList; +import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -47,6 +48,8 @@ public class CdmDataSourceWizardPage extends WizardPage implements KeyListener{ private ICdmDataSource dataSource; + + private WizardPage nextPage; protected CdmDataSourceWizardPage(ICdmDataSource dataSource) { super("DataSourceWizardPage"); @@ -141,7 +144,16 @@ public class CdmDataSourceWizardPage extends WizardPage implements KeyListener{ wizardPage = new CdmDataSourceMySQLWizardPage(dataSource); } - wizard.addPage(wizardPage); + if(wizard.getPage(wizardPage.getName()) != null){ + nextPage = (WizardPage) wizard.getPage(wizardPage.getName()); + }else{ + wizard.addPage(wizardPage); + nextPage = wizardPage; + } + +// nextPage = (WizardPage) wizard.getPage(wizardPage.getName()); +// +// wizard.addPage(wizardPage); getContainer().updateButtons(); } @@ -157,5 +169,14 @@ public class CdmDataSourceWizardPage extends WizardPage implements KeyListener{ public void keyReleased(KeyEvent e) { ((CdmDataSourceWizard) getWizard()).setDataSourceName(datasourceNameText.getText()); } + + /* (non-Javadoc) + * @see org.eclipse.jface.wizard.WizardPage#getNextPage() + */ + @Override + public IWizardPage getNextPage() { + return nextPage; + } + } diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredCdmResourceSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredCdmResourceSelectionDialog.java new file mode 100644 index 000000000..5d162a1e4 --- /dev/null +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredCdmResourceSelectionDialog.java @@ -0,0 +1,151 @@ +// $Id$ +/** +* 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.dialogs; + +import java.text.Collator; +import java.util.Comparator; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog; + +import eu.etaxonomy.cdm.model.common.IdentifiableEntity; +import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy; +import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; + +/** + * @author n.hoffmann + * @created 04.06.2009 + * @version 1.0 + */ +public abstract class FilteredCdmResourceSelectionDialog extends + FilteredItemsSelectionDialog { + + /** + * @param shell + */ + public FilteredCdmResourceSelectionDialog(Shell shell, String title) { + super(shell); + this.setTitle(title); + this.setListLabelProvider(new SelectionDialogSelectionLabelProvider()); + this.setDetailsLabelProvider(new SelectionDialogDetailsLabelProvider()); + this.setSelectionHistory(new CdmResourceHistory()); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getDialogSettings() + */ + @Override + protected IDialogSettings getDialogSettings() { + IDialogSettings settings = TaxeditorStorePlugin.getDefault().getDialogSettings().getSection(getSettings()); + + if (settings == null) { + settings = TaxeditorStorePlugin.getDefault().getDialogSettings().addNewSection(getSettings()); + } + return settings; + } + + /** + * + * @return + */ + public abstract String getSettings(); + + /* (non-Javadoc) + * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getElementName(java.lang.Object) + */ + @Override + public String getElementName(Object item) { + return ((IdentifiableEntity) item).getTitleCache(); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#validateItem(java.lang.Object) + */ + @Override + protected IStatus validateItem(Object item) { + return Status.OK_STATUS; + } + + + /* (non-Javadoc) + * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#getItemsComparator() + */ + @Override + protected Comparator getItemsComparator() { + return new Comparator() { + public int compare(IdentifiableEntity entity1, IdentifiableEntity entity2) { + Collator collator = Collator.getInstance(); + return collator.compare(entity1.getTitleCache(), entity2.getTitleCache()); + } + }; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createFilter() + */ + @Override + protected ItemsFilter createFilter() { + return new CdmResourceFilter(); + } + + /** + * + * @author n.hoffmann + * @created 04.06.2009 + * @version 1.0 + */ + class CdmResourceFilter extends ItemsFilter { + + @Override + public boolean isConsistentItem(Object item) { + return true; // don't remember the previous selection. + } + + @Override + public boolean matchItem(Object item) { + return matches(((IdentifiableEntity) item).getTitleCache()); + } + } + + /** + * + * @author n.hoffmann + * @created 04.06.2009 + * @version 1.0 + */ + class CdmResourceHistory extends SelectionHistory{ + + @Override + protected Object restoreItemFromMemento(IMemento memento) { + return null; + } + + @Override + protected void storeItemToMemento(Object item, IMemento memento) { + + } + + } + + /* (non-Javadoc) + * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createExtendedContentArea(org.eclipse.swt.widgets.Composite) + */ + @Override + protected Control createExtendedContentArea(Composite parent) { + return null; + } +} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredNameSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredNameSelectionDialog.java new file mode 100644 index 000000000..eba56fb98 --- /dev/null +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredNameSelectionDialog.java @@ -0,0 +1,69 @@ +// $Id$ +/** +* 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.dialogs; + +import java.util.List; + +import org.apache.log4j.Logger; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.swt.widgets.Shell; + +import eu.etaxonomy.cdm.model.name.TaxonNameBase; +import eu.etaxonomy.cdm.model.reference.ReferenceBase; +import eu.etaxonomy.taxeditor.store.CdmStore; + +/** + * @author n.hoffmann + * @created 04.06.2009 + * @version 1.0 + */ +public class FilteredNameSelectionDialog extends FilteredCdmResourceSelectionDialog { + /** + * @param shell + * @param title + */ + public FilteredNameSelectionDialog(Shell shell) { + super(shell, "Select Name"); + } + + private static final Logger logger = Logger + .getLogger(FilteredNameSelectionDialog.class); + + public static final String SETTINGS = FilteredNameSelectionDialog.class.getCanonicalName(); + + + /* + * (non-Javadoc) + * @see eu.etaxonomy.taxeditor.dialogs.FilteredCdmResourceSelectionDialog#getSettings() + */ + public String getSettings() { + if(SETTINGS == null){ + throw new IllegalStateException("No SETTINGS set."); + } + return SETTINGS; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#fillContentProvider(org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.AbstractContentProvider, org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.ItemsFilter, org.eclipse.core.runtime.IProgressMonitor) + */ + @Override + protected void fillContentProvider(AbstractContentProvider contentProvider, + ItemsFilter itemsFilter, IProgressMonitor progressMonitor) + throws CoreException { + List names = CdmStore.searchNameString("*"); + progressMonitor.beginTask("Looking for references", names.size()); + for (TaxonNameBase name : names){ + contentProvider.add(name, itemsFilter); + progressMonitor.worked(1); + } + } +} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredReferenceSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredReferenceSelectionDialog.java new file mode 100644 index 000000000..cee084a9c --- /dev/null +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredReferenceSelectionDialog.java @@ -0,0 +1,72 @@ +// $Id$ +/** +* 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.dialogs; + +import java.util.List; + +import org.apache.log4j.Logger; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.swt.widgets.Shell; + +import eu.etaxonomy.cdm.model.reference.ReferenceBase; +import eu.etaxonomy.taxeditor.store.CdmStore; + +/** + * @author n.hoffmann + * @created 04.06.2009 + * @version 1.0 + */ +public class FilteredReferenceSelectionDialog extends + FilteredCdmResourceSelectionDialog { + + private static final Logger logger = Logger + .getLogger(FilteredReferenceSelectionDialog.class); + + + public static final String SETTINGS = FilteredReferenceSelectionDialog.class.getCanonicalName(); + + /** + * @param shell + * @param title + */ + public FilteredReferenceSelectionDialog(Shell shell) { + super(shell, "Select Reference"); + } + + + /* (non-Javadoc) + * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#fillContentProvider(org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.AbstractContentProvider, org.eclipse.ui.dialogs.FilteredItemsSelectionDialog.ItemsFilter, org.eclipse.core.runtime.IProgressMonitor) + */ + @Override + protected void fillContentProvider(AbstractContentProvider contentProvider, + ItemsFilter itemsFilter, IProgressMonitor progressMonitor) + throws CoreException { + + List references = CdmStore.getReferencesByTitle("*"); + progressMonitor.beginTask("Looking for references", references.size()); + for (ReferenceBase reference : references){ + contentProvider.add(reference, itemsFilter); + progressMonitor.worked(1); + } + } + + /* + * (non-Javadoc) + * @see eu.etaxonomy.taxeditor.dialogs.FilteredCdmResourceSelectionDialog#getSettings() + */ + public String getSettings() { + if(SETTINGS == null){ + throw new IllegalStateException("No SETTINGS set."); + } + return SETTINGS; + } +} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogDetailsLabelProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogDetailsLabelProvider.java new file mode 100644 index 000000000..ef28569eb --- /dev/null +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogDetailsLabelProvider.java @@ -0,0 +1,27 @@ +// $Id$ +/** +* 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.dialogs; + +import org.apache.log4j.Logger; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.LabelProvider; + +/** + * @author n.hoffmann + * @created 04.06.2009 + * @version 1.0 + */ +public class SelectionDialogDetailsLabelProvider extends LabelProvider implements ILabelProvider { + private static final Logger logger = Logger + .getLogger(SelectionDialogDetailsLabelProvider.class); + + +} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogSelectionLabelProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogSelectionLabelProvider.java new file mode 100644 index 000000000..6fcef952d --- /dev/null +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogSelectionLabelProvider.java @@ -0,0 +1,26 @@ +// $Id$ +/** +* 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.dialogs; + +import org.apache.log4j.Logger; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.LabelProvider; + +/** + * @author n.hoffmann + * @created 04.06.2009 + * @version 1.0 + */ +public class SelectionDialogSelectionLabelProvider extends LabelProvider implements ILabelProvider { + private static final Logger logger = Logger + .getLogger(SelectionDialogSelectionLabelProvider.class); + +} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java index 8d2c92fc6..42fe692af 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.dialogs; import java.net.URI; import java.net.URISyntaxException; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java index 41f40ef33..c9333e0d0 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java @@ -18,7 +18,7 @@ import org.eclipse.core.commands.IHandler; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; -import eu.etaxonomy.taxeditor.store.datasource.view.CdmDataSourceView; +import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceView; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; /** diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractDataChangeBehaviour.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractDataChangeBehaviour.java similarity index 71% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractDataChangeBehaviour.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractDataChangeBehaviour.java index 9c13262fe..e53f52b7c 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractDataChangeBehaviour.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractDataChangeBehaviour.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.util.Vector; @@ -32,21 +32,21 @@ public abstract class AbstractDataChangeBehaviour implements IDataChangeBehavior /** * Implementors should overwrite this method if needed * - * @see eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior#reactOnDelete(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent) + * @see eu.etaxonomy.taxeditor.model.IDataChangeBehavior#reactOnDelete(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent) */ public void reactOnDelete(Vector event) {} /** * Implementors should overwrite this method if needed * - * @see eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior#reactOnInsert(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent) + * @see eu.etaxonomy.taxeditor.model.IDataChangeBehavior#reactOnInsert(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent) */ public void reactOnInsert(Vector event) {} /** * Implementors should overwrite this method if needed * - * @see eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior#reactOnUpdate(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent) + * @see eu.etaxonomy.taxeditor.model.IDataChangeBehavior#reactOnUpdate(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent) */ public void reactOnUpdate(Vector event) {} } diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java similarity index 98% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java index 13226e0c5..d0ed8ab37 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import org.eclipse.jface.resource.ColorRegistry; import org.eclipse.jface.resource.FontRegistry; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DataChangeBridge.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DataChangeBridge.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DataChangeBridge.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DataChangeBridge.java index d5c4e3721..c5af09bb3 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DataChangeBridge.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DataChangeBridge.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DescriptionUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionUtil.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DescriptionUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionUtil.java index 8292c0b47..389f167ca 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DescriptionUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionUtil.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import org.apache.log4j.Logger; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IDataChangeBehavior.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IDataChangeBehavior.java similarity index 97% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IDataChangeBehavior.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IDataChangeBehavior.java index 57e75a7f7..8228fe071 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IDataChangeBehavior.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IDataChangeBehavior.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.util.Vector; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java similarity index 99% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java index 35461ab41..b66d35fed 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.net.MalformedURLException; import java.net.URI; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImagesUtil.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImagesUtil.java index 38dbaaf1f..dffc0dcc3 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImagesUtil.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.util.HashSet; import java.util.List; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IterableSynonymyList.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IterableSynonymyList.java index f139f9092..ffd787a3c 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IterableSynonymyList.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.util.ArrayList; import java.util.Iterator; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/LanguageUtil.java similarity index 88% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/LanguageUtil.java index f7fd5221d..b2e925030 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/LanguageUtil.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import eu.etaxonomy.cdm.model.common.Language; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameRelationsUtil.java similarity index 92% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameRelationsUtil.java index 333b41129..1c9cea7b1 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameRelationsUtil.java @@ -8,14 +8,14 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.util.SortedSet; import eu.etaxonomy.cdm.model.name.NameRelationshipType; import eu.etaxonomy.cdm.model.name.NomenclaturalCode; +import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameUtil.java similarity index 98% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameUtil.java index 00f80d6bc..091920ea6 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameUtil.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.util.Set; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ReferenceUtil.java similarity index 91% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ReferenceUtil.java index be496f0f6..cdb32f61c 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ReferenceUtil.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import eu.etaxonomy.cdm.model.common.ReferencedEntityBase; import eu.etaxonomy.cdm.model.reference.Generic; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/Resources.java similarity index 99% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/Resources.java index 7d00c4d07..674eacd24 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/Resources.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.util.HashMap; import java.util.Set; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/SynonymUtil.java similarity index 99% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/SynonymUtil.java index f71e45a46..278cf53b0 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/SynonymUtil.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.util.HashSet; import java.util.Set; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java index 832157c9e..df6e443ad 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java @@ -1,4 +1,4 @@ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import org.eclipse.swt.dnd.ByteArrayTransfer; import org.eclipse.swt.dnd.TransferData; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonUtil.java similarity index 98% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonUtil.java index b33e2d972..2046f30ae 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonUtil.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import java.util.HashSet; import java.util.Set; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TimeUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TimeUtil.java similarity index 97% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TimeUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TimeUtil.java index cd43a037e..f74859459 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TimeUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TimeUtil.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.model; +package eu.etaxonomy.taxeditor.model; import eu.etaxonomy.cdm.model.common.TimePeriod; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPersistentPostOperation.java similarity index 97% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPersistentPostOperation.java index 17e7431dc..91034219b 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPersistentPostOperation.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.operations.IUndoContext; import org.eclipse.core.runtime.IStatus; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPostOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPostOperation.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPostOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPostOperation.java index f4095875c..9ee7ead76 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPostOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPostOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.apache.log4j.Logger; import org.eclipse.core.commands.operations.AbstractOperation; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptRelationshipTypeOperation.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptRelationshipTypeOperation.java index 176e577cb..2538d9283 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptRelationshipTypeOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.apache.log4j.Logger; import org.eclipse.core.commands.ExecutionException; @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; -import eu.etaxonomy.taxeditor.store.model.TaxonUtil; +import eu.etaxonomy.taxeditor.model.TaxonUtil; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java index b853e5458..0104f568d 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicGroupOperation.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicGroupOperation.java index 34b52b5c7..2989029db 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicGroupOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.apache.log4j.Logger; import org.eclipse.core.commands.ExecutionException; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicalGroupBasionymOperation.java similarity index 92% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicalGroupBasionymOperation.java index fafe76e9a..495502756 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicalGroupBasionymOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.model.SynonymUtil; +import eu.etaxonomy.taxeditor.model.SynonymUtil; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java index 323f91756..a0b649a86 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java index 0ebeffaf8..98cef6878 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.apache.log4j.Logger; import org.eclipse.core.commands.ExecutionException; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToMisapplicationOperation.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToMisapplicationOperation.java index 8a4dca621..733a734ee 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToMisapplicationOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import java.util.Set; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateChildTaxonOperation.java similarity index 85% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateChildTaxonOperation.java index 1eb307e7c..072f8d936 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateChildTaxonOperation.java @@ -1,95 +1,91 @@ -// $Id$ -/** -* 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.store.operations; - -import org.apache.log4j.Logger; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.operations.IUndoContext; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; - -import eu.etaxonomy.cdm.model.name.TaxonNameBase; -import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; -import eu.etaxonomy.taxeditor.store.model.TaxonUtil; - -/** - * @author n.hoffmann - * @created 08.05.2009 - * @version 1.0 - */ -public class CreateChildTaxonOperation extends AbstractPostOperation { - - private static final Logger logger = Logger - .getLogger(CreateChildTaxonOperation.class); - - private TaxonNameBase newTaxonName; - - private Taxon childTaxon; - - - /** - * @param label - * @param undoContext - * @param parentTaxon - * @param postOperationEnabled - * @param conversationEnabled - */ - public CreateChildTaxonOperation(String label, IUndoContext undoContext, - Taxon parentTaxon, TaxonNameBase name, IPostOperationEnabled postOperationEnabled) { - super(label, undoContext, parentTaxon, postOperationEnabled); - - this.newTaxonName = name; - } - - - /* (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 { - - childTaxon = TaxonUtil.addChildTaxonBaseIsolated(taxon.getUuid(), newTaxonName); - - if(childTaxon != null){ - return postExecute(childTaxon); - }else{ - return new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, TaxeditorStorePlugin.ERROR_SAVING_ZERO_NAME, "Attempt to save taxon with zero length name", 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 { - - logger.warn("Not yet implemented."); - return null; - } - - public Taxon getChildTaxon() { - return childTaxon; - } -} +// $Id$ +/** +* 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.operations; + +import org.apache.log4j.Logger; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.operations.IUndoContext; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; + +import eu.etaxonomy.cdm.model.name.TaxonNameBase; +import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.model.TaxonUtil; +import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; + +/** + * @author n.hoffmann + * @created 08.05.2009 + * @version 1.0 + */ +public class CreateChildTaxonOperation extends AbstractPostOperation { + + private static final Logger logger = Logger + .getLogger(CreateChildTaxonOperation.class); + + private TaxonNameBase newTaxonName; + + private Taxon childTaxon; + + + /** + * @param label + * @param undoContext + * @param taxon + * @param postOperationEnabled + * @param conversationEnabled + */ + public CreateChildTaxonOperation(String label, IUndoContext undoContext, + Taxon taxon, TaxonNameBase name, IPostOperationEnabled postOperationEnabled) { + super(label, undoContext, taxon, postOperationEnabled); + + this.newTaxonName = name; + } + + + /* (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 { + + childTaxon = TaxonUtil.addChildTaxonBaseIsolated(taxon.getUuid(), newTaxonName); + + if(childTaxon != null){ + return postExecute(childTaxon); + }else{ + return new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, TaxeditorStorePlugin.ERROR_SAVING_ZERO_NAME, "Attempt to save taxon with zero length name", 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 { + + logger.warn("Not yet implemented."); + return null; + } +} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateConceptRelationOperation.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateConceptRelationOperation.java index 5bf346d6d..c8bebfdab 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateConceptRelationOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; -import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil; +import eu.etaxonomy.taxeditor.parser.CdmParserUtil; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java index 7d6a77f97..d65fff699 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateImageOperation.java similarity index 92% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateImageOperation.java index 4b25737f2..ea769601a 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateImageOperation.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.media.ImageFile; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.model.ImagesUtil; +import eu.etaxonomy.taxeditor.model.ImagesUtil; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateMisapplicationOperation.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateMisapplicationOperation.java index 135580ea4..098ebc79d 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateMisapplicationOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; -import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil; +import eu.etaxonomy.taxeditor.parser.CdmParserUtil; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java index 577411764..05d57d838 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; @@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.SynonymRelationship; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil; +import eu.etaxonomy.taxeditor.parser.CdmParserUtil; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInNewGroupOperation.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInNewGroupOperation.java index 1c0cc4d2d..eb29285e5 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInNewGroupOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; @@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.SynonymRelationship; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil; +import eu.etaxonomy.taxeditor.parser.CdmParserUtil; /** *
    diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteConceptRelationOperation.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteConceptRelationOperation.java index 0b992d1d0..39aba56e4 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteConceptRelationOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; @@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; -import eu.etaxonomy.taxeditor.store.model.TaxonUtil; +import eu.etaxonomy.taxeditor.model.TaxonUtil; /** * Deletes a relation between two taxa. diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java index fa0bf8ca6..1f3bdbe97 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.apache.log4j.Logger; import org.eclipse.core.commands.ExecutionException; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteImageOperation.java similarity index 92% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteImageOperation.java index cdbf98d0b..bd1d0bb43 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteImageOperation.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.media.ImageFile; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.model.ImagesUtil; +import eu.etaxonomy.taxeditor.model.ImagesUtil; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteMisapplicationOperation.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteMisapplicationOperation.java index 4ad617ab9..15e2c8e72 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteMisapplicationOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java index 5ab896416..b2315e91e 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import java.util.Set; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteTaxonOperation.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteTaxonOperation.java index 19ba06fe2..5c7e89ee5 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteTaxonOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.apache.log4j.Logger; import org.eclipse.core.commands.ExecutionException; @@ -20,7 +20,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Shell; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.model.TaxonUtil; +import eu.etaxonomy.taxeditor.model.TaxonUtil; /** * Delete a taxon from the model. diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/IPostOperationEnabled.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/IPostOperationEnabled.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/IPostOperationEnabled.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/IPostOperationEnabled.java index 4c570b9c7..5dbb6ef3c 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/IPostOperationEnabled.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/IPostOperationEnabled.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import eu.etaxonomy.cdm.model.common.CdmBase; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java index 5aedfdfbd..46079d15a 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.apache.log4j.Logger; import org.eclipse.core.commands.ExecutionException; @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.model.TaxonUtil; +import eu.etaxonomy.taxeditor.model.TaxonUtil; /** * Change the taxonomic parent of a given taxon. diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/RemoveHomotypicalGroupBasionymOperation.java similarity index 92% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/RemoveHomotypicalGroupBasionymOperation.java index 8565f28e5..c0d633e8d 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/RemoveHomotypicalGroupBasionymOperation.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.model.SynonymUtil; +import eu.etaxonomy.taxeditor.model.SynonymUtil; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/SwapSynonymAndAcceptedOperation.java similarity index 96% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/SwapSynonymAndAcceptedOperation.java index 487eb617b..f963aa615 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/SwapSynonymAndAcceptedOperation.java @@ -8,7 +8,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.operations; +package eu.etaxonomy.taxeditor.operations; import org.apache.log4j.Logger; import org.eclipse.core.commands.ExecutionException; @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.Status; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.store.model.SynonymUtil; +import eu.etaxonomy.taxeditor.model.SynonymUtil; /** * @author n.hoffmann diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/parser/CdmParserUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/CdmParserUtil.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/parser/CdmParserUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/CdmParserUtil.java index a7f585e3c..732cf69fe 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/parser/CdmParserUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/CdmParserUtil.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.parser; +package eu.etaxonomy.taxeditor.parser; import org.apache.log4j.Logger; @@ -17,7 +17,7 @@ import eu.etaxonomy.cdm.model.name.Rank; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser; import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl; -import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil; +import eu.etaxonomy.taxeditor.preference.PreferencesUtil; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferences.java similarity index 92% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferences.java index 93081d3b0..9def950ef 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferences.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.preference; +package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java similarity index 92% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java index bf8dd63ab..839dc3890 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.preference; +package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeaturePreferences.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeaturePreferences.java index c49f86f1a..42b994816 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeaturePreferences.java @@ -6,7 +6,7 @@ * 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.store.preference; +package eu.etaxonomy.taxeditor.preference; import java.util.HashMap; import java.util.Map; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitNomenclaturalCodePrefDialog.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitNomenclaturalCodePrefDialog.java index 95ea77450..cbd3b1bdc 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitNomenclaturalCodePrefDialog.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.preference; +package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.swt.SWT; @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import eu.etaxonomy.taxeditor.store.model.Resources; +import eu.etaxonomy.taxeditor.model.Resources; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitializeDbPreferences.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitializeDbPreferences.java index 0a3c29705..ead719f50 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitializeDbPreferences.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.preference; +package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; @@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; -import eu.etaxonomy.taxeditor.store.model.Resources; +import eu.etaxonomy.taxeditor.model.Resources; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java similarity index 93% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java index 9caa4bcda..2b14e4347 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java @@ -6,7 +6,7 @@ * 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.store.preference; +package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; @@ -19,8 +19,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; +import eu.etaxonomy.taxeditor.model.Resources; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; -import eu.etaxonomy.taxeditor.store.model.Resources; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java similarity index 95% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java index a65b71f7b..d6cb75706 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.preference; +package eu.etaxonomy.taxeditor.preference; import java.util.ArrayList; import java.util.Collections; @@ -26,9 +26,9 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.name.Rank; import eu.etaxonomy.cdm.model.name.ZoologicalName; +import eu.etaxonomy.taxeditor.model.Resources; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; -import eu.etaxonomy.taxeditor.store.model.Resources; /** * @author p.ciardelli diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java similarity index 94% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java index 248e8af76..72cbe4378 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java @@ -6,7 +6,7 @@ * 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.store.preference; +package eu.etaxonomy.taxeditor.preference; import java.util.HashMap; import java.util.Map; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicPreferences.java similarity index 92% rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicPreferences.java index 9ec548dd8..9a9fa8ebe 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicPreferences.java @@ -7,7 +7,7 @@ * See LICENSE.TXT at the top of this package for the full license terms. */ -package eu.etaxonomy.taxeditor.store.preference; +package eu.etaxonomy.taxeditor.preference; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java index a81a88601..e75cb9125 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java @@ -10,6 +10,7 @@ package eu.etaxonomy.taxeditor.store; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Set; import java.util.SortedSet; @@ -28,6 +29,7 @@ import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator; import eu.etaxonomy.cdm.api.service.config.impl.TaxonServiceConfiguratorImpl; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; +import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.cdm.model.common.Language; import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary; @@ -39,11 +41,15 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; import eu.etaxonomy.cdm.model.name.Rank; import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus; import eu.etaxonomy.cdm.model.name.TaxonNameBase; +import eu.etaxonomy.cdm.model.reference.Article; +import eu.etaxonomy.cdm.model.reference.Book; +import eu.etaxonomy.cdm.model.reference.BookSection; +import eu.etaxonomy.cdm.model.reference.Generic; import eu.etaxonomy.cdm.model.reference.ReferenceBase; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; import eu.etaxonomy.cdm.persistence.query.MatchMode; -import eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceRepository; +import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository; /** * This implementation of ICdmDataRepository depends on hibernate sessions to store the data correctly @@ -151,18 +157,25 @@ public class CdmStore{ return applicationController.getTermService().getVocabulary(VocabularyEnum.NameRelationshipType).getTermsOrderedByLabels(Language.DEFAULT()); } - public TermVocabulary getNomStatus() { + public TermVocabulary getNomenclaturalStatusTypesInternal() { return applicationController.getTermService().getVocabulary(VocabularyEnum.NomenclaturalStatusType); } - + + public static Set getNomenclaturalStatusTypes(){ + // TODO sort types + return getDefault().getNomenclaturalStatusTypesInternal().getTerms(); + } + private SortedSet getRanksInternal() { - return ((OrderedTermVocabulary)applicationController.getTermService().getVocabulary(VocabularyEnum.Rank)).getOrderedTerms(null); + OrderedTermVocabulary rankVocabulary = HibernateProxyHelper.deproxy(applicationController.getTermService().getVocabulary(VocabularyEnum.Rank), OrderedTermVocabulary.class); + return rankVocabulary.getOrderedTerms(null); } public static SortedSet getRanks() { return getDefault().getRanksInternal(); } + public List getRootTaxa() { boolean onlyWithChildren = false; boolean withMisapplications = true; @@ -174,23 +187,11 @@ public class CdmStore{ public OrderedTermVocabulary getTaxonRelationshipTypes() { return (OrderedTermVocabulary) applicationController.getTermService().getVocabulary(VocabularyEnum.TaxonRelationshipType); } - - public Set getTaxonomicChildren(Taxon parentTaxon) { - new Throwable("Not implemented."); - return null; - } public TermVocabulary getSpecimenTypeDesignationStatus() { return applicationController.getTermService().getVocabulary(VocabularyEnum.SpecimenTypeDesignationStatus); } - - public void removeAllTaxa() { - new Throwable("Not implemented."); - } - - public void removeTaxon(Taxon taxon) { - new Throwable("Not implemented."); - } + public UUID saveTaxon(Taxon taxon) { return applicationController.getTaxonService().save(taxon); @@ -205,9 +206,6 @@ public class CdmStore{ return applicationController; } - public void setTaxonomicParent(Taxon taxon, Taxon newParentTaxon) { - new Throwable("Not implemented."); - } /** * Create a new conversation and bind resources to it @@ -294,7 +292,7 @@ public class CdmStore{ } configurator.setReferenceBase(null); configurator.setPageNumber(0); - // TODO currently limit results to 1000 for now + // TODO currently limit results to 1000 configurator.setPageSize(1000); List result = getTaxonService().findTaxaAndNames(configurator).getRecords(); @@ -338,6 +336,9 @@ public class CdmStore{ for (Language language : termService.getLanguageVocabulary()) { languages.add(language); } + + // TODO sort languages + // languages.add(Language.ENGLISH()); // languages.add(Language.GERMAN()); return languages; @@ -351,15 +352,6 @@ public class CdmStore{ public static Language getDefaultLanguage(){ return Language.ENGLISH(); } - - public static boolean changeDataSource(ICdmDataSource dataSource){ - - // some more things have to happen here - - instance = new CdmStore(dataSource, getDbSchemaValidation(), getApplicationContextBean()); - - return true; - } /** * @return @@ -367,4 +359,19 @@ public class CdmStore{ private static String getApplicationContextBean() { return DEFAULT_APPLICATION_CONTEXT; } + + /** + * @return + */ + public static LinkedHashMap, String> getReferenceTypes() { + LinkedHashMap, String> nomReferenceTypeMap = new LinkedHashMap, String>(); + +// referenceTypeMap.put(BibtexReference.class, "BibTeX Reference"); + nomReferenceTypeMap.put(Article.class, "Article"); + nomReferenceTypeMap.put(Generic.class, "Generic"); + nomReferenceTypeMap.put(Book.class, "Book"); + nomReferenceTypeMap.put(BookSection.class, "Book Section"); + + return nomReferenceTypeMap; + } } diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java index 29056ab13..30653cda9 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java @@ -10,7 +10,7 @@ package eu.etaxonomy.taxeditor.store; -import eu.etaxonomy.taxeditor.store.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.AbstractUtility; /** * @author n.hoffmann diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTest.java index ec150ba35..eeef5d338 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTest.java @@ -15,6 +15,8 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IProgressMonitor; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.AbstractPostOperation; +import eu.etaxonomy.taxeditor.operations.IPostOperationEnabled; /** * @author n.hoffmann diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java index 79969182e..bef56c9cb 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java @@ -11,6 +11,7 @@ import org.junit.Test; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; +import eu.etaxonomy.taxeditor.operations.ChangeConceptRelationshipTypeOperation; /** * Specification for changing the concept relation between two taxa diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperationTest.java index 552cea0f2..0de1d2c10 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperationTest.java @@ -23,6 +23,8 @@ import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; +import eu.etaxonomy.taxeditor.operations.AbstractPostOperation; +import eu.etaxonomy.taxeditor.operations.ChangeConceptToSynonymOperation; /** * @author n.hoffmann @@ -59,7 +61,7 @@ public class ChangeConceptToSynonymOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeConceptToSynonymOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeConceptToSynonymOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -73,7 +75,7 @@ public class ChangeConceptToSynonymOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeConceptToSynonymOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeConceptToSynonymOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -86,7 +88,7 @@ public class ChangeConceptToSynonymOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeConceptToSynonymOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeConceptToSynonymOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -99,7 +101,7 @@ public class ChangeConceptToSynonymOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(CdmBase)}. */ @Test public void testPostExecute() { diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperationTest.java index aec560773..7cf726244 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperationTest.java @@ -21,6 +21,8 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.AbstractPostOperation; +import eu.etaxonomy.taxeditor.operations.ChangeHomotypicGroupOperation; /** * @author n.hoffmann @@ -65,7 +67,7 @@ public class ChangeHomotypicGroupOperationTest extends AbstractTaxeditorOperatio /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeHomotypicGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeHomotypicGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -76,7 +78,7 @@ public class ChangeHomotypicGroupOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeHomotypicGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeHomotypicGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -87,7 +89,7 @@ public class ChangeHomotypicGroupOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeHomotypicGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeHomotypicGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -98,7 +100,7 @@ public class ChangeHomotypicGroupOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(CdmBase)}. */ @Test public void testPostExecute() { diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java index eb09ac3fd..db78ca076 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java @@ -19,6 +19,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.name.HomotypicalGroup; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.ChangeHomotypicalGroupBasionymOperation; /** * @author n.hoffmann @@ -49,7 +50,7 @@ public class ChangeHomotypicalGroupBasionymOperationTest extends AbstractTaxedit } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeHomotypicalGroupBasionymOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeHomotypicalGroupBasionymOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -60,7 +61,7 @@ public class ChangeHomotypicalGroupBasionymOperationTest extends AbstractTaxedit } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeHomotypicalGroupBasionymOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeHomotypicalGroupBasionymOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -71,7 +72,7 @@ public class ChangeHomotypicalGroupBasionymOperationTest extends AbstractTaxedit } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeHomotypicalGroupBasionymOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeHomotypicalGroupBasionymOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -82,7 +83,7 @@ public class ChangeHomotypicalGroupBasionymOperationTest extends AbstractTaxedit } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(CdmBase)}. */ @Test public void testPostExecute() { diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperationTest.java index 6ede57264..791249529 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperationTest.java @@ -24,6 +24,7 @@ import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; +import eu.etaxonomy.taxeditor.operations.ChangeSynonymToConceptOperation; /** * @author n.hoffmann @@ -55,7 +56,7 @@ public class ChangeSynonymToConceptOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeSynonymToConceptOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeSynonymToConceptOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -69,7 +70,7 @@ public class ChangeSynonymToConceptOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeSynonymToConceptOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeSynonymToConceptOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -82,7 +83,7 @@ public class ChangeSynonymToConceptOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeSynonymToConceptOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeSynonymToConceptOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -96,7 +97,7 @@ public class ChangeSynonymToConceptOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(CdmBase)}. */ @Test public void testPostExecute() { diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java index c8be419ca..b8ad155a2 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java @@ -11,6 +11,8 @@ import org.junit.Test; import eu.etaxonomy.cdm.model.name.HomotypicalGroup; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.AbstractPostOperation; +import eu.etaxonomy.taxeditor.operations.ChangeSynonymToHomotypicalGroupBasionymOperation; public class ChangeSynonymToHomotypicalGroupBasionymOperationTest { private static final Logger logger = Logger diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperationTest.java index 9d2bafa00..4e7e93f18 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperationTest.java @@ -21,6 +21,8 @@ import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.AbstractPostOperation; +import eu.etaxonomy.taxeditor.operations.ChangeSynonymToMisapplicationOperation; /** * @author n.hoffmann @@ -53,7 +55,7 @@ public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxedito } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeSynonymToMisapplicationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeSynonymToMisapplicationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -66,7 +68,7 @@ public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxedito } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeSynonymToMisapplicationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeSynonymToMisapplicationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -80,7 +82,7 @@ public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxedito } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeSynonymToMisapplicationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeSynonymToMisapplicationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -93,7 +95,7 @@ public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxedito } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(CdmBase)}. */ @Test public void testPostExecute() { diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperationTest.java index 05daa03c9..dfdd37f63 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperationTest.java @@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; +import eu.etaxonomy.taxeditor.operations.CreateConceptRelationOperation; /** * @author n.hoffmann @@ -45,7 +46,7 @@ public class CreateConceptRelationOperationTest extends AbstractTaxeditorOperati } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateConceptRelationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateConceptRelationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -57,7 +58,7 @@ public class CreateConceptRelationOperationTest extends AbstractTaxeditorOperati } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateConceptRelationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateConceptRelationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -68,7 +69,7 @@ public class CreateConceptRelationOperationTest extends AbstractTaxeditorOperati } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateConceptRelationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateConceptRelationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -80,7 +81,7 @@ public class CreateConceptRelationOperationTest extends AbstractTaxeditorOperati } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(CdmBase)}. */ @Test public void testPostExecute() { diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperationTest.java index 24698f435..2797f13ba 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperationTest.java @@ -12,6 +12,7 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.CreateDescriptionElementOperation; public class CreateDescriptionElementOperationTest extends AbstractTaxeditorOperationTest { private static final Logger logger = Logger diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java index 428052f22..7782845d8 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java @@ -16,6 +16,7 @@ import org.junit.BeforeClass; import org.junit.Test; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.CreateMisapplicationOperation; /** * @author n.hoffmann @@ -38,7 +39,7 @@ public class CreateMisapplicationOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateMisapplicationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateMisapplicationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -49,7 +50,7 @@ public class CreateMisapplicationOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateMisapplicationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateMisapplicationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -60,7 +61,7 @@ public class CreateMisapplicationOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateMisapplicationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateMisapplicationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java index a44834e65..08c2268d0 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java @@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.taxon.SynonymRelationship; import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.CreateSynonymInExisitingHomotypicalGroupOperation; /** * @author n.hoffmann @@ -52,7 +53,7 @@ public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends Abstr } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateSynonymInExisitingHomotypicalGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateSynonymInExisitingHomotypicalGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * * Homotypic group is the Taxons homotypic group, so we expect the synonym to be homotypic to the accepted taxon. * @@ -68,7 +69,7 @@ public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends Abstr } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateSynonymInExisitingHomotypicalGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateSynonymInExisitingHomotypicalGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * * Homotypic group is not the accepted taxons. Heterotypic synonym should be created. * @@ -86,7 +87,7 @@ public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends Abstr /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateSynonymInExisitingHomotypicalGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateSynonymInExisitingHomotypicalGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -100,7 +101,7 @@ public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends Abstr } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateSynonymInExisitingHomotypicalGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateSynonymInExisitingHomotypicalGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -112,7 +113,7 @@ public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends Abstr } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateSynonymInExisitingHomotypicalGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateSynonymInExisitingHomotypicalGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -128,7 +129,7 @@ public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends Abstr } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateSynonymInExisitingHomotypicalGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateSynonymInExisitingHomotypicalGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java index ad57fc753..b9322b7f4 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java @@ -16,6 +16,7 @@ import org.junit.BeforeClass; import org.junit.Test; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.CreateSynonymInNewGroupOperation; /** * @author n.hoffmann @@ -39,7 +40,7 @@ public class CreateSynonymInNewGroupOperationTest extends AbstractTaxeditorOpera } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateSynonymInNewGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateSynonymInNewGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -51,7 +52,7 @@ public class CreateSynonymInNewGroupOperationTest extends AbstractTaxeditorOpera } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateSynonymInNewGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateSynonymInNewGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -62,7 +63,7 @@ public class CreateSynonymInNewGroupOperationTest extends AbstractTaxeditorOpera } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.CreateSynonymInNewGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.CreateSynonymInNewGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java index 442576074..fcb3219c7 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; +import eu.etaxonomy.taxeditor.operations.DeleteConceptRelationOperation; /** * @author n.hoffmann @@ -51,7 +52,7 @@ public class DeleteConceptRelationOperationTest extends AbstractTaxeditorOperati } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteConceptRelationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteConceptRelationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -62,7 +63,7 @@ public class DeleteConceptRelationOperationTest extends AbstractTaxeditorOperati } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteConceptRelationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteConceptRelationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -73,7 +74,7 @@ public class DeleteConceptRelationOperationTest extends AbstractTaxeditorOperati } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteConceptRelationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteConceptRelationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -84,7 +85,7 @@ public class DeleteConceptRelationOperationTest extends AbstractTaxeditorOperati } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(CdmBase)}. */ @Test public void testPostExecute() { diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java index b0dd0fafd..f8885263d 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java @@ -19,6 +19,7 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.cdm.model.description.TextData; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.DeleteDescriptionElementOperation; /** * @author n.hoffmann @@ -50,7 +51,7 @@ public class DeleteDescriptionElementOperationTest extends AbstractTaxeditorOper } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteDescriptionElementOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteDescriptionElementOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -61,7 +62,7 @@ public class DeleteDescriptionElementOperationTest extends AbstractTaxeditorOper } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteDescriptionElementOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteDescriptionElementOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -73,7 +74,7 @@ public class DeleteDescriptionElementOperationTest extends AbstractTaxeditorOper } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteDescriptionElementOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteDescriptionElementOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java index a03ff514a..3ab373a53 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java @@ -18,6 +18,7 @@ import org.junit.Test; import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.DeleteMisapplicationOperation; /** * @author n.hoffmann @@ -47,7 +48,7 @@ public class DeleteMisapplicationOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteMisapplicationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteMisapplicationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -58,7 +59,7 @@ public class DeleteMisapplicationOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteMisapplicationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteMisapplicationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -69,7 +70,7 @@ public class DeleteMisapplicationOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteMisapplicationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteMisapplicationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -80,7 +81,7 @@ public class DeleteMisapplicationOperationTest extends AbstractTaxeditorOperatio } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(CdmBase)}. */ @Test public void testPostExecute() { diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperationTest.java index 50f97726b..585ec6fd8 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperationTest.java @@ -19,6 +19,7 @@ import org.junit.Test; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.DeleteSynonymOperation; /** * @author n.hoffmann @@ -48,7 +49,7 @@ public class DeleteSynonymOperationTest extends AbstractTaxeditorOperationTest{ } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteSynonymOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteSynonymOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -59,7 +60,7 @@ public class DeleteSynonymOperationTest extends AbstractTaxeditorOperationTest{ } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteSynonymOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteSynonymOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -71,7 +72,7 @@ public class DeleteSynonymOperationTest extends AbstractTaxeditorOperationTest{ } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteSynonymOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteSynonymOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperationTest.java index 5b6b90899..f49d4312d 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperationTest.java @@ -17,6 +17,7 @@ import org.junit.BeforeClass; import org.junit.Test; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.DeleteTaxonOperation; /** * @author n.hoffmann @@ -45,7 +46,7 @@ public class DeleteTaxonOperationTest extends AbstractTaxeditorOperationTest{ } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteTaxonOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteTaxonOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -58,7 +59,7 @@ public class DeleteTaxonOperationTest extends AbstractTaxeditorOperationTest{ } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteTaxonOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteTaxonOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -71,7 +72,7 @@ public class DeleteTaxonOperationTest extends AbstractTaxeditorOperationTest{ } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.DeleteTaxonOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.DeleteTaxonOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java index 3409912bb..2f262e40b 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java @@ -16,6 +16,7 @@ import org.junit.BeforeClass; import org.junit.Test; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.operations.MoveTaxonOperation; /** * @author n.hoffmann @@ -42,7 +43,7 @@ public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTest { } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.MoveTaxonOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.MoveTaxonOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -56,7 +57,7 @@ public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTest { /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.MoveTaxonOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.MoveTaxonOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -69,7 +70,7 @@ public class MoveTaxonOperationTest extends AbstractTaxeditorOperationTest { } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.MoveTaxonOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.MoveTaxonOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test diff --git a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java index 3c876a4fb..0e141c687 100644 --- a/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java +++ b/taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java @@ -26,6 +26,8 @@ import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; +import eu.etaxonomy.taxeditor.operations.AbstractPostOperation; +import eu.etaxonomy.taxeditor.operations.SwapSynonymAndAcceptedOperation; /** * @author n.hoffmann @@ -119,7 +121,7 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeHomotypicGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeHomotypicGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -162,7 +164,7 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeHomotypicGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeHomotypicGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -173,7 +175,7 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.ChangeHomotypicGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.ChangeHomotypicGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}. * @throws ExecutionException */ @Test @@ -184,7 +186,7 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat } /** - * Test method for {@link eu.etaxonomy.taxeditor.store.operations.AbstractPostOperation#postExecute(CdmBase)}. + * Test method for {@link eu.etaxonomy.taxeditor.operations.AbstractPostOperation#postExecute(CdmBase)}. */ @Test public void testPostExecute() { -- 2.34.1