refactored folder structure
authorn.hoffmann <n.hoffmann@localhost>
Wed, 10 Jun 2009 12:48:38 +0000 (12:48 +0000)
committern.hoffmann <n.hoffmann@localhost>
Wed, 10 Jun 2009 12:48:38 +0000 (12:48 +0000)
99 files changed:
.gitattributes
taxeditor-store/META-INF/MANIFEST.MF
taxeditor-store/plugin.xml
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/CdmDataSourceRepository.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/AbstractDataSourceHandler.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/AbstractDataSourceHandler.java with 91% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/ChangeConnectionHandler.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/ChangeConnectionHandler.java with 92% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CreateDataSourceHandler.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/CreateDataSourceHandler.java with 88% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DeleteDataSourceHandler.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/DeleteDataSourceHandler.java with 90% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/EditDataSourceHandler.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/handler/EditDataSourceHandler.java with 90% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceContentProvider.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceContentProvider.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceLabelProvider.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceLabelProvider.java with 91% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceView.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/view/CdmDataSourceView.java with 97% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceCredentialsWizardPage.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceCredentialsWizardPage.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceH2WizardPage.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceH2WizardPage.java with 96% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceMySQLWizardPage.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceMySQLWizardPage.java with 98% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizard.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizard.java with 97% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizardPage.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/datasource/wizard/CdmDataSourceWizardPage.java with 89% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredCdmResourceSelectionDialog.java [new file with mode: 0644]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredNameSelectionDialog.java [new file with mode: 0644]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/FilteredReferenceSelectionDialog.java [new file with mode: 0644]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogDetailsLabelProvider.java [new file with mode: 0644]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/SelectionDialogSelectionLabelProvider.java [new file with mode: 0644]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/UriDialog.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowDataSourceViewHandler.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractDataChangeBehaviour.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractDataChangeBehaviour.java with 71% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/AbstractUtility.java with 98% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DataChangeBridge.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DataChangeBridge.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/DescriptionUtil.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IDataChangeBehavior.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IDataChangeBehavior.java with 97% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImageResources.java with 99% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImagesUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ImagesUtil.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IterableSynonymyList.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/IterableSynonymyList.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/LanguageUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/LanguageUtil.java with 88% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameRelationsUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameRelationsUtil.java with 92% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/NameUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/NameUtil.java with 98% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ReferenceUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/ReferenceUtil.java with 91% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/Resources.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/Resources.java with 99% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/SynonymUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/SynonymUtil.java with 99% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonTransfer.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TaxonUtil.java with 98% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TimeUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/model/TimeUtil.java with 97% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPersistentPostOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPersistentPostOperation.java with 97% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/AbstractPostOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/AbstractPostOperation.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptRelationshipTypeOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperation.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeConceptToSynonymOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperation.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicGroupOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperation.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeHomotypicalGroupBasionymOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperation.java with 92% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToConceptOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperation.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperation.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/ChangeSynonymToMisapplicationOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperation.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateChildTaxonOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateChildTaxonOperation.java with 85% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateConceptRelationOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperation.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateDescriptionElementOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperation.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateImageOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateImageOperation.java with 92% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateMisapplicationOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperation.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperation.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/CreateSynonymInNewGroupOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperation.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteConceptRelationOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperation.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteDescriptionElementOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperation.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteImageOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteImageOperation.java with 92% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteMisapplicationOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperation.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteSynonymOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperation.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/DeleteTaxonOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperation.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/IPostOperationEnabled.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/IPostOperationEnabled.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperation.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/RemoveHomotypicalGroupBasionymOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/RemoveHomotypicalGroupBasionymOperation.java with 92% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/SwapSynonymAndAcceptedOperation.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperation.java with 96% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/CdmParserUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/parser/CdmParserUtil.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferences.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/CdmPreferences.java with 92% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/DescriptionPreferences.java with 92% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeaturePreferences.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/FeaturePreferences.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitNomenclaturalCodePrefDialog.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitNomenclaturalCodePrefDialog.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitializeDbPreferences.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/InitializeDbPreferences.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/NomenclaturalCodePreferences.java with 93% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/PreferencesUtil.java with 95% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/RankMenuPreferences.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/RankMenuPreferences.java with 94% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicPreferences.java [moved from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/preference/TaxonomicPreferences.java with 92% similarity]
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/AbstractTaxeditorOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptRelationshipTypeOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeConceptToSynonymOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicGroupOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeHomotypicalGroupBasionymOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToConceptOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToHomotypicalGroupBasionymOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/ChangeSynonymToMisapplicationOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateConceptRelationOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateDescriptionElementOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateMisapplicationOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInExisitingHomotypicalGroupOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/CreateSynonymInNewGroupOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteConceptRelationOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteDescriptionElementOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteMisapplicationOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteSynonymOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/DeleteTaxonOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/MoveTaxonOperationTest.java
taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/operations/SwapSynonymAndAcceptedOperationTest.java

index fc9fc1111465b87cc62f388f97017a7413e1b3c2..4c081c31675c1a0eb620f23cf0b101995abc9761 100644 (file)
@@ -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
index 70980c9d25b0b32a19952271d529ade34112801d..bc6e7a81dd924dfe4a4ce18a1a66cb32d560338f 100644 (file)
@@ -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
index 8ab4736f0d5e667dfc97ba96d1b3aac915604b2d..37791504d1961ff33206c90f6018726c50a42b5e 100644 (file)
@@ -5,7 +5,7 @@
          point="org.eclipse.ui.preferencePages">
       <page
             category="eu.etaxonomy.taxeditor.preferences.taxonomic"
-            class="eu.etaxonomy.taxeditor.store.preference.NomenclaturalCodePreferences"
+            class="eu.etaxonomy.taxeditor.preference.NomenclaturalCodePreferences"
             id="eu.etaxonomy.taxeditor.preferences.nomenclatural"
             name="Nomenclatural Code">
       </page>
       </page-->
       <page
             category="eu.etaxonomy.taxeditor.preferences.description"
-            class="eu.etaxonomy.taxeditor.store.preference.FeaturePreferences"
+            class="eu.etaxonomy.taxeditor.preference.FeaturePreferences"
             id="eu.etaxonomy.taxeditor.preferences.feature"
             name="Preferred Features">
       </page>
       <page
             category="eu.etaxonomy.taxeditor.preferences.taxonomic"
-            class="eu.etaxonomy.taxeditor.store.preference.RankMenuPreferences"
+            class="eu.etaxonomy.taxeditor.preference.RankMenuPreferences"
             id="eu.etaxonomy.taxeditor.preferences.ranks"
             name="Preferred Ranks">
       </page>
       <page
-            class="eu.etaxonomy.taxeditor.store.preference.TaxonomicPreferences"
+            class="eu.etaxonomy.taxeditor.preference.TaxonomicPreferences"
             id="eu.etaxonomy.taxeditor.preferences.taxonomic"
             name="Taxonomic">
       </page>
       <page
-            class="eu.etaxonomy.taxeditor.store.preference.DescriptionPreferences"
+            class="eu.etaxonomy.taxeditor.preference.DescriptionPreferences"
             id="eu.etaxonomy.taxeditor.preferences.description"
             name="Description">
       </page>
@@ -46,7 +46,7 @@
    <extension
          point="org.eclipse.ui.views">
       <view
-            class="eu.etaxonomy.taxeditor.store.datasource.view.CdmDataSourceView"
+            class="eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceView"
             id="eu.etaxonomy.taxeditor.store.datasource.datasourceView"
             name="Datasource"
             restorable="true">
          name="Popup Menu Commands"
          point="org.eclipse.ui.commands">
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.store.datasource.handler.ChangeConnectionHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.ChangeConnectionHandler"
             id="eu.etaxonomy.taxeditor.store.datasource.change"
             name="Connect Datasource">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.store.datasource.handler.EditDataSourceHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.EditDataSourceHandler"
             id="eu.etaxonomy.taxeditor.store.datasource.edit"
             name="Edit Datasource">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.store.datasource.handler.CreateDataSourceHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.CreateDataSourceHandler"
             id="eu.etaxonomy.taxeditor.store.datasource.create"
             name="Create Datasource">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.store.datasource.handler.DeleteDataSourceHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.DeleteDataSourceHandler"
             id="eu.etaxonomy.taxeditor.store.datasource.delete"
             name="Delete Datasource">
       </command>
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 2568025b2bea98e2708bde2179fef7fe43569e37..3f7530a436c9e25f0064c3e44be41977a5813e15 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.datasource;\r
+package eu.etaxonomy.taxeditor.datasource;\r
 \r
 import java.io.BufferedReader;\r
 import java.io.File;\r
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 3d0691c2099a3cd2481e22a1ac11135a336eb1fd..38fdf056a67ac5629f83d56a49a3b4057ca4e533 100644 (file)
@@ -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
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 37c5f943613e49da6cb2e23611cc24e717c3273a..6600b2afd9999f7b7a1ad0c72e820ad2200c00ee 100644 (file)
@@ -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
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 ecdac654e3178a5fc1a10f47843373f38a884851..a4720bd49be9a48d42d107457d6608052039152b 100644 (file)
@@ -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
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 29901079262f534be96ea8150a5e44ddb2f2f4b9..b76660fcf46292f41c37ce4379a1fb934225c9d1 100644 (file)
@@ -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
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 49b8ec3b32ca48e54aeda3cd86bab0a85e0a8256..4ac512c024394fcd53a91760da34849d6f1b0e35 100644 (file)
@@ -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
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 784aeed73a516d936f0629cbcb976d0f984f0271..6e7d8abd557698ba77519e26437931388db62aad 100644 (file)
@@ -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
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 bcd938a6b430c793967c35e97571a4f956214812..50d8c322653255f76a7936bb145dbc26313edfc9 100644 (file)
@@ -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
@@ -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;
+       }       
+       
        
 }
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 2dad28c1265382388f11af7e0d676bb494c1dc9b..34f6577692bd918ac12c2f74b856531519b34637 100644 (file)
@@ -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;
 
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 80fb3ac4a8d2afe6dad6623cd2ecb5a052a126ab..1e70d2193e2a47b040b7ee436d1a45a8676cae95 100644 (file)
@@ -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;
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 751dd10a0d786850b4842276ceb9541448de35a8..7f5bf49ef5ef1887aa1965be8cce616ecdd4defb 100644 (file)
@@ -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
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 994a82242e349116855e9cdcd24da81b591a65c9..144aa19144ac7decf82d2b35bf8bd3bdcf2427b8 100644 (file)
@@ -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 (file)
index 0000000..5d162a1
--- /dev/null
@@ -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<IIdentifiableEntityCacheStrategy>) 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<IdentifiableEntity>() {
+                       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<IIdentifiableEntityCacheStrategy>) 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 (file)
index 0000000..eba56fb
--- /dev/null
@@ -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<TaxonNameBase> 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 (file)
index 0000000..cee084a
--- /dev/null
@@ -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<ReferenceBase> 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 (file)
index 0000000..ef28569
--- /dev/null
@@ -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 (file)
index 0000000..6fcef95
--- /dev/null
@@ -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);
+
+}
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 8d2c92fc6628b6ad0bb43cecfba3470efd7d9200..42fe692af2bf5ca3bfc501b1aed6e334bc869b87 100644 (file)
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.model;\r
+package eu.etaxonomy.taxeditor.dialogs;\r
 \r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
index 41f40ef33317832384497298c30595f9653da922..c9333e0d0e516a62c73b6d4319b770b76cb0e73c 100644 (file)
@@ -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;
 
 /**
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 9c13262fe7bde00b8dc230f8b23f5dcd16729fe3..e53f52b7c8f57731bdb276751cb7369feb784b3f 100644 (file)
@@ -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<CdmDataChangeEvent> 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<CdmDataChangeEvent> 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<CdmDataChangeEvent> event) {}
 }
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 13226e0c54f20041b74026c745e322b26c648763..d0ed8ab37e23aabfa98ca25ef30ec73dcff1c17d 100644 (file)
@@ -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;
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 d5c4e3721c22deef0836c379e283b6af6bc8fce1..c5af09bb312c615a34bdeb2a4f5c0faa180eb4f2 100644 (file)
@@ -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;
 
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 8292c0b4730c34b96ecb4980a6770597642a1a30..389f167ca18f021aa517c3295ab6001a186d72d3 100644 (file)
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.model;\r
+package eu.etaxonomy.taxeditor.model;\r
 \r
 import org.apache.log4j.Logger;\r
 \r
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 57e75a7f7a7135c5a69c8af94815e5e0437c87c6..8228fe071567001533800630d7fd386e3f13ee83 100644 (file)
@@ -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;
 
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 35461ab4179a49f91af8b74b3ed2a86a2b554efa..b66d35fedc500391ff0f7070e81ee6b785e43313 100644 (file)
@@ -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;
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 38dbaaf1fa90ca06225b61e7a653e58708af9aff..dffc0dcc3dd168e9aeb22045fc7d3f18cdd40f43 100644 (file)
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.model;\r
+package eu.etaxonomy.taxeditor.model;\r
 \r
 import java.util.HashSet;\r
 import java.util.List;\r
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 f139f9092478516ffbf3a0751625569067153906..ffd787a3c3fce34f05acbc6ea4907337ce349bf2 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.model;\r
+package eu.etaxonomy.taxeditor.model;\r
 \r
 import java.util.ArrayList;\r
 import java.util.Iterator;\r
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 f7fd5221dcfe2ded2194cb5ced33b0f00b9be5ff..b2e9250309c369efb87d845b80a6f0de0f71c663 100644 (file)
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.model;\r
+package eu.etaxonomy.taxeditor.model;\r
 \r
 import eu.etaxonomy.cdm.model.common.Language;\r
 \r
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 333b41129a4563b3bdf51b11d1aab3e26fc47a7c..1c9cea7b17fc1e99d309c3b8cd59b19c1f8517c9 100644 (file)
@@ -8,14 +8,14 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.model;\r
+package eu.etaxonomy.taxeditor.model;\r
 \r
 import java.util.SortedSet;\r
 \r
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
-import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 00f80d6bc24991cd54645cbbaa2260d57115535d..091920ea667dfe20e7568aa812b6d29cebac90ec 100644 (file)
@@ -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;
 
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 be496f0f688860e0411247a38d69b59c98e7737c..cdb32f61c88be9281b0d51f9c399cc99c8e6059f 100644 (file)
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.model;\r
+package eu.etaxonomy.taxeditor.model;\r
 \r
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
 import eu.etaxonomy.cdm.model.reference.Generic;\r
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 7d00c4d070cf774774ce827e38495a76ac9a19cc..674eacd246df31876685c2ddf3c79ee5dc0047dc 100644 (file)
@@ -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;
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 f71e45a46901df8011c16e0f5c56bed6dd0570bb..278cf53b0bb685e65677808c8cbdd2d3d7a27cd0 100644 (file)
@@ -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;
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 832157c9e28743946db77b833a512fae4a0b116c..df6e443ad6fa5d6019e9dc2dc60efbf7307cb374 100644 (file)
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.store.model;\r
+package eu.etaxonomy.taxeditor.model;\r
 \r
 import org.eclipse.swt.dnd.ByteArrayTransfer;\r
 import org.eclipse.swt.dnd.TransferData;\r
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 b33e2d972e488b19db9ffb9419cb3e41b81e8dba..2046f30aebd1a111146594ad37f1171a49754e1a 100644 (file)
@@ -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;
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 cd43a037e2b2102fb618690c264e0b6796950222..f74859459027231d6722a1999389ed39f4b5349b 100644 (file)
@@ -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;
 
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 17e7431dc27cac00616faa46da2b22da2bcf5b2a..91034219b0aed4bd18ba688e92d025127137c88a 100644 (file)
@@ -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;
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 f4095875c82b3dfbedacd9f2132fb903a0b454f8..9ee7ead7634d32ca26286d53b5ee5a3ed7c9a70b 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.operations.AbstractOperation;\r
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 176e577cbf88f1e60083d1a1619c2d7f1d9efbaa..2538d928313c6079632e3a9749154911e9de112d 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
-import eu.etaxonomy.taxeditor.store.model.TaxonUtil;\r
+import eu.etaxonomy.taxeditor.model.TaxonUtil;\r
 \r
 /**\r
  * @author n.hoffmann\r
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 b853e5458dbc914fe064fa136c98b20bdc6f4b32..0104f568d591b0365c8aabe5d9b32d2d6b622d37 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
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 34b52b5c7faf5c281334da1578bc011f2b496ff7..2989029db312209dd78ecc263b505a8e31938be1 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
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 fafe76e9acc39b4c21b10e6cdf2f9efbb1c6349d..49550275694f01797b92bca0b490a2c23236abb9 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.model.SynonymUtil;\r
+import eu.etaxonomy.taxeditor.model.SynonymUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 323f9175655e45d2059eb88d68f8b6e4e2a0d141..a0b649a86f66bf768b0da0eb879bf1e655413720 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
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 1eb307e7cc8e7773e7d15e5374eed786c6b2f945..072f8d936ef99aaf19ac90b076d049a69152af1d 100644 (file)
@@ -1,95 +1,91 @@
-// $Id$\r
-/**\r
-* Copyright (C) 2007 EDIT\r
-* European Distributed Institute of Taxonomy \r
-* http://www.e-taxonomy.eu\r
-* \r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
-\r
-package eu.etaxonomy.taxeditor.store.operations;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.core.commands.ExecutionException;\r
-import org.eclipse.core.commands.operations.IUndoContext;\r
-import org.eclipse.core.runtime.IAdaptable;\r
-import org.eclipse.core.runtime.IProgressMonitor;\r
-import org.eclipse.core.runtime.IStatus;\r
-import org.eclipse.core.runtime.Status;\r
-\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;\r
-import eu.etaxonomy.taxeditor.store.model.TaxonUtil;\r
-\r
-/**\r
- * @author n.hoffmann\r
- * @created 08.05.2009\r
- * @version 1.0\r
- */\r
-public class CreateChildTaxonOperation extends AbstractPostOperation {\r
-       \r
-       private static final Logger logger = Logger\r
-       .getLogger(CreateChildTaxonOperation.class);\r
-       \r
-       private TaxonNameBase newTaxonName;\r
-\r
-       private Taxon childTaxon;\r
-\r
-       \r
-       /**\r
-        * @param label\r
-        * @param undoContext\r
-        * @param parentTaxon\r
-        * @param postOperationEnabled\r
-        * @param conversationEnabled\r
-        */\r
-       public CreateChildTaxonOperation(String label, IUndoContext undoContext,\r
-                       Taxon parentTaxon, TaxonNameBase name, IPostOperationEnabled postOperationEnabled) {\r
-               super(label, undoContext, parentTaxon, postOperationEnabled);\r
-               \r
-               this.newTaxonName = name;\r
-       }\r
-\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
-       @Override\r
-       public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
-                       throws ExecutionException {\r
-               \r
-               childTaxon = TaxonUtil.addChildTaxonBaseIsolated(taxon.getUuid(), newTaxonName);\r
-               \r
-               if(childTaxon != null){\r
-                       return postExecute(childTaxon);\r
-               }else{\r
-                       return new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, TaxeditorStorePlugin.ERROR_SAVING_ZERO_NAME, "Attempt to save taxon with zero length name", null);\r
-               }\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
-       @Override\r
-       public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
-                       throws ExecutionException {\r
-               return execute(monitor, info);\r
-       }\r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
-       @Override\r
-       public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
-                       throws ExecutionException {\r
-               \r
-               logger.warn("Not yet implemented.");\r
-               return null;\r
-       }\r
-       \r
-       public Taxon getChildTaxon() {\r
-               return childTaxon;\r
-       }\r
-}\r
+// $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;
+       }
+}
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 5bf346d6daaf190df4fdd8184d3716b7dea0f21e..c8bebfdab3bcea62e1027ee33a0ecf0076070486 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
-import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;\r
+import eu.etaxonomy.taxeditor.parser.CdmParserUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 7d6a77f97b34669491b6bfc7f5197bf4fdc9a358..d65fff699205bc1e36795545a5716f288c598dd4 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
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 4b25737f2795a1838a8503af7e4686eaac936608..ea769601af559b718f2b2558e9c4436e61bdb5da 100644 (file)
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.model.ImagesUtil;\r
+import eu.etaxonomy.taxeditor.model.ImagesUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 135580ea4bd6932834b1a484f883b74467e66d4a..098ebc79da925388ccf983f711f00b1d3256b068 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
-import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;\r
+import eu.etaxonomy.taxeditor.parser.CdmParserUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;\r
+import eu.etaxonomy.taxeditor.parser.CdmParserUtil;\r
 \r
 /**\r
  * @author n.hoffmann\r
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 1c0cc4d2d0acc7fee6afee45577bff9b4f6deb15..eb29285e58c8b6dc97e4b8a6fd213d1d3b62487e 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.parser.CdmParserUtil;\r
+import eu.etaxonomy.taxeditor.parser.CdmParserUtil;\r
 \r
 /**\r
  * <ol>\r
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 0b992d1d0c96aefb9d381212e84b8dea43752557..39aba56e4ad2c592b961cb085b76752722828ac7 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
-import eu.etaxonomy.taxeditor.store.model.TaxonUtil;\r
+import eu.etaxonomy.taxeditor.model.TaxonUtil;\r
 \r
 /**\r
  * Deletes a relation between two taxa. \r
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 fa0bf8ca6063cede7046c3c1c25487e45b2402cc..1f3bdbe9704aff5c141ac04de5aeacc84e35849b 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
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 cdbf98d0b41e21f74669698f7f39f8def6f9e1c8..bd1d0bb43b3ea2191f8ebecb2fe52583ff796355 100644 (file)
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;\r
 import eu.etaxonomy.cdm.model.media.ImageFile;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.model.ImagesUtil;\r
+import eu.etaxonomy.taxeditor.model.ImagesUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 4ad617ab9b4d08414c3155974d4510bd64aed87a..15e2c8e72fb1a343bebc39cbc62e47690b614b1b 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
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 5ab896416a098180f21660be378e251d2eb2c19f..b2315e91e22bba7c446c2c56a8d721005b81619e 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import java.util.Set;\r
 \r
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 19ba06fe21943ab0c154212a32a7b16ccb90152e..5c7e89ee56d143078bb33b226da495054f0d748e 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
@@ -20,7 +20,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.model.TaxonUtil;\r
+import eu.etaxonomy.taxeditor.model.TaxonUtil;\r
 \r
 /**\r
  * Delete a taxon from the model.\r
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 4c570b9c7db7a3d7650dd504c7af5f34f00de87a..5dbb6ef3ca2e046688d05fda6b0987960af2ad6b 100644 (file)
@@ -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;
 
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 5aedfdfbd5079ef6dd1c835b1d0717e8eb741f5a..46079d15aa8147c499c20706cacf033b3103ec96 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.ExecutionException;\r
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.model.TaxonUtil;\r
+import eu.etaxonomy.taxeditor.model.TaxonUtil;\r
 \r
 /**\r
  * Change the taxonomic parent of a given taxon.\r
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 8565f28e56d3cb5fd7e033eb38879c377f0eb6f2..c0d633e8dbc6416ae5a69bed09b25953983df28a 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.operations;\r
+package eu.etaxonomy.taxeditor.operations;\r
 \r
 import org.eclipse.core.commands.ExecutionException;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.store.model.SynonymUtil;\r
+import eu.etaxonomy.taxeditor.model.SynonymUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 487eb617b16b36bc512305e97bc8b274b242ec92..f963aa615c4c7c8c7d3464acd2e53a88718c882a 100644 (file)
@@ -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
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 a7f585e3c382f603fd052a7e0969530c3512be13..732cf69fe5ac5c4b70801a0cb579ef304ba37b91 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.parser;\r
+package eu.etaxonomy.taxeditor.parser;\r
 \r
 import org.apache.log4j.Logger;\r
 \r
@@ -17,7 +17,7 @@ import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser;\r
 import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;\r
-import eu.etaxonomy.taxeditor.store.preference.PreferencesUtil;\r
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 93081d3b08b5b2eba8a57d58779d49bd9f0b5cf1..9def950ef83b01023836eef5cff057120f1fc0ff 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.preference;\r
+package eu.etaxonomy.taxeditor.preference;\r
 \r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
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 bf8dd63abb9d23d9f940cb652e5faec22d485255..839dc3890ebeba9a62bd28354942c8a447a932ad 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.preference;\r
+package eu.etaxonomy.taxeditor.preference;\r
 \r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
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 c49f86f1a600abcd133d20b939c9851ffea48d12..42b994816a4ca797c1616397e40701810d3a7e55 100644 (file)
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
-package eu.etaxonomy.taxeditor.store.preference;\r
+package eu.etaxonomy.taxeditor.preference;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
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 95ea7745018b5ab1eeda356cf00fe81e89dda527..cbd3b1bdc5419354791c8d15bf73d8885032b44f 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.preference;\r
+package eu.etaxonomy.taxeditor.preference;\r
 \r
 import org.eclipse.jface.dialogs.Dialog;\r
 import org.eclipse.swt.SWT;\r
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;\r
 import org.eclipse.swt.widgets.Shell;\r
 \r
-import eu.etaxonomy.taxeditor.store.model.Resources;\r
+import eu.etaxonomy.taxeditor.model.Resources;\r
 \r
 /** \r
  * @author p.ciardelli\r
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 0a3c2970596fd2b0c2b98babcc3d96e9d27435f8..ead719f50b1d424535e38ea6d099d784a9a824c7 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.preference;\r
+package eu.etaxonomy.taxeditor.preference;\r
 \r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
@@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IWorkbench;\r
 import org.eclipse.ui.IWorkbenchPreferencePage;\r
 \r
-import eu.etaxonomy.taxeditor.store.model.Resources;\r
+import eu.etaxonomy.taxeditor.model.Resources;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 9caa4bcda9b8542c7a7680e19dbb22942f9a88f2..2b14e4347856f541cfc4a229192bd6efb3cd297f 100644 (file)
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
-package eu.etaxonomy.taxeditor.store.preference;\r
+package eu.etaxonomy.taxeditor.preference;\r
 \r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
@@ -19,8 +19,8 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IWorkbench;\r
 import org.eclipse.ui.IWorkbenchPreferencePage;\r
 \r
+import eu.etaxonomy.taxeditor.model.Resources;\r
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;\r
-import eu.etaxonomy.taxeditor.store.model.Resources;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 a65b71f7b12f2793ccf60b1e5801358c96fafcfd..d6cb75706adeb2fb284a3fd33f8b2ea6056b7c3e 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.preference;\r
+package eu.etaxonomy.taxeditor.preference;\r
 \r
 import java.util.ArrayList;\r
 import java.util.Collections;\r
@@ -26,9 +26,9 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.name.ZoologicalName;\r
+import eu.etaxonomy.taxeditor.model.Resources;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;\r
-import eu.etaxonomy.taxeditor.store.model.Resources;\r
 \r
 /**\r
  * @author p.ciardelli\r
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 248e8af766830b2b4cb3d20b578d726bbab4a556..72cbe43789bc8095b3e5aec2272184cb564e7c04 100644 (file)
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1\r
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
-package eu.etaxonomy.taxeditor.store.preference;\r
+package eu.etaxonomy.taxeditor.preference;\r
 \r
 import java.util.HashMap;\r
 import java.util.Map;\r
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 9ec548dd89b3b11ebd5fb0db4dfaa526d40ea85c..9a9fa8ebef70dda502acff1f03707340cfa4d0a0 100644 (file)
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.\r
 */\r
 \r
-package eu.etaxonomy.taxeditor.store.preference;\r
+package eu.etaxonomy.taxeditor.preference;\r
 \r
 import org.eclipse.jface.preference.PreferencePage;\r
 import org.eclipse.swt.SWT;\r
index a81a88601d31eb2cd93f11b4a0f789b632d60f87..e75cb9125331aa37c28d91ca1b0d02d52b6a8303 100644 (file)
@@ -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<NomenclaturalStatusType> getNomStatus() {
+       public TermVocabulary<NomenclaturalStatusType> getNomenclaturalStatusTypesInternal() {
                return applicationController.getTermService().getVocabulary(VocabularyEnum.NomenclaturalStatusType);
        }
-
+       
+       public static Set<NomenclaturalStatusType> getNomenclaturalStatusTypes(){
+               // TODO sort types
+               return getDefault().getNomenclaturalStatusTypesInternal().getTerms();
+       }
+       
        private SortedSet<Rank> 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<Rank> getRanks() {
                return getDefault().getRanksInternal();
        }
 
+
        public List<Taxon> getRootTaxa() {
                boolean onlyWithChildren = false;
                boolean withMisapplications = true;
@@ -174,23 +187,11 @@ public class CdmStore{
        public OrderedTermVocabulary<TaxonRelationshipType> getTaxonRelationshipTypes() {
                return (OrderedTermVocabulary<TaxonRelationshipType>) applicationController.getTermService().getVocabulary(VocabularyEnum.TaxonRelationshipType);
        }
-
-       public Set<Taxon> getTaxonomicChildren(Taxon parentTaxon) {
-               new Throwable("Not implemented.");
-               return null;
-       }
        
        public TermVocabulary<SpecimenTypeDesignationStatus> 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<IdentifiableEntity> 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<Class<?>, String> getReferenceTypes() {
+               LinkedHashMap<Class<?>, String> nomReferenceTypeMap = new LinkedHashMap<Class<?>, 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;
+       }
 }
index 29056ab13922eed005efc8f7c4c496073f457b70..30653cda9e5d32eb6019c2fcd449d6ae512051cd 100644 (file)
@@ -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
index ec150ba35690b2fbb94eae4da078459ec728091d..eeef5d33830fd167ba7bc5e1bea16a9727bc3832 100644 (file)
@@ -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
index 79969182e60fbb307a54555147f20c3e178447e3..bef56c9cb75da3263cf136113847b65abb5b4b7c 100644 (file)
@@ -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
index 552cea0f2c7013d31bc21aa414cade51c3559ed0..0de1d2c104d697543ca0177aa2fedbb8ee8c393c 100644 (file)
@@ -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() {
index aec560773cdf883329c4cc13a4aaae7df0a8d8b5..7cf7262449e0f75ad649bdb9964db6aa46485e61 100644 (file)
@@ -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() {
index eb09ac3fd5ae01e280b7b353d0576e6a9fee937e..db78ca076d2f84b2a40368a0e5811d92830ccfaa 100644 (file)
@@ -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() {
index 6ede572643f45c2606d14db1b246708de7f8ece2..791249529a1b74f36ac76d58de46b8271f8633f3 100644 (file)
@@ -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() {
index c8be419ca038a03fea3e6b0354db8479d4b2e5b2..b8ad155a2475a0e3162da8b70753d8ee788537dd 100644 (file)
@@ -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
index 9d2bafa00a6d21e648b9cf67821c24ef2d2db66d..4e7e93f181eb7cb095baefa962f940fbcaa563da 100644 (file)
@@ -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() {
index 05daa03c97fe7913ab58f2400190774da2f91435..dfdd37f6386e69dbc4cb721a8e4694123308c263 100644 (file)
@@ -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() {
index 24698f4358b3a5b1927c570beacc6481a0afe1e7..2797f13ba5d836716c18702d05a919f929a3103b 100644 (file)
@@ -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
index 428052f222e7a76aff1c12bb4a17941409878151..7782845d8971fe30007bee32ce340007c2228eee 100644 (file)
@@ -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
index a44834e65459259b0cd77d4bad26496e088e7faa..08c2268d0b4d331973fc87a783c23a7f62766429 100644 (file)
@@ -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
index ad57fc7539b6a614a0a48a7cf06132825cf606e1..b9322b7f4cccfc9496cdb9027ad3020566be41d4 100644 (file)
@@ -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
index 4425760745a9b6faf3eaaded7fd90c0f07868480..fcb3219c731b47ff57bdf905d08dbf07d68c8ca2 100644 (file)
@@ -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() {
index b0dd0fafd1e2c45281c35486efb8d4ba214bf951..f8885263d72a41068c68923fe51eb5cf9a6be094 100644 (file)
@@ -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
index a03ff514a057211d70565a2d1f3f5fa64437bbb2..3ab373a531a018f6ce67df1ed67060e7e690fb6b 100644 (file)
@@ -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() {
index 50f97726b03f56f993e9a613e29b8753ef4a81d1..585ec6fd8722f8ca18327090939b55e804a45034 100644 (file)
@@ -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
index 5b6b90899f369820d6fec8ea84ad406b6c122c45..f49d4312d0c69c934d608ff74840fd9b78561468 100644 (file)
@@ -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
index 3409912bb81734d93cfc997c1cb98c36dc8ceb2f..2f262e40be56caa8955df820ab61f357132550dd 100644 (file)
@@ -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
index 3c876a4fbf47f2c0eb4292a9c1db7b153a5bd498..0e141c687d5d3d8e006988fa2cb289f355fe239c 100644 (file)
@@ -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() {