Merged refactoring from development branch.

diff --git a/.gitattributes b/.gitattributes
index e6a9b96a03f78869a6b8888705b92a1f6754b387..ec4379e2552c274238515337588dffffebd80fe7 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -318,9 +318,7 @@ taxeditor-cdmlib/lib/yjp-controller-api-redist-8.0.1.jar -text
 taxeditor-cdmlib/pom.xml -text
 taxeditor-editor/META-INF/MANIFEST.MF -text
 taxeditor-editor/build.properties -text
-taxeditor-editor/icons/accessories-text-editor.png -text
 taxeditor-editor/icons/address-book-new.png -text
-taxeditor-editor/icons/applications-office.png -text
 taxeditor-editor/icons/camera-photo.png -text
 taxeditor-editor/icons/edit_16x16.gif -text
 taxeditor-editor/icons/emblem-photos.png -text
@@ -329,24 +327,6 @@ taxeditor-editor/p2.inf -text
 taxeditor-editor/plugin.properties -text
 taxeditor-editor/plugin.xml -text
 taxeditor-editor/pom.xml -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AgentSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/ClassificationSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/CollectionSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/DerivedUnitSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FeatureSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FeatureTreeSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FieldObservationSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/InstitutionSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NameSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NamedAreaSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NomenclaturalAuthorTeamSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/PersonSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/PolytomousKeySelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/ReferenceSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TaxonBaseSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TaxonNodeSelectionDialog.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TeamSelectionDialog.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/CdmDataTransfer.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java -text
@@ -438,25 +418,6 @@ taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/Dele
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/RemoveHomotypicalGroupBasionymOperation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/AbstractNewEntityWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/ExternalReferenceServiceWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewCollectionWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewDerivedUnitBaseWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewFieldObservationWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewInstitutionWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewNonViralNameWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewPersonWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewReferenceWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewTeamWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/GoogleLanguageApiWrapper.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/ITranslationServiceWrapper.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/LanguageNotSupportedException.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationMetaDataWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractCdmDataViewer.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractCdmEditorViewPart.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractSplitableViewPart.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptContentProvider.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptLabelProvider.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java -text
@@ -484,16 +445,12 @@ taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/ha
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DescriptionsMenuPropertyTester.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/ChangeDescriptionElementType.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateDescriptionElementOperation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/EditInXper2Handler.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionElementsOperation.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/CdmSectionPart.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewPart.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewer.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaLabelProvider.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java -text
@@ -507,244 +464,6 @@ taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operatio
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java -text
 taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/RemoveImageFromDescriptionElementOperation.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewPart.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewer.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmEntityWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmFormElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmFormElementWithErrors.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractFormSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/BrowserElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CdmFormFactory.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CdmPropertyChangeEvent.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CheckboxElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/DateDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ICdmFormElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IEnableableFormElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IEntityElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IErrorIntolerableElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IExceptionHandler.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ILabeledElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IPropertyChangeEmitter.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IRelevantFormElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ISelectable.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ISelectableElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ImageElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/KeyStatementElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/KeyValueViewerElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/LabelElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/LanguageStringWithLabelElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/MultilanguageTextElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/NumberWithLabelElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PartialElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PointElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/RootElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/SelectionArbitrator.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextActionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TimePeriodElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ToggleableTextElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/UriWithLabelElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/IOpenUrlEnabled.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlContentProvider.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlLabelProvider.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlReferencePage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlResultPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/AbstractSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/AgentSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/ClassificationSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/CollectionSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/DerivedUnitBaseSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/EditFromSelectionWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FeatureSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FeatureTreeSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FieldObservationSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/InstitutionSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NameSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NamedAreaSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NomenclaturalAuthorTeamSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PersonSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PolytomousKeyNodeSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PolytomousKeySelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/ReferenceSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/SynonymSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonBaseSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonNodeSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TeamSelectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractEnumComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractTermComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AnnotationTypeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/DeterminationModifierComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/EmptyComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ExtensionTypeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/LanguageComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/MarkerTypeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/MeasurementUnitComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ModifierComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NameRelationshipTypeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NameTypeDesignationStatusComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NamedAreaTypeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NomenclaturalCodeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NomenclaturalStatusTypeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/PresenceAbsenceTermComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/PreservationMethodComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/RankComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ReferenceSystemComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ReferenceTypeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/RightsTypeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ScopeComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/SexComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/SpecimenTypeDesignationStatusComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StageComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StateComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StatisticalMeasureComboElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractCdmDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractCdmDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractEntityCollectionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractEntityCollectionSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/BulkEditorOpeningSelectionListener.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/EmptyElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/ITaxonBaseDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamMemberElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamMemberSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamOrPersonBaseDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DerivedUnitElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescribedSpecimenSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementMediaSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementSourceElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementSourceSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionSourceElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionSourceSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/GeoScopeElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/GeoScopeSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/MediaDetailsSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ModifierElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ModifierSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/NaturalLanguageDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/NaturalLanguageSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ScopeElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ScopeSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StateDataElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StateDataSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StatisticalMeasurementValueElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StatisticalMeasurementValueSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/AbstractDetailedDescriptionDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/CategoricalDataDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/CommonNameDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/DistributionDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/IndividualsAssociationDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/QuantitativeDataDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/TaxonInteractionDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/TextDataDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/feature/FeatureDistributionDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/feature/FeatureDistributionDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/GeographicalScopeDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyNodeDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyNodeDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/ScopeRestrictionSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AbstractTypeDesignationElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AuthorshipDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AuthorshipDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/HybridDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/HybridDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipWizard.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameTypeDesignationElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NomenclaturalStatusElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NomenclaturalStatusSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/SpecimenTypeDesignationElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/TypeDesignationSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/AbstractEventDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectingAreasDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectionDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectionWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DeterminationEventDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DeterminationEventDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/IDerivedUnitFacadeDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/NamedAreaDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SourceCollectionDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SpecimenCollectionDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SpecimenCollectionDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/NomenclaturalReferenceDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/NomenclaturalReferenceDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceDetailSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceWizardPage.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractMediaRepresentationPartElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractOriginalSourceElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractReferencedEntityElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AnnotationElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AnnotationSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/CreditElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/CreditSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ExtensionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ExtensionSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/HeadlineSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/IdentifiableSourceElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MarkerElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MarkerSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationPartSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/RightsElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/RightsSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/SourceSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/VersionElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/VersionSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/ParsingMessageElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/ParsingMessagesSection.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/TaxonBaseDetailElement.java -text
-taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/TaxonBaseDetailSection.java -text
 taxeditor-editor/src/main/resources/TaonDescriptionEditor.screen -text
 taxeditor-editor/src/main/resources/log4j.properties -text
 taxeditor-editor/src/test/java/eu/etaxonomy/taxeditor/editor/Application.java -text
@@ -787,7 +506,6 @@ taxeditor-navigation/icons/edit_16x16.gif -text
 taxeditor-navigation/icons/preferences-system-windows.png -text
 taxeditor-navigation/icons/system-search.png -text
 taxeditor-navigation/icons/tree_icon.jpg -text
-taxeditor-navigation/icons/tree_icon_small.jpg -text
 taxeditor-navigation/p2.inf -text
 taxeditor-navigation/plugin.xml -text
 taxeditor-navigation/pom.xml -text
@@ -795,9 +513,6 @@ taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationU
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigatorStateManager.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/RecentNamesContributionItem.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/WorkbenchUndoContextAdapterFactory.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewClassificationHandler.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewTaxonNodeHandler.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/RefreshTreeHandler.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/internal/TaxeditorNavigationPlugin.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyContentProvider.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyLabelProvider.java -text
@@ -822,6 +537,9 @@ taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/T
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java -text
+taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewClassificationHandler.java -text
+taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewTaxonNodeHandler.java -text
+taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RefreshTreeHandler.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/EditClassificationOperation.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java -text
@@ -831,12 +549,6 @@ taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/C
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultLabelProvider.java -text
 taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchResultView.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/ClassificationWizard.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/ClassificationWizardPage.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewPolytomousKeyWizard.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizard.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizardPage.java -text
-taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/PolytomousKeyWizardPage.java -text
 taxeditor-navigation/src/main/java/log4j.properties -text
 taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/Application.java -text
 taxeditor-navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationActionBarAdvisor.java -text
@@ -881,12 +593,14 @@ taxeditor-store/icons/EDIT-logo.jpg -text
 taxeditor-store/icons/a_no_bg.gif -text
 taxeditor-store/icons/accepted.gif -text
 taxeditor-store/icons/accepted_small.gif -text
+taxeditor-store/icons/accessories-text-editor.png -text
 taxeditor-store/icons/add.gif -text
 taxeditor-store/icons/add_edit.gif -text
 taxeditor-store/icons/add_no_bg.gif -text
 taxeditor-store/icons/add_no_bg2.gif -text
 taxeditor-store/icons/alt_window_16.gif -text
 taxeditor-store/icons/alt_window_32.gif -text
+taxeditor-store/icons/applications-office.png -text
 taxeditor-store/icons/autonym_no_bg.gif -text
 taxeditor-store/icons/back.gif -text
 taxeditor-store/icons/basionym.gif -text
@@ -996,6 +710,7 @@ taxeditor-store/icons/thin_close_view.gif -text
 taxeditor-store/icons/thin_max_view.gif -text
 taxeditor-store/icons/thin_restore_view.GIF -text
 taxeditor-store/icons/trash.gif -text
+taxeditor-store/icons/tree_icon_small.jpg -text
 taxeditor-store/icons/undo.gif -text
 taxeditor-store/icons/unknown.gif -text
 taxeditor-store/icons/unknown_no_bg.gif -text
@@ -1010,10 +725,6 @@ taxeditor-store/icons/web.gif -text
 taxeditor-store/p2.inf -text
 taxeditor-store/plugin.xml -text
 taxeditor-store/pom.xml -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/AbstractAccountView.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/group/view/GroupLabelProvider.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/group/view/GroupView.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/AuthenticatedUserBar.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/CreateUserHandler.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/EditUserHandler.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/ToggleUserEnablementHandler.java -text
@@ -1021,25 +732,9 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/Crea
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/DeleteUserOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/EditUserOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/ToggleUserEnablementOperation.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserContentProvider.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserLabelProvider.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserView.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/wizard/UserWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/wizard/UserWizardPage.java -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/CloseConnectionHandler.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/DataSourceMenuPropertyTester.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/handler/UpdateDataSourceHandler.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/CdmDataSourceViewPart.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceViewerComparator.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmMetaDataAwareDataSourceContainer.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
@@ -1047,8 +742,6 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSo
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceSQLServerWizardPage.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceTypeSelectionWizardPage.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceWizard.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java -text
@@ -1087,7 +780,6 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/labels/ILabelImageStrategy.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/labels/LabelImageProvider.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/labels/ZoologicalNameLabelStrategy.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractCdmViewPart.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/AuthorHelper.java -text
@@ -1099,9 +791,11 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DataChangeBridge.java
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainerTree.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ICdmEditorHandle.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IContextListener.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IDataChangeBehavior.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IDirtyMarkableSelectionProvider.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IElementHasDetails.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IPartChangeListener.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IPartContentHasDetails.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IPartContentHasSupplementalData.java -text
@@ -1115,14 +809,23 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxeditorPartService.
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/TimeHelper.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/AbstractSpecificReferenceWizardPage.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/BookDetailsWizardPage.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewAuthorWizard.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewAuthorWizardPage.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewGenericReferenceWizardPage.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewNameWizard.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewNameWizardPage.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewReferenceWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ClassificationWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewCollectionWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewReferenceWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operation/IPostOperationEnabled.java -text
@@ -1167,16 +870,313 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/StageMenuPr
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/TaxonRelationshipTypeMenuPreferences.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/VocabularyTermWizard.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/VocabularyTermWizardPage.java -text
-taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/reporting/ReportingViewPart.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/ContextManager.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/EditorManager.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java -text
 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/UriDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AgentSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ClassificationSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/CollectionSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/DerivedUnitSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FeatureSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FeatureTreeSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FieldObservationSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/InstitutionSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NameSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NamedAreaSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NomenclaturalAuthorTeamSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/PersonSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/PolytomousKeySelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ReferenceSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TaxonBaseSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TaxonNodeSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TeamSelectionDialog.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmEntityWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElementWithErrors.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractFormSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/BrowserElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmPropertyChangeEvent.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CheckboxElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/DateDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ICdmFormElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IEnableableFormElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IEntityElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IErrorIntolerableElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IExceptionHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ILabeledElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IPropertyChangeEmitter.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IRelevantFormElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ISelectable.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ISelectableElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ImageElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/KeyStatementElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/KeyValueViewerElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/LabelElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/LanguageStringWithLabelElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/MultilanguageTextElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/NumberWithLabelElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PartialElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/RootElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/SelectionArbitrator.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextActionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextWithLabelElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TimePeriodElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ToggleableTextElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/UriWithLabelElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/IOpenUrlEnabled.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlContentProvider.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlLabelProvider.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlReferencePage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlResultPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/EmptyElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ITaxonBaseDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementMediaSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/GeoScopeElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/GeoScopeSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TextDataDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/GeographicalScopeDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AbstractTypeDesignationElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TypeDesignationSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AbstractEventDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/IDerivedUnitFacadeDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractMediaRepresentationPartElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractReferencedEntityElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/CreditElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/CreditSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ImageFileElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationPartSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessageElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessagesSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AgentSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/CollectionSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/DerivedUnitBaseSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureTreeSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FieldObservationSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/InstitutionSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NamedAreaSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PersonSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeyNodeSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeySelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ReferenceSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/SynonymSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonBaseSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TeamSelectionElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AnnotationTypeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/DeterminationModifierComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/EmptyComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ExtensionTypeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/LanguageComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MarkerTypeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MeasurementUnitComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ModifierComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameRelationshipTypeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameTypeDesignationStatusComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NamedAreaTypeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalCodeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalStatusTypeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PresenceAbsenceTermComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PreservationMethodComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RankComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceSystemComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceTypeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RightsTypeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ScopeComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SexComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SpecimenTypeDesignationStatusComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StageComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StateComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StatisticalMeasureComboElement.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/ITranslationServiceWrapper.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/LanguageNotSupportedException.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationMetaDataWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizard.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractAccountViewPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmDataViewer.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmEditorViewPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractSplitableViewPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceContentProvider.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/CloseConnectionHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/CreateDataSourceHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DataSourceMenuPropertyTester.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DeleteDataSourceHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/group/GroupLabelProvider.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/group/GroupViewPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/reporting/ReportingViewPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewPart.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserContentProvider.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserLabelProvider.java -text
+taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserView.java -text
 taxeditor-store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml -text
 taxeditor-store/src/main/resources/log4j.properties -text
 taxeditor-store/src/test/java/eu/etaxonomy/taxeditor/store/CdmStoreTest.java -text

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
index 7b5ac6f5f47eea59d4df7b602d3f3a3fcc0294e1..72ee9adf8745b16ba8e6c9cd280c9f85daed2aa1 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
@@ -13,9 +13,9 @@ import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 import org.osgi.framework.ServiceReference;
 
-import eu.etaxonomy.taxeditor.dialogs.LoginDialog;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.dialogs.LoginDialog;
 
 /**
  * <p>ApplicationWorkbenchWindowAdvisor class.</p>

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java
index 354e4a8d07717de3474738266355565b196d8056..d40480c98ae2dd948967e53c3ec1b59553ddcca7 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java
@@ -6,8 +6,8 @@ package eu.etaxonomy.taxeditor.perspective;
 import org.eclipse.ui.IPageLayout;
 
 import eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView;
-import eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewPart;
-import eu.etaxonomy.taxeditor.editor.view.supplementaldata.SupplementalDataViewPart;
+import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
+import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Default.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Default.java
index fad8147f943e5954c270fa7de9ff77a79c3eee3b..ca709e7f834002f9e7d5ee48dfb656ac2cf5e266 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Default.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Default.java
@@ -8,8 +8,8 @@ import org.eclipse.ui.IPerspectiveFactory;
 import org.eclipse.ui.IPlaceholderFolderLayout;
 import org.eclipse.ui.progress.IProgressConstants;
 
-import eu.etaxonomy.taxeditor.account.user.view.UserView;
-import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
+import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
+import eu.etaxonomy.taxeditor.view.user.UserView;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java
index 6c4f4fb6f7f219b6ca48a88dd95c8d667411d6a4..92564c1ac56c07d8f13d11c1a8a97d434bf4d356 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java
@@ -5,9 +5,9 @@ package eu.etaxonomy.taxeditor.perspective;
 
 import org.eclipse.ui.IPageLayout;
 
-import eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewPart;
-import eu.etaxonomy.taxeditor.editor.view.supplementaldata.SupplementalDataViewPart;
 import eu.etaxonomy.taxeditor.navigation.key.polytomous.PolytomousKeyViewPart;
+import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
+import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java
index bc5e0a6689b45722f23d37d923c72804312d7610..c36ae329db9953d150315a4cf1e16a8373389fbe 100644 (file)
--- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java
+++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java
@@ -14,11 +14,11 @@ import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
-import eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewPart;
 import eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart;
-import eu.etaxonomy.taxeditor.editor.view.supplementaldata.SupplementalDataViewPart;
 import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;
 import eu.etaxonomy.taxeditor.navigation.search.SearchResultView;
+import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
+import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
index 0635914f47d32c8ddf5d651ba0228f6b75c3e7d6..0cfeff3f47f679c23504877f3d190f91ec5a72af 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
@@ -37,6 +37,7 @@ public class AgentCreator implements IEntityCreator<AgentBase> {
         */
        /** {@inheritDoc} */
        public AgentBase createEntity(String text) {
+               // FIXME
                logger.error("FIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXME");
                logger.error("We can only create Persons at the moment. See #1820");
                logger.error("FIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXME");

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
index 15604b9811fb6228fc175ed9b1aeb30db69c4c58..b999d4e385eace55026bdecb0c8db139e732b8e1 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
@@ -16,6 +16,7 @@ import java.util.Map;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
+import eu.etaxonomy.taxeditor.parser.ParseHandler;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -43,9 +44,7 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
         */
        /** {@inheritDoc} */
        public TaxonNameBase createEntity(Object key, String text) {
-               TaxonNameBase name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance((Rank) key);
-               name.setTitleCache(text);
-               return name;
+               return ParseHandler.parseName(text, (Rank) key);
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
index 37f95c0a8a33bbd3daae7b260271f23aa8750c25..6d141bebecfe1409aeef50fe11758e6852c47fba 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
@@ -19,6 +19,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
+import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
 
 /**
  * <p>ReferenceCreator class.</p>
@@ -28,8 +29,6 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
  * @version 1.0
  */
 public class ReferenceCreator implements IEntityCreator<Reference> {
-       private static final Logger logger = Logger
-                       .getLogger(ReferenceCreator.class);
 
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.bulkeditor.IEntityCreator#createEntity(java.lang.String)
@@ -96,7 +95,7 @@ public class ReferenceCreator implements IEntityCreator<Reference> {
                        reference = ReferenceFactory.newWebPage();
                }
                if (reference == null) {
-                       logger.warn("Reference type " + key + " not found. Creating reference with default type.");
+                       BulkEditorUtil.warn(getClass(), "Reference type " + key + " not found. Creating reference with default type.");
                        reference = ReferenceFactory.newGeneric();
                }
                reference.setTitleCache(text);

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index 312ac49e6c0644f291349289d15be2852f5833a1..2acee1d6fb9df84ed513f95ae3dd74d995366566 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@ -38,10 +38,10 @@ import eu.etaxonomy.cdm.api.service.ICommonService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
-import eu.etaxonomy.taxeditor.model.AbstractCdmViewPart;
 import eu.etaxonomy.taxeditor.model.DescriptionHelper;
 import eu.etaxonomy.taxeditor.model.LineSelection;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
 
 /**
  * <p>ReferencingObjectsView class.</p>

diff --git a/taxeditor-editor/META-INF/MANIFEST.MF b/taxeditor-editor/META-INF/MANIFEST.MF
index 40ce65492db7d4c423656f33e2acf3e529bc8c5d..d63b1058d0240bc438aee1ad95b6bd4397a347f3 100644 (file)
--- a/taxeditor-editor/META-INF/MANIFEST.MF
+++ b/taxeditor-editor/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-ClassPath: .,icons/
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
-Export-Package: eu.etaxonomy.taxeditor.dialogs.filteredSelection,
- eu.etaxonomy.taxeditor.editor,
+Export-Package: eu.etaxonomy.taxeditor.editor,
  eu.etaxonomy.taxeditor.editor.descriptiontree,
  eu.etaxonomy.taxeditor.editor.descriptiontree.detailpage,
  eu.etaxonomy.taxeditor.editor.descriptiontree.handler,
@@ -16,16 +15,10 @@ Export-Package: eu.etaxonomy.taxeditor.dialogs.filteredSelection,
  eu.etaxonomy.taxeditor.editor.internal,
  eu.etaxonomy.taxeditor.editor.name,
  eu.etaxonomy.taxeditor.editor.name.handler,
- eu.etaxonomy.taxeditor.editor.newWizard,
  eu.etaxonomy.taxeditor.editor.reference,
  eu.etaxonomy.taxeditor.editor.view.descriptive,
- eu.etaxonomy.taxeditor.editor.view.detail,
  eu.etaxonomy.taxeditor.editor.view.media,
- eu.etaxonomy.taxeditor.editor.view.supplementaldata,
- eu.etaxonomy.taxeditor.forms,
  eu.etaxonomy.taxeditor.forms.internal,
- eu.etaxonomy.taxeditor.forms.selection,
- eu.etaxonomy.taxeditor.forms.term,
  eu.etaxonomy.taxeditor.propertysheet,
  eu.etaxonomy.taxeditor.propertysheet.authors,
  eu.etaxonomy.taxeditor.propertysheet.name,
@@ -33,16 +26,7 @@ Export-Package: eu.etaxonomy.taxeditor.dialogs.filteredSelection,
  eu.etaxonomy.taxeditor.propertysheet.reference,
  eu.etaxonomy.taxeditor.propertysheet.tabbed,
  eu.etaxonomy.taxeditor.propertysheet.type,
- eu.etaxonomy.taxeditor.propertysheet.type.wizard,
- eu.etaxonomy.taxeditor.section,
- eu.etaxonomy.taxeditor.section.agent,
- eu.etaxonomy.taxeditor.section.classification,
- eu.etaxonomy.taxeditor.section.description,
- eu.etaxonomy.taxeditor.section.key,
- eu.etaxonomy.taxeditor.section.name,
- eu.etaxonomy.taxeditor.section.reference,
- eu.etaxonomy.taxeditor.section.supplemental,
- eu.etaxonomy.taxeditor.section.taxon
+ eu.etaxonomy.taxeditor.propertysheet.type.wizard
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.expressions,

diff --git a/taxeditor-editor/plugin.xml b/taxeditor-editor/plugin.xml
index 8344b510ca9f8cb122c535587ec493d502aed49e..542554cf40a3a7cbc52f5c328cc5fc84caf402d1 100644 (file)
--- a/taxeditor-editor/plugin.xml
+++ b/taxeditor-editor/plugin.xml
@@ -20,71 +20,20 @@
             </adapter>
          </factory>
       </extension>
-      <extension
-            point="org.eclipse.ui.newWizards">
-         <wizard
-               category="eu.etaxonomy.taxeditor.new.category.cdm"
-               class="eu.etaxonomy.taxeditor.editor.newWizard.NewReferenceWizard"
-               hasPages="true"
-               id="eu.etaxonomy.taxeditor.new.reference"
-               name="Reference">
-         </wizard>
-         <wizard
-               category="eu.etaxonomy.taxeditor.new.category.cdm"
-               class="eu.etaxonomy.taxeditor.editor.newWizard.NewNonViralNameWizard"
-               hasPages="true"
-               id="eu.etaxonomy.taxeditor.new.nonViralName"
-               name="Name">
-         </wizard>
-         <wizard
-               category="eu.etaxonomy.taxeditor.new.category.cdm"
-               class="eu.etaxonomy.taxeditor.editor.newWizard.NewTeamWizard"
-               hasPages="true"
-               id="eu.etaxonomy.taxeditor.new.team"
-               name="Team">
-         </wizard>
-         <wizard
-               category="eu.etaxonomy.taxeditor.new.category.cdm"
-               class="eu.etaxonomy.taxeditor.editor.newWizard.NewPersonWizard"
-               hasPages="true"
-               id="eu.etaxonomy.taxeditor.new.person"
-               name="Person">
-         </wizard>
-         <wizard
-               category="eu.etaxonomy.taxeditor.new.category.cdm"
-               class="eu.etaxonomy.taxeditor.editor.newWizard.NewDerivedUnitBaseWizard"
-               hasPages="true"
-               id="eu.etaxonomy.taxeditor.new.specimen"
-               name="Specimen">
-         </wizard>
-         <wizard
-               category="eu.etaxonomy.taxeditor.new.category.cdm"
-               class="eu.etaxonomy.taxeditor.editor.newWizard.NewPolytomousKeyWizard"
-               hasPages="true"
-               id="eu.etaxonomy.taxeditor.new.key.polytomous"
-               name="Polytomous Key">
-         </wizard>
-      </extension>
    <extension
          point="org.eclipse.ui.editors">
       <editor
            class="eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor"
            icon="icons/edit_16x16.gif"
-           id="eu.etaxonomy.taxeditor.editor.multipagetaxonview"
-           name="Multitabbed Taxon Editor">
+           id="eu.etaxonomy.taxeditor.editor.taxon"
+           name="Multipage Taxon Editor">
          </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor"
             default="true"
-            id="eu.etaxonomy.taxeditor.taxonNameEditor"
+            id="eu.etaxonomy.taxeditor.editor.taxon.name"
             name="Taxon Name Editor">
       </editor>
-      <editor
-            class="eu.etaxonomy.taxeditor.editor.descriptiontree.TaxonDescriptionTreeEditor"
-            default="false"
-            id="eu.etaxonomy.taxeditor.descriptiontreeeditor"
-            name="Taxon Description Editor">
-      </editor>
       <editor
             class="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditor"
             default="false"
@@ -94,30 +43,14 @@
    </extension>
       <extension
             point="org.eclipse.ui.views">
-         <view
-               allowMultiple="false"
-               class="eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewPart"
-               icon="icons/accessories-text-editor.png"
-               id="eu.etaxonomy.taxeditor.editor.forms.detailsView"
-               name="Details"
-               restorable="true">
-         </view>
          <view
                allowMultiple="false"
                class="eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart"
                icon="icons/address-book-new.png"
-               id="eu.etaxonomy.taxeditor.editor.view.description"
+               id="eu.etaxonomy.taxeditor.editor.view.descriptive"
                name="Descriptive"
                restorable="true">
          </view>
-         <view
-               allowMultiple="false"
-               class="eu.etaxonomy.taxeditor.editor.view.supplementaldata.SupplementalDataViewPart"
-               icon="icons/applications-office.png"
-               id="eu.etaxonomy.taxeditor.editor.view.supplementalData"
-               name="Supplemental Data"
-               restorable="true">
-         </view>
          <view
                allowMultiple="false"
                class="eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart"
@@ -137,38 +70,48 @@
          point="org.eclipse.ui.elementFactories">
       <factory
             class="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory"
-            id="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory">
+            id="eu.etaxonomy.taxeditor.editor.name.taxonEditorInputFactory">
       </factory>
    </extension>
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView">
+            locationURI="menu:eu.etaxonomy.navigation.menu.new?after=eu.etaxonomy.navigation.menu.new.separator1">
          <command
-               commandId="org.eclipse.ui.views.showView"
-               label="Details"
+               commandId="eu.etaxonomy.taxeditor.editor.command.new.reference"
+               label="Reference"
                style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.editor.forms.detailsView">
-            </parameter>
          </command>
          <command
-               commandId="org.eclipse.ui.views.showView"
-               label="Descriptive"
+               commandId="eu.etaxonomy.taxeditor.editor.command.new.name"
+               label="Name"
+               style="push">
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.command.new.team"
+               label="Team"
+               style="push">
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.command.new.person"
+               label="Person"
+               style="push">
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.command.new.specimen"
+               label="Specimen"
                style="push">
-            <parameter
-                  name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.editor.view.description">
-            </parameter>
          </command>
+      </menuContribution>
+      <menuContribution
+            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView">
          <command
                commandId="org.eclipse.ui.views.showView"
-               label="Supplemental"
+               label="Descriptive"
                style="push">
             <parameter
                   name="org.eclipse.ui.views.showView.viewId"
-                  value="eu.etaxonomy.taxeditor.editor.view.supplementalData">
+                  value="eu.etaxonomy.taxeditor.editor.view.description">
             </parameter>
          </command>
          <command
@@ -190,9 +133,6 @@
             </parameter>
          </command>
       </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
       <menuContribution
             locationURI="menu:org.eclipse.ui.main.menu.navigate">
          <command
@@ -201,74 +141,13 @@
                style="push">
          </command>
       </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenParentHandler"
-            id="eu.etaxonomy.taxeditor.editor.command.openParent"
-            name="Open Parent">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.taxonNameEditor">
-            <menu
-                  label="New">
-               <command
-                     commandId="eu.etaxonomy.taxeditor.editor.name.createHeterotypicSynoym"
-                     label="Heterotypic Synonym"
-                     style="push">
-                  <visibleWhen>
-                     <reference
-                           definitionId="isAcceptedTaxon">
-                     </reference>
-                  </visibleWhen>
-               </command>
-               <command
-                     commandId="eu.etaxonomy.taxeditor.editor.name.createHomotypicSynoym"
-                     label="Homotypic Synonym"
-                     style="push">
-                  <visibleWhen>
-                     <reference
-                           definitionId="isAcceptedTaxon">
-                     </reference>
-                  </visibleWhen>
-               </command>
-               <command
-                     commandId="eu.etaxonomy.taxeditor.editor.name.createSynonymInHomotypicalGroup"
-                     label="Synonym In Homotypical Group"
-                     style="push">
-                  <visibleWhen>
-                     <reference
-                           definitionId="isSynonym">
-                     </reference>
-                  </visibleWhen>
-               </command>
-               <separator
-                     name="separator1"
-                     visible="true">
-               </separator>
-               <command
-                     commandId="eu.etaxonomy.taxeditor.editor.name.createMisapplication"
-                     label="Misapplication"
-                     style="push">
-                  <visibleWhen>
-                     <or>
-                        <reference
-                              definitionId="isAcceptedTaxon">
-                        </reference>
-                        <reference
-                              definitionId="isMisapplication">
-                        </reference>
-                     </or>
-                  </visibleWhen>
-               </command>
-            </menu>
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.taxon.name">
+         <menu
+               label="New">
             <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.changeAcceptedToSynonym"
-                  label="Change Accepted Taxon to Synonym"
+                  commandId="eu.etaxonomy.taxeditor.editor.name.createHeterotypicSynoym"
+                  label="Heterotypic Synonym"
                   style="push">
                <visibleWhen>
                   <reference
@@ -276,142 +155,363 @@
                   </reference>
                </visibleWhen>
             </command>
-            <menu
-                  label="Change To">
-               <command
-                     commandId="eu.etaxonomy.taxeditor.editor.name.changeToAcceptedTaxon"
-                     label="Accepted Taxon"
-                     style="push">
-                  <visibleWhen>
-                     <not>
-                        <or>
-                           <reference
-                                 definitionId="isAcceptedTaxon">
-                           </reference>
-                           <reference
-                                 definitionId="isMisapplication">
-                           </reference>
-                        </or>
-                     </not>
-                  </visibleWhen>
-               </command>
-               <command
-                     commandId="eu.etaxonomy.taxeditor.editor.name.changeToSynonym"
-                     label="Synonym"
-                     style="push">
-                  <visibleWhen>
-                     <not>
-                       <or>
-                           <reference
-                                 definitionId="isAcceptedTaxon">
-                           </reference>
-                               <reference
-                                     definitionId="isSynonym">
-                               </reference>
-                            </or>
-                     </not>
-                  </visibleWhen>
-               </command>
-               <command
-                     commandId="eu.etaxonomy.taxeditor.editor.name.changeToMisapplication"
-                     label="Misapplication"
-                     style="push">
-                  <visibleWhen>
-                        <not>
-                        <or>
-                           <reference
-                                 definitionId="isAcceptedTaxon">
-                           </reference>
-                           <reference
-                                 definitionId="isMisapplication">
-                           </reference>
-                        </or>
-                     </not>
-                  </visibleWhen>
-               </command>
-            </menu>
-            <separator
-                  name="taxeditor-editor.separator1"
-                  visible="true">
-            </separator>
             <command
-                  commandId="org.eclipse.ui.edit.delete"
-                  label="Delete"
+                  commandId="eu.etaxonomy.taxeditor.editor.name.createHomotypicSynoym"
+                  label="Homotypic Synonym"
                   style="push">
                <visibleWhen>
-                  <or>
-                     <reference
-                           definitionId="isSynonym">
-                     </reference>
-                     <reference
-                           definitionId="isMisapplication">
-                     </reference>
-                     <reference
-                           definitionId="isConceptRelation">
-                     </reference>
-                  </or>
+                  <reference
+                        definitionId="isAcceptedTaxon">
+                  </reference>
                </visibleWhen>
             </command>
             <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.deleteAllEmptyNames"
-                  label="Delete All Empty Names"
+                  commandId="eu.etaxonomy.taxeditor.editor.name.createSynonymInHomotypicalGroup"
+                  label="Synonym In Homotypical Group"
                   style="push">
                <visibleWhen>
                   <reference
-                        definitionId="hasEmptyNames">
+                        definitionId="isSynonym">
                   </reference>
                </visibleWhen>
             </command>
             <separator
-                  name="taxeditor-editor.separator2"
+                  name="separator1"
                   visible="true">
             </separator>
-            <dynamic
-                  class="eu.etaxonomy.taxeditor.editor.name.handler.GroupBasionymContributionItem"
-                  id="taxeditor-editor.dynamic.setBasionym">
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.name.createMisapplication"
+                  label="Misapplication"
+                  style="push">
                <visibleWhen>
                   <or>
                      <reference
                            definitionId="isAcceptedTaxon">
                      </reference>
                      <reference
-                           definitionId="isSynonym">
+                           definitionId="isMisapplication">
                      </reference>
                   </or>
                </visibleWhen>
-            </dynamic>
+            </command>
+         </menu>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.name.changeAcceptedToSynonym"
+               label="Change Accepted Taxon to Synonym"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isAcceptedTaxon">
+               </reference>
+            </visibleWhen>
+         </command>
+         <menu
+               label="Change To">
             <command
-                  commandId="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted"
-                  label="Swap Synonym With Accepted"
+                  commandId="eu.etaxonomy.taxeditor.editor.name.changeToAcceptedTaxon"
+                  label="Accepted Taxon"
                   style="push">
                <visibleWhen>
-                  <reference
-                        definitionId="isSynonym">
-                  </reference>
+                  <not>
+                     <or>
+                        <reference
+                              definitionId="isAcceptedTaxon">
+                        </reference>
+                        <reference
+                              definitionId="isMisapplication">
+                        </reference>
+                     </or>
+                  </not>
                </visibleWhen>
             </command>
-            <separator
-                  name="taxeditor-editor.separator3"
-                  visible="true">
-            </separator>
             <command
-                  commandId="org.eclipse.ui.views.showView"
-                  label="Show Details"
+                  commandId="eu.etaxonomy.taxeditor.editor.name.changeToSynonym"
+                  label="Synonym"
                   style="push">
-               <parameter
-                     name="org.eclipse.ui.views.showView.viewId"
-                     value="eu.etaxonomy.taxeditor.editor.forms.detailsView">
-               </parameter>
+               <visibleWhen>
+                  <not>
+                     <or>
+                        <reference
+                              definitionId="isAcceptedTaxon">
+                        </reference>
+                        <reference
+                              definitionId="isSynonym">
+                        </reference>
+                     </or>
+                  </not>
+               </visibleWhen>
             </command>
-            <separator
-                  name="taxeditor-editor.separator4"
-                  visible="true">
-            </separator>
             <command
-                  commandId="org.eclipse.ui.file.save"
-                  label="Save"
+                  commandId="eu.etaxonomy.taxeditor.editor.name.changeToMisapplication"
+                  label="Misapplication"
                   style="push">
+               <visibleWhen>
+                  <not>
+                     <or>
+                        <reference
+                              definitionId="isAcceptedTaxon">
+                        </reference>
+                        <reference
+                              definitionId="isMisapplication">
+                        </reference>
+                     </or>
+                  </not>
+               </visibleWhen>
             </command>
+         </menu>
+         <separator
+               name="taxeditor-editor.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.edit.delete"
+               label="Delete"
+               style="push">
+            <visibleWhen>
+               <or>
+                  <reference
+                        definitionId="isSynonym">
+                  </reference>
+                  <reference
+                        definitionId="isMisapplication">
+                  </reference>
+                  <reference
+                        definitionId="isConceptRelation">
+                  </reference>
+               </or>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.name.deleteAllEmptyNames"
+               label="Delete All Empty Names"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="hasEmptyNames">
+               </reference>
+            </visibleWhen>
+         </command>
+         <separator
+               name="taxeditor-editor.separator2"
+               visible="true">
+         </separator>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.editor.name.handler.GroupBasionymContributionItem"
+               id="taxeditor-editor.dynamic.setBasionym">
+            <visibleWhen>
+               <or>
+                  <reference
+                        definitionId="isAcceptedTaxon">
+                  </reference>
+                  <reference
+                        definitionId="isSynonym">
+                  </reference>
+               </or>
+            </visibleWhen>
+         </dynamic>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted"
+               label="Swap Synonym With Accepted"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isSynonym">
+               </reference>
+            </visibleWhen>
+         </command>
+         <separator
+               name="taxeditor-editor.separator3"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.views.showView"
+               label="Show Details"
+               style="push">
+            <parameter
+                  name="org.eclipse.ui.views.showView.viewId"
+                  value="eu.etaxonomy.taxeditor.editor.forms.detailsView">
+            </parameter>
+         </command>
+         <separator
+               name="taxeditor-editor.separator4"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.file.save"
+               label="Save"
+               style="push">
+         </command>
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.key.polytomous">
+         <command
+               commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new"
+               label="New Node"
+               style="push">
+         </command>
+         <separator
+               name="taxeditor-editor.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.edit.delete"
+               label="Delete"
+               style="push">
+         </command>
+         <separator
+               name="taxeditor-editor.separator2"
+               visible="true">
+         </separator>
+         <command
+               commandId="eu.etaxonomy.taxeditor.key.command.applyLayout"
+               label="Apply Layout"
+               style="push">
+         </command>
+         <separator
+               name="taxeditor-editor.separator3"
+               visible="true">
+         </separator>
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.description">
+         <command
+               commandId="eu.etaxonomy.taxeditor.description.commands.adddescription"
+               label="New Descriptive Data"
+               style="push">
+         </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator3"
+               visible="true">
+         </separator>
+         <menu
+               label="New">
+            <dynamic
+                  class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DynamicFeatureMenu"
+                  id="eu.etaxonomy.taxeditor.dynamicFeatureMenu">
+            </dynamic>
+            <visibleWhen
+                  checkEnabled="true">
+               <or>
+                  <reference
+                        definitionId="isDescription">
+                  </reference>
+                  <reference
+                        definitionId="isDescriptionElement">
+                  </reference>
+                  <reference
+                        definitionId="isFeatureNodeContainer">
+                  </reference>
+               </or>
+            </visibleWhen>
+         </menu>
+         <separator
+               name="taxeditor-editor.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
+               label="Move Elements"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+               <reference
+                     definitionId="isDescriptionElement">
+               </reference>
+            </visibleWhen>
+         </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterNew"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.edit.delete"
+               label="Delete"
+               style="push">
+         </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterDelete"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.file.save"
+               label="Save"
+               style="push">
+         </command>
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.media">
+         <command
+               commandId="taxeditor-editor.command.newimagegallery"
+               label="New Image Gallery"
+               style="push">
+         </command>
+         <separator
+               name="taxeditor-editor.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="taxeditor-editor.newimage"
+               label="New Image"
+               style="push">
+         </command>
+         <command
+               commandId="taxeditor-editor.command.moveimgdown"
+               label="Move Image Up In List"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMedia">
+               </reference>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="taxeditor-editor.command.moveimgup"
+               label="Move Image Down In List"
+               style="push">
+            <visibleWhen>
+               <reference
+                     definitionId="isMedia">
+               </reference>
+            </visibleWhen>
+         </command>
+         <separator
+               name="taxeditor-editor.separator2"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.edit.delete"
+               label="Delete"
+               style="push">
+         </command>
+         <command
+               commandId="org.eclipse.ui.file.save"
+               label="Save"
+               style="push">
+         </command>
+      </menuContribution>
+      <menuContribution
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.concept">
+         <menu
+               label="New">
+            <dynamic
+                  class="eu.etaxonomy.taxeditor.editor.view.concept.handler.CreateConceptRelationMenu"
+                  id="eu.etaxonomy.taxeditor.editor.view.concept.menus.new">
+            </dynamic>
+         </menu>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
+               label="Open Related Concept"
+               style="push">
+         </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.view.concept.menu.separator1"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.edit.delete"
+               label="Delete"
+               style="push">
+         </command>
       </menuContribution>
    </extension>
    <extension
@@ -436,127 +536,255 @@
             class="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
             commandId="org.eclipse.ui.edit.delete">
          <activeWhen>
-            <and>
-               <not>
-                  <reference
-                        definitionId="isAcceptedTaxon">
-                  </reference>
-               </not>
-               <reference
-                     definitionId="isTaxonBase">
-               </reference>
-            </and>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.editor.taxon.name">
+               </equals>
+            </with>
          </activeWhen>
       </handler>
-      <!--handler
-            class="eu.etaxonomy.taxeditor.editor.handler.SaveTaxonHandler"
-            commandId="org.eclipse.ui.file.save">
+      <handler
+            class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
+            commandId="org.eclipse.ui.edit.delete">
+               <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.editor.view.descriptive">
+               </equals>
+            </with>
       </handler>
       <handler
-            class="eu.etaxonomy.taxeditor.editor.handler.SaveAllHandler"
-            commandId="org.eclipse.ui.file.saveAll">
-      </handler-->
-   </extension>
-   <extension
-         name="File Menu Commands"
-         point="org.eclipse.ui.commands">
-      <command
-            categoryId="org.eclipse.ui.category.file"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.EditNewTaxonHandler"
-            id="eu.etaxonomy.taxeditor.editor.newTaxon"
-            name="New Taxon">
-      </command>
-      <!--command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.SaveTaxonHandler"
-            id="eu.etaxonomy.taxeditor.editor.saveTaxon"
-            name="Save">
-      </command>
-      <command
-            categoryId="org.eclipse.ui.category.file"
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.SaveAllHandler"
-            id="eu.etaxonomy.taxeditor.editor.saveAll"
-            name="Save All">
-      </command-->
+            class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.DeleteNodeHandler"
+            commandId="org.eclipse.ui.edit.delete">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditor">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="eu.etaxonomy.taxeditor.editor.view.concept.handler.DeleteConceptRelationHandler"
+            commandId="org.eclipse.ui.edit.delete">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.editor.view.concept">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
    </extension>
    <extension
          name="Name Commands"
          point="org.eclipse.ui.commands">
       <category
-            id="eu.etaxonomy.taxeditor.editor.synonymCategory"
-            name="Synonym Category">
+            id="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
+            name="-- Name Editor">
       </category>
       <command
-            categoryId="eu.etaxonomy.taxeditor.editor.synonymCategory"
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenParentHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.openParent"
+            name="Open Parent">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateHomotypicSynonymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.createHomotypicSynoym"
             name="Create Homotypic Synonym">
       </command>
       <command
-            categoryId="eu.etaxonomy.taxeditor.editor.synonymCategory"
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateHeterotypicSynonymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.createHeterotypicSynoym"
             name="Create Heterotypic Synonym">
       </command>
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateSynonymInHomotypicalGroupHandler"
             id="eu.etaxonomy.taxeditor.editor.name.createSynonymInHomotypicalGroup"
             name="Create Synonym In Homotypical Group">
       </command>
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.CreateMisapplicationHandler"
             id="eu.etaxonomy.taxeditor.editor.name.createMisapplication"
             name="Create Misapplication">
       </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.DeleteTaxonBaseHandler"
-            id="eu.etaxonomy.taxeditor.editor.name.deleteTaxonBase"
-            name="Delete Taxon Base">
-      </command>
       <!--command
             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.MoveTaxonHandler"
             id="eu.etaxonomy.taxeditor.editor.name.moveTaxon"
             name="Move Taxon">
       </command-->
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeToSynonymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.changeToSynonym"
             name="Change To Synonym">
       </command>
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeSynonymToAcceptedTaxonHandler"
             id="eu.etaxonomy.taxeditor.editor.name.changeToAcceptedTaxon"
             name="Change To Accepted Taxon">
       </command>
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeToMisapplicationHandler"
             id="eu.etaxonomy.taxeditor.editor.name.changeToMisapplication"
             name="Change To Misapplication">
       </command>
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.SwapSynonymAndAcceptedHandler"
             id="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted"
             name="Swap Synonym With Accepted">
       </command>
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.SetBasionymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.setBasionym"
             name="Set Basionym / Original Combination">
       </command>
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.RemoveBasionymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.removeBasionym"
             name="Remove Basionym / Original Combination">
       </command>
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.ChangeAcceptedTaxonToSynonymHandler"
             id="eu.etaxonomy.taxeditor.editor.name.changeAcceptedToSynonym"
             name="Change Accepted Taxon to Synonym">
       </command>
       <command
+            categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.DeleteAllEmptyNamesHandler"
             id="eu.etaxonomy.taxeditor.editor.name.deleteAllEmptyNames"
             name="Delete All Empty Names">
       </command>
+      <category
+            id="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            name="-- Descriptive">
+      </category>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionElementHandler"
+            id="eu.etaxonomy.taxeditor.editor.description.createDescriptionElement"
+            name="Create Description Element">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionHandler"
+            id="eu.etaxonomy.taxeditor.description.commands.adddescription"
+            name="New Description">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionElementsHandler"
+            id="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
+            name="Move Description Elements">
+      </command>
+      <category
+            id="eu.etaxonomy.taxeditor.editor.media.category"
+            name="-- Media">
+      </category>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.media.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageDownInListHandler"
+            id="taxeditor-editor.command.moveimgdown"
+            name="Move Image Down In List">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.media.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.AddImageGalleryHandler"
+            id="taxeditor-editor.command.newimagegallery"
+            name="New Image Gallery">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.media.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.CreateMediaHandler"
+            id="taxeditor-editor.newimage"
+            name="New Image">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.media.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageUpInListHandler"
+            id="taxeditor-editor.command.moveimgup"
+            name="Move Image Up In List">
+      </command>
+      <category
+            id="eu.etaxonomy.taxeditor.editor.new.category"
+            name="-- New Entity">
+      </category>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewReferenceHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.new.reference"
+            name="New Reference">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewNameHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.new.name"
+            name="New Name">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewTeamHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.new.team"
+            name="New Team">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewPersonHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.new.person"
+            name="New Person">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.new.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewSpecimenHandler"
+            id="eu.etaxonomy.taxeditor.editor.command.new.specimen"
+            name="New Specimen">
+      </command>
+      <category
+            id="eu.etaxonomy.taxeditor.editor.key.category"
+            name="-- Polytomous Keys">
+      </category>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.key.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.CreateNodeHandler"
+            id="eu.etaxonomy.taxeditor.key.polytomous.command.new"
+            name="New Node">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.key.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.key.handler.ApplyLayoutHandler"
+            id="eu.etaxonomy.taxeditor.key.command.applyLayout"
+            name="Apply Layout">
+      </command>
+      <category
+            id="eu.etaxonomy.taxeditor.editor.view.concept.category"
+            name="-- Concept Relations">
+      </category>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.concept.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.CreateConceptRelationHandler"
+            id="eu.etaxonomy.taxeditor.editor.name.createConceptRelation"
+            name="Create Concept Relation">
+      </command>
+      <command
+            categoryId="eu.etaxonomy.taxeditor.editor.view.concept.category"
+            defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.OpenRelatedConceptHandler"
+            id="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
+            name="Open Related Concept">
+      </command>
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
@@ -614,6 +842,51 @@
             </test>
          </with>
       </definition>
+      <definition
+            id="isDeletable">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDeletable">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isMedia">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isMedia">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isDescription">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDescription">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isDescriptionElement">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDescriptionElement">
+            </test>
+         </with>
+      </definition>
+      <definition
+            id="isFeatureNodeContainer">
+         <with
+               variable="selection">
+            <test
+                  property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isFeatureNodeContainer">
+            </test>
+         </with>
+      </definition>
    </extension>
    <extension
          point="org.eclipse.core.expressions.propertyTesters">
@@ -624,82 +897,14 @@
             properties="isAcceptedTaxon,isSynonym,isMisapplication,isTaxonBase,hasEmptyNames"
             type="org.eclipse.jface.viewers.IStructuredSelection">
       </propertyTester>
+      <propertyTester
+            class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DescriptionsMenuPropertyTester"
+            id="eu.etaxonomy.taxeditor.descriptions.PropertyTester"
+            namespace="eu.etaxonomy.taxeditor.descriptions.propertyTester"
+            properties="isMedia,isDescription,isDescriptionElement,isDeletable,isFeatureNodeContainer"
+            type="org.eclipse.jface.viewers.TreeSelection">
+      </propertyTester>
    </extension>
-      <extension
-            point="org.eclipse.ui.menus">
-         <menuContribution
-               locationURI="popup:eu.etaxonomy.taxeditor.editor.view.description">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.description.commands.adddescription"
-                  label="New Descriptive Data"
-                  style="push">
-            </command>
-            <separator
-                  name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator3"
-                  visible="true">
-            </separator>
-            <menu
-                  label="New">
-               <dynamic
-                     class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DynamicFeatureMenu"
-                     id="eu.etaxonomy.taxeditor.dynamicFeatureMenu">
-               </dynamic>
-               <visibleWhen
-                     checkEnabled="true">
-                  <or>
-                     <reference
-                           definitionId="isDescription">
-                     </reference>
-                     <reference
-                           definitionId="isDescriptionElement">
-                     </reference>
-                     <reference
-                           definitionId="isFeatureNodeContainer">
-                     </reference>
-                  </or>
-               </visibleWhen>
-            </menu>
-            <separator
-                  name="taxeditor-editor.separator1"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
-                  label="Move Elements"
-                  style="push">
-               <visibleWhen
-                     checkEnabled="true">
-                  <reference
-                        definitionId="isDescriptionElement">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.description.editInXper2"
-                  icon="icons/xper64.png"
-                  label="Edit in Xper2"
-                  style="push">
-            </command>
-            <separator
-                  name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterNew"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="org.eclipse.ui.edit.delete"
-                  label="Delete"
-                  style="push">
-            </command>
-            <separator
-                  name="eu.etaxonomy.taxeditor.taxonDescriptionEditor.separator.afterDelete"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="org.eclipse.ui.file.save"
-                  label="Save"
-                  style="push">
-            </command>
-         </menuContribution>
-      </extension>
    <extension
          point="org.eclipse.ui.bindings">   
       <scheme
@@ -708,357 +913,4 @@
             name="Taxonomic Editor Default Key Bindings">
       </scheme>
    </extension>
-      <extension
-            point="org.eclipse.ui.handlers">
-         <handler
-               class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DeleteHandler"
-               commandId="org.eclipse.ui.edit.delete">
-            <activeWhen>
-               <reference
-                     definitionId="isDeletable">
-               </reference>
-            </activeWhen>
-         </handler>
-      </extension>
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionElementHandler"
-               id="eu.etaxonomy.taxeditor.editor.description.createDescriptionElement"
-               name="Create Description Element">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.CreateDescriptionHandler"
-               id="eu.etaxonomy.taxeditor.description.commands.adddescription"
-               name="New Description">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.MoveDescriptionElementsHandler"
-               id="eu.etaxonomy.taxeditor.description.commands.moveDescriptionElements"
-               name="Move Description Elements">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.descriptive.operation.EditInXper2Handler"
-               id="eu.etaxonomy.taxeditor.editor.description.editInXper2"
-               name="Edit in Xper2">
-         </command>
-      </extension>
-      <extension
-            point="org.eclipse.core.expressions.definitions">
-         <definition
-               id="isDeletable">
-            <with
-                  variable="selection">
-               <test
-                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDeletable">
-               </test>
-            </with>
-         </definition>
-         <definition
-               id="isMedia">
-            <with
-                  variable="selection">
-               <test
-                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isMedia">
-               </test>
-            </with>
-         </definition>
-         <definition
-               id="isDescription">
-            <with
-                  variable="selection">
-               <test
-                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDescription">
-               </test>
-            </with>
-         </definition>
-         <definition
-               id="isDescriptionElement">
-            <with
-                  variable="selection">
-               <test
-                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isDescriptionElement">
-               </test>
-            </with>
-         </definition>
-         <definition
-               id="isFeatureNodeContainer">
-            <with
-                  variable="selection">
-               <test
-                     property="eu.etaxonomy.taxeditor.descriptions.propertyTester.isFeatureNodeContainer">
-               </test>
-            </with>
-         </definition>
-      </extension>
-      <extension
-            point="org.eclipse.core.expressions.propertyTesters">
-         <propertyTester
-               class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.DescriptionsMenuPropertyTester"
-               id="eu.etaxonomy.taxeditor.descriptions.PropertyTester"
-               namespace="eu.etaxonomy.taxeditor.descriptions.propertyTester"
-               properties="isMedia,isDescription,isDescriptionElement,isDeletable,isFeatureNodeContainer"
-               type="org.eclipse.jface.viewers.TreeSelection">
-         </propertyTester>
-      </extension>
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               id="org.eclipse.ui.window.newEditor"
-               name="New Editor">
-         </command>
-      </extension>
-      <extension
-            point="org.eclipse.ui.menus">
-         <menuContribution
-               locationURI="popup:eu.etaxonomy.taxeditor.editor.view.media">
-            <command
-                  commandId="taxeditor-editor.command.newimagegallery"
-                  label="New Image Gallery"
-                  style="push">
-            </command>
-            <separator
-                  name="taxeditor-editor.separator1"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="taxeditor-editor.newimage"
-                  label="New Image"
-                  style="push">
-            </command>
-            <command
-                  commandId="taxeditor-editor.command.moveimgdown"
-                  label="Move Image Up In List"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isMedia">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="taxeditor-editor.command.moveimgup"
-                  label="Move Image Down In List"
-                  style="push">
-               <visibleWhen>
-                  <reference
-                        definitionId="isMedia">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <separator
-                  name="taxeditor-editor.separator2"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="org.eclipse.ui.edit.delete"
-                  label="Delete"
-                  style="push">
-            </command>
-            <command
-                  commandId="org.eclipse.ui.file.save"
-                  label="Save"
-                  style="push">
-            </command>
-         </menuContribution>
-      </extension>
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageDownInListHandler"
-               id="taxeditor-editor.command.moveimgdown"
-               name="Move Image Down In List">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.AddImageGalleryHandler"
-               id="taxeditor-editor.command.newimagegallery"
-               name="New Image Gallery">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.CreateMediaHandler"
-               id="taxeditor-editor.newimage"
-               name="New Image">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.media.handler.MoveImageUpInListHandler"
-               id="taxeditor-editor.command.moveimgup"
-               name="Move Image Up In List">
-         </command>
-      </extension>
-      <extension
-            point="org.eclipse.ui.menus">
-         <menuContribution
-               locationURI="menu:eu.etaxonomy.navigation.menu.new?after=eu.etaxonomy.navigation.menu.new.separator1">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.command.new.reference"
-                  label="Reference"
-                  style="push">
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.command.new.name"
-                  label="Name"
-                  style="push">
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.command.new.team"
-                  label="Team"
-                  style="push">
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.command.new.person"
-                  label="Person"
-                  style="push">
-            </command>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.command.new.specimen"
-                  label="Specimen"
-                  style="push">
-            </command>
-         </menuContribution>
-      </extension>
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewReferenceHandler"
-               id="eu.etaxonomy.taxeditor.editor.command.new.reference"
-               name="New Reference">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewNameHandler"
-               id="eu.etaxonomy.taxeditor.editor.command.new.name"
-               name="New Name">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewTeamHandler"
-               id="eu.etaxonomy.taxeditor.editor.command.new.team"
-               name="New Team">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewPersonHandler"
-               id="eu.etaxonomy.taxeditor.editor.command.new.person"
-               name="New Person">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.create.NewSpecimenHandler"
-               id="eu.etaxonomy.taxeditor.editor.command.new.specimen"
-               name="New Specimen">
-         </command>
-      </extension>
-      <extension
-            point="org.eclipse.ui.menus">
-         <menuContribution
-               locationURI="popup:eu.etaxonomy.taxeditor.editor.key.polytomous">
-            <command
-                  commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new"
-                  label="New Node"
-                  style="push">
-            </command>
-            <separator
-                  name="taxeditor-editor.separator1"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="org.eclipse.ui.edit.delete"
-                  label="Delete"
-                  style="push">
-            </command>
-            <separator
-                  name="taxeditor-editor.separator2"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.key.command.applyLayout"
-                  label="Apply Layout"
-                  style="push">
-            </command>
-            <separator
-                  name="taxeditor-editor.separator3"
-                  visible="true">
-            </separator>
-         </menuContribution>
-      </extension>
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.CreateNodeHandler"
-               id="eu.etaxonomy.taxeditor.key.polytomous.command.new"
-               name="New Node">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.key.handler.ApplyLayoutHandler"
-               id="eu.etaxonomy.taxeditor.key.command.applyLayout"
-               name="Apply Layout">
-         </command>
-      </extension>
-      <extension
-            point="org.eclipse.ui.handlers">
-         <handler
-               class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.DeleteNodeHandler"
-               commandId="org.eclipse.ui.edit.delete">
-            <activeWhen>
-               <with
-                     variable="activePartId">
-                  <equals
-                        value="eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditor">
-                  </equals>
-               </with>
-            </activeWhen>
-         </handler>
-      </extension>
-      <extension
-            point="org.eclipse.ui.menus">
-         <menuContribution
-               allPopups="false"
-               locationURI="popup:eu.etaxonomy.taxeditor.editor.view.concept">
-            <menu
-                  label="New">
-               <dynamic
-                     class="eu.etaxonomy.taxeditor.editor.view.concept.handler.CreateConceptRelationMenu"
-                     id="eu.etaxonomy.taxeditor.editor.view.concept.menus.new">
-               </dynamic>
-            </menu>
-            <command
-                  commandId="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
-                  label="Open Related Concept"
-                  style="push">
-            </command>
-            <separator
-                  name="eu.etaxonomy.taxeditor.editor.view.concept.menu.separator1"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="org.eclipse.ui.edit.delete"
-                  label="Delete"
-                  style="push">
-            </command>
-         </menuContribution>
-      </extension>
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.CreateConceptRelationHandler"
-               id="eu.etaxonomy.taxeditor.editor.name.createConceptRelation"
-               name="Create Concept Relation">
-         </command>
-         <command
-               defaultHandler="eu.etaxonomy.taxeditor.editor.view.concept.handler.OpenRelatedConceptHandler"
-               id="eu.etaxonomy.taxeditor.editor.view.concept.command.open"
-               name="Open Related Concept">
-         </command>
-      </extension>
-      <extension
-            point="org.eclipse.ui.handlers">
-         <handler
-               class="eu.etaxonomy.taxeditor.editor.view.concept.handler.DeleteConceptRelationHandler"
-               commandId="org.eclipse.ui.edit.delete">
-            <activeWhen>
-               <with
-                     variable="activePartId">
-                  <equals
-                        value="eu.etaxonomy.taxeditor.editor.view.concept">
-                  </equals>
-               </with>
-            </activeWhen>
-         </handler>
-      </extension>
 </plugin>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java
index aed6628deab402668f34a2779d672a5ea528ff72..85682be0d7da937d03ddd956369beee9089a2541 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java
@@ -21,11 +21,11 @@ import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IPersistable;
 import org.eclipse.ui.PartInitException;
 
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmEditorViewPart;
 import eu.etaxonomy.taxeditor.editor.view.concept.ConceptViewPart;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
 import eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart;
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
+import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
 
 /**
  * <p>EditorStateManager class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index ed249d9420501f13c7c56debb0dcbedb65980c5c..a781c7afe926cdaebf0ce6295053184625eacffc 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@ -29,10 +29,10 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditor;
 import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditorInput;
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmDataViewer;
-import eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewPart;
-import eu.etaxonomy.taxeditor.editor.view.supplementaldata.SupplementalDataViewPart;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.view.AbstractCdmDataViewer;
+import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
+import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
 
 /**
  * Utility for the editor package
@@ -163,15 +163,6 @@ public class EditorUtil extends AbstractUtility{
                return taxonEditors;
        }
        
-       /**
-        * <p>getActiveEditor</p>
-        *
-        * @return a {@link org.eclipse.ui.IEditorPart} object.
-        */
-       public static IEditorPart getActiveEditor(){
-               return getActivePage() != null ? getActivePage().getActiveEditor() : null;
-       }
-       
        /**
         * Returns the currently active taxon editor
         *
@@ -251,46 +242,7 @@ public class EditorUtil extends AbstractUtility{
                        editor.doSave(EditorUtil.getMonitor());
                }
                return true;
-       }
-       
-       /**
-        * <p>getDetailsView</p>
-        *
-        * @return a {@link eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewPart} object.
-        */
-       public static DetailsViewPart getDetailsView(){
-               return  (DetailsViewPart) EditorUtil.getView(DetailsViewPart.ID, false);
-       }
-       
-       /**
-        * <p>refreshDetailsViewer</p>
-        */
-       public static void refreshDetailsViewer(){
-               if(getDetailsView() != null){
-                       ((AbstractCdmDataViewer) getDetailsView().getViewer()).refresh();
-               }
-       }
-       
-       /**
-        * <p>reflowDetailsViewer</p>
-        */
-       public static void reflowDetailsViewer(){
-               if(getDetailsView() != null){
-                       ((AbstractCdmDataViewer) getDetailsView().getViewer()).reflow();
-               }
-       }
-       
-       public static SupplementalDataViewPart getSupplementalDataView(){
-               return (SupplementalDataViewPart) EditorUtil.getView(SupplementalDataViewPart.ID, false);
-       }
-       
-       public static void reflowSupplementalViewer(){
-               if(getSupplementalDataView() != null){
-                       ((AbstractCdmDataViewer) getSupplementalDataView().getViewer()).reflow();
-               }
-       }
-       
-       
+       }       
        
        /**
         * <p>getSelection</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
index 40d94f879ab75d6119b5fb959bfbd25ec1d01b72..7725380804b367cb7985b5598d9c0d2eb5583d41 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
@@ -50,8 +50,8 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  */
 public class MultiPageTaxonEditor extends FormEditor implements IConversationEnabled, IPostOperationEnabled, IDirtyMarkableSelectionProvider, IPartContentHasDetails { 
 
-       /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.multipage"{trunked}</code> */
-       public static final String ID = "eu.etaxonomy.taxeditor.editor.multipagetaxonview";
+       /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.taxon"{trunked}</code> */
+       public static final String ID = "eu.etaxonomy.taxeditor.editor.taxon";
 
        private boolean dirty;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java
index 187568dd1ad5a9cb9acda98675cd848746718302..c5457f4d17374f3a6465f9bedfd2424bb57e1d48 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java
@@ -33,7 +33,7 @@ public class TaxonEditorInputFactory implements IElementFactory {
      * Factory id. The workbench plug-in registers a factory by this name
      * with the "org.eclipse.ui.elementFactories" extension point.
      */
-    private static final String ID_FACTORY = "eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory"; //$NON-NLS-1$
+    private static final String ID_FACTORY = "eu.etaxonomy.taxeditor.editor.name.taxonEditorInputFactory"; //$NON-NLS-1$
        
     /**
      * Tag for the IFile.fullPath of the file resource.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewNameHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewNameHandler.java
index 9906e00c3e884bfa403cda167d8f66fa51d46722..3ce5778300cc622cc4b2b82cb0ab028e4894b7b7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewNameHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewNameHandler.java
@@ -18,7 +18,7 @@ import org.eclipse.core.commands.IHandler;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.editor.newWizard.NewNonViralNameWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewNonViralNameWizard;
 
 /**
  * <p>NewNameHandler class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewPersonHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewPersonHandler.java
index 6fb733da0a37aa0664a3b7a8ad560005a8f30ab8..e03e91b79b0387840996115ea562f0d730dbe9f7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewPersonHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewPersonHandler.java
@@ -18,7 +18,7 @@ import org.eclipse.core.commands.IHandler;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.editor.newWizard.NewPersonWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewPersonWizard;
 
 /**
  * <p>NewPersonHandler class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewReferenceHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewReferenceHandler.java
index d431f6c811ab0e222217b775fbed9eba858d5348..fd18e8e7c09b6655a1a7f448df38a90476ad15e8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewReferenceHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewReferenceHandler.java
@@ -18,7 +18,7 @@ import org.eclipse.core.commands.IHandler;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.editor.newWizard.NewReferenceWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewReferenceWizard;
 
 /**
  * <p>NewReferenceHandler class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
index 3b2852e7c63166454b7ea5b29b765ca0dc9feb14..04747d1916de4ec825045dcac1de02cae91b1340 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
@@ -17,7 +17,7 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.editor.newWizard.NewDerivedUnitBaseWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard;
 
 /**
  * <p>NewSpecimenHandler class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewTeamHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewTeamHandler.java
index a1235e3836e87f1bcbacf27c59cd82100afdc921..55fdfc49613ed8de90f154e45441757616d78221 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewTeamHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewTeamHandler.java
@@ -18,7 +18,7 @@ import org.eclipse.core.commands.IHandler;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.editor.newWizard.NewTeamWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewTeamWizard;
 
 /**
  * <p>NewTeamHandler class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/AbstractKeyEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/AbstractKeyEditor.java
index 7b075db6ea3ac8d11abadc0e4cb49cc1eed524cb..b7c96d3ffdef9f6e079b66a1f2ed6a5b044b7fbc 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/AbstractKeyEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/AbstractKeyEditor.java
@@ -37,9 +37,9 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.description.IIdentificationKey;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java
index a0a198bb6169b74269436466e78d8cd05d3b2eba..73d84ec90dedf96b50cbcba5d7f81de54e56c36f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyEditorInput.java
@@ -8,7 +8,6 @@ import java.util.UUID;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.key.AbstractIdentificationEditorInput;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
index 1ff1238a43e6b43e32038c720a5ffcfe3225371c..fc11c445660c8b638621a70542d0c88dd4467df7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
@@ -82,8 +82,8 @@ import eu.etaxonomy.taxeditor.preference.Resources;
 public class TaxonNameEditor extends EditorPart implements IMultiPageTaxonEditorPage, IAdaptable, IConversationEnabled, IPostOperationEnabled, IPartContentHasDetails, IPartChangeListener
                , ISelectionListener, IDropTargetable {
        
-       /** Constant <code>ID="eu.etaxonomy.taxeditor.taxonNameEditor"</code> */
-       public static final String ID = "eu.etaxonomy.taxeditor.taxonNameEditor";
+       /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.taxon.name"</code> */
+       public static final String ID = "eu.etaxonomy.taxeditor.editor.taxon.name";
        
        private Taxon taxon;
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroupedContainer.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroupedContainer.java
index 4cfdc8af1e3be10be6cd136d8f68d09ca4b89245..1cd5f562fc7b905d067452adac0cc85e641a27bd 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroupedContainer.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroupedContainer.java
@@ -56,6 +56,7 @@ import eu.etaxonomy.taxeditor.editor.name.dnd.NameEditorDragSourceEffect;
 import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation;
 import eu.etaxonomy.taxeditor.labels.ILabelImageStrategy;
 import eu.etaxonomy.taxeditor.labels.LabelImageProvider;
+import eu.etaxonomy.taxeditor.model.IElementHasDetails;
 import eu.etaxonomy.taxeditor.model.NameHelper;
 import eu.etaxonomy.taxeditor.model.TextHelper;
 import eu.etaxonomy.taxeditor.parser.ParseHandler;
@@ -84,7 +85,7 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  * @created 02.06.2008
  * @version 1.0
  */
-abstract public class AbstractGroupedContainer<T extends TaxonBase> implements IFormPart, IContainerConstants {        
+abstract public class AbstractGroupedContainer<T extends TaxonBase> implements IFormPart, IContainerConstants, IElementHasDetails {    
 
        protected ParseHandler parseHandler;
        
@@ -282,7 +283,7 @@ abstract public class AbstractGroupedContainer<T extends TaxonBase> implements I
         */
        protected void handleSplitText(String text) {
                // Create a synonym in a new homotypic group using text as name
-               TaxonNameBase synonymName = ParseHandler.quickParse(text);
+               TaxonNameBase synonymName = ParseHandler.parseReferencedName(text, null);
                
                EditorUtil.executeOperation(new CreateSynonymInNewGroupOperation
                                ("New Heterotypic Synonym", getEditor().getUndoContext(), getEditor().getTaxon(), synonymName, getEditor()));

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeAcceptedTaxonToSynonymHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeAcceptedTaxonToSynonymHandler.java
index 8069da7f658f591244334d153f3e03136b4602a2..3b4ff58e83a3c5f22132a8a444d7fb1d71da1b42 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeAcceptedTaxonToSynonymHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeAcceptedTaxonToSynonymHandler.java
@@ -19,7 +19,6 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TaxonNodeSelectionDialog;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.Page;
@@ -27,6 +26,7 @@ import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeAcceptedTaxonToSynonymOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonNodeSelectionDialog;
 
 /**
  * <p>ChangeAcceptedTaxonToSynonymHandler class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
index 26dc6daa04264d0e3af771ffcc494526a9174907..915d6ef6b10340777cdbb34666c52fa8a94d69da 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
@@ -28,13 +28,13 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TaxonNodeSelectionDialog;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToAcceptedTaxonOperation;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonNodeSelectionDialog;
 
 /**
  * <p>ChangeSynonymToAcceptedTaxonHandler class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java
index dea4553a524bde7f630af2cdcd2910645d937dbf..16a89724c0a73f63ec0ddd1bc57fd2d2dd0eb50c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptViewPart.java
@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.key.AbstractKeyEditor;
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmEditorViewPart;
+import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java
index b8e62ab8470c0f3fce9e90c7fe30d3694784219f..935a65f7b2f6db8f2fb13a7d982b5b4c3c22636c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java
@@ -23,7 +23,6 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 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.dialogs.filteredSelection.TaxonBaseSelectionDialog;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.Page;
 import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor;
@@ -31,6 +30,7 @@ import eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelatio
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.parser.ParseHandler;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonBaseSelectionDialog;
 
 /**
  * <p>CreateConceptRelationHandler class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
index 1eb100f10cb55043da103e6d224badfc2419b059..73c5753c2990af05eebace2aa271284f4af59aa5 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
@@ -43,12 +43,12 @@ import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 import eu.etaxonomy.taxeditor.editor.key.AbstractKeyEditor;
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmEditorViewPart;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
 import eu.etaxonomy.taxeditor.model.ImageResources;
+import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
 
 /**
  * <p>DescriptiveViewPart class.</p>
@@ -60,7 +60,7 @@ import eu.etaxonomy.taxeditor.model.ImageResources;
 public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IPartContentHasDetails, IPartContentHasSupplementalData {
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.desc"{trunked}</code> */
-       public static final String ID = "eu.etaxonomy.taxeditor.editor.view.description";
+       public static final String ID = "eu.etaxonomy.taxeditor.editor.view.descriptive";
        
        private TreeViewer viewer;
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
index 4d8241abfef367f27aad41f9054d5d16431c9298..f83ff5ca6b84274b820a5bc47db59b285407ead9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
@@ -27,13 +27,13 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TaxonBaseSelectionDialog;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionElementsOperation;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonBaseSelectionDialog;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java
index 47051e5b705d4f390a9c0ba750a3ead1b8d51293..a512e5ac9bb47a2f642310fb1967383be80fbd30 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java
@@ -30,9 +30,9 @@ import org.eclipse.ui.IWorkbenchPart;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmEditorViewPart;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
+import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
 
 /**
  * <p>MediaViewPart class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/BulkEditorOpeningSelectionListener.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/BulkEditorOpeningSelectionListener.java
deleted file mode 100644 (file)
index 0b789d9..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/BulkEditorOpeningSelectionListener.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// $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.section;
-
-import org.apache.log4j.Logger;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.ui.PartInitException;
-
-import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-
-/**
- * <p>BulkEditorOpeningSelectionListener class.</p>
- *
- * @author n.hoffmann
- * @created Apr 26, 2010
- * @version 1.0
- */
-public class BulkEditorOpeningSelectionListener extends SelectionAdapter{
-       
-       private static final Logger logger = Logger
-                       .getLogger(BulkEditorOpeningSelectionListener.class);
-       
-       private IdentifiableEntity entity;
-
-       /**
-        * <p>Constructor for BulkEditorOpeningSelectionListener.</p>
-        *
-        * @param entity a {@link eu.etaxonomy.cdm.model.common.IdentifiableEntity} object.
-        */
-       public BulkEditorOpeningSelectionListener(IdentifiableEntity entity){
-               this.entity = entity;
-       }
-
-       /** {@inheritDoc} */
-       @Override
-       public void widgetSelected(SelectionEvent e) {
-               try {
-                       if(entity == null ){
-                               logger.error("Trying to open bulk editor for null entity");                             
-                       }
-                       if(entity.getId() == 0){
-                               EditorUtil.warningDialog(entity.getClass().getSimpleName() + " not persisted yet", this,
-                                               "Please save the currently open editor to edit details of the selected entity.");
-                               logger.warn("Object not persisted yet");
-                       }else{
-                               BulkEditorUtil.openEditor(entity);
-                       }
-               } catch (PartInitException ex) {
-//                     logger.error("Could not open BulkEditor", ex);
-                       throw new RuntimeException("Could not open BulkEditor", ex);
-               }
-       }
-       
-}

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeWizardPage.java
deleted file mode 100644 (file)
index cd876c0..0000000
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeWizardPage.java
+++ /dev/null
@@ -1,408 +0,0 @@
-// $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.section.classification;
-
-
-import org.apache.log4j.Logger;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-
-/**
- * <p>TaxonNodeWizardPage class.</p>
- *
- * @author n.hoffmann
- * @created Sep 15, 2009
- * @version 1.0
- */
-public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITreeNode> implements IPropertyChangeListener{
-       
-       private static final Logger logger = Logger
-                       .getLogger(TaxonNodeWizardPage.class);
-       
-       /**
-        * <p>Constructor for TaxonNodeWizardPage.</p>
-        *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param entity a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
-        */
-       public TaxonNodeWizardPage(CdmFormFactory formFactory,
-                       ConversationHolder conversation, ITreeNode entity) {
-               super(formFactory, conversation, entity);
-               setTitle("Create a new Taxon");
-       }
-
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement)
-        */
-       /** {@inheritDoc} */
-       @Override
-       public TaxonNodeDetailElement createElement(ICdmFormElement rootElement) {
-       
-               TaxonNodeDetailElement detailElement = (TaxonNodeDetailElement) formFactory.createCdmDetailElement(DetailType.TAXON_NODE, rootElement, SWT.NULL);
-               detailElement.setEntity(entity);
-               formFactory.addPropertyChangeListener(this);
-               return detailElement;
-       }
-
-
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-        */
-       /** {@inheritDoc} */
-       @Override
-       public void propertyChange(PropertyChangeEvent event) {
-               if(event.getSource() == getDetailElement()){
-                       setPageComplete(checkComplete());
-               }
-       }
-
-       /**
-        * 
-        */
-       private boolean checkComplete() {
-               TaxonNodeDetailElement detailElement = (TaxonNodeDetailElement) getDetailElement();
-               
-               if(detailElement.getClassification() == null){
-                       setMessage("No classification", WARNING);
-               }else{
-                       setMessage(null);
-                       return true;
-               }
-               
-               return false;
-       }
-
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#dispose()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public void dispose() {
-               formFactory.removePropertyChangeListener(this);
-               super.dispose();
-       }
-       
-       
-//     private static final String BUTTON_TEXT_BROWSE = "Browse";
-//     
-//     private static final String ERROR_MESSAGE_TAXONOMIC_TREE_EMPTY = "Classification must not be empty";
-//
-//     private TaxonomicTree classification;
-//     
-//     private ParseHandler parseHandler;
-//     
-//     private TaxonNode parentTaxonNode;
-//     
-//     private TaxonBase taxonBase;
-//     
-//     private boolean reuseExistingTaxon = false;
-//     
-//     private TaxonNameBase taxonName;
-//     
-//     private boolean openInEditor = true;
-//
-//     private Button button_openInEditor;
-//
-//     private Text text_parentTaxonNode;
-//
-//     private Text text_reuseTaxon;
-//
-//     private Text text_taxonName;
-//
-//     private Text text_taxonomicTree;
-//
-//     private Button button_taxonName;
-//
-//     private Button button_reuseTaxon;
-//
-//     private Button button_toggleReuseTaxon;
-//     
-//     /**
-//      * @param pageName
-//      */
-//     protected TaxonNodeWizardPage(IStructuredSelection selection) {
-//             super("New Taxon");
-//             
-//             if(selection != null && selection.size() == 1){
-//                     if(selection.getFirstElement() instanceof ITreeNode){
-//                             ITreeNode parentNode = (ITreeNode) selection.getFirstElement();                 
-//                             
-//                             if(parentNode instanceof TaxonNode){
-//                                     parentTaxonNode = (TaxonNode) parentNode;
-//                                     classification = parentTaxonNode.getTaxonomicTree();
-//                             }else{
-//                                     classification = (TaxonomicTree) parentNode;
-//                             }
-//                     }
-//             }else{
-//                     setPageComplete(false);
-//             }
-//             
-//     }
-//     
-//     /* (non-Javadoc)
-//      * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-//      */
-//     public void createControl(Composite parent) {
-//             Composite composite = new Composite(parent, SWT.NULL);
-//             
-//             GridLayout layout = new GridLayout(3, false);
-//             composite.setLayout(layout);
-//             
-//             // taxonomic tree
-//             Label label_taxonomicTree = new Label(composite, SWT.NULL);
-//             label_taxonomicTree.setText("Classification");
-//             
-//             text_taxonomicTree = new Text(composite, SWT.BORDER | SWT.SINGLE);
-//             text_taxonomicTree.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-//             text_taxonomicTree.setEnabled(false);
-//             text_taxonomicTree.addModifyListener(this);
-//             text_taxonomicTree.setText(classification != null ? classification.getTitleCache() : "");
-//             
-//             Button button_taxonomicTree = new Button(composite, SWT.PUSH);
-//             button_taxonomicTree.setText(BUTTON_TEXT_BROWSE);
-//             button_taxonomicTree.addSelectionListener(new TaxonomicTreeSelector());
-//             
-//             
-//             // parental node
-//             Label label_parentTaxonNode = new Label(composite, SWT.NULL);
-//             label_parentTaxonNode.setText("Parent Taxon");
-//             
-//             text_parentTaxonNode = new Text(composite, SWT.BORDER | SWT.SINGLE);
-//             text_parentTaxonNode.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-//             text_parentTaxonNode.setEnabled(false);
-//             text_parentTaxonNode.setText(parentTaxonNode != null ? parentTaxonNode.getTaxon().getName().getTitleCache() : "");
-//             
-//             Button button_parentTaxonNode = new Button(composite, SWT.PUSH);
-//             button_parentTaxonNode.setText(BUTTON_TEXT_BROWSE);
-//             button_parentTaxonNode.addSelectionListener(new TaxonNodeSelector());
-//             
-//             // existing taxon
-//             Composite container_label_reuseTaxon = new Composite(composite, SWT.NULL);
-//             container_label_reuseTaxon.setLayout(new GridLayout(2, false));
-//             
-//             button_toggleReuseTaxon = new Button(container_label_reuseTaxon, SWT.CHECK);
-//             button_toggleReuseTaxon.addSelectionListener(new ToggleReuseTaxonSelector());
-//             button_toggleReuseTaxon.setSelection(reuseExistingTaxon);
-//             
-//             Label label_reuseTaxon = new Label(container_label_reuseTaxon, SWT.NULL);
-//             label_reuseTaxon.setText("Reuse Existing Taxon");
-//             label_reuseTaxon.setEnabled(false);
-//             
-//             text_reuseTaxon = new Text(composite, SWT.BORDER | SWT.SINGLE);
-//             text_reuseTaxon.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-//             text_reuseTaxon.setEnabled(false);
-//     
-//             
-//             button_reuseTaxon = new Button(composite, SWT.PUSH);
-//             button_reuseTaxon.setText(BUTTON_TEXT_BROWSE);
-//             button_reuseTaxon.addSelectionListener(new TaxonSelector());
-//             button_reuseTaxon.setEnabled(false);
-//             
-//             // name
-//             Label label_taxonName = new Label(composite, SWT.NULL);
-//             label_taxonName.setText("Taxon Name");
-//             
-//             text_taxonName = new Text(composite, SWT.BORDER | SWT.SINGLE);
-//             text_taxonName.addModifyListener(this);
-//             text_taxonName.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-//             
-//             button_taxonName = new Button(composite, SWT.PUSH);
-//             button_taxonName.setText(BUTTON_TEXT_BROWSE);
-//             button_taxonName.addSelectionListener(new TaxonNameSelector());
-//             
-//             // open in editor
-//             Composite container_openInEditor = new Composite(composite, SWT.NULL);
-//             container_openInEditor.setLayout(new GridLayout(2, false));
-//             button_openInEditor = new Button(container_openInEditor, SWT.CHECK);
-//             button_openInEditor.addSelectionListener(new OpenInEditorSelector());
-//             button_openInEditor.setSelection(openInEditor);
-//             
-//             Label label_openInEditor = new Label(container_openInEditor, SWT.NULL);
-//             label_openInEditor.setText("Open Taxon in Editor");
-//                             
-//             // initialize the parse handler
-//             parseHandler = ParseHandler.NewInstance(text_taxonName, taxonName);
-//             
-//             // set focus to name field
-//             text_taxonName.setFocus();
-//             
-//             setControl(composite);
-//     }
-//     
-//     /**
-//      * @return the taxon
-//      */
-//     public TaxonBase getTaxon() {
-//             return taxonBase;
-//     }
-//
-//     /**
-//      * @return the name
-//      */
-//     public TaxonNameBase getTaxonName() {
-//             return taxonName;
-//     }
-//     
-//     /**
-//      * @return
-//      */
-//     public ITreeNode getParentNode() {
-//             return parentTaxonNode != null ? parentTaxonNode : classification;
-//     }
-//     
-//     public boolean openInEditor(){
-//             return openInEditor;
-//     }
-//     
-//     private void updatePage() {
-//             getWizard().getContainer().updateButtons();
-//     }
-//     
-//     /*
-//      * SELECTION ADAPTERS
-//      */
-//     
-//     private class TaxonomicTreeSelector extends SelectionAdapter{
-//             /* (non-Javadoc)
-//              * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-//              */
-//             @Override
-//             public void widgetSelected(SelectionEvent e) {
-//                     super.widgetSelected(e);
-//                     classification = FilteredClassificationSelectionDialog.selectClassification(NavigationUtil.getShell(), null);
-//                     if (classification != null) {
-//                             text_taxonomicTree.setText(classification.getTitleCache());
-//                             text_parentTaxonNode.setText("");
-//                             parentTaxonNode = null;
-//                     }
-//                     setPageComplete(true);
-//             }
-//     }
-//     
-//     private class TaxonNodeSelector extends SelectionAdapter{
-//             /* (non-Javadoc)
-//              * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-//              */
-//             @Override
-//             public void widgetSelected(SelectionEvent e) {
-//                     super.widgetSelected(e);
-//                     parentTaxonNode = FilteredTaxonNodeSelectionDialog.selectTaxonNode(NavigationUtil.getShell(), "Select parent", null, null);
-//                     if (parentTaxonNode != null) {
-//                             text_parentTaxonNode.setText(parentTaxonNode.getTaxon().getTitleCache());
-//                             text_taxonomicTree.setText(parentTaxonNode.getTaxonomicTree().getTitleCache());
-//
-//                             
-//                     }
-//                     setPageComplete(true);
-//             }
-//             
-//     }
-//     
-//     private class TaxonSelector extends SelectionAdapter{
-//             /* (non-Javadoc)
-//              * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-//              */
-//             @Override
-//             public void widgetSelected(SelectionEvent e) {
-//                     super.widgetSelected(e);
-//                     taxonBase = FilteredTaxonSelectionDialog.selectTaxon(NavigationUtil.getShell(), null);
-//                     if (taxonBase != null) {
-//                             text_reuseTaxon.setText(taxonBase.getTitleCache());
-//                     }
-//             }
-//     }
-//     
-//     private class TaxonNameSelector extends SelectionAdapter{
-//             /* (non-Javadoc)
-//              * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-//              */
-//             @Override
-//             public void widgetSelected(SelectionEvent e) {
-//                     super.widgetSelected(e);
-//                     taxonName = FilteredNameSelectionDialog.selectName(NavigationUtil.getShell(), null, null);
-//                     if (taxonName != null) {
-//                             text_taxonName.setText(taxonName.getTitleCache());
-//                     }
-//             }
-//     }
-//     
-//     private class OpenInEditorSelector extends SelectionAdapter{
-//             /* (non-Javadoc)
-//              * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-//              */
-//             @Override
-//             public void widgetSelected(SelectionEvent e) {
-//                     super.widgetSelected(e);
-//                     openInEditor = button_openInEditor.getSelection();
-//             }
-//     }
-//     
-//     private class ToggleReuseTaxonSelector extends SelectionAdapter{
-//             /* (non-Javadoc)
-//              * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-//              */
-//             @Override
-//             public void widgetSelected(SelectionEvent e) {
-//                     super.widgetSelected(e);
-//                     
-//                     if(button_toggleReuseTaxon.getSelection()){
-//                             // enable reuse Taxon
-//                             text_reuseTaxon.setEnabled(true);
-//                             button_reuseTaxon.setEnabled(true);
-//                             // disable name
-//                             text_taxonName.setEnabled(false);
-//                             button_taxonName.setEnabled(false);
-//                     }else{
-//                             // disable reuse Taxon
-//                             text_reuseTaxon.setEnabled(false);
-//                             button_reuseTaxon.setEnabled(false);
-//                             // enable name
-//                             text_taxonName.setEnabled(true);
-//                             button_taxonName.setEnabled(true);
-//                     }
-//                     
-//             }
-//     }
-//
-//     /* (non-Javadoc)
-//      * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-//      */
-//     public void modifyText(ModifyEvent e) {
-//             if (e.getSource().equals(text_taxonomicTree)) {
-//                     if (! "".equals(text_taxonomicTree.getText())) {
-//                             setErrorMessage(null);
-//                     }
-//             }
-//             
-//             if (e.getSource().equals(text_taxonName)) {
-//                     // Set error message if taxonomic tree was not chosen
-//                     if ("".equals(text_taxonomicTree.getText())) {
-//                             setErrorMessage(ERROR_MESSAGE_TAXONOMIC_TREE_EMPTY);
-//                     }
-//                     
-//                     taxonName = parseHandler.parse();
-//             }
-//             
-//             updatePage();
-//     }       
-}

diff --git a/taxeditor-navigation/plugin.xml b/taxeditor-navigation/plugin.xml
index 49dcdb6868267ff7e3051eca1dc349e40d408271..87559168053388ecd2b01800400e045699931fff 100644 (file)
--- a/taxeditor-navigation/plugin.xml
+++ b/taxeditor-navigation/plugin.xml
@@ -228,12 +228,12 @@
    <extension
          point="org.eclipse.ui.commands">
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.handler.NewTaxonNodeHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.NewTaxonNodeHandler"
             id="eu.etaxonomy.taxeditor.navigation.newTaxonNode"
             name="New Taxon Node">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.handler.NewClassificationHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.NewClassificationHandler"
             id="eu.etaxonomy.taxeditor.navigation.newClassification"
             name="New Classification">
       </command>
@@ -251,7 +251,7 @@
             name="Move Taxon">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.navigation.handler.RefreshTreeHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.RefreshTreeHandler"
             id="org.eclipse.ui.file.refresh"
             name="Refresh">
       </command>
@@ -503,31 +503,6 @@
             type="eu.etaxonomy.cdm.model.taxon.TaxonomicTree">
       </propertyTester>
    </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            id="eu.etaxonomy.taxeditor.new.category.cdm"
-            name="CDM">
-      </category>
-      <!--primaryWizard
-            id="taxeditor-navigation.wizard1">
-      </primaryWizard-->
-      <wizard
-            category="eu.etaxonomy.taxeditor.new.category.cdm"
-            class="eu.etaxonomy.taxeditor.wizard.ClassificationWizard"
-            hasPages="true"
-            icon="icons/tree_icon_small.jpg"
-            id="eu.etaxonomy.taxeditor.new.classification"
-            name="Classification">
-      </wizard>
-      <wizard
-            category="eu.etaxonomy.taxeditor.new.category.cdm"
-            class="eu.etaxonomy.taxeditor.wizard.NewTaxonNodeWizard"
-            hasPages="true"
-            id="eu.etaxonomy.taxeditor.new.taxonNode"
-            name="Taxon">
-      </wizard>
-   </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
       <definition

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
index cbdf673ffd80a41dfc43f5fb67e6826072f5cab6..0c6ed7b160bf56a54ed4890072ad69fd16c41eda 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
@@ -134,7 +134,6 @@ public class NavigationUtil extends AbstractUtility{
         * @param configuration a eu.etaxonomy.taxeditor.editor.OpenEditorConfiguration object.
         */
        public static void openEditor(OpenEditorConfiguration configuration) {
-               // TODO Auto-generated method stub
                
        }
        

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyContentProvider.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyContentProvider.java
index 520bc78aa1900623904959944905c9b2df259288..f3c04ec1320af3b3bd46607d04bc3632315c2fa6 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyContentProvider.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyContentProvider.java
@@ -16,13 +16,11 @@ public class PolytomousKeyContentProvider implements IStructuredContentProvider{
 
        @Override
        public void dispose() {
-               // TODO Auto-generated method stub
                
        }
 
        @Override
        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-               // TODO Auto-generated method stub
                
        }
 

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java
index 89f609b720a9a3efe0a4a5381cf6853fe3a8dfc4..9dfdfb3255a8a5ef2f1b275ad87ab03131e14f52 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java
@@ -37,12 +37,12 @@ import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 import eu.etaxonomy.taxeditor.model.IContextListener;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java
index c3dbc56e869e593e650319ae5a283611769b0dea..0ded7902e75db9a02424bb2b36e58d565d328c0f 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java
@@ -61,7 +61,6 @@ public class DeleteOperation extends AbstractPersistentPostOperation {
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -71,7 +70,6 @@ public class DeleteOperation extends AbstractPersistentPostOperation {
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index 6a118296ba23bf7397caa0d42fbede225a19a12f..486682689e3a88d2e7b39671a2864587f41d82a0 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@ -44,6 +44,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * Taxonomic tree implementation using Common Navigator Framework.
  *
  * @author p.ciardelli
+ * @author n.hoffmann
  * @created 02.06.2009
  * @version 1.0
  */
@@ -344,8 +345,7 @@ public class TaxonNavigator extends CommonNavigator implements IPostOperationEna
         * @return a boolean.
         */
        public boolean onComplete() {
-               // TODO Auto-generated method stub
-               return false;
+               return true;
        }
        
        /* (non-Javadoc)

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java
index 07d29cda089dad18aea4a4d749d4321ee9f0f99a..98f26996ba61f7773fa9dde9c42987b1ecc2764c 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java
@@ -28,7 +28,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
-import eu.etaxonomy.taxeditor.wizard.ClassificationWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
 
 /**
  * <p>EditHandler class.</p>
@@ -51,8 +51,10 @@ public class EditHandler extends AbstractHandler implements IHandler{
                        final StructuredSelection structuredSelection = (StructuredSelection) selection;
                        
                        if(structuredSelection.size() == 1 && structuredSelection.getFirstElement() instanceof Classification){
-                               ClassificationWizard classificationWizard = new ClassificationWizard((Classification) structuredSelection.getFirstElement());
+                               Classification classification = (Classification) structuredSelection.getFirstElement();
                                
+                               NewClassificationWizard classificationWizard = new NewClassificationWizard();
+                               classificationWizard.init(null, new StructuredSelection(classification));
                                WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), classificationWizard);
                                dialog.open();
                                

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java
index c35cb6b1cfc31a15162427c1088aef146f4fb53e..87d1f5828b212db5b385d949e1252fbaaba93736 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java
@@ -25,12 +25,12 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TaxonNodeSelectionDialog;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;
 import eu.etaxonomy.taxeditor.navigation.navigator.operation.MoveTaxonOperation;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonNodeSelectionDialog;
 
 /**
  * <p>MoveTaxonHandler class.</p>
@@ -102,7 +102,6 @@ public class MoveTaxonHandler extends AbstractHandler implements IPostOperationE
         * @return a boolean.
         */
        public boolean onComplete() {
-               // TODO Auto-generated method stub
                return false;
        }
 }

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewClassificationHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewClassificationHandler.java
similarity index 79%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewClassificationHandler.java
rename to taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewClassificationHandler.java
index ba7783e6f6f0ff0b99913e744c64b331727ad86b..4d8e79a9f2db8660c63081cd56ed64174e92e834 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewClassificationHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewClassificationHandler.java
@@ -8,9 +8,8 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.navigation.handler;
+package eu.etaxonomy.taxeditor.navigation.navigator.handler;
 
-import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -18,7 +17,7 @@ import org.eclipse.core.commands.IHandler;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.wizard.ClassificationWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
 
 /**
  * <p>NewClassificationHandler class.</p>
@@ -29,16 +28,15 @@ import eu.etaxonomy.taxeditor.wizard.ClassificationWizard;
  */
 public class NewClassificationHandler extends AbstractHandler implements
                IHandler {
-       private static final Logger logger = Logger
-                       .getLogger(NewClassificationHandler.class);
 
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
         */
        /** {@inheritDoc} */
        public Object execute(ExecutionEvent event) throws ExecutionException {
-               
-               WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), new ClassificationWizard());
+               NewClassificationWizard wizard = new NewClassificationWizard();
+               wizard.init(null, null);
+               WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), wizard);
                dialog.open();
                
                return null;

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewTaxonNodeHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewTaxonNodeHandler.java
similarity index 86%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewTaxonNodeHandler.java
rename to taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewTaxonNodeHandler.java
index b3b0ad8335525f0dc2e832fd574967df8bd27a37..e6dd07aa3ef3bb3fdab9d8170ff077e7b46bc458 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/NewTaxonNodeHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewTaxonNodeHandler.java
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.navigation.handler;
+package eu.etaxonomy.taxeditor.navigation.navigator.handler;
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
@@ -19,7 +19,7 @@ import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
-import eu.etaxonomy.taxeditor.wizard.NewTaxonNodeWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewTaxonNodeWizard;
 
 /**
  * <p>NewTaxonNodeHandler class.</p>
@@ -35,14 +35,14 @@ public class NewTaxonNodeHandler extends AbstractHandler implements IHandler {
         */
        /** {@inheritDoc} */
        public Object execute(ExecutionEvent event) throws ExecutionException {
-               
                NewTaxonNodeWizard wizard = new NewTaxonNodeWizard();
+               wizard.init(null, null);
                WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), wizard);
                int status = dialog.open();
                
                if(status == IStatus.OK && wizard.openInEditor()){
                        if(wizard.openEmpty()){
-                               NavigationUtil.openEmpty(wizard.getParent().getUuid());
+                               NavigationUtil.openEmpty(wizard.getParentTreeNode().getUuid());
                        }else{
                                NavigationUtil.openEditor(wizard.getTaxonNode());
                        }

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/RefreshTreeHandler.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RefreshTreeHandler.java
similarity index 95%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/RefreshTreeHandler.java
rename to taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RefreshTreeHandler.java
index 0152ac274885812c873f8c5ac7603bef05045c26..06b50e1c57bf553d3bbf198d009858499b78a24d 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/handler/RefreshTreeHandler.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RefreshTreeHandler.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.navigation.handler;
+package eu.etaxonomy.taxeditor.navigation.navigator.handler;
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.AbstractHandler;

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
index 9ee8ef5425f8096451e1eddd56c2528fe40020ad..381dbf6b1fa04a46bc33a0f47e83104c7210bfdf 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
@@ -92,7 +92,6 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -103,7 +102,6 @@ public class DeleteOperation extends AbstractPersistentPostOperation{
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 }

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/EditClassificationOperation.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/EditClassificationOperation.java
index 70e21b32b744d8421e3f5ceeeeb0c6d62827d281..072fc2fb526ad56c2443f11c69ddb7e6076a0a46 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/EditClassificationOperation.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/EditClassificationOperation.java
@@ -74,7 +74,6 @@ public class EditClassificationOperation extends AbstractPersistentPostOperation
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -85,7 +84,6 @@ public class EditClassificationOperation extends AbstractPersistentPostOperation
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 }

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateClassification.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateClassification.java
index 15ef9b648504158b2683b5dfb746bf675b25477c..12c9d5548fad1aba909026ac100cb3f967e8c926 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateClassification.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateClassification.java
@@ -32,6 +32,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created 23.06.2009
  * @version 1.0
  */
+@Deprecated // we do not undo creation of elements
 public class CreateClassification extends AbstractPersistentPostOperation {
 
        private Classification classification;
@@ -84,7 +85,6 @@ public class CreateClassification extends AbstractPersistentPostOperation {
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -95,7 +95,6 @@ public class CreateClassification extends AbstractPersistentPostOperation {
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 }

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreatePolytomousKey.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreatePolytomousKey.java
index 1c8719dc5d0f3325e911f7c12c9b4f8fcfdec2d3..293811bd11a655df8a4c995e6f8eb57d595afd8f 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreatePolytomousKey.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreatePolytomousKey.java
@@ -28,6 +28,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created Dec 2, 2010
  * @version 1.0
  */
+@Deprecated // we do not undo creation of elements
 public class CreatePolytomousKey extends AbstractPersistentPostOperation {
 
        private PolytomousKey key;
@@ -67,7 +68,6 @@ public class CreatePolytomousKey extends AbstractPersistentPostOperation {
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -77,7 +77,6 @@ public class CreatePolytomousKey extends AbstractPersistentPostOperation {
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
index c6084d696e81f515e31c3b77e64c8618f71e2bbc..3ae83c87f0de4d181344c62d10041351c660d707 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
@@ -36,6 +36,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @created 08.05.2009
  * @version 1.0
  */
+@Deprecated // we do not undo creation of elements
 public class CreateTaxonNode extends AbstractPersistentPostOperation {
        
        private Taxon newTaxon;

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/ClassificationWizard.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/ClassificationWizard.java
deleted file mode 100644 (file)
index 22eab66..0000000
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/ClassificationWizard.java
+++ /dev/null
@@ -1,138 +0,0 @@
-// $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.wizard;
-
-import org.apache.log4j.Logger;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
-import eu.etaxonomy.cdm.api.service.IClassificationService;
-import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
-import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;
-import eu.etaxonomy.taxeditor.navigation.operation.CreateClassification;
-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
-import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-/**
- * <p>ClassificationWizard class.</p>
- *
- * @author n.hoffmann
- * @created 23.06.2009
- * @version 1.0
- */
-public class ClassificationWizard extends Wizard implements INewWizard, IPostOperationEnabled, IConversationEnabled {
-       
-       private ClassificationWizardPage page;
-       
-       private Classification classification;
-
-       private ConversationHolder conversation;
-       
-       /**
-        * <p>Constructor for ClassificationWizard.</p>
-        */
-       public ClassificationWizard(){
-               setWindowTitle("New Entity");
-               conversation = CdmStore.createConversation();
-       }
-       
-       /**
-        * <p>Constructor for ClassificationWizard.</p>
-        *
-        * @param classification a {@link eu.etaxonomy.cdm.model.taxon.TaxonomicTree} object.
-        */
-       public ClassificationWizard(Classification classification){
-               this();
-               setWindowTitle("Edit Entity");
-               this.classification = CdmStore.getService(IClassificationService.class).load(classification.getUuid());
-       }
-       
-       /* (non-Javadoc)
-       * @see org.eclipse.jface.wizard.Wizard#addPages()
-       */
-       /** {@inheritDoc} */
-       @Override
-       public void addPages() {
-               super.addPages();
-       
-               page = new ClassificationWizardPage(getConversationHolder(), classification);
-               
-               addPage(page);
-       }
-       
-       /* (non-Javadoc)
-       * @see org.eclipse.jface.wizard.Wizard#performFinish()
-       */
-       /** {@inheritDoc} */
-       @Override
-       public boolean performFinish() {
-       
-               TaxonNavigator taxonNavigator;
-               taxonNavigator = (TaxonNavigator) NavigationUtil.showView(TaxonNavigator.ID);
-               
-               AbstractPostOperation operation = new CreateClassification("Save Classification", 
-                               NavigationUtil.getUndoContext(), page.getClassification(), this, this);
-               NavigationUtil.executeOperation(operation);
-               
-               return true;
-       }
-
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-        */
-       /** {@inheritDoc} */
-       @Override
-       public void init(IWorkbench workbench, IStructuredSelection selection) {
-               
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostDataChangeObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap)
-        */
-       /** {@inheritDoc} */
-       @Override
-       public void update(CdmDataChangeMap changeEvents) {}
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public ConversationHolder getConversationHolder() {
-               return conversation;
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)
-        */
-       /** {@inheritDoc} */
-       @Override
-       public boolean postOperation(CdmBase objectAffectedByOperation) {
-               return false;
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#onComplete()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public boolean onComplete() {
-               return true;
-       }
-}

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizard.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizard.java
deleted file mode 100644 (file)
index c398d2b..0000000
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizard.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
-import eu.etaxonomy.cdm.api.service.IClassificationService;
-import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
-import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.cdm.model.taxon.ITreeNode;
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
-import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;
-import eu.etaxonomy.taxeditor.navigation.operation.CreateTaxonNode;
-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
-import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-/**
- * <p>NewTaxonNodeWizard class.</p>
- *
- * @author n.hoffmann
- * @created Sep 15, 2009
- * @version 1.0
- */
-public class NewTaxonNodeWizard extends Wizard implements INewWizard, IPostOperationEnabled, IConversationEnabled {
-
-       private NewTaxonNodeWizardPage page;
-
-       private IStructuredSelection selection;
-
-       private TaxonNode generatedTaxonNode;
-
-       private boolean openEmptyEditor = false;
-
-       private ConversationHolder conversation;
-       
-       /**
-        * <p>Constructor for NewTaxonNodeWizard.</p>
-        */
-       public NewTaxonNodeWizard() {
-               this.setWindowTitle("New Entity");
-               conversation = CdmStore.createConversation();
-               selection = getNavigatorSelection();
-       }
-
-       /**
-        * Retrieve the current selection from taxon navigator
-        * 
-        * @return
-        */
-       private IStructuredSelection getNavigatorSelection() {
-               StructuredSelection selection = null;
-               TaxonNavigator navigator = NavigationUtil.getNavigator(false);
-               
-               if(navigator != null){
-                       selection = (StructuredSelection) navigator.getCommonViewer().getSelection();
-               }
-               
-               return selection;
-       }
-
-       private ITreeNode getSelectedTreeNode(){
-               if(selection != null){
-                       Object selectedObject = selection.getFirstElement();
-                       if(selectedObject instanceof ITreeNode){
-                               ITreeNode treeNode = (ITreeNode) selectedObject;
-                               
-                               if(treeNode instanceof Classification){
-                                       return CdmStore.getService(IClassificationService.class).load(treeNode.getUuid());
-                               }
-                               else if(treeNode instanceof TaxonNode){
-                                       return CdmStore.getService(ITaxonNodeService.class).load(treeNode.getUuid());
-                               }
-                       }
-               }
-               return null;
-       }
-
-
-       /** {@inheritDoc} */
-       @Override
-       public boolean performFinish() {
-               if(page.getTaxon() == null || page.getTaxon().getName().getFullTitleCache().length() == 0){
-                       openEmptyEditor = true;
-               }else{                  
-                       AbstractPostOperation operation = new CreateTaxonNode("Create Taxon", 
-                                       NavigationUtil.getUndoContext(), page.getParentTreeNode(), page.getTaxon(), this, this);
-                       NavigationUtil.executeOperation(operation);
-               }
-               return true;
-       }
-       
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.wizard.Wizard#addPages()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public void addPages() {
-               super.addPages();
-               
-               page = new NewTaxonNodeWizardPage(getConversationHolder(), getSelectedTreeNode());
-               
-               addPage(page);
-       }
-
-       /** {@inheritDoc} */
-       public void init(IWorkbench workbench, IStructuredSelection selection) {
-               // workbench is not used at the moment
-               this.selection = selection;
-       }
-
-       /**
-        * <p>openInEditor</p>
-        *
-        * @return a boolean.
-        */
-       public boolean openInEditor(){
-               return page.openInEditor();
-       }
-       
-       /**
-        * <p>openEmpty</p>
-        *
-        * @return a boolean.
-        */
-       public boolean openEmpty(){
-               return openInEditor() && openEmptyEditor;
-       }
-
-       /**
-        * <p>getTaxonNode</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonNode} object.
-        */
-       public TaxonNode getTaxonNode(){
-               return generatedTaxonNode;
-       }
-       
-       /**
-        * <p>getParent</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
-        */
-       public ITreeNode getParent(){
-               return page.getParentTreeNode();
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)
-        */
-       /** {@inheritDoc} */
-       public boolean postOperation(CdmBase objectAffectedByOperation) {
-               generatedTaxonNode = (TaxonNode) objectAffectedByOperation;
-               
-               NavigationUtil.selectInNavigator(generatedTaxonNode, generatedTaxonNode.getParent());
-               
-               return true;
-       }
-
-       /**
-        * <p>onComplete</p>
-        *
-        * @return a boolean.
-        */
-       public boolean onComplete() {
-               return true;
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostDataChangeObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap)
-        */
-       /** {@inheritDoc} */
-       @Override
-       public void update(CdmDataChangeMap changeEvents) {}
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public ConversationHolder getConversationHolder() {
-               return conversation;
-       }
-}

diff --git a/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java b/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java
index 5d2c4513837cd481d997e66ad00185031ae9b7d1..b940a46a16838bdf952b9d0799c081df1eded686 100644 (file)
--- a/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java
+++ b/taxeditor-printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java
@@ -151,7 +151,6 @@ public class SelectTaxaWizardPage extends AbstractPublishWizardPage {
                }
 
                public Object getParent(Object element) {
-                       // TODO Auto-generated method stub
                        return null;
                }
 
@@ -164,12 +163,10 @@ public class SelectTaxaWizardPage extends AbstractPublishWizardPage {
                }
 
                public void dispose() {
-                       // TODO Auto-generated method stub
                        
                }
 
                public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-                       // TODO Auto-generated method stub
                        
                }
                

diff --git a/taxeditor-store/META-INF/MANIFEST.MF b/taxeditor-store/META-INF/MANIFEST.MF
index cfaa3646aea0d5cd3d17b7205f8faae01084fb0c..d6c6816b82d8ba9c42d1e23406b725f16b305487 100644 (file)
--- a/taxeditor-store/META-INF/MANIFEST.MF
+++ b/taxeditor-store/META-INF/MANIFEST.MF
@@ -8,15 +8,10 @@ Bundle-Vendor: EDIT
 Export-Package: dbscripts,
  eu.etaxonomy.cdm,
  eu.etaxonomy.cdm.database,
- eu.etaxonomy.taxeditor.account.user,
  eu.etaxonomy.taxeditor.account.user.handler,
- eu.etaxonomy.taxeditor.account.user.view,
  eu.etaxonomy.taxeditor.account.user.wizard,
  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.ext.service.wizard,
  eu.etaxonomy.taxeditor.featuretree,
  eu.etaxonomy.taxeditor.forms.section,
@@ -26,6 +21,7 @@ Export-Package: dbscripts,
  eu.etaxonomy.taxeditor.io.wizard,
  eu.etaxonomy.taxeditor.labels,
  eu.etaxonomy.taxeditor.model;uses:="eu.etaxonomy.cdm.model.common,eu.etaxonomy.cdm.model.name,eu.etaxonomy.cdm.model.taxon",
+ eu.etaxonomy.taxeditor.newWizard,
  eu.etaxonomy.taxeditor.newWizards,
  eu.etaxonomy.taxeditor.operation,
  eu.etaxonomy.taxeditor.parser,
@@ -35,11 +31,34 @@ Export-Package: dbscripts,
  eu.etaxonomy.taxeditor.preference.wizard,
  eu.etaxonomy.taxeditor.store,
  eu.etaxonomy.taxeditor.store.internal,
- eu.etaxonomy.taxeditor.store.operations
+ eu.etaxonomy.taxeditor.store.operations,
+ eu.etaxonomy.taxeditor.ui.bar,
+ eu.etaxonomy.taxeditor.ui.dialogs,
+ eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection,
+ eu.etaxonomy.taxeditor.ui.forms,
+ eu.etaxonomy.taxeditor.ui.section,
+ eu.etaxonomy.taxeditor.ui.section.agent,
+ eu.etaxonomy.taxeditor.ui.section.classification,
+ eu.etaxonomy.taxeditor.ui.section.description,
+ eu.etaxonomy.taxeditor.ui.section.key,
+ eu.etaxonomy.taxeditor.ui.section.name,
+ eu.etaxonomy.taxeditor.ui.section.occurrence,
+ eu.etaxonomy.taxeditor.ui.section.reference,
+ eu.etaxonomy.taxeditor.ui.section.supplemental,
+ eu.etaxonomy.taxeditor.ui.section.taxon,
+ eu.etaxonomy.taxeditor.ui.selection,
+ eu.etaxonomy.taxeditor.ui.term,
+ eu.etaxonomy.taxeditor.view,
+ eu.etaxonomy.taxeditor.view.datasource,
+ eu.etaxonomy.taxeditor.view.datasource.handler,
+ eu.etaxonomy.taxeditor.view.detail,
+ eu.etaxonomy.taxeditor.view.supplementaldata,
+ eu.etaxonomy.taxeditor.view.user
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  org.eclipse.jface.text,
  org.eclipse.pde.runtime,
+ org.eclipse.ui.forms;bundle-version="3.5.0",
  eu.etaxonomy.taxeditor.cdmlib;bundle-version="3.0.0"
 Import-Package: junit.framework,
  org.eclipse.core.commands,

diff --git a/taxeditor-editor/icons/accessories-text-editor.png b/taxeditor-store/icons/accessories-text-editor.png
similarity index 100%
rename from taxeditor-editor/icons/accessories-text-editor.png
rename to taxeditor-store/icons/accessories-text-editor.png

diff --git a/taxeditor-editor/icons/applications-office.png b/taxeditor-store/icons/applications-office.png
similarity index 100%
rename from taxeditor-editor/icons/applications-office.png
rename to taxeditor-store/icons/applications-office.png

diff --git a/taxeditor-navigation/icons/tree_icon_small.jpg b/taxeditor-store/icons/tree_icon_small.jpg
similarity index 100%
rename from taxeditor-navigation/icons/tree_icon_small.jpg
rename to taxeditor-store/icons/tree_icon_small.jpg

diff --git a/taxeditor-store/plugin.xml b/taxeditor-store/plugin.xml
index 925ef36ef368f6396e63bfbc6154aa2678774ea0..d12709fa257ab4a6c4a9c59f0eb00e516c10706e 100644 (file)
--- a/taxeditor-store/plugin.xml
+++ b/taxeditor-store/plugin.xml
@@ -173,21 +173,21 @@
    <extension
          point="org.eclipse.ui.views">
       <view
-            class="eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart"
+            class="eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart"
             icon="icons/system-file-manager.png"
-            id="eu.etaxonomy.taxeditor.store.datasource.datasourceView"
+            id="eu.etaxonomy.taxeditor.view.datasource"
             name="Datasource"
             restorable="true">
       </view>
       <view
-            class="eu.etaxonomy.taxeditor.account.user.view.UserView"
+            class="eu.etaxonomy.taxeditor.view.user.UserView"
             icon="icons/system-users.png"
             id="eu.etaxonomy.taxeditor.store.userManagerView"
             name="User"
             restorable="true">
       </view>
       <view
-            class="eu.etaxonomy.taxeditor.account.group.view.GroupView"
+            class="eu.etaxonomy.taxeditor.view.group.GroupViewPart"
             id="eu.etaxonomy.taxeditor.store.groupView"
             name="Group"
             restorable="true">
@@ -206,10 +206,26 @@
                        id="org.eclipse.ui.views.LogView">  
                </view>
   <view
-        class="eu.etaxonomy.taxeditor.reporting.ReportingViewPart"
+        class="eu.etaxonomy.taxeditor.view.reporting.ReportingViewPart"
         id="eu.etaxonomy.taxeditor.reporting.viewPart"
         name="Reporting"
         restorable="true">
+  </view>
+  <view
+        allowMultiple="false"
+        class="eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart"
+        icon="icons/applications-office.png"
+        id="eu.etaxonomy.taxeditor.view.supplementalData"
+        name="Supplemental Data"
+        restorable="true">
+  </view>
+  <view
+        allowMultiple="false"
+        class="eu.etaxonomy.taxeditor.view.detail.DetailsViewPart"
+        icon="icons/accessories-text-editor.png"
+        id="eu.etaxonomy.taxeditor.view.detail"
+        name="Details"
+        restorable="true">
   </view>
    </extension>
    <extension
@@ -219,6 +235,24 @@
          <menu
                id="eu.etaxonomy.taxeditor.menu.showView"
                label="Show View">
+            <command
+                  commandId="org.eclipse.ui.views.showView"
+                  label="Details"
+                  style="push">
+               <parameter
+                     name="org.eclipse.ui.views.showView.viewId"
+                     value="eu.etaxonomy.taxeditor.view.detail">
+               </parameter>
+            </command>
+            <command
+                  commandId="org.eclipse.ui.views.showView"
+                  label="Supplemental"
+                  style="push">
+               <parameter
+                     name="org.eclipse.ui.views.showView.viewId"
+                     value="eu.etaxonomy.taxeditor.view.supplementalData">
+               </parameter>
+            </command>
             <separator
                   name="eu.etaxonomy.taxeditor.store.showViewMenu.internal"
                   visible="true">
@@ -229,7 +263,7 @@
                   style="push">
                <parameter
                      name="org.eclipse.ui.views.showView.viewId"
-                     value="eu.etaxonomy.taxeditor.store.datasource.datasourceView">
+                     value="eu.etaxonomy.taxeditor.view.datasource">
                </parameter>
             </command>
             <command
@@ -289,7 +323,7 @@
          </separator>
       </menuContribution>
       <menuContribution
-            locationURI="popup:eu.etaxonomy.taxeditor.store.datasource.datasourceView">
+            locationURI="popup:eu.etaxonomy.taxeditor.view.datasource">
          <command
                commandId="eu.etaxonomy.taxeditor.store.datasource.change"
                label="Connect"
@@ -310,7 +344,7 @@
                visible="true">
          </separator>
          <command
-               commandId="eu.etaxonomy.taxeditor.store.datasource.delete"
+               commandId="org.eclipse.ui.edit.delete"
                label="Delete"
                style="push">
          </command>
@@ -364,7 +398,7 @@
          <toolbar
                id="eu.etaxonomy.taxeditor.store.authentication.trim.toolbar">
             <control
-                  class="eu.etaxonomy.taxeditor.account.user.AuthenticatedUserBar">
+                  class="eu.etaxonomy.taxeditor.ui.bar.AuthenticatedUserBar">
             </control>
          </toolbar>
       </menuContribution>
@@ -378,36 +412,46 @@
             name="Show Login Window">
       </command>
    </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="eu.etaxonomy.taxeditor.view.datasource.handler.DeleteDataSourceHandler"
+            commandId="org.eclipse.ui.edit.delete">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="eu.etaxonomy.taxeditor.view.datasource">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+   </extension>
    <extension
          name="Popup Menu Commands"
          point="org.eclipse.ui.commands">
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.ChangeConnectionHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.ChangeConnectionHandler"
             id="eu.etaxonomy.taxeditor.store.datasource.change"
             name="Connect Datasource">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.EditDataSourceHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.EditDataSourceHandler"
             id="eu.etaxonomy.taxeditor.store.datasource.edit"
             name="Edit Datasource">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.CreateDataSourceHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.CreateDataSourceHandler"
             id="eu.etaxonomy.taxeditor.store.datasource.create"
             name="Create Datasource">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.DeleteDataSourceHandler"
-            id="eu.etaxonomy.taxeditor.store.datasource.delete"
-            name="Delete Datasource">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.CloseConnectionHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.CloseConnectionHandler"
             id="eu.etaxonomy.taxeditor.store.datasource.close"
             name="Close Active Connection">
       </command>
       <command
-            defaultHandler="eu.etaxonomy.taxeditor.datasource.handler.UpdateDataSourceHandler"
+            defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.UpdateDataSourceHandler"
             id="eu.etaxonomy.taxeditor.store.datasource.update"
             name="Update Datasource">
       </command>
@@ -508,6 +552,70 @@
             name="SDD">
       </wizard>
    </extension>
+   <extension
+         point="org.eclipse.ui.newWizards">
+      <wizard
+            category="eu.etaxonomy.taxeditor.new.category.cdm"
+            class="eu.etaxonomy.taxeditor.newWizard.NewReferenceWizard"
+            hasPages="true"
+            id="eu.etaxonomy.taxeditor.new.reference"
+            name="Reference">
+      </wizard>
+      <wizard
+            category="eu.etaxonomy.taxeditor.new.category.cdm"
+            class="eu.etaxonomy.taxeditor.newWizard.NewNonViralNameWizard"
+            hasPages="true"
+            id="eu.etaxonomy.taxeditor.new.nonViralName"
+            name="Name">
+      </wizard>
+      <wizard
+            category="eu.etaxonomy.taxeditor.new.category.cdm"
+            class="eu.etaxonomy.taxeditor.newWizard.NewTeamWizard"
+            hasPages="true"
+            id="eu.etaxonomy.taxeditor.new.team"
+            name="Team">
+      </wizard>
+      <wizard
+            category="eu.etaxonomy.taxeditor.new.category.cdm"
+            class="eu.etaxonomy.taxeditor.newWizard.NewPersonWizard"
+            hasPages="true"
+            id="eu.etaxonomy.taxeditor.new.person"
+            name="Person">
+      </wizard>
+      <wizard
+            category="eu.etaxonomy.taxeditor.new.category.cdm"
+            class="eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard"
+            hasPages="true"
+            id="eu.etaxonomy.taxeditor.new.specimen"
+            name="Specimen">
+      </wizard>
+      <wizard
+            category="eu.etaxonomy.taxeditor.new.category.cdm"
+            class="eu.etaxonomy.taxeditor.newWizard.NewPolytomousKeyWizard"
+            hasPages="true"
+            id="eu.etaxonomy.taxeditor.new.key.polytomous"
+            name="Polytomous Key">
+      </wizard>
+      <category
+            id="eu.etaxonomy.taxeditor.new.category.cdm"
+            name="CDM">
+      </category>
+      <wizard
+            category="eu.etaxonomy.taxeditor.new.category.cdm"
+            class="eu.etaxonomy.taxeditor.newWizard.NewTaxonNodeWizard"
+            hasPages="true"
+            id="eu.etaxonomy.taxeditor.new.taxonNode"
+            name="Taxon">
+      </wizard>
+      <wizard
+            category="eu.etaxonomy.taxeditor.new.category.cdm"
+            class="eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard"
+            hasPages="true"
+            icon="icons/tree_icon_small.jpg"
+            id="eu.etaxonomy.taxeditor.new.classification"
+            name="Classification">
+      </wizard>
+   </extension>
 <extension
             point="org.eclipse.ui.themes">
          <themeElementCategory
@@ -701,7 +809,7 @@
 <extension
       point="org.eclipse.core.expressions.propertyTesters">
    <propertyTester
-         class="eu.etaxonomy.taxeditor.datasource.handler.DataSourceMenuPropertyTester"
+         class="eu.etaxonomy.taxeditor.view.datasource.handler.DataSourceMenuPropertyTester"
          id="eu.etaxonomy.taxeditor.datasource.propertyTester"
          namespace="eu.etaxonomy.taxeditor.datasource.propertyTester"
          properties="isCompatible"

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/CreateUserHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/CreateUserHandler.java
index ed72245ca6a4ee12db2947f33f5ad0ae6202202a..235ca5600fbd4c32e0e5fd9a323695d26fcbab05 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/CreateUserHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/CreateUserHandler.java
@@ -13,12 +13,13 @@ package eu.etaxonomy.taxeditor.account.user.handler;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.account.user.view.UserView;
-import eu.etaxonomy.taxeditor.account.user.wizard.UserWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewUserWizard;
+import eu.etaxonomy.taxeditor.view.user.UserView;
 
 /**
  * <p>CreateUserHandler class.</p>
@@ -34,13 +35,15 @@ public class CreateUserHandler extends AbstractHandler {
         */
        /** {@inheritDoc} */
        public Object execute(ExecutionEvent event) throws ExecutionException {
-               Shell shell = HandlerUtil.getActiveShell(event);
-               
                UserView part = (UserView) HandlerUtil.getActivePart(event);
-               UserWizard wizard = new UserWizard(part); 
                
-               WizardDialog dialog = new WizardDialog(shell, wizard);
-           dialog.open();
+               NewUserWizard wizard = new NewUserWizard();
+               wizard.init(null, null);
+               
+               WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), wizard);
+           if(dialog.open() == IStatus.OK){
+               part.getViewer().refresh();
+           }
                return null;
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/EditUserHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/EditUserHandler.java
index 4aa87305d182dac2dd9c826496c9fb48964c83d8..85a7807bdefba168c61d5a360568b71cf5ac12a9 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/EditUserHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/EditUserHandler.java
@@ -19,8 +19,8 @@ import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.model.common.User;
-import eu.etaxonomy.taxeditor.account.user.view.UserView;
 import eu.etaxonomy.taxeditor.account.user.wizard.UserWizard;
+import eu.etaxonomy.taxeditor.view.user.UserView;
 
 /**
  * <p>EditUserHandler class.</p>

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/ToggleUserEnablementHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/ToggleUserEnablementHandler.java
index a0b0574a51b2ca79f39da8dd812777e877e408c9..4f51d8b3ec2e735223d4c9680853e0eced70ba5b 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/ToggleUserEnablementHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/handler/ToggleUserEnablementHandler.java
@@ -19,9 +19,9 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.taxeditor.account.user.operation.ToggleUserEnablementOperation;
-import eu.etaxonomy.taxeditor.account.user.view.UserView;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.view.user.UserView;
 
 /**
  * <p>ToggleUserEnablementHandler class.</p>

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/CreateUserOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/CreateUserOperation.java
index 73beb4d86b0f1ad5ce25406aad4510802478bbc2..428502a1f42d28387cafe8e8dc9384c56e5985d5 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/CreateUserOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/CreateUserOperation.java
@@ -72,7 +72,6 @@ public class CreateUserOperation extends AbstractPersistentPostOperation {
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -83,7 +82,6 @@ public class CreateUserOperation extends AbstractPersistentPostOperation {
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/DeleteUserOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/DeleteUserOperation.java
index f8e07494172f62466c5d3ce1d56e0bd5598d6b46..fd85c5d00f0d87d3dc5338d3600603e5fc33e185 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/DeleteUserOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/DeleteUserOperation.java
@@ -66,7 +66,6 @@ public class DeleteUserOperation extends AbstractPersistentPostOperation {
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -76,7 +75,6 @@ public class DeleteUserOperation extends AbstractPersistentPostOperation {
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/EditUserOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/EditUserOperation.java
index a1ca3e41ede5a8215a102a2942db3f0fbf70f159..81e58bfe5c04eab40e56ce2f66979aca51bd5751 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/EditUserOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/operation/EditUserOperation.java
@@ -73,7 +73,6 @@ public class EditUserOperation extends AbstractPersistentPostOperation {
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -84,7 +83,6 @@ public class EditUserOperation extends AbstractPersistentPostOperation {
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
-               // TODO Auto-generated method stub
                return null;
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/wizard/UserWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/wizard/UserWizard.java
index 354f40655fa31a1c9b55357e00649f08e40aa403..b0c355e2973313c19f4cd4c4f9ea8e5972f6da53 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/wizard/UserWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/wizard/UserWizard.java
@@ -16,9 +16,9 @@ import org.eclipse.jface.wizard.Wizard;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.taxeditor.account.user.operation.CreateUserOperation;
 import eu.etaxonomy.taxeditor.account.user.operation.EditUserOperation;
-import eu.etaxonomy.taxeditor.account.user.view.UserView;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.view.user.UserView;
 
 /**
  * <p>UserWizard class.</p>
@@ -36,7 +36,7 @@ public class UserWizard extends Wizard {
        /**
         * <p>Constructor for UserWizard.</p>
         *
-        * @param view a {@link eu.etaxonomy.taxeditor.account.user.view.UserView} object.
+        * @param view a {@link eu.etaxonomy.taxeditor.view.user.UserView} object.
         */
        public UserWizard(UserView view){
                this.view = view;
@@ -47,7 +47,7 @@ public class UserWizard extends Wizard {
        /**
         * <p>Constructor for UserWizard.</p>
         *
-        * @param view a {@link eu.etaxonomy.taxeditor.account.user.view.UserView} object.
+        * @param view a {@link eu.etaxonomy.taxeditor.view.user.UserView} object.
         * @param user a {@link eu.etaxonomy.cdm.model.common.User} object.
         */
        public UserWizard(UserView view, User user){

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
index 4e6957557902018854df7e03362fc4cf489e5c81..a8278c654fc451051195f3c706b4cab7fe137e44 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
@@ -33,7 +33,6 @@ public class FeatureTreeContentProvider implements ITreeContentProvider {
        /** {@inheritDoc} */
        @Override
        public void dispose() {
-               // TODO Auto-generated method stub
 
        }
 
@@ -43,7 +42,6 @@ public class FeatureTreeContentProvider implements ITreeContentProvider {
        /** {@inheritDoc} */
        @Override
        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-               // TODO Auto-generated method stub
 
        }
 
@@ -75,7 +73,6 @@ public class FeatureTreeContentProvider implements ITreeContentProvider {
        /** {@inheritDoc} */
        @Override
        public Object getParent(Object element) {
-               // TODO Auto-generated method stub
                return null;
        }
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizard.java
index 557bfdebb4ad40cc88b44b6c5015229d25cb6e83..95bfa129d35d50df53bede2f473cae2602579105 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizard.java
@@ -36,7 +36,6 @@ public class SelectFeatureTreeWizard extends Wizard {
        /** {@inheritDoc} */
        @Override
        public boolean performFinish() {
-               // TODO Auto-generated method stub
                return false;
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java
index 436e30d9b37da23d415145133f45c4c9e2ae3461..d90f953b34c5ca8d034af13b1cee76769068f935 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/handler/ShowLoginWindowHandler.java
@@ -17,7 +17,7 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.IHandler;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.dialogs.LoginDialog;
+import eu.etaxonomy.taxeditor.ui.dialogs.LoginDialog;
 
 /**
  * <p>ShowLoginWindowHandler class.</p>

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/identificationkey/AbstractIdentificaitonKeyWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/identificationkey/AbstractIdentificaitonKeyWizard.java
index bd11aa2061ae516638ccf8086518c36f34723a2c..1efddce93b7f8f75bfe0eadc5656a0d520ba3d7a 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/identificationkey/AbstractIdentificaitonKeyWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/identificationkey/AbstractIdentificaitonKeyWizard.java
@@ -16,7 +16,6 @@ public class AbstractIdentificaitonKeyWizard extends Wizard {
         */
        @Override
        public boolean performFinish() {
-               // TODO Auto-generated method stub
                return false;
        }
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelExportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelExportWizard.java
index 536dd52f8fe21d1fe52bf237b108244ee6e62648..1249409b43f13e34314b61a6a3c0772d7ed1c733 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelExportWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelExportWizard.java
@@ -30,7 +30,6 @@ public class AbstractExcelExportWizard extends Wizard implements IExportWizard {
        /** {@inheritDoc} */
        @Override
        public boolean performFinish() {
-               // TODO Auto-generated method stub
                return false;
        }
 
@@ -39,7 +38,6 @@ public class AbstractExcelExportWizard extends Wizard implements IExportWizard {
         */
        /** {@inheritDoc} */
        public void init(IWorkbench workbench, IStructuredSelection selection) {
-               // TODO Auto-generated method stub
-
+               
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelImportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelImportWizard.java
index 7996abc7b05cd276c6ff41e3e995a3ad047cc89c..28cc2577ee57f418a9486611f77d230ae94d252a 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelImportWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelImportWizard.java
@@ -30,7 +30,6 @@ public class AbstractExcelImportWizard extends Wizard implements IImportWizard {
        /** {@inheritDoc} */
        @Override
        public boolean performFinish() {
-               // TODO Auto-generated method stub
                return false;
        }
 
@@ -39,7 +38,6 @@ public class AbstractExcelImportWizard extends Wizard implements IImportWizard {
         */
        /** {@inheritDoc} */
        public void init(IWorkbench workbench, IStructuredSelection selection) {
-               // TODO Auto-generated method stub
 
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbImportSourceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbImportSourceWizardPage.java
index 3de62222d89f24c222e36590bccc1dba265943c3..fa664a25157a2645eac60a88d59d4baedfa4625a 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbImportSourceWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/JaxbImportSourceWizardPage.java
@@ -28,7 +28,6 @@ public class JaxbImportSourceWizardPage extends WizardPage {
         */
        protected JaxbImportSourceWizardPage(String pageName) {
                super(pageName);
-               // TODO Auto-generated constructor stub
        }
 
        /* (non-Javadoc)
@@ -36,7 +35,5 @@ public class JaxbImportSourceWizardPage extends WizardPage {
         */
        /** {@inheritDoc} */
        public void createControl(Composite parent) {
-               // TODO Auto-generated method stub
-
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index 78c690bb237c1c804728db556540146170ae9239..36f2d5197aa68b51e79a0825460cc44e5da36d9e 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -34,6 +34,7 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbench;
@@ -51,6 +52,9 @@ import org.eclipse.ui.themes.IThemeManager;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
+import eu.etaxonomy.taxeditor.view.AbstractCdmDataViewer;
+import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
+import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
 
 /**
  * <p>Abstract AbstractUtility class.</p>
@@ -115,16 +119,20 @@ public abstract class AbstractUtility {
                return getActivePage() != null ? getActivePage().getActivePart() : null;
        }
        
+       public static IWorkbench getWorkbench(){
+               return TaxeditorStorePlugin.getDefault().getWorkbench();
+       }
+       
        /**
         * <p>getWorkbenchWindow</p>
         *
         * @return a {@link org.eclipse.jface.window.ApplicationWindow} object.
         */
        public static ApplicationWindow getWorkbenchWindow(){
-               if(TaxeditorStorePlugin.getDefault().getWorkbench().getWorkbenchWindowCount() > 1){
+               if(getWorkbench().getWorkbenchWindowCount() > 1){
                        throw new IllegalStateException("More than one workbench window");
                }
-               return (ApplicationWindow) TaxeditorStorePlugin.getDefault().getWorkbench().getWorkbenchWindows()[0];
+               return (ApplicationWindow) getWorkbench().getWorkbenchWindows()[0];
        }
        
        /**
@@ -632,4 +640,50 @@ public abstract class AbstractUtility {
        protected static String getPluginId(){
                return "eu.taxeditor";
        }
+       
+       /**
+        * <p>getActiveEditor</p>
+        *
+        * @return a {@link org.eclipse.ui.IEditorPart} object.
+        */
+       public static IEditorPart getActiveEditor(){
+               return getActivePage() != null ? getActivePage().getActiveEditor() : null;
+       }
+       
+       /**
+        * <p>getDetailsView</p>
+        *
+        * @return a {@link eu.etaxonomy.taxeditor.view.detail.DetailsViewPart} object.
+        */
+       public static DetailsViewPart getDetailsView(){
+               return  (DetailsViewPart) getView(DetailsViewPart.ID, false);
+       }
+       
+       /**
+        * <p>refreshDetailsViewer</p>
+        */
+       public static void refreshDetailsViewer(){
+               if(getDetailsView() != null){
+                       ((AbstractCdmDataViewer) getDetailsView().getViewer()).refresh();
+               }
+       }
+       
+       /**
+        * <p>reflowDetailsViewer</p>
+        */
+       public static void reflowDetailsViewer(){
+               if(getDetailsView() != null){
+                       ((AbstractCdmDataViewer) getDetailsView().getViewer()).reflow();
+               }
+       }
+       
+       public static SupplementalDataViewPart getSupplementalDataView(){
+               return (SupplementalDataViewPart) getView(SupplementalDataViewPart.ID, false);
+       }
+       
+       public static void reflowSupplementalViewer(){
+               if(getSupplementalDataView() != null){
+                       ((AbstractCdmDataViewer) getSupplementalDataView().getViewer()).reflow();
+               }
+       }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ICdmEditorHandle.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ICdmEditorHandle.java
new file mode 100644 (file)
index 0000000..43c694d
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ICdmEditorHandle.java
@@ -0,0 +1,20 @@
+/**
+ * 
+ */
+package eu.etaxonomy.taxeditor.model;
+
+import java.util.UUID;
+
+import org.eclipse.ui.IEditorInput;
+
+/**
+ * @author n.hoffmann
+ *
+ */
+public interface ICdmEditorHandle {
+
+       public void open(UUID uuid);
+
+       public Class<? extends IEditorInput> getInputType();
+       
+}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IElementHasDetails.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IElementHasDetails.java
new file mode 100644 (file)
index 0000000..9440c7b
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IElementHasDetails.java
@@ -0,0 +1,17 @@
+/**
+ * 
+ */
+package eu.etaxonomy.taxeditor.model;
+
+/**
+ * @author n.hoffmann
+ *
+ */
+public interface IElementHasDetails {
+
+       /**
+        * The data for which the details view should show details. 
+        * @return
+        */
+       public Object getData();
+}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IPartContentHasDetails.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IPartContentHasDetails.java
index 088e3ba6554f9feb98002318fc050af4b0520f6f..da4e04ef6da7f6ab54ee6e9f657fa3ad3409f0ab 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IPartContentHasDetails.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/IPartContentHasDetails.java
@@ -13,7 +13,7 @@ package eu.etaxonomy.taxeditor.model;
 
 /**
  * Clients implementing this interface indicate, that the data they present is suitable for the details view
- * and that the details view should handle selection from the implmenting part.
+ * and that the details view should handle selection from the implementing part.
  *
  * @author n.hoffmann
  * @created Apr 20, 2010

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
index 548021a180ab483544f2581db0335ef2f4a62e8b..86c3c30170da90db3b9f42caa3b8472915aba7a7 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
@@ -22,6 +22,7 @@ import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
 
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 /**
@@ -177,8 +178,7 @@ public class ImageResources {
                        } catch (MalformedURLException e) {
                                // should never happen
                        } catch (Exception e) {
-                               // TODO Auto-generated catch block
-                               e.printStackTrace();
+                               StoreUtil.error(ImageResources.class, e);
                        }
                        
 //                     logger.warn(ImageDescriptor.getMissingImageDescriptor().getClass());

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/AbstractNewEntityWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/AbstractNewEntityWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java
index 9c73064ae7e95762cd836c83ffada3a885d474f1..aad8b1c96cc1d2eda74df04e6f72ff11eebf5d5b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/AbstractNewEntityWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java
@@ -8,19 +8,21 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.ISelectionService;
 import org.eclipse.ui.IWorkbench;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 
 /**
  * <p>Abstract AbstractNewEntityWizard class.</p>
@@ -36,9 +38,11 @@ public abstract class AbstractNewEntityWizard<T> extends Wizard implements
        
        protected CdmFormFactory formFactory;
 
-       protected T entity;
+       private T entity;
 
-       protected IStructuredSelection selection;
+       private IWorkbench workbench;
+
+       private IStructuredSelection selection;
        
        /**
         * <p>Constructor for AbstractNewEntityWizard.</p>
@@ -91,12 +95,22 @@ public abstract class AbstractNewEntityWizard<T> extends Wizard implements
        /** {@inheritDoc} */
        @Override
        public void init(IWorkbench workbench, IStructuredSelection selection) {
+               this.workbench = workbench != null ? workbench : StoreUtil.getWorkbench();
+               
+               if(selection == null){
+                       ISelectionService service = (ISelectionService) this.workbench.getActiveWorkbenchWindow().getSelectionService();
+                       if(service.getSelection() instanceof IStructuredSelection){
+                               selection = (IStructuredSelection) service.getSelection();
+                       }
+               }
                this.selection = selection;
+               
                formFactory = new CdmFormFactory(Display.getCurrent(), null);
-               entity = createNewEntity();
                conversation = CdmStore.createConversation();
+               entity = createNewEntity();
+               
        }
-
+       
        /**
         * <p>createNewEntity</p>
         *
@@ -115,4 +129,18 @@ public abstract class AbstractNewEntityWizard<T> extends Wizard implements
        
        /** {@inheritDoc} */
        public void update(CdmDataChangeMap changeEvents) {}
+
+       /**
+        * @return the workbench
+        */
+       public IWorkbench getWorkbench() {
+               return workbench;
+       }
+
+       /**
+        * @return the selection
+        */
+       public IStructuredSelection getSelection() {
+               return selection;
+       }
 }

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/ClassificationWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ClassificationWizardPage.java
similarity index 92%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/ClassificationWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ClassificationWizardPage.java
index 2abc41daa87ec8035b9c762df37f3e309066ab83..2585929c210e1ec0101c93e30638d86d26e27729 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/ClassificationWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ClassificationWizardPage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.wizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.util.IPropertyChangeListener;
@@ -25,12 +25,12 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.RootElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.ReferenceSelectionElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
 
 /**
  * <p>ClassificationWizardPage class.</p>
@@ -39,6 +39,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created Sep 29, 2010
  * @version 1.0
  */
+@Deprecated // remove this file when refactoring is complete
 public class ClassificationWizardPage extends WizardPage implements IPropertyChangeListener, IConversationEnabled {
        private static final Logger logger = Logger
                        .getLogger(ClassificationWizardPage.class);

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/ExternalReferenceServiceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
similarity index 96%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/ExternalReferenceServiceWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
index 152e6509d5cffed21d8c4e15cfe44bd35650dfe2..d50975265722fd80ad37853aa615eece72bcad7c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/ExternalReferenceServiceWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import java.util.List;
 
@@ -32,8 +32,8 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.ext.ipni.IIpniService;
 import eu.etaxonomy.cdm.ext.ipni.IpniService;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 
 /**
  * <p>ExternalReferenceServiceWizardPage class.</p>
@@ -57,7 +57,7 @@ public class ExternalReferenceServiceWizardPage extends WizardPage implements Se
        /**
         * <p>Constructor for ExternalReferenceServiceWizardPage.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase} object.
         */

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java
new file mode 100644 (file)
index 0000000..fe1ba44
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java
@@ -0,0 +1,45 @@
+// $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.newWizard;
+
+import eu.etaxonomy.cdm.api.service.IClassificationService;
+import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.classification.ClassificationWizardPage;
+
+/**
+ * <p>ClassificationWizard class.</p>
+ *
+ * @author n.hoffmann
+ * @created 23.06.2009
+ * @version 1.0
+ */
+
+public class NewClassificationWizard extends AbstractNewEntityWizard<Classification> {
+
+       private ClassificationWizardPage classificationWizardPage;
+
+       @Override
+       public void addPages() {
+               classificationWizardPage = new ClassificationWizardPage(formFactory, getConversationHolder(), getEntity());
+               addPage(classificationWizardPage);
+       }
+       
+       @Override
+       protected void saveEntity() {
+               CdmStore.getService(IClassificationService.class).saveOrUpdate(getEntity());
+       }
+
+       @Override
+       protected Classification createNewEntity() {
+               return Classification.NewInstance(null);
+       }
+}

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewCollectionWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewCollectionWizard.java
similarity index 84%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewCollectionWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewCollectionWizard.java
index 35268e4f4ad36ae85d19484e7db7db5a9ca25494..7ec742e5c444f73e1a0258578419b4577ecf27b2 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewCollectionWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewCollectionWizard.java
@@ -8,12 +8,12 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.ICollectionService;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
-import eu.etaxonomy.taxeditor.section.occurrence.CollectionWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.CollectionWizardPage;
 
 /**
  * <p>NewCollectionWizard class.</p>
@@ -27,7 +27,7 @@ public class NewCollectionWizard extends AbstractNewEntityWizard<Collection> {
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               addPage(new CollectionWizardPage(formFactory, getConversationHolder(), entity));
+               addPage(new CollectionWizardPage(formFactory, getConversationHolder(), getEntity()));
        }
        
        /* (non-Javadoc)
@@ -36,7 +36,7 @@ public class NewCollectionWizard extends AbstractNewEntityWizard<Collection> {
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(ICollectionService.class).saveOrUpdate(entity);
+               CdmStore.getService(ICollectionService.class).saveOrUpdate(getEntity());
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewDerivedUnitBaseWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
similarity index 84%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewDerivedUnitBaseWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
index c9aed5ddb28c84243981bd7758bf88d13d3ce590..f8be0e55ff40f11e9debe187177ecc348da154a0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewDerivedUnitBaseWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
@@ -16,11 +16,11 @@ import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.section.occurrence.DerivedUnitBaseWizardPage;
-import eu.etaxonomy.taxeditor.section.occurrence.FieldObservationWizardPage;
-import eu.etaxonomy.taxeditor.section.occurrence.GatheringEventWizardPage;
-import eu.etaxonomy.taxeditor.section.occurrence.GeneralWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralWizardPage;
 
 /**
  * <p>NewDerivedUnitBaseWizard class.</p>
@@ -77,6 +77,6 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUni
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IOccurrenceService.class).saveOrUpdate(entity);
+               CdmStore.getService(IOccurrenceService.class).saveOrUpdate(getEntity());
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewFieldObservationWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewFieldObservationWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java
index 2b3ca2a6f0bf8f9b44470404bdb5af1cbcdd8c1c..d25a83869fbeee4670b394b73dff0186e6915025 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewFieldObservationWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
@@ -29,7 +29,6 @@ public class NewFieldObservationWizard extends AbstractNewEntityWizard<FieldObse
        /** {@inheritDoc} */
        @Override
        protected FieldObservation createNewEntity() {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -39,6 +38,6 @@ public class NewFieldObservationWizard extends AbstractNewEntityWizard<FieldObse
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IOccurrenceService.class).saveOrUpdate(entity);
+               CdmStore.getService(IOccurrenceService.class).saveOrUpdate(getEntity());
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewInstitutionWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java
similarity index 89%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewInstitutionWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java
index 81139944ead46d23c50736ea4e524a02ca90f773..50e1117d35239199953000d78c69e8799ef592df 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewInstitutionWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java
@@ -8,12 +8,12 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.model.agent.Institution;
-import eu.etaxonomy.taxeditor.section.agent.InstitutionWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionWizardPage;
 
 /**
  * @author n.hoffmann
@@ -27,7 +27,7 @@ public class NewInstitutionWizard extends AbstractNewEntityWizard<Institution> {
         */
        @Override
        public void addPages() {
-               addPage(new InstitutionWizardPage(formFactory, getConversationHolder(), entity));
+               addPage(new InstitutionWizardPage(formFactory, getConversationHolder(), getEntity()));
        }
        
        /* (non-Javadoc)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewNonViralNameWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewNonViralNameWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
index 298aa33398a433b170cab3c8af67ec1f3376c298..c82a842be4398b4f31dde650e770daeb2a07e4e7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewNonViralNameWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.model.name.BotanicalName;
@@ -16,8 +16,8 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.ZoologicalName;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.section.name.NonViralNameWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
 
 /**
  * <p>NewNonViralNameWizard class.</p>
@@ -31,7 +31,7 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName>
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               addPage(new NonViralNameWizardPage(formFactory, getConversationHolder(), entity));
+               addPage(new NonViralNameWizardPage(formFactory, getConversationHolder(), getEntity()));
        }
        
        /** {@inheritDoc} */
@@ -49,6 +49,6 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName>
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(INameService.class).saveOrUpdate(entity);
+               CdmStore.getService(INameService.class).saveOrUpdate(getEntity());
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewPersonWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewPersonWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java
index 88da47b3daf571acc3a5f3ba4a6a345c083de09a..2268713342c95ad21c1e9d7dfa0cb52514c1ee9d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewPersonWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java
@@ -8,12 +8,12 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.taxeditor.section.agent.PersonWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.agent.PersonWizardPage;
 
 /**
  * <p>NewPersonWizard class.</p>
@@ -27,7 +27,7 @@ public class NewPersonWizard extends AbstractNewEntityWizard<Person> {
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               addPage(new PersonWizardPage(formFactory, getConversationHolder(), entity));
+               addPage(new PersonWizardPage(formFactory, getConversationHolder(), getEntity()));
        }
        
        /** {@inheritDoc} */
@@ -39,6 +39,6 @@ public class NewPersonWizard extends AbstractNewEntityWizard<Person> {
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IAgentService.class).saveOrUpdate(entity);
+               CdmStore.getService(IAgentService.class).saveOrUpdate(getEntity());
        }
 }

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewPolytomousKeyWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java
similarity index 55%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewPolytomousKeyWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java
index b3adf4a0353f59f8aab576de837943d166a69864..ec67349a0f5c1f6b4af7b466674e6a7630908a9b 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewPolytomousKeyWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java
@@ -1,13 +1,11 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.wizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
+import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.navigation.operation.CreatePolytomousKey;
-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
  * @author n.hoffmann
@@ -17,7 +15,7 @@ public class NewPolytomousKeyWizard extends AbstractNewEntityWizard<PolytomousKe
 
        @Override
        public void addPages() {
-               PolytomousKeyWizardPage page = new PolytomousKeyWizardPage(formFactory, getConversationHolder(), entity);
+               PolytomousKeyWizardPage page = new PolytomousKeyWizardPage(formFactory, getConversationHolder(), getEntity());
                super.addPage(page);
        }
        
@@ -26,13 +24,7 @@ public class NewPolytomousKeyWizard extends AbstractNewEntityWizard<PolytomousKe
         */
        @Override
        protected void saveEntity() {
-               AbstractPostOperation operation = new CreatePolytomousKey(
-                               "Create Polytomous Key",
-                               EditorUtil.getUndoContext(), 
-                               getEntity(), 
-                               null,
-                               this);
-               EditorUtil.executeOperation(operation);
+               CdmStore.getService(IPolytomousKeyService.class).saveOrUpdate(getEntity());
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewReferenceWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewReferenceWizard.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewReferenceWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewReferenceWizard.java
index 351d9e5f6a1005052a404049ad6a179b1a35daf1..91131aa736c68df006757c12a102602751695de1 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewReferenceWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewReferenceWizard.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
-import eu.etaxonomy.taxeditor.section.reference.ReferenceWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceWizardPage;
 
 /**
  * <p>NewReferenceWizard class.</p>
@@ -32,7 +32,7 @@ public class NewReferenceWizard extends AbstractNewEntityWizard<Reference> {
        public void addPages() {
                // TODO disabling external service wizard page for now
 //             addPage(new ExternalReferenceServiceWizardPage(formFactory, getConversationHolder(), entity));
-               referencePage = new ReferenceWizardPage(formFactory, getConversationHolder(), entity);
+               referencePage = new ReferenceWizardPage(formFactory, getConversationHolder(), getEntity());
                addPage(referencePage);
        }
 
@@ -45,7 +45,7 @@ public class NewReferenceWizard extends AbstractNewEntityWizard<Reference> {
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IReferenceService.class).saveOrUpdate(entity);
+               CdmStore.getService(IReferenceService.class).saveOrUpdate(getEntity());
        }
 
        /** {@inheritDoc} */

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
new file mode 100644 (file)
index 0000000..cdafe54
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@ -0,0 +1,106 @@
+/**
+ * 
+ */
+package eu.etaxonomy.taxeditor.newWizard;
+
+import java.util.UUID;
+
+import org.apache.commons.lang.StringUtils;
+
+import eu.etaxonomy.cdm.api.service.IClassificationService;
+import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
+import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeWizardPage;
+
+/**
+ * <p>NewTaxonNodeWizard class.</p>
+ *
+ * @author n.hoffmann
+ * @created Sep 15, 2009
+ * @version 1.0
+ */
+public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
+
+       private TaxonNodeWizardPage taxonNodePage;
+       private boolean openEmptyEditor;
+       private UUID generatedTaxonNodeUuid;
+
+       @Override
+       public void addPages() {
+               taxonNodePage = new TaxonNodeWizardPage(formFactory, getConversationHolder(), getEntity());
+               addPage(taxonNodePage);
+       }
+       
+       @Override
+       protected void saveEntity() {
+               if(taxonNodePage.getTaxon() == null || StringUtils.isEmpty(taxonNodePage.getTaxon().getName().getFullTitleCache())){
+                       openEmptyEditor = true;
+               }else{
+                       getConversationHolder().bind();
+                       ITreeNode parent = getParentTreeNode();
+                       Taxon taxon = taxonNodePage.getTaxon();
+                       TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference(), null);
+                       
+                       
+                       generatedTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(taxonNode);
+               }
+       }
+
+       @Override
+       protected ITreeNode createNewEntity() {         
+               if(getSelection() != null){
+                       Object selectedObject = getSelection().getFirstElement();
+                       if(selectedObject instanceof ITreeNode){
+                               ITreeNode treeNode = (ITreeNode) selectedObject;
+                               
+                               if(treeNode instanceof Classification){
+                                       return CdmStore.getService(IClassificationService.class).load(treeNode.getUuid());
+                               }
+                               else if(treeNode instanceof TaxonNode){
+                                       return CdmStore.getService(ITaxonNodeService.class).load(treeNode.getUuid());
+                               }
+                       }
+               }
+               
+               return null;
+       }
+       
+       /**
+        * <p>openInEditor</p>
+        *
+        * @return a boolean.
+        */
+       public boolean openInEditor(){
+               return taxonNodePage.openInEditor();
+       }
+       
+       /**
+        * <p>openEmpty</p>
+        *
+        * @return a boolean.
+        */
+       public boolean openEmpty(){
+               return openInEditor() && openEmptyEditor;
+       }
+       
+       /**
+        * <p>getTaxonNode</p>
+        *
+        * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonNode} object.
+        */
+       public TaxonNode getTaxonNode(){
+               if(generatedTaxonNodeUuid != null){
+                       return CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid);                       
+               }
+               return null;
+       }
+       
+       public ITreeNode getParentTreeNode(){
+               return taxonNodePage.getParentTreeNode();
+       }
+       
+}
\ No newline at end of file

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardPage.java
similarity index 90%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardPage.java
index 07ae7af4bf58b3ca7dad4c50817b2ba2af3fcf14..db659db689dec1f67a2bbee39ecd230348ecc6c8 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/NewTaxonNodeWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardPage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.wizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
@@ -25,22 +25,19 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.ITreeNode;
-import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.RootElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.ClassificationSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.NameSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonNodeSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonSelectionElement;
-import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
 import eu.etaxonomy.taxeditor.parser.ParseHandler;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.selection.ClassificationSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonNodeSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 
 /**
  * <p>NewTaxonNodeWizardPage class.</p>
@@ -49,6 +46,7 @@ import eu.etaxonomy.taxeditor.parser.ParseHandler;
  * @created Sep 29, 2010
  * @version 1.0
  */
+@Deprecated //delete this file when refactoring is complete 
 public class NewTaxonNodeWizardPage extends WizardPage implements IPropertyChangeListener, IConversationEnabled{       
        private ClassificationSelectionElement selection_classification;
        private TaxonNodeSelectionElement selection_parentTaxonNode;
@@ -209,7 +207,7 @@ public class NewTaxonNodeWizardPage extends WizardPage implements IPropertyChang
        }
        
        private void setTaxon(String taxonNameString){
-               TaxonNameBase taxonName = ParseHandler.quickParse(taxonNameString);
+               TaxonNameBase taxonName = ParseHandler.parseReferencedName(taxonNameString, null);
                setTaxon(taxonName);
        }               
                
@@ -272,7 +270,6 @@ public class NewTaxonNodeWizardPage extends WizardPage implements IPropertyChang
        /** {@inheritDoc} */
        @Override
        public void update(CdmDataChangeMap changeEvents) {
-               // TODO Auto-generated method stub
                
        }
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewTeamWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewTeamWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java
index 958e418dacbb901b05a9ba5e5ea09754ee9fb23d..4e50f0c6b8fcc706b27bb319e13ed595dbea6866 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewTeamWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java
@@ -8,12 +8,12 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.section.agent.TeamWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.agent.TeamWizardPage;
 
 /**
  * <p>NewTeamWizard class.</p>
@@ -27,7 +27,7 @@ public class NewTeamWizard extends AbstractNewEntityWizard<Team> {
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               addPage(new TeamWizardPage(formFactory, getConversationHolder(), entity));
+               addPage(new TeamWizardPage(formFactory, getConversationHolder(), getEntity()));
        }
        
        /* (non-Javadoc)
@@ -42,6 +42,6 @@ public class NewTeamWizard extends AbstractNewEntityWizard<Team> {
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(IAgentService.class).saveOrUpdate(entity);
+               CdmStore.getService(IAgentService.class).saveOrUpdate(getEntity());
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java
new file mode 100644 (file)
index 0000000..6124398
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java
@@ -0,0 +1,35 @@
+/**
+ * 
+ */
+package eu.etaxonomy.taxeditor.newWizard;
+
+import eu.etaxonomy.cdm.api.service.IUserService;
+import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.user.UserDetailWizardPage;
+
+/**
+ * @author n.hoffmann
+ *
+ */
+public class NewUserWizard extends AbstractNewEntityWizard<User> {
+
+       private UserDetailWizardPage userPage;
+       
+       @Override
+       public void addPages() {
+               userPage = new UserDetailWizardPage(formFactory, getConversationHolder(), getEntity());
+               addPage(userPage);
+       }
+       
+       @Override
+       protected void saveEntity() {
+               CdmStore.getService(IUserService.class).saveOrUpdate(getEntity());
+       }
+
+       @Override
+       protected User createNewEntity() {
+               return User.NewInstance(null, null);
+       }
+
+}

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/PolytomousKeyWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java
similarity index 63%
rename from taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/PolytomousKeyWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java
index c6682ad10a49449f5cb6a8ac2bd9b1202680a27a..795f0175c3e2040dcf2beef699961f4c06ae94a1 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/wizard/PolytomousKeyWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java
@@ -1,18 +1,18 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.wizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.section.key.PolytomousKeyDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyDetailElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/AbstractSpecificReferenceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/AbstractSpecificReferenceWizardPage.java
deleted file mode 100644 (file)
index 9496a68..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/AbstractSpecificReferenceWizardPage.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// $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.newWizards;
-
-import org.eclipse.jface.wizard.WizardPage;
-
-/**
- * <p>Abstract AbstractSpecificReferenceWizardPage class.</p>
- *
- * @author n.hoffmann
- * @created Apr 16, 2010
- * @version 1.0
- */
-public abstract class AbstractSpecificReferenceWizardPage extends WizardPage {
-
-       /**
-        * <p>Constructor for AbstractSpecificReferenceWizardPage.</p>
-        *
-        * @param pageName a {@link java.lang.String} object.
-        */
-       protected AbstractSpecificReferenceWizardPage(String pageName) {
-               super(pageName);
-       }
-}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/BookDetailsWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/BookDetailsWizardPage.java
deleted file mode 100644 (file)
index 7f70c61..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/BookDetailsWizardPage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// $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.newWizards;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * <p>BookDetailsWizardPage class.</p>
- *
- * @author n.hoffmann
- * @created Apr 16, 2010
- * @version 1.0
- */
-public class BookDetailsWizardPage extends AbstractSpecificReferenceWizardPage {
-
-       /**
-        * <p>Constructor for BookDetailsWizardPage.</p>
-        *
-        * @param pageName a {@link java.lang.String} object.
-        */
-       protected BookDetailsWizardPage(String pageName) {
-               super(pageName);
-               // TODO Auto-generated constructor stub
-       }
-       
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-        */
-       /** {@inheritDoc} */
-       public void createControl(Composite parent) {
-               // TODO Auto-generated method stub
-
-       }
-}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewAuthorWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewAuthorWizard.java
deleted file mode 100644 (file)
index 6bc4cbb..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewAuthorWizard.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.newWizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * <p>NewAuthorWizard class.</p>
- *
- * @author n.hoffmann
- * @created Apr 16, 2010
- * @version 1.0
- */
-public class NewAuthorWizard extends Wizard implements INewWizard {
-
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.wizard.Wizard#performFinish()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public boolean performFinish() {
-               // TODO Auto-generated method stub
-               return false;
-       }
-
-       /** {@inheritDoc} */
-       public void init(IWorkbench workbench, IStructuredSelection selection) {
-               // TODO Auto-generated method stub
-               
-       }
-}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewAuthorWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewAuthorWizardPage.java
deleted file mode 100644 (file)
index 16476cf..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewAuthorWizardPage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.newWizards;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * <p>NewAuthorWizardPage class.</p>
- *
- * @author n.hoffmann
- * @created Apr 16, 2010
- * @version 1.0
- */
-public class NewAuthorWizardPage extends WizardPage {
-
-       /**
-        * <p>Constructor for NewAuthorWizardPage.</p>
-        *
-        * @param pageName a {@link java.lang.String} object.
-        */
-       protected NewAuthorWizardPage(String pageName) {
-               super(pageName);
-       }
-
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-        */
-       /** {@inheritDoc} */
-       public void createControl(Composite parent) {
-               Composite container = new Composite(parent, SWT.NULL);
-               
-               setControl(container);
-       }
-
-}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewGenericReferenceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewGenericReferenceWizardPage.java
deleted file mode 100644 (file)
index 86aa473..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewGenericReferenceWizardPage.java
+++ /dev/null
@@ -1,103 +0,0 @@
-// $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.newWizards;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-import eu.etaxonomy.cdm.model.agent.AgentBase;
-
-/**
- * <p>NewGenericReferenceWizardPage class.</p>
- *
- * @author n.hoffmann
- * @created Apr 16, 2010
- * @version 1.0
- */
-public class NewGenericReferenceWizardPage extends WizardPage {
-       
-       private Combo combo_referenceType;
-       private Text text_title;
-       private AgentBase selection_agent;
-       private Text text_editor;
-       private Text text_series;
-       private Text text_volume;
-       private Text text_pages;
-
-       /**
-        * <p>Constructor for NewGenericReferenceWizardPage.</p>
-        *
-        * @param pageName a {@link java.lang.String} object.
-        */
-       protected NewGenericReferenceWizardPage(String pageName) {
-               super(pageName);
-       }
-
-       /** {@inheritDoc} */
-       public void createControl(Composite parent) {
-               setTitle("General");
-               setDescription("General information for a reference.");
-               
-               Composite container = new Composite(parent, SWT.NULL);
-               container.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-               
-               container.setLayout(new GridLayout(2, false));
-               
-               createLabel(container, "Reference Type");
-               combo_referenceType = new Combo(container, SWT.NULL);
-               top(combo_referenceType);
-               
-               createLabel(container, "Title");
-               text_title = new Text(container, SWT.NULL);
-               top(text_title);
-               
-//             createLabel(container, "Author Team");
-//             selection_agent = FilteredAgentSelectionDialog.selectAgent(getShell(), null);
-               
-//             composite_timePeriod
-               
-               createLabel(container, "Editor");
-               text_editor = new Text(container, SWT.NULL);
-               top(text_editor);
-               
-               createLabel(container, "Series");
-               text_series = new Text(container, SWT.NULL);
-               top(text_series);
-               
-               createLabel(container, "Volume");
-               text_volume = new Text(container, SWT.NULL);
-               top(text_volume);
-               
-               createLabel(container, "Pages");
-               text_pages = new Text(container, SWT.NULL);
-               top(text_pages);
-               
-               setControl(container);
-       }
-       
-       
-       private Label createLabel(Composite parent, String labelString){
-               Label label = new Label(parent, SWT.NULL);
-               label.setText(labelString);
-               return label;
-       }
-       
-       private void top(Control control){
-               control.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
-       }
-}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewNameWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewNameWizard.java
deleted file mode 100644 (file)
index 0cf8008..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewNameWizard.java
+++ /dev/null
@@ -1,78 +0,0 @@
-// $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.newWizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-import eu.etaxonomy.cdm.model.name.NonViralName;
-
-/**
- * <p>NewNameWizard class.</p>
- *
- * @author n.hoffmann
- * @created Apr 16, 2010
- * @version 1.0
- */
-public class NewNameWizard extends Wizard implements INewWizard {
-
-       /** Constant <code>NEW_NAME="NEW_NAME"</code> */
-       public static final String NEW_NAME = "NEW_NAME";
-
-       private NewNameWizardPage page;
-       
-       /**
-        * <p>Constructor for NewNameWizard.</p>
-        */
-       public NewNameWizard(){
-               setWindowTitle("New Scientific Name");
-       }
-       
-       /*
-        * (non-Javadoc)
-        * @see org.eclipse.jface.wizard.Wizard#addPages()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public void addPages() {
-               page = new NewNameWizardPage(NEW_NAME);
-               
-               addPage(page);
-       }
-       
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.wizard.Wizard#performFinish()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public boolean performFinish() {
-               
-               // TODO
-               
-               return false;
-       }
-
-       /** {@inheritDoc} */
-       public void init(IWorkbench workbench, IStructuredSelection selection) {
-               
-       }
-       
-       /**
-        * <p>getName</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.model.name.NonViralName} object.
-        */
-       public NonViralName getName() {
-               return null;
-       }
-}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewNameWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewNameWizardPage.java
deleted file mode 100644 (file)
index 9b0d589..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewNameWizardPage.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// $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.newWizards;
-
-import org.apache.log4j.Logger;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * <p>NewNameWizardPage class.</p>
- *
- * @author n.hoffmann
- * @created Apr 16, 2010
- * @version 1.0
- */
-public class NewNameWizardPage extends WizardPage {
-       private static final Logger logger = Logger
-                       .getLogger(NewNameWizardPage.class);
-
-       /**
-        * <p>Constructor for NewNameWizardPage.</p>
-        *
-        * @param pageName a {@link java.lang.String} object.
-        */
-       public NewNameWizardPage(String pageName) {
-               super(pageName);
-       }
-
-
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-        */
-       /** {@inheritDoc} */
-       public void createControl(Composite parent) {
-               Composite container = new Composite(parent, SWT.NULL);
-               
-               setControl(container);
-       }
-}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewReferenceWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewReferenceWizard.java
deleted file mode 100644 (file)
index b580502..0000000
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizards/NewReferenceWizard.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.newWizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-import eu.etaxonomy.cdm.model.reference.Reference;
-
-/**
- * <p>NewReferenceWizard class.</p>
- *
- * @author n.hoffmann
- * @created Apr 16, 2010
- * @version 1.0
- */
-public class NewReferenceWizard extends Wizard implements INewWizard{
-
-       /** Constant <code>NEW_REFERENCE="NEW_REFERENCE"</code> */
-       public static final String NEW_REFERENCE = "NEW_REFERENCE";
-
-       private NewGenericReferenceWizardPage page;
-       
-       /**
-        * <p>Constructor for NewReferenceWizard.</p>
-        */
-       public NewReferenceWizard(){
-               setWindowTitle("New Reference");
-       }
-       
-       /** {@inheritDoc} */
-       @Override
-       public void addPages() {
-               page = new NewGenericReferenceWizardPage(NEW_REFERENCE);
-               
-               addPage(page);
-       }
-       
-       /* (non-Javadoc)
-        * @see org.eclipse.jface.wizard.Wizard#performFinish()
-        */
-       /** {@inheritDoc} */
-       @Override
-       public boolean performFinish() {
-               
-               // TODO 
-               
-               
-               return false;
-       }
-
-       /** {@inheritDoc} */
-       public void init(IWorkbench workbench, IStructuredSelection selection) {
-               // TODO Auto-generated method stub
-               
-       }
-       
-       /**
-        * <p>getReference</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase} object.
-        */
-       public Reference getReference(){
-               return null;
-       }
-
-}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
index b57c67e3bc28e38d25bfc0f960a75df2d576beae..0ca07983aaf269d2acd64d8edb7b03239c6943d6 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
@@ -6,12 +6,11 @@ package eu.etaxonomy.taxeditor.parser;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.swt.widgets.Control;
-
 import eu.etaxonomy.cdm.api.service.ICommonService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
@@ -89,9 +88,9 @@ public class ParseHandler{
         * @param unparsedNameString a {@link java.lang.String} object.
         * @return a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
         */
-       public static TaxonNameBase quickParse(String unparsedNameString){
+       public static TaxonNameBase parseReferencedName(String unparsedNameString, Rank rank){
                TaxonNameBase name = nonViralNameParser.parseReferencedName(unparsedNameString,
-                               PreferencesUtil.getPreferredNomenclaturalCode(), null);
+                               PreferencesUtil.getPreferredNomenclaturalCode(), rank);
 
 //             if (name.hasProblem()) {
 //                     name.setFullTitleCache(unparsedNameString);
@@ -100,6 +99,13 @@ public class ParseHandler{
                return name;
        }
        
+       public static TaxonNameBase parseName(String unparsedNameString, Rank rank){
+               TaxonNameBase name = nonViralNameParser.parseFullName(unparsedNameString,
+                               PreferencesUtil.getPreferredNomenclaturalCode(), rank);
+               
+               return name;
+       }
+       
        /**
         * Creates an empty <code>TaxonNameBase</code> instance with the nomenclatural code
         * currently set in preferences.

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeatureTreePreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeatureTreePreferences.java
index 1c8f49c04fcb36fc5c5a75229d03a791ba665628..969807d13ed7d4c9a72fc8f6ecd2bf9e527a44e7 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeatureTreePreferences.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/FeatureTreePreferences.java
@@ -39,7 +39,6 @@ public class FeatureTreePreferences extends PreferencePage implements
         * <p>Constructor for FeatureTreePreferences.</p>
         */
        public FeatureTreePreferences() {
-               // TODO Auto-generated constructor stub
        }
 
        /**
@@ -49,7 +48,6 @@ public class FeatureTreePreferences extends PreferencePage implements
         */
        public FeatureTreePreferences(String title) {
                super(title);
-               // TODO Auto-generated constructor stub
        }
 
        /**
@@ -60,7 +58,6 @@ public class FeatureTreePreferences extends PreferencePage implements
         */
        public FeatureTreePreferences(String title, ImageDescriptor image) {
                super(title, image);
-               // TODO Auto-generated constructor stub
        }
 
        /* (non-Javadoc)
@@ -69,8 +66,6 @@ public class FeatureTreePreferences extends PreferencePage implements
        /** {@inheritDoc} */
        @Override
        public void init(IWorkbench workbench) {
-               // TODO Auto-generated method stub
-
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index cc6a56c7b8242fd53fe4d78ab45705cc4b0ac977..3417e3704515f7e85c68e8dcb03e55c1a6d85c9f 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -29,11 +29,11 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
-import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
 import eu.etaxonomy.taxeditor.io.ExportManager;
 import eu.etaxonomy.taxeditor.io.ImportManager;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
+import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
 
 /**
  * This implementation of ICdmDataRepository depends on hibernate sessions to store the data correctly
@@ -67,6 +67,8 @@ public class CdmStore{
        
        private static SearchManager searchManager;
        
+       private static EditorManager editorManager;
+       
        private static CdmStoreConnector job;
        
        private Language language;
@@ -346,6 +348,14 @@ public class CdmStore{
                return searchManager;
        }
        
+       public static EditorManager getEditorManager() {
+               if(editorManager == null){
+                       editorManager = new EditorManager();
+               }
+               
+               return editorManager;
+       }
+       
        /*
         * IMPORT/EXPORT FACTORIES
         */
@@ -401,4 +411,5 @@ public class CdmStore{
        private ICdmDataSource getDatasource() {
                return cdmDatasource;
        }
+
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
index 6d8bcde764776c3b3e38d9f8625f6f8184838050..853dbe42c7044ea1acd929ee9e4b22fefb3306d0 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
@@ -25,9 +25,9 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.model.common.CdmMetaData;
 import eu.etaxonomy.cdm.model.common.CdmMetaData.MetaDataPropertyName;
-import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
-import eu.etaxonomy.taxeditor.dialogs.LoginDialog;
 import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter;
+import eu.etaxonomy.taxeditor.ui.dialogs.LoginDialog;
+import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/EditorManager.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/EditorManager.java
new file mode 100644 (file)
index 0000000..bd2b3a5
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/EditorManager.java
@@ -0,0 +1,41 @@
+/**
+ * 
+ */
+package eu.etaxonomy.taxeditor.store;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.eclipse.ui.IEditorInput;
+
+import eu.etaxonomy.taxeditor.model.ICdmEditorHandle;
+
+/**
+ * 
+ * 
+ * @author n.hoffmann
+ *
+ */
+public class EditorManager {
+       
+       Map<Class<? extends IEditorInput>, ICdmEditorHandle> editors = new HashMap<Class<? extends IEditorInput>, ICdmEditorHandle>();
+       
+       public void openEditor(Class<? extends IEditorInput> inputType, UUID uuid){
+               ICdmEditorHandle editor = editors.get(inputType);
+               
+               if(editor == null){
+                       StoreUtil.warningDialog("No editor", getClass(), "No editor was registered for the given type.");
+               }else{
+                       editor.open(uuid);
+               }
+       }
+       
+       public ICdmEditorHandle add(ICdmEditorHandle editor){
+               return editors.put(editor.getInputType(), editor);
+       }
+       
+       public ICdmEditorHandle remove(ICdmEditorHandle editor){
+               return editors.remove(editor);
+       }
+}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/AuthenticatedUserBar.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java
similarity index 98%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/AuthenticatedUserBar.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java
index d865ab6edc93f15e58315573d9d5c7c1bb5061d5..dea82de48dabc61da01391b69959dad169b16287 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/AuthenticatedUserBar.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.account.user;
+package eu.etaxonomy.taxeditor.ui.bar;
 
 import java.util.Observable;
 import java.util.Observer;

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialog.java
similarity index 98%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialog.java
index db44d58592acce06d76a582bb05792416a99ce2d..c228d38574bda7f1475c10fbf3341d89a8246fb5 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/LoginDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/LoginDialog.java
@@ -8,7 +8,7 @@
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 
-package eu.etaxonomy.taxeditor.dialogs;
+package eu.etaxonomy.taxeditor.ui.dialogs;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/UriDialog.java
similarity index 91%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/UriDialog.java
index 181a99b8044681f61bcfd09d4222f813509b121c..f5e8c9e3d49ebf605f081f9762630de254f17396 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/dialogs/UriDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/UriDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs;
+package eu.etaxonomy.taxeditor.ui.dialogs;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -17,6 +17,9 @@ import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.editors.text.EditorsUI;
+
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * <p>UriDialog class.</p>
@@ -64,8 +67,7 @@ public class UriDialog extends InputDialog {
                try {
                        uri = new URI(getValue());
                } catch (URISyntaxException e) {
-                       // TODO Auto-generated catch block
-                       e.printStackTrace();
+                       StoreUtil.error(getClass(), e);
                }
                return uri;
        }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
similarity index 95%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
index fabe88956fe5958be7298f647b06f687a63e1141..f42eb82f60ca8bc4e96565196d77e34fca5d954a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.text.Collator;
 import java.util.Comparator;
@@ -46,8 +46,8 @@ import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 /**
@@ -70,7 +70,7 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
         * <p>Constructor for AbstractFilteredCdmResourceSelectionDialog.</p>
         *
         * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
-        * @param conversation TODO
+        * @param conversation 
         * @param title a {@link java.lang.String} object.
         * @param multi a boolean.
         * @param settings a {@link java.lang.String} object.
@@ -111,7 +111,7 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
        /**
         * <p>getSelectionFromDialog</p>
         *
-        * @param dialog a {@link eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog} object.
+        * @param dialog a {@link eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog} object.
         * @param <TYPE> a TYPE object.
         * @return a TYPE object.
         */
@@ -250,7 +250,7 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
                                        progressMonitor.worked(1);
                                }
                        }else{
-                               EditorUtil.warn(getClass(), "Model for Filtered Selection is null:" + this.getClass().getSimpleName());
+                               StoreUtil.warn(getClass(), "Model for Filtered Selection is null:" + this.getClass().getSimpleName());
                        }
                }
                finally {
@@ -358,9 +358,8 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
        
        /**
         * <p>getNewEntityWizard</p>
-        * @param parameter TODO
-        * @param text 
-        * @return a {@link eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard} object.
+        * @param parameter 
+        * @return a {@link eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard} object.
         */
        protected abstract AbstractNewEntityWizard getNewEntityWizard(String parameter);
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AgentSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AgentSelectionDialog.java
similarity index 94%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AgentSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AgentSelectionDialog.java
index 6f31ff458e5ed6d23d2bb706592f86d88b74db67..3732694cf4d3c83b19a94a277fe7508691ee3a7f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/AgentSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AgentSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -21,9 +21,9 @@ import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewPersonWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewTeamWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewPersonWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewTeamWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/ClassificationSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ClassificationSelectionDialog.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/ClassificationSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ClassificationSelectionDialog.java
index 1969cf6f02ae56d61ebece1773e9187934d6403c..e2c05bb616ac11e16c28926ffe6217df646f2a11 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/ClassificationSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ClassificationSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -66,7 +66,6 @@ public class ClassificationSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected Control createExtendedContentArea(Composite parent) {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -91,14 +90,12 @@ public class ClassificationSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
-               // TODO Auto-generated method stub
                return null;
        }
 
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               // TODO Auto-generated method stub
                return null;
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/CollectionSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/CollectionSelectionDialog.java
similarity index 94%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/CollectionSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/CollectionSelectionDialog.java
index a59ecb4e139e307736dbb136ff199a97466e3582..c13e2d621b44680d12af2456472de754956ce2bb 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/CollectionSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/CollectionSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -17,8 +17,8 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.ICollectionService;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewCollectionWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewCollectionWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/DerivedUnitSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/DerivedUnitSelectionDialog.java
similarity index 90%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/DerivedUnitSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/DerivedUnitSelectionDialog.java
index 05b44903df2243d08a6a77dd858105f1c88de349..d7d6c7c483cc6c0a55443da3dca2815ed46bd3f6 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/DerivedUnitSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/DerivedUnitSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -19,10 +19,10 @@ import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewDerivedUnitBaseWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * <p>FilteredDerivedUnitSelectionDialog class.</p>
@@ -73,7 +73,7 @@ public class DerivedUnitSelectionDialog extends
                if(specimenObservationBase instanceof DerivedUnitBase){ 
                        return (DerivedUnitBase) specimenObservationBase; 
                }
-               EditorUtil.error(this.getClass(), "Selected unit is not a derived unit", null);
+               StoreUtil.error(this.getClass(), "Selected unit is not a derived unit", null);
                return null;            
        }
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FeatureSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FeatureSelectionDialog.java
similarity index 95%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FeatureSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FeatureSelectionDialog.java
index f590fdd4c8582489c169a2058d1d978776e23efd..bac7130e8a4a653bc54d1f3ee2f39e113bbade1b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FeatureSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FeatureSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FeatureTreeSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FeatureTreeSelectionDialog.java
similarity index 97%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FeatureTreeSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FeatureTreeSelectionDialog.java
index 4cc2f00f90d799ede90abda4e0dbc248045269aa..48c701d516a4a1d1fcce4d7af44a24e55a84f77f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FeatureTreeSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FeatureTreeSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,8 +28,8 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.featuretree.FeatureTreeEditorWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FieldObservationSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FieldObservationSelectionDialog.java
similarity index 91%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FieldObservationSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FieldObservationSelectionDialog.java
index ecb9093134f354618b6cfda5e4cea79c1fe5d4b1..c766febe80f7f818d3c30c43a1e0e3fa62d7fcbc 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/FieldObservationSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/FieldObservationSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -19,10 +19,10 @@ import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewFieldObservationWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewFieldObservationWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * <p>FilteredFieldObservationSelectionDialog class.</p>
@@ -77,7 +77,7 @@ public class FieldObservationSelectionDialog extends
                if(specimenObservationBase instanceof FieldObservation){        
                        return (FieldObservation) specimenObservationBase; 
                }
-               EditorUtil.error(this.getClass(), "Selected object is not a field observation", null);
+               StoreUtil.error(this.getClass(), "Selected object is not a field observation", null);
                return null;
        }
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/InstitutionSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/InstitutionSelectionDialog.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/InstitutionSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/InstitutionSelectionDialog.java
index 8df4f3b88f1181021345fcdc6e1f47db63ad8b9a..4ed8efc4d140d15d61c687cd7c425a9091f3cfa5 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/InstitutionSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/InstitutionSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -18,8 +18,8 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Institution;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewInstitutionWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewInstitutionWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NameSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NameSelectionDialog.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NameSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NameSelectionDialog.java
index 3ba1cfd54aff0cf53790d1465a55f0ec793a897b..c793f1eeeef69c97a65d9b6a8cfc2769ba1d19c4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NameSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NameSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -17,8 +17,8 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewNonViralNameWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewNonViralNameWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NamedAreaSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NamedAreaSelectionDialog.java
similarity index 98%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NamedAreaSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NamedAreaSelectionDialog.java
index feda16bbe31c50ffe96182197c2a65c9006f836c..a9279b4852de4677dee946a9204c8579e9591336 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NamedAreaSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NamedAreaSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -31,7 +31,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.cdm.model.common.VocabularyEnum;
 import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NomenclaturalAuthorTeamSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NomenclaturalAuthorTeamSelectionDialog.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NomenclaturalAuthorTeamSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NomenclaturalAuthorTeamSelectionDialog.java
index 21955fe062c72d5d39daf58d8a62011115ae99a5..95562bf62292957353a3146754256ee38d30fcd4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/NomenclaturalAuthorTeamSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/NomenclaturalAuthorTeamSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -17,8 +17,8 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewTeamWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewTeamWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/PersonSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/PersonSelectionDialog.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/PersonSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/PersonSelectionDialog.java
index 3bfe95810704d3add8d6db4f10589e6f91785f29..f50a9c1a16900751bf2de418cd0dbb2e5b1d5288 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/PersonSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/PersonSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -17,8 +17,8 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewPersonWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewPersonWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/PolytomousKeySelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/PolytomousKeySelectionDialog.java
similarity index 95%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/PolytomousKeySelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/PolytomousKeySelectionDialog.java
index 68c17566f516120b7f164f5080012bd11996d87b..104637d8b1864b32bb046cc1a29c7e8f7199d7ed 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/PolytomousKeySelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/PolytomousKeySelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/ReferenceSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ReferenceSelectionDialog.java
similarity index 94%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/ReferenceSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ReferenceSelectionDialog.java
index 8e464ea6a0043a87261952f70e11fa97cea225da..175049c442719b5c9cb06abd5c1df1075c43269f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/ReferenceSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ReferenceSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -18,8 +18,8 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.strategy.cache.reference.ReferenceBaseDefaultCacheStrategy;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewReferenceWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewReferenceWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TaxonBaseSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TaxonBaseSelectionDialog.java
similarity index 95%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TaxonBaseSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TaxonBaseSelectionDialog.java
index 7734b3e17bc3d6d2ed0da082d229cf3915a945cf..16b8948e6ffd7769c88828c421f3d6acb552fa17 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TaxonBaseSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TaxonBaseSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -127,14 +127,12 @@ public class TaxonBaseSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
-               // TODO Auto-generated method stub
                return null;
        }
 
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               // TODO Auto-generated method stub
                return null;
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TaxonNodeSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TaxonNodeSelectionDialog.java
similarity index 97%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TaxonNodeSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TaxonNodeSelectionDialog.java
index 36a7ec1f4532dfe1264c4a698c3800848704c244..e5699e0eac5e32c86fcd12c4161105e47618cd30 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TaxonNodeSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TaxonNodeSelectionDialog.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.List;
 import java.util.UUID;
@@ -22,7 +22,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TeamSelectionDialog.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TeamSelectionDialog.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TeamSelectionDialog.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TeamSelectionDialog.java
index 5cb4d2e5c3bb12fae2e04bf870f682d5db0a4ae8..65b4246eb5a837210b4d751d4fd8f63526e7d2d4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/dialogs/filteredSelection/TeamSelectionDialog.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/TeamSelectionDialog.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.dialogs.filteredSelection;
+package eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection;
 
 import java.util.UUID;
 
@@ -17,8 +17,8 @@ import org.eclipse.swt.widgets.Shell;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard;
-import eu.etaxonomy.taxeditor.editor.newWizard.NewTeamWizard;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewTeamWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmEntityWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmEntityWizardPage.java
similarity index 89%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmEntityWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmEntityWizardPage.java
index e5f9ccbaef5a0182542fb314b89c85a855300798..21a205cd1631e1450960cb7ba3041b675de67fa4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmEntityWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmEntityWizardPage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.graphics.Color;
@@ -18,7 +18,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>Abstract AbstractCdmEntityWizardPage class.</p>
@@ -38,7 +38,7 @@ public abstract class AbstractCdmEntityWizardPage<T> extends WizardPage implemen
        /**
         * <p>Constructor for AbstractCdmEntityWizardPage.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param entity a T object.
         * @param <T> a T object.
@@ -94,8 +94,8 @@ public abstract class AbstractCdmEntityWizardPage<T> extends WizardPage implemen
        /**
         * Creates the detail element for this wizard page
         *
-        * @param rootElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
-        * @return a {@link eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement} object.
+        * @param rootElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement} object.
         */
        public abstract AbstractCdmDetailElement createElement(ICdmFormElement rootElement);
        
@@ -143,7 +143,7 @@ public abstract class AbstractCdmEntityWizardPage<T> extends WizardPage implemen
        /**
         * <p>Getter for the field <code>detailElement</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement} object.
         */
        public AbstractCdmDetailElement<T> getDetailElement() {
                return detailElement;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmFormElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java
similarity index 90%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmFormElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java
index 6c9c301fb5987a06825103921834d573086b4956..25865d546e016fa4306e083c281b887fda32127d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmFormElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.util.HashSet;
 import java.util.List;
@@ -15,6 +15,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.forms.widgets.Section;
 
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+
 /**
  * <p>Abstract AbstractCdmFormElement class.</p>
  *
@@ -38,7 +40,7 @@ public abstract class AbstractCdmFormElement implements IPropertyChangeEmitter,
        /**
         * <p>Constructor for AbstractCdmFormElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param layoutComposite a {@link org.eclipse.swt.widgets.Composite} object.
         */
        protected AbstractCdmFormElement(CdmFormFactory formFactory, Composite layoutComposite){
@@ -49,8 +51,8 @@ public abstract class AbstractCdmFormElement implements IPropertyChangeEmitter,
        /**
         * <p>Constructor for AbstractCdmFormElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public AbstractCdmFormElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
                this(formFactory, formElement.getLayoutComposite());
@@ -61,7 +63,7 @@ public abstract class AbstractCdmFormElement implements IPropertyChangeEmitter,
        /**
         * <p>Getter for the field <code>formFactory</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         */
        public CdmFormFactory getFormFactory() {
                return formFactory;
@@ -118,7 +120,7 @@ public abstract class AbstractCdmFormElement implements IPropertyChangeEmitter,
        /**
         * <p>Getter for the field <code>parentElement</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public ICdmFormElement getParentElement(){
                return parentElement;
@@ -132,7 +134,7 @@ public abstract class AbstractCdmFormElement implements IPropertyChangeEmitter,
        /**
         * <p>removeElement</p>
         *
-        * @param element a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param element a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        protected void removeElement(ICdmFormElement element){
                elements.remove(element);
@@ -243,7 +245,7 @@ public abstract class AbstractCdmFormElement implements IPropertyChangeEmitter,
         *
         * It is good advice to check whether the PropertyChangeEvent is destined for the implementing composite.
         * Implementations should also check for null PropertyChangeEvents and return immediately in that case.
-        * @see eu.etaxonomy.taxeditor.forms.ICdmFormElement#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
+        * @see eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
         */
        public void propertyChange(PropertyChangeEvent event) {
                // implement in subclasses
@@ -282,4 +284,8 @@ public abstract class AbstractCdmFormElement implements IPropertyChangeEmitter,
                        element.setBackground(color);
                }
        }
+       
+       public Color getColor(String colorId){
+               return StoreUtil.getColor(colorId);
+       }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmFormElementWithErrors.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElementWithErrors.java
similarity index 89%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmFormElementWithErrors.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElementWithErrors.java
index 6782ea3eddb5c596512dd33ca16d78c024392072..099d87c6bf84112c505500d3937678bbb3dad9c1 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractCdmFormElementWithErrors.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElementWithErrors.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,8 +28,8 @@ public abstract class AbstractCdmFormElementWithErrors extends AbstractCdmFormEl
        /**
         * <p>Constructor for AbstractCdmFormElementWithErrors.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public AbstractCdmFormElementWithErrors(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractFormSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractFormSection.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractFormSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractFormSection.java
index 287375b3b9f3401181d0db54278705c7bbbe5f14..f20c07468baeba8cbf9b5c684079a7de3222f94e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/AbstractFormSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractFormSection.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.util.HashSet;
 import java.util.List;
@@ -61,8 +61,8 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
         *
         * @param conversation TODO
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param <ENTITY> a ENTITY object.
         */
        protected AbstractFormSection(CdmFormFactory formFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {
@@ -91,9 +91,9 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        /**
         * <p>Constructor for AbstractFormSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */
@@ -151,7 +151,7 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        /**
         * <p>getSection</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         */
        public AbstractFormSection<ENTITY> getSection(){
                return this;
@@ -289,7 +289,7 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        /**
         * <p>removeElement</p>
         *
-        * @param element a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param element a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        protected void removeElement(ICdmFormElement element){
                elements.remove(element);
@@ -333,7 +333,7 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        /**
         * <p>Getter for the field <code>parentElement</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public ICdmFormElement getParentElement() {
                return parentElement;
@@ -398,7 +398,7 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        /**
         * <p>Getter for the field <code>formFactory</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         */
        public CdmFormFactory getFormFactory() {
                return formFactory;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/BrowserElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/BrowserElement.java
similarity index 92%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/BrowserElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/BrowserElement.java
index 322133b0a02341d20f294009ce0ea59f25d2021e..7acaeabf70b9da5a19d467e16b9e5f5f6d0669ff 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/BrowserElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/BrowserElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.net.URI;
 
@@ -28,8 +28,8 @@ public class BrowserElement extends AbstractCdmFormElement implements ControlLis
         * <p>Constructor for BrowserElement.</p>
         *
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param imageUri a {@link java.net.URI} object.
         */
        protected BrowserElement(CdmFormFactory formFactory, ICdmFormElement parentElement, URI imageUri, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CdmFormFactory.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java
similarity index 74%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CdmFormFactory.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java
index b638ea58cb0eb4e8a3edda6ceb92f346b2388ea0..7cd0c9b60f411d1edeabe9cb8f62824d143eafa8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CdmFormFactory.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -120,174 +120,178 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.openurl.IOpenUrlEnabled;
-import eu.etaxonomy.taxeditor.forms.openurl.OpenUrlSelectorElement;
-import eu.etaxonomy.taxeditor.forms.selection.AbstractSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.AgentSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.ClassificationSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.CollectionSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.DerivedUnitBaseSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.FeatureSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.FeatureTreeSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.FieldObservationSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.InstitutionSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.NameSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.NamedAreaSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.NomenclaturalAuthorTeamSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.PersonSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.PolytomousKeyNodeSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.PolytomousKeySelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.ReferenceSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.SynonymSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonBaseSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonNodeSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TeamSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.AbstractEnumComboElement;
-import eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement;
-import eu.etaxonomy.taxeditor.forms.term.AnnotationTypeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.DeterminationModifierComboElement;
-import eu.etaxonomy.taxeditor.forms.term.EmptyComboElement;
-import eu.etaxonomy.taxeditor.forms.term.ExtensionTypeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.LanguageComboElement;
-import eu.etaxonomy.taxeditor.forms.term.MarkerTypeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.MeasurementUnitComboElement;
-import eu.etaxonomy.taxeditor.forms.term.ModifierComboElement;
-import eu.etaxonomy.taxeditor.forms.term.NameRelationshipTypeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.NameTypeDesignationStatusComboElement;
-import eu.etaxonomy.taxeditor.forms.term.NamedAreaTypeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.NomenclaturalCodeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.NomenclaturalStatusTypeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.PresenceAbsenceTermComboElement;
-import eu.etaxonomy.taxeditor.forms.term.PreservationMethodComboElement;
-import eu.etaxonomy.taxeditor.forms.term.RankComboElement;
-import eu.etaxonomy.taxeditor.forms.term.ReferenceSystemComboElement;
-import eu.etaxonomy.taxeditor.forms.term.ReferenceTypeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.RightsTypeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.ScopeComboElement;
-import eu.etaxonomy.taxeditor.forms.term.SexComboElement;
-import eu.etaxonomy.taxeditor.forms.term.SpecimenTypeDesignationStatusComboElement;
-import eu.etaxonomy.taxeditor.forms.term.StageComboElement;
-import eu.etaxonomy.taxeditor.forms.term.StateComboElement;
-import eu.etaxonomy.taxeditor.forms.term.StatisticalMeasureComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
-import eu.etaxonomy.taxeditor.section.EmptyElement;
-import eu.etaxonomy.taxeditor.section.agent.InstitutionDetailElement;
-import eu.etaxonomy.taxeditor.section.agent.InstitutionDetailSection;
-import eu.etaxonomy.taxeditor.section.agent.PersonDetailElement;
-import eu.etaxonomy.taxeditor.section.agent.PersonDetailSection;
-import eu.etaxonomy.taxeditor.section.agent.TeamDetailElement;
-import eu.etaxonomy.taxeditor.section.agent.TeamDetailSection;
-import eu.etaxonomy.taxeditor.section.agent.TeamMemberElement;
-import eu.etaxonomy.taxeditor.section.agent.TeamMemberSection;
-import eu.etaxonomy.taxeditor.section.agent.TeamOrPersonBaseDetailSection;
-import eu.etaxonomy.taxeditor.section.classification.ClassificationDetailElement;
-import eu.etaxonomy.taxeditor.section.classification.ClassificationDetailSection;
-import eu.etaxonomy.taxeditor.section.classification.TaxonNodeDetailElement;
-import eu.etaxonomy.taxeditor.section.classification.TaxonNodeDetailSection;
-import eu.etaxonomy.taxeditor.section.description.DerivedUnitElement;
-import eu.etaxonomy.taxeditor.section.description.DescribedSpecimenSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionDetailElement;
-import eu.etaxonomy.taxeditor.section.description.DescriptionDetailSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionElementDetailElement;
-import eu.etaxonomy.taxeditor.section.description.DescriptionElementDetailSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionElementMediaSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionElementSourceElement;
-import eu.etaxonomy.taxeditor.section.description.DescriptionElementSourceSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionSourceElement;
-import eu.etaxonomy.taxeditor.section.description.DescriptionSourceSection;
-import eu.etaxonomy.taxeditor.section.description.ModifierElement;
-import eu.etaxonomy.taxeditor.section.description.ModifierSection;
-import eu.etaxonomy.taxeditor.section.description.NaturalLanguageDetailElement;
-import eu.etaxonomy.taxeditor.section.description.NaturalLanguageSection;
-import eu.etaxonomy.taxeditor.section.description.ScopeElement;
-import eu.etaxonomy.taxeditor.section.description.ScopeSection;
-import eu.etaxonomy.taxeditor.section.description.StateDataElement;
-import eu.etaxonomy.taxeditor.section.description.StateDataSection;
-import eu.etaxonomy.taxeditor.section.description.StatisticalMeasurementValueElement;
-import eu.etaxonomy.taxeditor.section.description.StatisticalMeasurementValueSection;
-import eu.etaxonomy.taxeditor.section.description.detail.AbstractDetailedDescriptionDetailElement;
-import eu.etaxonomy.taxeditor.section.description.detail.CategoricalDataDetailElement;
-import eu.etaxonomy.taxeditor.section.description.detail.CommonNameDetailElement;
-import eu.etaxonomy.taxeditor.section.description.detail.DistributionDetailElement;
-import eu.etaxonomy.taxeditor.section.description.detail.IndividualsAssociationDetailElement;
-import eu.etaxonomy.taxeditor.section.description.detail.QuantitativeDataDetailElement;
-import eu.etaxonomy.taxeditor.section.description.detail.TaxonInteractionDetailElement;
-import eu.etaxonomy.taxeditor.section.description.detail.TextDataDetailElement;
-import eu.etaxonomy.taxeditor.section.feature.FeatureDistributionDetailElement;
-import eu.etaxonomy.taxeditor.section.feature.FeatureDistributionDetailSection;
-import eu.etaxonomy.taxeditor.section.key.GeographicalScopeDetailSection;
-import eu.etaxonomy.taxeditor.section.key.PolytomousKeyDetailElement;
-import eu.etaxonomy.taxeditor.section.key.PolytomousKeyDetailSection;
-import eu.etaxonomy.taxeditor.section.key.PolytomousKeyNodeDetailElement;
-import eu.etaxonomy.taxeditor.section.key.PolytomousKeyNodeDetailSection;
-import eu.etaxonomy.taxeditor.section.key.ScopeRestrictionSection;
-import eu.etaxonomy.taxeditor.section.name.AuthorshipDetailElement;
-import eu.etaxonomy.taxeditor.section.name.AuthorshipDetailSection;
-import eu.etaxonomy.taxeditor.section.name.HybridDetailElement;
-import eu.etaxonomy.taxeditor.section.name.HybridDetailSection;
-import eu.etaxonomy.taxeditor.section.name.NameDetailElement;
-import eu.etaxonomy.taxeditor.section.name.NameDetailSection;
-import eu.etaxonomy.taxeditor.section.name.NameRelationshipDetailElement;
-import eu.etaxonomy.taxeditor.section.name.NameRelationshipDetailSection;
-import eu.etaxonomy.taxeditor.section.name.NameTypeDesignationElement;
-import eu.etaxonomy.taxeditor.section.name.NomenclaturalStatusElement;
-import eu.etaxonomy.taxeditor.section.name.NomenclaturalStatusSection;
-import eu.etaxonomy.taxeditor.section.name.NonViralNameDetailElement;
-import eu.etaxonomy.taxeditor.section.name.NonViralNameDetailSection;
-import eu.etaxonomy.taxeditor.section.name.ProtologueElement;
-import eu.etaxonomy.taxeditor.section.name.ProtologueSection;
-import eu.etaxonomy.taxeditor.section.name.SpecimenTypeDesignationElement;
-import eu.etaxonomy.taxeditor.section.name.TypeDesignationSection;
-import eu.etaxonomy.taxeditor.section.occurrence.CollectingAreasDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.CollectionDetailElement;
-import eu.etaxonomy.taxeditor.section.occurrence.DerivedUnitBaseDetailElement;
-import eu.etaxonomy.taxeditor.section.occurrence.DerivedUnitBaseDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.DerivedUnitFacadeDetailElement;
-import eu.etaxonomy.taxeditor.section.occurrence.DerivedUnitFacadeDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.DeterminationEventDetailElement;
-import eu.etaxonomy.taxeditor.section.occurrence.DeterminationEventDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.FieldObservationDetailElement;
-import eu.etaxonomy.taxeditor.section.occurrence.FieldObservationDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.GatheringEventDetailElement;
-import eu.etaxonomy.taxeditor.section.occurrence.GatheringEventDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.GeneralDetailElement;
-import eu.etaxonomy.taxeditor.section.occurrence.GeneralDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.NamedAreaDetailElement;
-import eu.etaxonomy.taxeditor.section.occurrence.SourceCollectionDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.SpecimenCollectionDetailElement;
-import eu.etaxonomy.taxeditor.section.occurrence.SpecimenCollectionDetailSection;
-import eu.etaxonomy.taxeditor.section.reference.NomenclaturalReferenceDetailElement;
-import eu.etaxonomy.taxeditor.section.reference.NomenclaturalReferenceDetailSection;
-import eu.etaxonomy.taxeditor.section.reference.ReferenceDetailElement;
-import eu.etaxonomy.taxeditor.section.reference.ReferenceDetailSection;
-import eu.etaxonomy.taxeditor.section.supplemental.AnnotationElement;
-import eu.etaxonomy.taxeditor.section.supplemental.AnnotationSection;
-import eu.etaxonomy.taxeditor.section.supplemental.CreditElement;
-import eu.etaxonomy.taxeditor.section.supplemental.CreditSection;
-import eu.etaxonomy.taxeditor.section.supplemental.ExtensionElement;
-import eu.etaxonomy.taxeditor.section.supplemental.ExtensionSection;
-import eu.etaxonomy.taxeditor.section.supplemental.HeadlineSection;
-import eu.etaxonomy.taxeditor.section.supplemental.IdentifiableSourceElement;
-import eu.etaxonomy.taxeditor.section.supplemental.ImageFileElement;
-import eu.etaxonomy.taxeditor.section.supplemental.MarkerElement;
-import eu.etaxonomy.taxeditor.section.supplemental.MarkerSection;
-import eu.etaxonomy.taxeditor.section.supplemental.MediaElement;
-import eu.etaxonomy.taxeditor.section.supplemental.MediaRepresentationElement;
-import eu.etaxonomy.taxeditor.section.supplemental.MediaRepresentationPartSection;
-import eu.etaxonomy.taxeditor.section.supplemental.MediaRepresentationSection;
-import eu.etaxonomy.taxeditor.section.supplemental.MediaSection;
-import eu.etaxonomy.taxeditor.section.supplemental.RightsElement;
-import eu.etaxonomy.taxeditor.section.supplemental.RightsSection;
-import eu.etaxonomy.taxeditor.section.supplemental.SourceSection;
-import eu.etaxonomy.taxeditor.section.supplemental.VersionElement;
-import eu.etaxonomy.taxeditor.section.supplemental.VersionSection;
-import eu.etaxonomy.taxeditor.section.taxon.ParsingMessageElement;
-import eu.etaxonomy.taxeditor.section.taxon.ParsingMessagesSection;
-import eu.etaxonomy.taxeditor.section.taxon.TaxonBaseDetailElement;
-import eu.etaxonomy.taxeditor.section.taxon.TaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.openurl.IOpenUrlEnabled;
+import eu.etaxonomy.taxeditor.ui.openurl.OpenUrlSelectorElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.section.EmptyElement;
+import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.agent.PersonDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.agent.PersonDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.agent.TeamDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.agent.TeamDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.agent.TeamMemberElement;
+import eu.etaxonomy.taxeditor.ui.section.agent.TeamMemberSection;
+import eu.etaxonomy.taxeditor.ui.section.agent.TeamOrPersonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.classification.ClassificationDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.classification.ClassificationDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DerivedUnitElement;
+import eu.etaxonomy.taxeditor.ui.section.description.DescribedSpecimenSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementMediaSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementSourceElement;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementSourceSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionSourceElement;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionSourceSection;
+import eu.etaxonomy.taxeditor.ui.section.description.ModifierElement;
+import eu.etaxonomy.taxeditor.ui.section.description.ModifierSection;
+import eu.etaxonomy.taxeditor.ui.section.description.NaturalLanguageDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.NaturalLanguageSection;
+import eu.etaxonomy.taxeditor.ui.section.description.ScopeElement;
+import eu.etaxonomy.taxeditor.ui.section.description.ScopeSection;
+import eu.etaxonomy.taxeditor.ui.section.description.StateDataElement;
+import eu.etaxonomy.taxeditor.ui.section.description.StateDataSection;
+import eu.etaxonomy.taxeditor.ui.section.description.StatisticalMeasurementValueElement;
+import eu.etaxonomy.taxeditor.ui.section.description.StatisticalMeasurementValueSection;
+import eu.etaxonomy.taxeditor.ui.section.description.detail.AbstractDetailedDescriptionDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.detail.CategoricalDataDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.detail.CommonNameDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.detail.DistributionDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.detail.IndividualsAssociationDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.detail.QuantitativeDataDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.detail.TaxonInteractionDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.detail.TextDataDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.feature.FeatureDistributionDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.feature.FeatureDistributionDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.key.GeographicalScopeDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyNodeDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyNodeDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.key.ScopeRestrictionSection;
+import eu.etaxonomy.taxeditor.ui.section.name.AuthorshipDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.name.AuthorshipDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.name.HybridDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.name.HybridDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.name.NameDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.name.NameDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.name.NameRelationshipDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.name.NameRelationshipDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.name.NameTypeDesignationElement;
+import eu.etaxonomy.taxeditor.ui.section.name.NomenclaturalStatusElement;
+import eu.etaxonomy.taxeditor.ui.section.name.NomenclaturalStatusSection;
+import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.name.ProtologueElement;
+import eu.etaxonomy.taxeditor.ui.section.name.ProtologueSection;
+import eu.etaxonomy.taxeditor.ui.section.name.SpecimenTypeDesignationElement;
+import eu.etaxonomy.taxeditor.ui.section.name.TypeDesignationSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.CollectingAreasDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.CollectionDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitFacadeDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitFacadeDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DeterminationEventDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DeterminationEventDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.NamedAreaDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.SourceCollectionDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.SpecimenCollectionDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.SpecimenCollectionDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalReferenceDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalReferenceDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AnnotationElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AnnotationSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.CreditElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.CreditSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.ExtensionElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.ExtensionSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.HeadlineSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.IdentifiableSourceElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.ImageFileElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MarkerElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MarkerSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MediaElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MediaRepresentationElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MediaRepresentationPartSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MediaRepresentationSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MediaSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.RightsElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.RightsSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.SourceSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.VersionElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.VersionSection;
+import eu.etaxonomy.taxeditor.ui.section.taxon.ParsingMessageElement;
+import eu.etaxonomy.taxeditor.ui.section.taxon.ParsingMessagesSection;
+import eu.etaxonomy.taxeditor.ui.section.taxon.TaxonBaseDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.taxon.TaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.user.GroupsByUserDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.user.GroupsByUserDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.user.UserDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.user.UserDetailSection;
+import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.ClassificationSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.CollectionSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.DerivedUnitBaseSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.FeatureSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.FeatureTreeSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.FieldObservationSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.InstitutionSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.NomenclaturalAuthorTeamSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.PersonSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.PolytomousKeyNodeSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.PolytomousKeySelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.SynonymSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonBaseSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonNodeSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TeamSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement;
+import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
+import eu.etaxonomy.taxeditor.ui.term.AnnotationTypeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.DeterminationModifierComboElement;
+import eu.etaxonomy.taxeditor.ui.term.EmptyComboElement;
+import eu.etaxonomy.taxeditor.ui.term.ExtensionTypeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.LanguageComboElement;
+import eu.etaxonomy.taxeditor.ui.term.MarkerTypeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.MeasurementUnitComboElement;
+import eu.etaxonomy.taxeditor.ui.term.ModifierComboElement;
+import eu.etaxonomy.taxeditor.ui.term.NameRelationshipTypeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.NameTypeDesignationStatusComboElement;
+import eu.etaxonomy.taxeditor.ui.term.NamedAreaTypeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.NomenclaturalCodeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.NomenclaturalStatusTypeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.PresenceAbsenceTermComboElement;
+import eu.etaxonomy.taxeditor.ui.term.PreservationMethodComboElement;
+import eu.etaxonomy.taxeditor.ui.term.RankComboElement;
+import eu.etaxonomy.taxeditor.ui.term.ReferenceSystemComboElement;
+import eu.etaxonomy.taxeditor.ui.term.ReferenceTypeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.RightsTypeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.ScopeComboElement;
+import eu.etaxonomy.taxeditor.ui.term.SexComboElement;
+import eu.etaxonomy.taxeditor.ui.term.SpecimenTypeDesignationStatusComboElement;
+import eu.etaxonomy.taxeditor.ui.term.StageComboElement;
+import eu.etaxonomy.taxeditor.ui.term.StateComboElement;
+import eu.etaxonomy.taxeditor.ui.term.StatisticalMeasureComboElement;
 
 /**
  * <p>CdmFormFactory class.</p>
@@ -470,8 +474,8 @@ public class CdmFormFactory extends FormToolkit{
         * Make sure to remove the instance when the entityComposite disposes via
         * destroySelectionArbitrator(..)
         *
-        * @param entityElement a {@link eu.etaxonomy.taxeditor.forms.IEntityElement} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.SelectionArbitrator} object.
+        * @param entityElement a {@link eu.etaxonomy.taxeditor.ui.forms.IEntityElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator} object.
         */
        public SelectionArbitrator createSelectionArbitrator(IEntityElement entityElement){
                SelectionArbitrator selectionArbitrator = new SelectionArbitrator(entityElement);
@@ -484,14 +488,14 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>destroySelectionArbitrator</p>
         *
-        * @param selectionArbitrator a {@link eu.etaxonomy.taxeditor.forms.SelectionArbitrator} object.
+        * @param selectionArbitrator a {@link eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator} object.
         */
        public void destroySelectionArbitrator(SelectionArbitrator selectionArbitrator){
                removeSelectionListener(selectionArbitrator);
                if(selectionProvider != null){
                        selectionProvider.removeSelectionChangedListener(selectionArbitrator);
                }else{
-                       EditorUtil.error(this.getClass(), "Tried to destroy a selection listener from this factories listeners but was null", null);
+                       StoreUtil.error(this.getClass(), "Tried to destroy a selection listener from this factories listeners but was null", null);
                }
        }
 
@@ -505,7 +509,7 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>adapt</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement} object.
         */
        public void adapt(AbstractCdmFormElement formElement){          
                formElement.setPropertyChangeListeners(propertyChangeListeners);
@@ -523,7 +527,7 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>destroyElement</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public void destroyElement(ICdmFormElement formElement){
                // return if element was not initialized
@@ -573,8 +577,8 @@ public class CdmFormFactory extends FormToolkit{
         * @param labelString a {@link java.lang.String} object.
         * @param textHeight a int.
         * @param style a int.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.TextWithLabelElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement} object.
         */
        public TextWithLabelElement createMultilineTextWithLabel(ICdmFormElement parentElement, String labelString, int textHeight, int style){
                TextWithLabelElement element = new TextWithLabelElement(this, parentElement, labelString, "", textHeight, style);
@@ -587,12 +591,12 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createMultiLanguageTextElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param multilanguageText a {@link java.util.Map} object.
         * @param textHeight a int.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.MultilanguageTextElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.MultilanguageTextElement} object.
         */
        public MultilanguageTextElement createMultiLanguageTextElement(
                        ICdmFormElement parentElement, String labelString, Map<Language, LanguageString> multilanguageText, int textHeight,
@@ -618,8 +622,8 @@ public class CdmFormFactory extends FormToolkit{
         * @param labelString a {@link java.lang.String} object.
         * @param initialText a {@link java.lang.String} object.
         * @param style a int.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.TextWithLabelElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement} object.
         */
        public TextWithLabelElement createTextWithLabelElement(ICdmFormElement parentElement, String labelString, String initialText, int style){
                TextWithLabelElement element = new TextWithLabelElement(this, parentElement, labelString, initialText, null, style);
@@ -653,11 +657,11 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createIntegerTextWithLabelElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param initialInteger a {@link java.lang.Integer} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.NumberWithLabelElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement} object.
         */
        public NumberWithLabelElement createIntegerTextWithLabelElement(ICdmFormElement parentElement, String labelString, Integer initialInteger, int style){
                NumberWithLabelElement element = new NumberWithLabelElement(this, parentElement, labelString, initialInteger, style);
@@ -670,11 +674,11 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createFloatTextWithLabelElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param initialFloat a float.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.NumberWithLabelElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement} object.
         */
        public NumberWithLabelElement createFloatTextWithLabelElement(
                        ICdmFormElement parentElement, String labelString, float initialFloat,
@@ -688,11 +692,11 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createLanguageStringWithLabelElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param languageString a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.LanguageStringWithLabelElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.LanguageStringWithLabelElement} object.
         */
        public LanguageStringWithLabelElement createLanguageStringWithLabelElement(ICdmFormElement parentElement, String labelString, LanguageString languageString, int style){
                LanguageStringWithLabelElement element = new LanguageStringWithLabelElement(this, parentElement, labelString, languageString, style);
@@ -704,12 +708,12 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createLanguageStringWithLabelElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param languageString a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
         * @param height a int.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.LanguageStringWithLabelElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.LanguageStringWithLabelElement} object.
         */
        public LanguageStringWithLabelElement createLanguageStringWithLabelElement(ICdmFormElement parentElement, String labelString, LanguageString languageString, int height, int style){
                LanguageStringWithLabelElement element = new LanguageStringWithLabelElement(this, parentElement, labelString, languageString, height, style);
@@ -721,10 +725,10 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createTextElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param initialText a {@link java.lang.String} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.TextWithLabelElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement} object.
         */
        public TextWithLabelElement createTextElement(ICdmFormElement parentElement, String initialText, int style){
                TextWithLabelElement element = new TextWithLabelElement(this, parentElement, null, initialText, null, style);
@@ -736,11 +740,11 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createKeyValueViewerElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param keyHeading a {@link java.lang.String} object.
         * @param valueHeading a {@link java.lang.String} object.
         * @param map a {@link java.util.Map} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.KeyValueViewerElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.KeyValueViewerElement} object.
         */
        public KeyValueViewerElement createKeyValueViewerElement(ICdmFormElement parentElement, String keyHeading, String valueHeading, Map<Object, Object> map){
                KeyValueViewerElement element = new KeyValueViewerElement(this, parentElement, keyHeading, valueHeading, map);
@@ -779,12 +783,12 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createTermComboElement</p>
         *
-        * @param termComboType a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param termComboType a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.common.DefinedTermBase} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement} object.
         */
        public AbstractTermComboElement createTermComboElement(TermComboType termComboType, ICdmFormElement parentElement, String labelString, DefinedTermBase selection, int style){
                AbstractTermComboElement element = null;
@@ -874,10 +878,10 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createEnumComboElement</p>
         *
-        * @param enumComboType a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory.EnumComboType} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param enumComboType a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EnumComboType} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.term.AbstractEnumComboElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement} object.
         */
        public AbstractEnumComboElement createEnumComboElement(EnumComboType enumComboType, ICdmFormElement parentElement, int style){
                AbstractEnumComboElement element = null;
@@ -900,8 +904,8 @@ public class CdmFormFactory extends FormToolkit{
         *
         * @param imageUri a {@link java.net.URI} object.
         * @param style a int.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.BrowserElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.BrowserElement} object.
         */
        public BrowserElement createBrowserElement(ICdmFormElement parentElement, URI imageUri, int style){
                BrowserElement element = new BrowserElement(this, parentElement, imageUri, style);
@@ -913,10 +917,10 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createImageElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param imageUri a {@link java.net.URI} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.ImageElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.ImageElement} object.
         */
        public ImageElement createImageElement(ICdmFormElement parentElement, URI imageUri, int style) {
                ImageElement element = new ImageElement(this, parentElement, imageUri, style);
@@ -931,9 +935,9 @@ public class CdmFormFactory extends FormToolkit{
         * @param labelString a {@link java.lang.String} object.
         * @param initialText a {@link java.lang.String} object.
         * @param style a int.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param buttonLabel a {@link java.lang.String} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.TextActionElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.TextActionElement} object.
         */
        public TextActionElement createTextActionElement(ICdmFormElement parentElement, String labelString, String buttonLabel, String initialText, int style){
                TextActionElement element = new TextActionElement(this, parentElement, labelString, buttonLabel, initialText, style);
@@ -973,11 +977,11 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createCheckbox</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param label a {@link java.lang.String} object.
         * @param initialState a boolean.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.CheckboxElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.CheckboxElement} object.
         */
        public CheckboxElement createCheckbox(ICdmFormElement parentElement, String label, boolean initialState, int style) {
                CheckboxElement element = new CheckboxElement(this, parentElement, label, initialState, style | orientation);
@@ -992,7 +996,7 @@ public class CdmFormFactory extends FormToolkit{
         * Creates a section as a part of the form.
         *
         * @return the section widget
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         */
        public Section adapt(AbstractFormSection section) {
                section.setMenu(section.getLayoutComposite().getMenu());
@@ -1059,12 +1063,12 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createToggleableTextField</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param initialText a {@link java.lang.String} object.
         * @param initialState a boolean.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.ToggleableTextElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement} object.
         */
        public ToggleableTextElement createToggleableTextField(ICdmFormElement parentElement,
                        String labelString,     String initialText, boolean initialState, int style) {
@@ -1078,11 +1082,11 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createTimePeriodElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param timePeriod a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.TimePeriodElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.TimePeriodElement} object.
         */
        public TimePeriodElement createTimePeriodElement(
                        ICdmFormElement parentElement, String labelString, TimePeriod timePeriod, int style) {
@@ -1097,9 +1101,9 @@ public class CdmFormFactory extends FormToolkit{
         * <p>createPointElement</p>
         *
         * @param style a int.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param point a {@link eu.etaxonomy.cdm.model.location.Point} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.PointElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.PointElement} object.
         */
        public PointElement createPointElement(ICdmFormElement parentElement,
                        Point point, int style) {
@@ -1112,9 +1116,9 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createDateDetailSection</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.DateDetailSection} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.DateDetailSection} object.
         */
        public DateDetailSection createDateDetailSection(ICdmFormElement parentElement, int style){
                DateDetailSection section = new DateDetailSection(this, parentElement, style);
@@ -1126,11 +1130,11 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createPartialElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param partial a {@link org.joda.time.Partial} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.PartialElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.PartialElement} object.
         */
        public PartialElement createPartialElement(ICdmFormElement parentElement, String labelString, Partial partial, int style){
                PartialElement element = new PartialElement(this, parentElement, labelString, style);
@@ -1155,7 +1159,7 @@ public class CdmFormFactory extends FormToolkit{
         */
        public void removeSelectionListener(SelectionListener listener){
                if(listener == null){
-                       EditorUtil.error(this.getClass(), "Tried to remove a selection listener from this factories listeners but was null", null);
+                       StoreUtil.error(this.getClass(), "Tried to remove a selection listener from this factories listeners but was null", null);
                }else{
                        selectionListenerList.remove(listener);
                }
@@ -1184,7 +1188,7 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createHorizontalSeparator</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         * @return a {@link org.eclipse.swt.widgets.Label} object.
         */
@@ -1197,10 +1201,10 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createVersionElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.common.VersionableEntity} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.section.supplemental.VersionElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.supplemental.VersionElement} object.
         */
        public VersionElement createVersionElement(ICdmFormElement parentElement, VersionableEntity entity,
                        int style) {
@@ -1213,9 +1217,9 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createVersionSection</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.section.supplemental.VersionSection} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.supplemental.VersionSection} object.
         */
        public VersionSection createVersionSection(ICdmFormElement parentElement, int style) {
                VersionSection section = new VersionSection(this, parentElement, style);
@@ -1227,8 +1231,8 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createEmptyElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
-        * @return a {@link eu.etaxonomy.taxeditor.section.EmptyElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.EmptyElement} object.
         */
        public EmptyElement createEmptyElement(ICdmFormElement parentElement) {
                EmptyElement element = new EmptyElement(this, parentElement, null, SWT.NULL);
@@ -1240,8 +1244,8 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createHeadlineSection</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
-        * @return a {@link eu.etaxonomy.taxeditor.section.supplemental.HeadlineSection} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.supplemental.HeadlineSection} object.
         */
        public HeadlineSection createHeadlineSection(ICdmFormElement parentElement) {
                HeadlineSection section = new HeadlineSection(this, parentElement, SWT.NULL);
@@ -1254,10 +1258,10 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createParsingMessageElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param parserProblem a {@link eu.etaxonomy.cdm.strategy.parser.ParserProblem} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.section.taxon.ParsingMessageElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.taxon.ParsingMessageElement} object.
         */
        public ParsingMessageElement createParsingMessageElement(
                        ICdmFormElement parentElement, ParserProblem parserProblem, int style) {
@@ -1300,18 +1304,20 @@ public class CdmFormFactory extends FormToolkit{
                POLYTOMOUS_KEY_NODE, 
                INSTITUTION, 
                DERIVED_UNIT_GENERAL, 
-               HYBRID
+               HYBRID, 
+               USER, 
+               GROUPS_BY_USER
        }
        
        /**
         * <p>createCdmDetailSection</p>
         *
-        * @param detailType a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param detailType a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         */
        public AbstractFormSection createCdmDetailSection(DetailType detailType, ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){
                AbstractFormSection section = null;
@@ -1354,7 +1360,7 @@ public class CdmFormFactory extends FormToolkit{
                        section = new NonViralNameDetailSection(this, conversation, parentElement, selectionProvider, style);
                        break;
                case MEDIA:
-                       section = new eu.etaxonomy.taxeditor.section.description.MediaDetailsSection(this, conversation, parentElement, selectionProvider, style);
+                       section = new eu.etaxonomy.taxeditor.ui.section.description.MediaDetailsSection(this, conversation, parentElement, selectionProvider, style);
                        break;
                case DERIVED_UNIT_FACADE:
                        section = new DerivedUnitFacadeDetailSection(this, conversation, parentElement, selectionProvider, style);
@@ -1395,6 +1401,12 @@ public class CdmFormFactory extends FormToolkit{
                case HYBRID:
                        section = new HybridDetailSection(this, conversation, parentElement, selectionProvider, style);
                        break;
+               case USER:
+                       section = new UserDetailSection(this, conversation, parentElement, selectionProvider, style);
+                       break;
+               case GROUPS_BY_USER:
+                       section = new GroupsByUserDetailSection(this, conversation, parentElement, selectionProvider, style);
+                       break;
                }
                
                if(section == null){
@@ -1409,10 +1421,10 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createCdmDetailElement</p>
         *
-        * @param detailType a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType} object.
+        * @param detailType a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType} object.
         * @param style a int.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
-        * @return a {@link eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement} object.
         */
        public AbstractCdmDetailElement createCdmDetailElement(DetailType detailType, ICdmFormElement parentElement, int style){
                AbstractCdmDetailElement element = null;
@@ -1490,10 +1502,16 @@ public class CdmFormFactory extends FormToolkit{
                case HYBRID:
                        element = new HybridDetailElement(this, parentElement);
                        break;
+               case USER:
+                       element = new UserDetailElement(this, parentElement);
+                       break;
+               case GROUPS_BY_USER:
+                       element = new GroupsByUserDetailElement(this, parentElement);
+                       break;
                }
                
                if(element == null){
-                       EditorUtil.error(this.getClass(), "Detail element was not created. Seems like the case was not implemented for the requested detail type: " + detailType, null);
+                       StoreUtil.error(this.getClass(), "Detail element was not created. Seems like the case was not implemented for the requested detail type: " + detailType, null);
                }
                
                adapt(element);
@@ -1542,11 +1560,11 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createEntityDetailSection</p>
         *
-        * @param entityDetailType a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType} object.
+        * @param entityDetailType a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType} object.
         * @param style a int.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         */
        public AbstractFormSection createEntityDetailSection(EntityDetailType entityDetailType, ConversationHolder conversation, ICdmFormElement parentElement, int style){
                AbstractFormSection section = null;
@@ -1650,10 +1668,10 @@ public class CdmFormFactory extends FormToolkit{
         *
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param versionableEntity a {@link eu.etaxonomy.cdm.model.common.IVersionableEntity} object.
         * @param backgroundColor a {@link org.eclipse.swt.graphics.Color} object.
-        * @return a {@link eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement} object.
         */
        public AbstractEntityCollectionElement createEntityCollectionElement(AbstractFormSection parentElement, IVersionableEntity versionableEntity, SelectionListener removeListener, Color backgroundColor, int style){
                AbstractEntityCollectionElement element = null;
@@ -1742,7 +1760,7 @@ public class CdmFormFactory extends FormToolkit{
                }
                
                if(element == null){
-                       EditorUtil.errorDialog("No element for entity", this, "Could not generate element for entity. " +
+                       StoreUtil.errorDialog("No element for entity", this, "Could not generate element for entity. " +
                                        "Looks like the case is not handled already. Check implementation. Entity: " + entity, null);
                }
                
@@ -1758,14 +1776,14 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createSelectionElement</p>
         *
-        * @param selectionType a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param selectionType a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selectionType
         * @param selection a {@link eu.etaxonomy.cdm.model.common.IAnnotatableEntity} object.
         * @param style a int.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.selection.AbstractSelectionElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement} object.
         */
        public AbstractSelectionElement createSelectionElement(SelectionType selectionType,  ConversationHolder conversation, ICdmFormElement parentElement, String labelString, ICdmBase selection, int style){
                AbstractSelectionElement element = null;
@@ -1843,12 +1861,12 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createNamedAreaSelectionElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.location.NamedArea} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.forms.selection.NamedAreaSelectionElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement} object.
         */
        public NamedAreaSelectionElement createNamedAreaSelectionElement(ICdmFormElement parentElement, ConversationHolder conversation, String labelString, NamedArea selection, int style){
                NamedAreaSelectionElement element = new NamedAreaSelectionElement(this, conversation, parentElement, labelString, selection, style);
@@ -1877,10 +1895,10 @@ public class CdmFormFactory extends FormToolkit{
        /**
         * <p>createDetailedDescriptionDetailElement</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase} object.
         * @param style a int.
-        * @return a {@link eu.etaxonomy.taxeditor.section.description.detail.AbstractDetailedDescriptionDetailElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.section.description.detail.AbstractDetailedDescriptionDetailElement} object.
         */
        public AbstractDetailedDescriptionDetailElement createDetailedDescriptionDetailElement(
                        ICdmFormElement parentElement, DescriptionElementBase entity, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CdmPropertyChangeEvent.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmPropertyChangeEvent.java
similarity index 98%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CdmPropertyChangeEvent.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmPropertyChangeEvent.java
index 41f89b91ff6b4bbc713b606662f85c562a22f0c0..ffaa391ec61dc09ca8b5ac27e91dc0f107865aa0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CdmPropertyChangeEvent.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmPropertyChangeEvent.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.jface.util.PropertyChangeEvent;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CheckboxElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CheckboxElement.java
similarity index 90%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CheckboxElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CheckboxElement.java
index c55114b4d1781f9e7625bc6a021ce1b4ac1e8f94..8ad897a528bb7c4ab17efc3a8fd62956e07b7c20 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/CheckboxElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CheckboxElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -17,7 +17,6 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Label;
 
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
 /**
@@ -38,8 +37,8 @@ public class CheckboxElement extends AbstractCdmFormElement implements Selection
         *
         * @param initialState a boolean.
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         */
        protected CheckboxElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString, boolean initialState,
@@ -105,7 +104,7 @@ public class CheckboxElement extends AbstractCdmFormElement implements Selection
        public void setIrrelevant(boolean irrelevant) {
                String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
                
-               Color color = EditorUtil.getColor(colorId);
+               Color color = getColor(colorId);
                checkbox.setBackground(color);
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/DateDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/DateDetailSection.java
similarity index 92%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/DateDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/DateDetailSection.java
index a6d6bb6e59d02bc92131b9c693debf10040fe077..bd48c8280fc0784edc086acaf7e5756630812583 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/DateDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/DateDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.joda.time.Partial;
@@ -30,8 +30,8 @@ public class DateDetailSection extends AbstractFormSection<TimePeriod> {
        /**
         * <p>Constructor for DateDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        protected DateDetailSection(CdmFormFactory formFactory, ICdmFormElement parentElement,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ICdmFormElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ICdmFormElement.java
similarity index 87%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ICdmFormElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ICdmFormElement.java
index 42d26e7f058e554874e2c916a9170af2417088e9..dca303cd5e3857d367d43849bc83a47a0b635f55 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ICdmFormElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ICdmFormElement.java
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 
 import java.util.List;
@@ -49,14 +49,14 @@ public interface ICdmFormElement extends IPropertyChangeEmitter, IPropertyChange
        /**
         * <p>addElement</p>
         *
-        * @param element a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param element a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public abstract void addElement(ICdmFormElement element);
        
        /**
         * <p>getParentElement</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public abstract ICdmFormElement getParentElement();
                
@@ -75,7 +75,7 @@ public interface ICdmFormElement extends IPropertyChangeEmitter, IPropertyChange
        /**
         * <p>containsFormElement</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @return a boolean.
         */
        public boolean containsFormElement(ICdmFormElement formElement);

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IEnableableFormElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IEnableableFormElement.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IEnableableFormElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IEnableableFormElement.java
index fe01a9178b0f27540f8870f571bf0d469972940f..eb6a7f57692abd482eb3e3dd7d550dad7e3d4e60 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IEnableableFormElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IEnableableFormElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IEntityElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IEntityElement.java
similarity index 94%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IEntityElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IEntityElement.java
index e2096fe0a0d75dd3e698e4b39f741cd582dc28db..e95c8a05124746ba65bd4ef074b99022c1157c28 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IEntityElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IEntityElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IErrorIntolerableElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IErrorIntolerableElement.java
similarity index 71%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IErrorIntolerableElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IErrorIntolerableElement.java
index eec18ddc2e1a076e52130174fb562ea69516f144..5b53ce9ec40df838da8e42badc5c152c8f9a8eed 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IErrorIntolerableElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IErrorIntolerableElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 
 /**
@@ -23,21 +23,21 @@ public interface IErrorIntolerableElement {
        /**
         * <p>addExceptionHandler</p>
         *
-        * @param handler a {@link eu.etaxonomy.taxeditor.forms.IExceptionHandler} object.
+        * @param handler a {@link eu.etaxonomy.taxeditor.ui.forms.IExceptionHandler} object.
         */
        public void addExceptionHandler(IExceptionHandler handler);
        
        /**
         * <p>removeExceptionHandler</p>
         *
-        * @param handler a {@link eu.etaxonomy.taxeditor.forms.IExceptionHandler} object.
+        * @param handler a {@link eu.etaxonomy.taxeditor.ui.forms.IExceptionHandler} object.
         */
        public void removeExceptionHandler(IExceptionHandler handler);
 
        /**
         * <p>exceptionOccurred</p>
         *
-        * @param event a {@link eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent} object.
+        * @param event a {@link eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent} object.
         */
        public void exceptionOccurred(CdmPropertyChangeEvent event);
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IExceptionHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IExceptionHandler.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IExceptionHandler.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IExceptionHandler.java
index 470ee76be1d872582d4d84aebbe23ef249a22ee7..3ac64e99e70419a1606dd18a4aff75c667f3026a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IExceptionHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IExceptionHandler.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 
 /**
@@ -23,7 +23,7 @@ public interface IExceptionHandler {
        /**
         * <p>handleException</p>
         *
-        * @param event a {@link eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent} object.
+        * @param event a {@link eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent} object.
         */
        void handleException(CdmPropertyChangeEvent event);
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ILabeledElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ILabeledElement.java
similarity index 94%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ILabeledElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ILabeledElement.java
index b491a77675b0d75609524d0ea67b3ce8402fdd60..47352656958fd7f8374b09c81ea8b03d1e4bec83 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ILabeledElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ILabeledElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IPropertyChangeEmitter.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IPropertyChangeEmitter.java
similarity index 68%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IPropertyChangeEmitter.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IPropertyChangeEmitter.java
index 016e03c06e064215c51037fe38e74ba03ceb9a12..6f6eb5f12f2d9d1dbde06620ff90f54c8f655d57 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IPropertyChangeEmitter.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IPropertyChangeEmitter.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 
 
@@ -15,7 +15,7 @@ public interface IPropertyChangeEmitter {
        /**
         * Notify registeres listeners of changed properties
         *
-        * @param event a {@link eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent} object.
+        * @param event a {@link eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent} object.
         */
        public void firePropertyChangeEvent(CdmPropertyChangeEvent event);
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IRelevantFormElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IRelevantFormElement.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IRelevantFormElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IRelevantFormElement.java
index fff6dd9a689b51ed5885109132a8aa1671c51766..321ee97d9f20d11d207ec4d25728ec3364c6e821 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/IRelevantFormElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/IRelevantFormElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ISelectable.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ISelectable.java
similarity index 96%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ISelectable.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ISelectable.java
index 5f354089b25c90ac4b30844aedb565a6d3a4b087..6424dd2725d1bcbfc6b8045ef2d45c494b48b8be 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ISelectable.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ISelectable.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ISelectableElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ISelectableElement.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ISelectableElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ISelectableElement.java
index 10bce04d8e97c1d8f01394b0e3287e6a4a4b1890..739c227389d540ea44c9d46798dd3cf38a7c28a8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ISelectableElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ISelectableElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 
 
@@ -24,7 +24,7 @@ public interface ISelectableElement {
        /**
         * Returns this elements selection arbitrator
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.SelectionArbitrator} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator} object.
         */
        public abstract SelectionArbitrator getSelectionArbitrator();
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ImageElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ImageElement.java
similarity index 90%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ImageElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ImageElement.java
index 9db80d123cd8bbcbb711c1fb3a35e7582ef508b2..948f064e8c3f89ef1c8e52af81d5f0e8c1fd5d14 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ImageElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ImageElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.io.InputStream;
 import java.net.URI;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 
 import eu.etaxonomy.cdm.common.UriUtils;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * <p>ImageElement class.</p>
@@ -49,8 +49,8 @@ public class ImageElement extends AbstractCdmFormElement implements PaintListene
        /**
         * <p>Constructor for ImageElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param imageUri a {@link java.net.URI} object.
         * @param style a int.
         */
@@ -73,7 +73,6 @@ public class ImageElement extends AbstractCdmFormElement implements PaintListene
        /** {@inheritDoc} */
        @Override
        public void setSelected(boolean selected) {
-               // TODO Auto-generated method stub
 
        }
 
@@ -110,7 +109,7 @@ public class ImageElement extends AbstractCdmFormElement implements PaintListene
                                        try {
                                                runnable.run(monitor);
                                        } catch (Exception e) {
-                                               EditorUtil.errorDialog("Could not load image", getClass(), e.getMessage()  + ": " +  getImageUri(), e);
+                                               StoreUtil.errorDialog("Could not load image", getClass(), e.getMessage()  + ": " +  getImageUri(), e);
                                        }
                                        
                                        return Status.OK_STATUS;
@@ -155,7 +154,7 @@ public class ImageElement extends AbstractCdmFormElement implements PaintListene
                                        }
                                        monitor.done();                                 
                                }catch (Exception e) {
-                                       EditorUtil.errorDialog("Could not load image", getClass(), e.getMessage()  + ": " + imageUri , e);
+                                       StoreUtil.errorDialog("Could not load image", getClass(), e.getMessage()  + ": " + imageUri , e);
                                } 
                        }                                       
                };

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/KeyStatementElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/KeyStatementElement.java
similarity index 96%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/KeyStatementElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/KeyStatementElement.java
index ecab42f3a62a261fe62de796d324c02d28978e5a..197a5c4ffef557d08044ceecaed36a74eef3286d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/KeyStatementElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/KeyStatementElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import eu.etaxonomy.cdm.model.description.KeyStatement;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/KeyValueViewerElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/KeyValueViewerElement.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/KeyValueViewerElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/KeyValueViewerElement.java
index fbf5be397e426d8a41b871f09bb845569d76e0f0..386b748a36e6ae9be0cc5733d96ffefa3445b8d0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/KeyValueViewerElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/KeyValueViewerElement.java
@@ -1,5 +1,5 @@
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -31,8 +31,8 @@ public class KeyValueViewerElement extends AbstractCdmFormElement {
        /**
         * <p>Constructor for KeyValueViewerElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param keyHeading a {@link java.lang.String} object.
         * @param valueHeading a {@link java.lang.String} object.
         * @param map a {@link java.util.Map} object.
@@ -68,7 +68,6 @@ public class KeyValueViewerElement extends AbstractCdmFormElement {
        
        /** {@inheritDoc} */
        public void setSelected(boolean selected) {
-               // TODO Auto-generated method stub
 
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/LabelElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/LabelElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/LabelElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/LabelElement.java
index 97947bb1be8da1ccd45806c77296c84e1a2aa039..e9fdedb3e26dbfe393b7a7d33b979bd9772e4c60 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/LabelElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/LabelElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Label;
@@ -27,8 +27,8 @@ public class LabelElement extends AbstractCdmFormElement {
        /**
         * <p>Constructor for LabelElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param text a {@link java.lang.String} object.
         */
        public LabelElement(CdmFormFactory formFactory, ICdmFormElement formElement, String text) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/LanguageStringWithLabelElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/LanguageStringWithLabelElement.java
similarity index 87%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/LanguageStringWithLabelElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/LanguageStringWithLabelElement.java
index 13fd5cce3c071add47fffaf9dc22db60f7990cc1..36ca7f61a472bdf4438617f97df44bc822174be4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/LanguageStringWithLabelElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/LanguageStringWithLabelElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.events.ModifyEvent;
 
@@ -29,8 +29,8 @@ public class LanguageStringWithLabelElement extends TextWithLabelElement {
        /**
         * <p>Constructor for LanguageStringWithLabelElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param languageString a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
         * @param style a int.
@@ -44,8 +44,8 @@ public class LanguageStringWithLabelElement extends TextWithLabelElement {
        /**
         * <p>Constructor for LanguageStringWithLabelElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param languageString a {@link eu.etaxonomy.cdm.model.common.LanguageString} object.
         * @param height a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/MultilanguageTextElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/MultilanguageTextElement.java
similarity index 92%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/MultilanguageTextElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/MultilanguageTextElement.java
index 6b4a24a1285b7bcab02841a795137498117c8808..89fbe24f0717baf77f93834ff9ba495ac7b2922a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/MultilanguageTextElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/MultilanguageTextElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,12 +27,11 @@ import org.eclipse.swt.widgets.Button;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.translation.TranslationWizard;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.term.EmptyComboElement;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.term.EmptyComboElement;
+import eu.etaxonomy.taxeditor.ui.translation.TranslationWizard;
 
 /**
  * <p>MultilanguageTextElement class.</p>
@@ -57,7 +56,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                @Override
                public void widgetSelected(SelectionEvent e) {
                        TranslationWizard wizard = new TranslationWizard(multilanguageText);
-                       WizardDialog dialog = new WizardDialog(EditorUtil.getShell(), wizard);
+                       WizardDialog dialog = new WizardDialog(getLayoutComposite().getShell(), wizard);
                        
                        if (dialog.open() == IStatus.OK){
                                combo_language.setTerms(getLanguages());
@@ -81,8 +80,8 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
        /**
         * <p>Constructor for MultilanguageTextElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param multilanguageText a {@link java.util.Map} object.
         * @param textHeight a {@link java.lang.Integer} object.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/NumberWithLabelElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/NumberWithLabelElement.java
similarity index 91%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/NumberWithLabelElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/NumberWithLabelElement.java
index b726a29d0e14c2b77d93198acebf9fa7e777d984..c3201544b78f353d8d8d62665359ab59246f0e58 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/NumberWithLabelElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/NumberWithLabelElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -34,8 +34,8 @@ public class NumberWithLabelElement extends TextWithLabelElement {
        /**
         * <p>Constructor for NumberWithLabelElement.</p>
         *
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param initialInteger a {@link java.lang.Integer} object.
         * @param style a int.
@@ -50,8 +50,8 @@ public class NumberWithLabelElement extends TextWithLabelElement {
        /**
         * <p>Constructor for NumberWithLabelElement.</p>
         *
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param initialFloat a {@link java.lang.Float} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PartialElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PartialElement.java
similarity index 94%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PartialElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PartialElement.java
index 16ed9ab1cd6b6f2cc7c8d4989c507bbe51ea26f6..c72ac925dc284ea472ec630be2b6f053c8b8b4e7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PartialElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PartialElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -37,8 +37,8 @@ public class PartialElement extends AbstractCdmFormElement implements SelectionL
        /**
         * <p>Constructor for PartialElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PointElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PointElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java
index a65ddd03f3d0a0ba32905eb02b47544b6625527d..bb65087ce56fe0ff3784323712b05b0b590f5748 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/PointElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/PointElement.java
@@ -8,17 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.text.ParseException;
 
 import org.eclipse.jface.util.PropertyChangeEvent;
 
 import eu.etaxonomy.cdm.model.location.Point;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.term.ReferenceSystemComboElement;
 import eu.etaxonomy.taxeditor.preference.Resources;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.term.ReferenceSystemComboElement;
 
 /**
  * <p>PointElement class.</p>
@@ -39,8 +38,8 @@ public class PointElement extends AbstractCdmFormElement implements IEntityEleme
        /**
         * <p>Constructor for PointElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param point a {@link eu.etaxonomy.cdm.model.location.Point} object.
         * @param style a int.
         */
@@ -83,20 +82,20 @@ public class PointElement extends AbstractCdmFormElement implements IEntityEleme
                        try {
                                getPoint().setLatitudeByParsing(text_latitude.getText());
                                text_latitude.setText(point.getLatitudeSexagesimal().toString(false));
-                               text_latitude.setBackground(EditorUtil.getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
+                               text_latitude.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
                                propagate = true;
                        } catch (ParseException e) {
-                               text_latitude.setBackground(EditorUtil.getColor(Resources.COLOR_PARSE_ERROR));
+                               text_latitude.setBackground(getColor(Resources.COLOR_PARSE_ERROR));
                        }
                }
                else if(eventSource == text_longitude){
                        try {
                                getPoint().setLongitudeByParsing(text_longitude.getText());
                                text_longitude.setText(point.getLongitudeSexagesimal().toString(false));
-                               text_longitude.setBackground(EditorUtil.getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
+                               text_longitude.setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
                                propagate = true;
                        } catch (ParseException e) {
-                               text_latitude.setBackground(EditorUtil.getColor(Resources.COLOR_PARSE_ERROR));
+                               text_latitude.setBackground(getColor(Resources.COLOR_PARSE_ERROR));
                        }
                }
                else if(eventSource == number_errorRadius){

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/RootElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/RootElement.java
similarity index 88%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/RootElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/RootElement.java
index 2d0cafefed2bd4c8597c24957f6afc4bb7d9a4cd..4ca2ad87bf49f2addf4945be7e2baa8bbdd64a11 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/RootElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/RootElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
@@ -25,7 +25,7 @@ public class RootElement extends AbstractCdmFormElement {
        /**
         * <p>Constructor for RootElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param layoutComposite a {@link org.eclipse.swt.widgets.Composite} object.
         */
        public RootElement(CdmFormFactory formFactory, Composite layoutComposite) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/SelectionArbitrator.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/SelectionArbitrator.java
similarity index 90%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/SelectionArbitrator.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/SelectionArbitrator.java
index e282db9bc6f374c2f11ae2402d04ae302f7b70b7..f851b9e8ed80718779fe795ba2df6bc12abe47e2 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/SelectionArbitrator.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/SelectionArbitrator.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -25,7 +25,7 @@ import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Widget;
 
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 
 /**
@@ -48,7 +48,7 @@ public class SelectionArbitrator implements SelectionListener, ISelectionChanged
        /**
         * <p>Constructor for SelectionArbitrator.</p>
         *
-        * @param selectableComposite a {@link eu.etaxonomy.taxeditor.forms.IEntityElement} object.
+        * @param selectableComposite a {@link eu.etaxonomy.taxeditor.ui.forms.IEntityElement} object.
         */
        public SelectionArbitrator(IEntityElement selectableComposite){
                this.entityElement = selectableComposite;
@@ -118,7 +118,7 @@ public class SelectionArbitrator implements SelectionListener, ISelectionChanged
        /**
         * <p>Getter for the field <code>entityElement</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.IEntityElement} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.IEntityElement} object.
         */
        public IEntityElement getEntityElement() {
                return entityElement;
@@ -127,7 +127,7 @@ public class SelectionArbitrator implements SelectionListener, ISelectionChanged
        /**
         * <p>setEntityComposite</p>
         *
-        * @param entityElement a {@link eu.etaxonomy.taxeditor.forms.IEntityElement} object.
+        * @param entityElement a {@link eu.etaxonomy.taxeditor.ui.forms.IEntityElement} object.
         */
        public void setEntityComposite(IEntityElement entityElement) {
                this.entityElement = entityElement;
@@ -142,7 +142,7 @@ public class SelectionArbitrator implements SelectionListener, ISelectionChanged
                try{
                entityElement.setSelected(false);
                }catch(SWTException e){
-                       EditorUtil.error(getClass(), "Widgets of element are disposed", e);
+                       StoreUtil.error(getClass(), "Widgets of element are disposed", e);
                }
                ISelection selection = event.getSelection();            
                if(selection != null && selection instanceof StructuredSelection){

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextActionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextActionElement.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextActionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextActionElement.java
index ed336bc72f63d103a09bffddf5c87ed23539c892..0d19fd0fda98493ee714c33c4f709b67a5d41680 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextActionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextActionElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -32,8 +32,8 @@ public class TextActionElement extends AbstractCdmFormElement implements ModifyL
         * <p>Constructor for TextActionElement.</p>
         *
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param buttonLabel a {@link java.lang.String} object.
         * @param initialText a {@link java.lang.String} object.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextWithLabelElement.java
similarity index 92%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextWithLabelElement.java
index d8fc6d2e28d633b11b4dd341a6a467b1cc18d536..866730348c6ec4f16a54f5d7138673e93d2997bb 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TextWithLabelElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TextWithLabelElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
@@ -16,7 +16,6 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.TableWrapData;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
 /**
@@ -38,8 +37,8 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
        /**
         * <p>Constructor for TextWithLabelElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param initialText a {@link java.lang.String} object.
         * @param textHeight a {@link java.lang.Integer} object.
@@ -136,14 +135,14 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
        public void setEnabled(boolean enabled) {
                text.setEnabled(enabled);
                String symbolicName = enabled ? Resources.COLOR_FONT_DEFAULT : Resources.COLOR_TEXT_DISABLED;
-               text.setForeground(EditorUtil.getColor(symbolicName));
+               text.setForeground(getColor(symbolicName));
        }
 
        /** {@inheritDoc} */
        public void setIrrelevant(boolean irrelevant) {
                String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
                
-               Color color = EditorUtil.getColor(colorId);
+               Color color = getColor(colorId);
                text.setBackground(color);
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TimePeriodElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TimePeriodElement.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TimePeriodElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TimePeriodElement.java
index c41d9e8afebd59facd78d88e2ffedfcfcbde0f99..446b13cf5fe3ef151914bc74c6abc63416134215 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/TimePeriodElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/TimePeriodElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.graphics.Color;
@@ -35,8 +35,8 @@ public class TimePeriodElement extends AbstractCdmFormElement{
         * <p>Constructor for TimePeriodElement.</p>
         *
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param timePeriod a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ToggleableTextElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ToggleableTextElement.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ToggleableTextElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ToggleableTextElement.java
index bb27ee3bafcb6be19ff969d0dd03f9b4331be25b..1a7a09a331a8bd701672782cb2f9bb0c6dd54737 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/ToggleableTextElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/ToggleableTextElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -26,8 +26,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * When the button is pressed, this textfield may be edited.
@@ -50,8 +50,8 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel
         * <p>Constructor for ToggleableTextElement.</p>
         *
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param initialText a {@link java.lang.String} object.
         * @param initialState a boolean.
@@ -131,7 +131,7 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel
        public void setEnabled(boolean enabled) {
                text_cache.setEnabled(enabled);
                String symbolicName = enabled ? Resources.COLOR_FONT_DEFAULT : Resources.COLOR_TEXT_DISABLED;
-               text_cache.setForeground(EditorUtil.getColor(symbolicName));
+               text_cache.setForeground(StoreUtil.getColor(symbolicName));
                button_toggle.setSelection(enabled);
        }
 
@@ -192,7 +192,7 @@ public class ToggleableTextElement extends AbstractCdmFormElement implements Sel
        public void setIrrelevant(boolean irrelevant) {
                String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
                
-               Color color = EditorUtil.getColor(colorId);
+               Color color = getColor(colorId);
                text_cache.setBackground(color);
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/UriWithLabelElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/UriWithLabelElement.java
similarity index 96%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/UriWithLabelElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/UriWithLabelElement.java
index fad1db15438f0ee1980b04158ee2a210d8768e69..1067f1820b9403dd6fbf5f3a21d7fd1bd59f4128 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/UriWithLabelElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/UriWithLabelElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms;
+package eu.etaxonomy.taxeditor.ui.forms;
 
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/IOpenUrlEnabled.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/IOpenUrlEnabled.java
similarity index 92%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/IOpenUrlEnabled.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/IOpenUrlEnabled.java
index 2a219e17c8567e3555c2d51402ded92d05ad34d8..4798c8e143aaed58b47f762890c1bc9032a9b8e8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/IOpenUrlEnabled.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/IOpenUrlEnabled.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.openurl;
+package eu.etaxonomy.taxeditor.ui.openurl;
 
 import java.net.URI;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlContentProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlContentProvider.java
similarity index 87%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlContentProvider.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlContentProvider.java
index 46c99cf80ead9f37105279c4a029e5f8b6d159f6..e7d5034ed68b6f9efaf67172706d79864a2c7cfa 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlContentProvider.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlContentProvider.java
@@ -8,15 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.openurl;
+package eu.etaxonomy.taxeditor.ui.openurl;
 
 import java.util.List;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
-import eu.etaxonomy.cdm.ext.openurl.OpenUrlReference;
-
 /**
  * @author n.hoffmann
  * @created Jan 31, 2011
@@ -29,7 +27,6 @@ public class OpenUrlContentProvider implements IStructuredContentProvider {
         */
        @Override
        public void dispose() {
-               // TODO Auto-generated method stub
 
        }
 
@@ -38,7 +35,6 @@ public class OpenUrlContentProvider implements IStructuredContentProvider {
         */
        @Override
        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-               // TODO Auto-generated method stub
 
        }
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlLabelProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlLabelProvider.java
similarity index 92%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlLabelProvider.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlLabelProvider.java
index af539e66af5c4987a2575662a449d844206ac95c..25942965a904f3dc96c144cf099c10f4bb225a47 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlLabelProvider.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlLabelProvider.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.openurl;
+package eu.etaxonomy.taxeditor.ui.openurl;
 
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlReferencePage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlReferencePage.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlReferencePage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlReferencePage.java
index 1e5be3f01b0b11d04e0a3dfb587434d182222701..127472a97219128a504b7adb31fe2334e1f2c734 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlReferencePage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlReferencePage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.openurl;
+package eu.etaxonomy.taxeditor.ui.openurl;
 
 import java.net.URI;
 import java.util.List;
@@ -26,10 +26,10 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 
 import eu.etaxonomy.cdm.ext.openurl.OpenUrlReference;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ImageElement;
-import eu.etaxonomy.taxeditor.forms.RootElement;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ImageElement;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
 
 /**
  * @author n.hoffmann
@@ -126,7 +126,7 @@ public class OpenUrlReferencePage extends WizardPage implements SelectionListene
                try {
                        getWizard().getContainer().run(true, false, runnable);
                } catch (Exception e) {
-                       EditorUtil.errorDialog("Could not load image", getClass(), e.getMessage()  + ": " + imageUri , e);
+                       StoreUtil.errorDialog("Could not load image", getClass(), e.getMessage()  + ": " + imageUri , e);
                }
        }
 
@@ -163,7 +163,7 @@ public class OpenUrlReferencePage extends WizardPage implements SelectionListene
                } catch (IllegalArgumentException e) {
                        setErrorMessage(String.format("Could not page: %s", e.getLocalizedMessage()));
                } catch (Exception e) {
-                       EditorUtil.error(getClass(), e);
+                       StoreUtil.error(getClass(), e);
                }
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlResultPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlResultPage.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlResultPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlResultPage.java
index 69fe0a4f3c2d950cc7828eba533b48dc335841e3..4b2629f89589dad6faa76e19df9f17a127c43120 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlResultPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlResultPage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.openurl;
+package eu.etaxonomy.taxeditor.ui.openurl;
 
 import java.util.List;
 
@@ -65,8 +65,8 @@ public class OpenUrlResultPage extends WizardPage {
                List<OpenUrlReference> results = getWizard().getResult();
                
                if(results == null || results.isEmpty()){
-                       String nomenclaturalCitation = getWizard().getReference().getNomenclaturalCitation(getWizard().getReferenceDetail());
-                       setMessage("No results for the given reference: " + nomenclaturalCitation, WizardPage.WARNING);
+                       String nomenclatuaralCitation = getWizard().getReference().getNomenclaturalCitation(getWizard().getReferenceDetail());
+                       setMessage("No results for the given reference: " + nomenclatuaralCitation, WizardPage.WARNING);
                }
                viewer.setInput(results);
                

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorElement.java
index 0a1ece659dc49d3f32ba01b40a110a34e245318b..970c1f3183066d8181aaf15a49843d35876c586f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.openurl;
+package eu.etaxonomy.taxeditor.ui.openurl;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.wizard.WizardDialog;
@@ -17,12 +17,13 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.editors.text.EditorsUI;
 
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * @author n.hoffmann
@@ -67,12 +68,13 @@ public class OpenUrlSelectorElement extends AbstractCdmFormElement implements Se
        @Override
        public void widgetSelected(SelectionEvent e) {
                if(openUrlEnabled.getReference() == null){
-                       EditorUtil.warningDialog("No reference", getClass(), "The given reference is empty");
+                       StoreUtil.warningDialog("No reference", getClass(), "The given reference is empty");
                        return;
                }
+               
                OpenUrlSelectorWizard wizard = new OpenUrlSelectorWizard(openUrlEnabled.getReference(), openUrlEnabled.getDetail());
                
-               WizardDialog dialog = new WizardDialog(EditorUtil.getShell(), wizard);
+               WizardDialog dialog = new WizardDialog(getLayoutComposite().getShell(), wizard);
                
                if(dialog.open() == IStatus.OK){
                        openUrlEnabled.setOpenUrl(wizard.getOpenUrlReference().getUri());

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
similarity index 97%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
index d40df1ce60dfcad5f5813dd63ea2fec963038dd3..dacd714b58b8ee4585ddc3453b98e296d3d29dd0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/openurl/OpenUrlSelectorWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorWizard.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.openurl;
+package eu.etaxonomy.taxeditor.ui.openurl;
 
 import java.net.URI;
 import java.util.List;
@@ -21,9 +21,9 @@ import eu.etaxonomy.cdm.ext.openurl.MobotOpenUrlServiceWrapper;
 import eu.etaxonomy.cdm.ext.openurl.MobotOpenUrlServiceWrapper.ReferenceType;
 import eu.etaxonomy.cdm.ext.openurl.OpenUrlReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 
 /**
  * @author n.hoffmann
@@ -36,15 +36,14 @@ public class OpenUrlSelectorWizard extends Wizard {
 
        private MobotOpenUrlQuery query;
        
-       private Reference reference;
-
-
        private OpenUrlReference openUrlReference;
        
        private CdmFormFactory formFactory;
 
        private URI openUrlReferenceImageUri;
-
+       
+       private Reference reference;
+       
        private String referenceDetail;
        
        
@@ -55,8 +54,9 @@ public class OpenUrlSelectorWizard extends Wizard {
         */
        public OpenUrlSelectorWizard(Reference reference, String referenceDetail) {
                if(reference == null){
-                       throw new IllegalArgumentException("Reference may not be empty.");
+                       throw new IllegalArgumentException("Reference may not be empty");
                }
+               
                this.reference = reference;
                this.referenceDetail = referenceDetail;
                
@@ -75,7 +75,6 @@ public class OpenUrlSelectorWizard extends Wizard {
                        query.authorName = reference.getAuthorTeam().getTitleCache();
                }
                query.abbreviation = reference.getTitle();
-               
                if(reference.getInReference() != null){
                        query.journalTitle = reference.getInReference().getTitle();
                }
@@ -154,8 +153,7 @@ public class OpenUrlSelectorWizard extends Wizard {
        public URI getOpenUrlReferenceImageUri() {
                return openUrlReferenceImageUri;
        }
-       
-       
+
        public Reference getReference() {
                return reference;
        }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractCdmDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractCdmDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
index 039a9ef76dd07bf0e651623677d55b54e63e3c4f..252402155bf2fd98a7a72e9f95b64daa3195e2f7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractCdmDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section;
+package eu.etaxonomy.taxeditor.ui.section;
 
 import java.util.Collection;
 
@@ -19,14 +19,14 @@ import org.eclipse.swt.widgets.Composite;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEnableableFormElement;
-import eu.etaxonomy.taxeditor.forms.IEntityElement;
-import eu.etaxonomy.taxeditor.forms.ISelectable;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEntityElement;
+import eu.etaxonomy.taxeditor.ui.forms.ISelectable;
 
 /**
  * <p>Abstract AbstractCdmDetailElement class.</p>
@@ -47,8 +47,8 @@ public abstract class AbstractCdmDetailElement<T> extends
        /**
         * <p>Constructor for AbstractCdmDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param <T> a T object.
         */
        public AbstractCdmDetailElement(CdmFormFactory formFactory,
@@ -103,7 +103,7 @@ public abstract class AbstractCdmDetailElement<T> extends
        /**
         * Sets all field to the given enablement state except the objects in collection except
         *
-        * @see eu.etaxonomy.taxeditor.forms.IEnableableFormElement#setEnabled(boolean)
+        * @see eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement#setEnabled(boolean)
         * @param enabled a boolean.
         * @param except a {@link java.util.Collection} object.
         */
@@ -156,7 +156,7 @@ public abstract class AbstractCdmDetailElement<T> extends
        /**
         * Create all content elements
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a T object.
         * @param style a int.
         */
@@ -199,11 +199,11 @@ public abstract class AbstractCdmDetailElement<T> extends
        /**
         * <p>handleException</p>
         *
-        * @param event a {@link eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent} object.
+        * @param event a {@link eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent} object.
         */
        public void handleException(CdmPropertyChangeEvent event){
                //override this in subclasses if you want to deal with the error
-               EditorUtil.error(event.getSource().getClass(), event.getException());
+               StoreUtil.error(event.getSource().getClass(), event.getException());
        }
 
        /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractCdmDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractCdmDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
index 82cb3e6f620ca5911dcee974329febe33b0d0824..15fcf7e6b654bc738c70efc155a7184cfe31af65 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractCdmDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section;
+package eu.etaxonomy.taxeditor.ui.section;
 
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -22,12 +22,12 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEnableableFormElement;
-import eu.etaxonomy.taxeditor.forms.ISelectableElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.ISelectableElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
 
 /**
  * <p>Abstract AbstractCdmDetailSection class.</p>
@@ -43,9 +43,9 @@ public abstract class AbstractCdmDetailSection<ENTITY> extends AbstractFormSecti
        /**
         * <p>Constructor for AbstractCdmDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         * @param <ENTITY> a ENTITY object.
@@ -65,7 +65,7 @@ public abstract class AbstractCdmDetailSection<ENTITY> extends AbstractFormSecti
        /**
         * <p>createControls</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection} object.
         * @param style a int.
         */
        protected void createControls(AbstractCdmDetailSection<ENTITY> formElement, int style) {
@@ -80,7 +80,7 @@ public abstract class AbstractCdmDetailSection<ENTITY> extends AbstractFormSecti
        /**
         * <p>getDetailType</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType} object.
         */
        protected abstract DetailType getDetailType();
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractEntityCollectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
similarity index 90%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractEntityCollectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
index c78140b1a1addf14d4a4d4201ebe7d9b239948e5..c77ee1ccb071f293e29ae1cdd3d8f8a794f6b17c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractEntityCollectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section;
+package eu.etaxonomy.taxeditor.ui.section;
 
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
@@ -23,13 +23,13 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEntityElement;
-import eu.etaxonomy.taxeditor.forms.ISelectable;
 import eu.etaxonomy.taxeditor.model.ImageResources;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEntityElement;
+import eu.etaxonomy.taxeditor.ui.forms.ISelectable;
 
 /**
  * <p>Abstract AbstractEntityCollectionElement class.</p>
@@ -53,10 +53,9 @@ public abstract class AbstractEntityCollectionElement<ENTITY> extends AbstractCd
        /**
         * <p>Constructor for AbstractEntityCollectionElement.</p>
         *
-        * @param backgroundColor TODO
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a ENTITY object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param <ENTITY> a ENTITY object.
@@ -141,7 +140,7 @@ public abstract class AbstractEntityCollectionElement<ENTITY> extends AbstractCd
        /**
         * <p>createControls</p>
         *
-        * @param element a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param element a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public abstract void createControls(ICdmFormElement element, int style);

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractEntityCollectionSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
similarity index 94%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractEntityCollectionSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
index bd0c2f83da1393bdff41063e94228fbf1da2c5b6..a198c8433eb8fd4433ac945061d3548146635e9d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/AbstractEntityCollectionSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section;
+package eu.etaxonomy.taxeditor.ui.section;
 
 import java.util.Collection;
 
@@ -25,15 +25,15 @@ import org.eclipse.ui.forms.widgets.Section;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.IVersionableEntity;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>Abstract AbstractEntityCollectionSection class.</p>
@@ -52,10 +52,10 @@ public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT extends IV
        /**
         * <p>Constructor for AbstractEntityCollectionSection.</p>
         *
-        * @param conversation TODO
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param conversation 
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param title a {@link java.lang.String} object.
         * @param <ENTITY> a ENTITY object.
         * @param <ELEMENT> a ELEMENT object.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/EmptyElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/EmptyElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/EmptyElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/EmptyElement.java
index ae659fd0d2d5468297b33b56ed00ef6a53e17c14..d010c9a4122114cb92fb5a724f4170d7d15a65c6 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/EmptyElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/EmptyElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section;
+package eu.etaxonomy.taxeditor.ui.section;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
@@ -16,10 +16,10 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Label;
 
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEntityElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEntityElement;
 
 /**
  * <p>EmptyElement class.</p>
@@ -37,8 +37,8 @@ public class EmptyElement extends AbstractCdmFormElement implements IEntityEleme
         * <p>Constructor for EmptyElement.</p>
         *
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.common.VersionableEntity} object.
         */
        public EmptyElement(CdmFormFactory toolkit, ICdmFormElement parentElement, VersionableEntity entity, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/ITaxonBaseDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ITaxonBaseDetailSection.java
similarity index 90%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/ITaxonBaseDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ITaxonBaseDetailSection.java
index 10e8e1106103a6d0950fa9d5f0f6ca7f803ac332..f8436d5bf2ec541cda5f69fe836b741f7d84eb3e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/ITaxonBaseDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ITaxonBaseDetailSection.java
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.section;
+package eu.etaxonomy.taxeditor.ui.section;
 
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailElement.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailElement.java
index 4708be6e3665e79581ff73ac6501fe0d52a42232..fae99becf51b2329fbe52a2470b16ccf12362c6d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import eu.etaxonomy.cdm.model.agent.Institution;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.InstitutionSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.InstitutionSelectionElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailSection.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailSection.java
index 651e16716c8397529b6a2945d320f4ccdc31f4da..9003785e0f501680ce75fd60330206bf081e4cdd 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionDetailSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Institution;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionWizardPage.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionWizardPage.java
index 2dd48c7598bc0889a04eb295b2306eadcc0e01f9..4b6a3058d4e5a89ee27a8e9d9e474a3830642535 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/InstitutionWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/InstitutionWizardPage.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Institution;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java
index 799054c8a1ea2e703e28866cde7ed03d93791817..be41973f1577f7e4a8228d035fbb706798bda190 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -17,11 +17,11 @@ import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>PersonDetailElement class.</p>
@@ -48,8 +48,8 @@ public class PersonDetailElement extends AbstractCdmDetailElement<Person> {
        /**
         * <p>Constructor for PersonDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public PersonDetailElement(CdmFormFactory cdmFormFactory, ICdmFormElement formElement,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java
index be225b3cfa9b62a466bf9669519455efc95b7bda..e3645e6482bdd3bc281414f63c9a9d60afd5e11e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailSection.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>PersonDetailSection class.</p>
@@ -35,9 +35,9 @@ public class PersonDetailSection extends AbstractCdmDetailSection<Person>{
        /**
         * <p>Constructor for PersonDetailSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java
index b42e879b4cca3d9227821b4791ab6f42668d2020..f773806c431b448e2c5b9f143030689ab9c0f43d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/PersonWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonWizardPage.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>PersonWizardPage class.</p>
@@ -36,7 +36,7 @@ public class PersonWizardPage extends AbstractCdmEntityWizardPage<Person> {
        /**
         * <p>Constructor for PersonWizardPage.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.agent.Person} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java
index b17f321f341f37b82b9ad4c8a68658f3e20be9d7..2a5a774f9bdc253f84bef6834bed820aba9b9428 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import java.util.Arrays;
 
 import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>TeamDetailElement class.</p>
@@ -39,8 +39,8 @@ public class TeamDetailElement extends AbstractCdmDetailElement<Team> {
        /**
         * <p>Constructor for TeamDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public TeamDetailElement(CdmFormFactory cdmFormFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailSection.java
similarity index 73%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailSection.java
index 5c2a2b7a321503f9bb0b3b625574d088fc297ae3..6cf73bc46d086ff193d0713ce4b825a21753071c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>TeamDetailSection class.</p>
@@ -31,9 +31,9 @@ public class TeamDetailSection extends AbstractCdmDetailSection<Team>{
        /**
         * <p>Constructor for TeamDetailSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamMemberElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamMemberElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java
index 0c4d90200201618be54248e956839e7140c3caca..6d189964cc68bcc8cbcca89e913920b326fc34b8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamMemberElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberElement.java
@@ -8,21 +8,20 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.selection.PersonSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
-import eu.etaxonomy.taxeditor.section.BulkEditorOpeningSelectionListener;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.PersonSelectionElement;
 
 /**
  * <p>TeamMemberElement class.</p>
@@ -40,8 +39,8 @@ public class TeamMemberElement extends AbstractEntityCollectionElement<Person> {
        /**
         * <p>Constructor for TeamMemberElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.agent.Person} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamMemberSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberSection.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamMemberSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberSection.java
index daa1f26903377e9ac48fe02c4de205cdd694ba3c..3a73774cd2f715f664f7e36b4756cba3ee5b2973 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamMemberSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>TeamMemberSection class.</p>
@@ -31,9 +31,9 @@ public class TeamMemberSection extends AbstractEntityCollectionSection<Team, Per
        /**
         * <p>Constructor for TeamMemberSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public TeamMemberSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamOrPersonBaseDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamOrPersonBaseDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java
index fd1bb80875b623aea7d8f54e590b01ed5e2413f4..28944f7bca8d78810e5db9bd7f3fa1f070bb7f2d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamOrPersonBaseDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -17,10 +17,10 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>TeamOrPersonBaseDetailSection class.</p>
@@ -37,9 +37,9 @@ public class TeamOrPersonBaseDetailSection extends AbstractCdmDetailSection<Team
        /**
         * <p>Constructor for TeamOrPersonBaseDetailSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamWizardPage.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamWizardPage.java
index 02229a81271935d5c504e626d04609aa1edc2abe..584cc099b2de232e45fdb477a8af5f29659ddc38 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/agent/TeamWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamWizardPage.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.agent;
+package eu.etaxonomy.taxeditor.ui.section.agent;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>TeamWizardPage class.</p>
@@ -35,7 +35,7 @@ public class TeamWizardPage extends AbstractCdmEntityWizardPage<Team> {
        /**
         * <p>Constructor for TeamWizardPage.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.agent.Team} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java
index 46fc3dd4737e280512aa977988e60fe84d3a4637..b214143f279c5eae7e7f19f670db399d5f5ed4d4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java
@@ -8,20 +8,20 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.classification;
+package eu.etaxonomy.taxeditor.ui.section.classification;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.ReferenceSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
 
 /**
  * <p>ClassificationDetailElement class.</p>
@@ -45,8 +45,8 @@ public class ClassificationDetailElement extends AbstractCdmDetailElement<Classi
        /**
         * <p>Constructor for ClassificationDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public ClassificationDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailSection.java
similarity index 70%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailSection.java
index 1110072df066262ba1254e35539b2cf75cbd2a82..aaa45514c9c18d7e9c71bd72565b8e3b9f353108 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailSection.java
@@ -8,17 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.classification;
+package eu.etaxonomy.taxeditor.ui.section.classification;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>ClassificationDetailSection class.</p>
@@ -29,16 +28,12 @@ import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
  */
 public class ClassificationDetailSection extends AbstractCdmDetailSection<Classification> {
        
-
-       private static final Logger logger = Logger
-                       .getLogger(ClassificationDetailSection.class);
-
        /**
         * <p>Constructor for ClassificationDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */
@@ -46,7 +41,6 @@ public class ClassificationDetailSection extends AbstractCdmDetailSection<Classi
                        ConversationHolder conversation, ICdmFormElement parentElement,
                        ISelectionProvider selectionProvider, int style) {
                super(formFactory, conversation, parentElement, selectionProvider, style);
-               // TODO Auto-generated constructor stub
        }
        
        /* (non-Javadoc)
@@ -55,7 +49,6 @@ public class ClassificationDetailSection extends AbstractCdmDetailSection<Classi
        /** {@inheritDoc} */
        @Override
        public void setEnabled(boolean enabled) {
-               // TODO Auto-generated method stub
 
        }
 
@@ -65,7 +58,6 @@ public class ClassificationDetailSection extends AbstractCdmDetailSection<Classi
        /** {@inheritDoc} */
        @Override
        protected DetailType getDetailType() {
-               // TODO Auto-generated method stub
                return null;
        }
 
@@ -75,7 +67,6 @@ public class ClassificationDetailSection extends AbstractCdmDetailSection<Classi
        /** {@inheritDoc} */
        @Override
        public String getHeading() {
-               // TODO Auto-generated method stub
                return null;
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationWizardPage.java
similarity index 68%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationWizardPage.java
index afa8d7c855634fa8c11709a2979399e8b9cc59eb..1982f872f9980cc190ec4b9910de99df539ccc0d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/ClassificationWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationWizardPage.java
@@ -8,18 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.classification;
+package eu.etaxonomy.taxeditor.ui.section.classification;
 
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>ClassificationWizardPage class.</p>
@@ -29,13 +28,11 @@ import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
  * @version 1.0
  */
 public class ClassificationWizardPage extends AbstractCdmEntityWizardPage<Classification>{
-       private static final Logger logger = Logger
-                       .getLogger(ClassificationWizardPage.class);
        
        /**
         * <p>Constructor for ClassificationWizardPage.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.taxon.TaxonomicTree} object.
         */
@@ -55,13 +52,4 @@ public class ClassificationWizardPage extends AbstractCdmEntityWizardPage<Classi
                
                return detailElement;
        }
-
-       /**
-        * <p>getClassification</p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonomicTree} object.
-        */
-       public Classification getClassification() {
-               return getDetailElement().getEntity();
-       }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
similarity index 70%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index 0f94eeb863a2f96c02c9d31c4a40c40219b27178..cd673aa0cb8208764013ec7b39cbe81507959174 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -8,26 +8,28 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.classification;
+package eu.etaxonomy.taxeditor.ui.section.classification;
 
+import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.ITreeNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.ClassificationSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonBaseSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonNodeSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonSelectionElement;
 import eu.etaxonomy.taxeditor.parser.ParseHandler;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.ClassificationSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonNodeSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 
 /**
  * <p>TaxonNodeDetailElement class.</p>
@@ -57,12 +59,14 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
        private boolean openInEditor;
        
        private boolean complete;
+
+       private NameSelectionElement selection_reuseExistingName;
        
        /**
         * <p>Constructor for TaxonNodeDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public TaxonNodeDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {
@@ -80,6 +84,8 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
                selection_parentTaxonNode = (TaxonNodeSelectionElement) formFactory.createSelectionElement(SelectionType.TAXON_NODE, getConversationHolder(), formElement, "Parent", null, style);
                selection_reuseExistingTaxon = (TaxonSelectionElement) formFactory.createSelectionElement(SelectionType.TAXON, getConversationHolder(), formElement, "Reuse existing Taxon", null, style);
                
+               selection_reuseExistingName = (NameSelectionElement) formFactory.createSelectionElement(SelectionType.NAME, getConversationHolder(), formElement, "Reuse existgin name", null, style);
+               
                text_newTaxonName = formFactory.createTextWithLabelElement(formElement, "New Taxon", "", style);
 
                checkbox_openInEditor = formFactory.createCheckbox(formElement, "Open in Editor", true, style);
@@ -101,9 +107,24 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
                        setParentTreeNode(selection_parentTaxonNode.getEntity());
                }
                else if(eventSource == selection_reuseExistingTaxon){
+                       boolean enabled = selection_reuseExistingTaxon.getEntity() == null;
+                       selection_reuseExistingName.setEnabled(enabled);
+                       text_newTaxonName.setEnabled(enabled);
+                       
                        setTaxon((Taxon) selection_reuseExistingTaxon.getEntity());
                }
+               else if(eventSource == selection_reuseExistingName){
+                       boolean enabled = selection_reuseExistingName.getEntity() == null;
+                       selection_reuseExistingTaxon.setEnabled(enabled);
+                       text_newTaxonName.setEnabled(enabled);
+                       
+                       setTaxon(selection_reuseExistingName.getEntity());
+               }
                else if(eventSource == text_newTaxonName){
+                       boolean enabled = CdmUtils.isEmpty(text_newTaxonName.getText());
+                       selection_reuseExistingTaxon.setEnabled(enabled);
+                       selection_reuseExistingName.setEnabled(enabled);
+                                               
                        setTaxon(text_newTaxonName.getText());
                }
                else if(eventSource == checkbox_openInEditor){
@@ -165,10 +186,12 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
                this.parentTreeNode = parentTreeNode;
 
                if(parentTreeNode instanceof Classification){
+                       classification = (Classification) parentTreeNode;
+                       selection_classification.setEntity(classification);
                        selection_parentTaxonNode.setEntity(null);
                }
                else if(parentTreeNode instanceof TaxonNode){
-                       classification = ((TaxonNode) parentTreeNode).getClassification();
+                       classification = (Classification) HibernateProxyHelper.deproxy(((TaxonNode) parentTreeNode).getClassification());
                        selection_classification.setEntity(classification);
                        selection_parentTaxonNode.setEntity((TaxonNode) parentTreeNode);
                }               
@@ -182,10 +205,14 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
        }
        
        private void setTaxon(String taxonNameString){
-               TaxonNameBase taxonName = ParseHandler.quickParse(taxonNameString);
+               TaxonNameBase taxonName = ParseHandler.parseReferencedName(taxonNameString, null);
+               setTaxon(taxonName);
+       }
+       
+       private void setTaxon(TaxonNameBase taxonName){
                Reference secundum = null;
                if(getParentTreeNode() != null){
-                       if(getParentElement() instanceof Classification){
+                       if(getParentTreeNode() instanceof Classification){
                                secundum = ((Classification) getParentTreeNode()).getReference();
                        }
                        else if(getParentTreeNode() instanceof TaxonNode){

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java
similarity index 68%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java
index eb84be80daf11623186d4cc12c5292a17d20e4e0..4489c373a0546504fbaafb779a914bd475b1feff 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/classification/TaxonNodeDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailSection.java
@@ -8,17 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.classification;
+package eu.etaxonomy.taxeditor.ui.section.classification;
 
-import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>TaxonNodeDetailSection class.</p>
@@ -29,26 +28,21 @@ import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
  */
 public class TaxonNodeDetailSection extends AbstractCdmDetailSection<TaxonNode> {
        
-
-       private static final Logger logger = Logger
-                       .getLogger(TaxonNodeDetailSection.class);
-
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getDetailType()
         */
        /** {@inheritDoc} */
        @Override
        protected DetailType getDetailType() {
-               // TODO Auto-generated method stub
                return null;
        }
        
        /**
         * <p>Constructor for TaxonNodeDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */
@@ -56,7 +50,6 @@ public class TaxonNodeDetailSection extends AbstractCdmDetailSection<TaxonNode>
                        ConversationHolder conversation, ICdmFormElement parentElement,
                        ISelectionProvider selectionProvider, int style) {
                super(formFactory, conversation, parentElement, selectionProvider, style);
-               // TODO Auto-generated constructor stub
        }
 
        /* (non-Javadoc)
@@ -65,7 +58,6 @@ public class TaxonNodeDetailSection extends AbstractCdmDetailSection<TaxonNode>
        /** {@inheritDoc} */
        @Override
        public String getHeading() {
-               // TODO Auto-generated method stub
                return null;
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
new file mode 100644 (file)
index 0000000..f33b201
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
@@ -0,0 +1,121 @@
+// $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.ui.section.classification;
+
+
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.swt.SWT;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.taxon.ITreeNode;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+
+/**
+ * <p>TaxonNodeWizardPage class.</p>
+ *
+ * @author n.hoffmann
+ * @created Sep 15, 2009
+ * @version 1.0
+ */
+public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITreeNode> implements IPropertyChangeListener{
+
+       /**
+        * <p>Constructor for TaxonNodeWizardPage.</p>
+        *
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+        * @param entity a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+        */
+       public TaxonNodeWizardPage(CdmFormFactory formFactory,
+                       ConversationHolder conversation, ITreeNode entity) {
+               super(formFactory, conversation, entity);
+               setTitle("Create a new Taxon");
+       }
+
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement)
+        */
+       /** {@inheritDoc} */
+       @Override
+       public TaxonNodeDetailElement createElement(ICdmFormElement rootElement) {
+       
+               TaxonNodeDetailElement detailElement = (TaxonNodeDetailElement) formFactory.createCdmDetailElement(DetailType.TAXON_NODE, rootElement, SWT.NULL);
+               detailElement.setEntity(entity);
+               formFactory.addPropertyChangeListener(this);
+               return detailElement;
+       }
+
+       /**
+        * <p>openInEditor</p>
+        *
+        * @return a boolean.
+        */
+       public boolean openInEditor(){
+               return ((TaxonNodeDetailElement) getDetailElement()).isOpenInEditor();
+       }       
+       
+
+       /* (non-Javadoc)
+        * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
+        */
+       /** {@inheritDoc} */
+       @Override
+       public void propertyChange(PropertyChangeEvent event) {
+               if(event.getSource() == getDetailElement()){
+                       setPageComplete(checkComplete());
+               }
+       }
+
+       /**
+        * 
+        */
+       private boolean checkComplete() {
+               TaxonNodeDetailElement detailElement = (TaxonNodeDetailElement) getDetailElement();
+               
+               if(detailElement.getClassification() == null){
+                       setMessage("No classification", WARNING);
+               }else{
+                       setMessage(null);
+                       return true;
+               }
+               
+               return false;
+       }
+       
+       /**
+        * <p>Getter for the field <code>parentTreeNode</code>.</p>
+        *
+        * @return a {@link eu.etaxonomy.cdm.model.taxon.ITreeNode} object.
+        */
+       public ITreeNode getParentTreeNode() {
+               return ((TaxonNodeDetailElement) getDetailElement()).getParentTreeNode();
+       }
+       
+       public Taxon getTaxon(){
+               return ((TaxonNodeDetailElement) getDetailElement()).getTaxon();
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#dispose()
+        */
+       /** {@inheritDoc} */
+       @Override
+       public void dispose() {
+               formFactory.removePropertyChangeListener(this);
+               super.dispose();
+       }
+}

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DerivedUnitElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java
similarity index 70%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DerivedUnitElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java
index c0cb1bd14b7c9e2b37a059dae0ecc274f53ff78d..0a975bae52930e1dcbc1660ee2a81d4b0c730714 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DerivedUnitElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DerivedUnitElement.java
@@ -8,18 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.selection.AbstractSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
 
 /**
  * <p>DerivedUnitElement class.</p>
@@ -30,16 +29,13 @@ import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
  */
 public class DerivedUnitElement extends AbstractEntityCollectionElement<SpecimenOrObservationBase> {
        
-
-       private static final Logger logger = Logger
-                       .getLogger(DerivedUnitElement.class);
        private AbstractSelectionElement selection_derivedUnit;
 
        /**
         * <p>Constructor for DerivedUnitElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
@@ -65,14 +61,12 @@ public class DerivedUnitElement extends AbstractEntityCollectionElement<Specimen
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
-               // TODO Auto-generated method stub
 
        }
 
        /** {@inheritDoc} */
        @Override
        public void setEntity(SpecimenOrObservationBase entity) {
-               // TODO Auto-generated method stub
                
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescribedSpecimenSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescribedSpecimenSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
index da88df0f533ac38ceeb6c4c27eee0d693d991dbe..ca19c9f3f046081ec666db5c6a273ccda36d931f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescribedSpecimenSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.Collection;
 
@@ -16,9 +16,9 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>DescribedSpecimenSection class.</p>
@@ -32,9 +32,9 @@ public class DescribedSpecimenSection extends AbstractEntityCollectionSection<Ta
        /**
         * <p>Constructor for DescribedSpecimenSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public DescribedSpecimenSection(CdmFormFactory formFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java
similarity index 74%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java
index 5cfabc1f4941f697f107ec48ee0d10864e2abed0..a4b948615669e059bc9a282fb8e07903d592d4a6 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailElement.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.FeatureTreeSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.FeatureTreeSelectionElement;
 
 /**
  * <p>DescriptionDetailElement class.</p>
@@ -36,8 +36,8 @@ public class DescriptionDetailElement extends AbstractCdmDetailElement<Descripti
        /**
         * <p>Constructor for DescriptionDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public DescriptionDetailElement(CdmFormFactory cdmFormFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailSection.java
similarity index 76%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailSection.java
index 4e9040e3ec03ae9a306ed91f66c2c8d313f5e0cc..75730c99658c63b8e0cfa74a3dc580e993d996ac 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionDetailSection.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>DescriptionDetailSection class.</p>
@@ -35,9 +35,9 @@ public class DescriptionDetailSection extends AbstractCdmDetailSection<Descripti
        /**
         * <p>Constructor for DescriptionDetailSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailElement.java
similarity index 72%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailElement.java
index 371216bef150378c935af6942b0afc05405eaed8..859eb72c2505f149c68f7f874e717b9b1916288f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.section.description.detail.AbstractDetailedDescriptionDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.detail.AbstractDetailedDescriptionDetailElement;
 
 /**
  * <p>DescriptionElementDetailElement class.</p>
@@ -36,8 +36,8 @@ public class DescriptionElementDetailElement extends
        /**
         * <p>Constructor for DescriptionElementDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public DescriptionElementDetailElement(CdmFormFactory cdmFormFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java
index 8568473d3f5b8b112ad3df95fbcb390abfdd5ca7..463a5dc18dba282a357513ad5ce4f30be46291e9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
@@ -19,13 +19,13 @@ import org.eclipse.swt.widgets.Control;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.TextData;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.ChangeDescriptionElementType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.description.operation.ChangeDescriptionElementType;
 
 /**
  * <p>DescriptionElementDetailSection class.</p>
@@ -40,9 +40,9 @@ public class DescriptionElementDetailSection extends
        /**
         * <p>Constructor for DescriptionElementDetailSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */
@@ -69,12 +69,13 @@ public class DescriptionElementDetailSection extends
                         */
                        @Override
                        public void run() {
-                               boolean confirmed = EditorUtil.confirmDialog("Confirmation", "Do you really want to change to "
+                               boolean confirmed = StoreUtil.confirmDialog("Confirmation", "Do you really want to change to "
                                                + destinationString + "? Current data will be lost.");
                                if (confirmed) {
+                                       // FIXME
                                        ChangeDescriptionElementType operation = new ChangeDescriptionElementType(label, 
-                                                       getEntity(), EditorUtil.getDetailsView(), EditorUtil.getActiveMultiPageTaxonEditor().getUndoContext());
-                                       EditorUtil.executeOperation(operation);
+                                                       getEntity(), StoreUtil.getDetailsView(), StoreUtil.getUndoContext());
+                                       StoreUtil.executeOperation(operation);
                                }
                        }
                };

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementMediaSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementMediaSection.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementMediaSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementMediaSection.java
index 9c64eb7acbd50a7f020e58429563a6bd8081bf98..a5ec37f961c58c74e7fc9cb263f7404c025205e5 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementMediaSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementMediaSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.Collection;
 
@@ -18,9 +18,9 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>DescriptionElementMediaSection class.</p>
@@ -37,9 +37,9 @@ public class DescriptionElementMediaSection extends
        /**
         * <p>Constructor for DescriptionElementMediaSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public DescriptionElementMediaSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementSourceElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementSourceElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java
index e8e6187e85ea5ad235116c5f3043739ed92c152a..2607c196baa8a963d2929c509d5ee4782889b046 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementSourceElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceElement.java
@@ -8,22 +8,20 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
-import org.apache.log4j.Logger;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEntityElement;
-import eu.etaxonomy.taxeditor.forms.SelectionArbitrator;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.selection.NameSelectionElement;
-import eu.etaxonomy.taxeditor.section.supplemental.AbstractOriginalSourceElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEntityElement;
+import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractOriginalSourceElement;
+import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
 
 /**
  * <p>DescriptionElementSourceElement class.</p>
@@ -35,10 +33,6 @@ import eu.etaxonomy.taxeditor.section.supplemental.AbstractOriginalSourceElement
  */
 public class DescriptionElementSourceElement extends AbstractOriginalSourceElement<DescriptionElementSource> implements IEntityElement<DescriptionElementSource>{
        
-       private static final Logger logger = Logger
-       .getLogger(DescriptionElementSourceElement.class);
-
-       
        private SelectionArbitrator selectionArbitrator;
 
        private NameSelectionElement selection_name;
@@ -47,11 +41,11 @@ public class DescriptionElementSourceElement extends AbstractOriginalSourceEleme
        /**
         * <p>Constructor for DescriptionElementSourceElement.</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.common.DescriptionElementSource} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         */
        public DescriptionElementSourceElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement,
                        DescriptionElementSource element, SelectionListener removeListener, int style) {
@@ -89,7 +83,6 @@ public class DescriptionElementSourceElement extends AbstractOriginalSourceEleme
 
        /** {@inheritDoc} */
        public void setSelected(boolean selected) {
-               // TODO Auto-generated method stub
                
        }
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementSourceSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementSourceSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java
index f65074e7c7fc6de26f00d84a3b0a671086e90bfa..1bd4128fbc328c9202e0a2d48e2a47364f5a207f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionElementSourceSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementSourceSection.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.Collection;
 
@@ -9,9 +9,9 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>DescriptionElementSourceSection class.</p>
@@ -25,9 +25,9 @@ public class DescriptionElementSourceSection extends AbstractEntityCollectionSec
        /**
         * <p>Constructor for DescriptionElementSourceSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        public DescriptionElementSourceSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style){

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionSourceElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceElement.java
similarity index 67%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionSourceElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceElement.java
index a4efaec82b69d5055229ecb55dc67593462d8032..416d0e1a822bf03f31ce990f2f91e5665ffdd884 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionSourceElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceElement.java
@@ -8,18 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.selection.ReferenceSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
 
 /**
  * <p>DescriptionSourceElement class.</p>
@@ -30,16 +29,13 @@ import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
  */
 public class DescriptionSourceElement extends AbstractEntityCollectionElement<Reference> {
 
-
-       private static final Logger logger = Logger
-                       .getLogger(DescriptionSourceElement.class);
        private ReferenceSelectionElement selection_descriptionSource;
 
        /**
         * <p>Constructor for DescriptionSourceElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
@@ -48,7 +44,6 @@ public class DescriptionSourceElement extends AbstractEntityCollectionElement<Re
                        AbstractFormSection formElement, Reference element,
                        SelectionListener removeListener, int style) {
                super(cdmFormFactory, formElement, element, removeListener, null, style);
-               // TODO Auto-generated constructor stub
        }
        
        /** {@inheritDoc} */
@@ -66,7 +61,6 @@ public class DescriptionSourceElement extends AbstractEntityCollectionElement<Re
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
-               // TODO Auto-generated method stub
                
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionSourceSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceSection.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionSourceSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceSection.java
index c5c23f5c98880a084773eb2c9e8de0fac465c6e0..6eab9b730f4f249bac3deb60a0ac198502b4e634 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionSourceSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>DescriptionSourceSection class.</p>
@@ -32,9 +32,9 @@ public class DescriptionSourceSection extends
        /**
         * <p>Constructor for DescriptionSourceSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public DescriptionSourceSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/GeoScopeElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/GeoScopeElement.java
similarity index 67%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/GeoScopeElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/GeoScopeElement.java
index 86fc974bdd78d5d38456d4c3880d59584cf11003..10b2c5a895c47018fe7bd4330d55ea6e7446b2b6 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/GeoScopeElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/GeoScopeElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 
 /**
  * <p>GeoScopeElement class.</p>
@@ -30,8 +30,8 @@ public class GeoScopeElement extends AbstractEntityCollectionElement<NamedArea>
        /**
         * <p>Constructor for GeoScopeElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.location.NamedArea} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
@@ -45,21 +45,17 @@ public class GeoScopeElement extends AbstractEntityCollectionElement<NamedArea>
        /** {@inheritDoc} */
        @Override
        public void setEntity(NamedArea entity) {
-               // TODO Auto-generated method stub
                
        }
 
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               // TODO Auto-generated method stub
                
        }
 
        /** {@inheritDoc} */
        @Override
-       public void handleEvent(Object eventSource) {
-               // TODO Auto-generated method stub
-               
+       public void handleEvent(Object eventSource) {           
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/GeoScopeSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/GeoScopeSection.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/GeoScopeSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/GeoScopeSection.java
index af5a54669f057923c90ffbfdb1153a4b69dc8b43..2522700a1e47b0a4266dfbe132d9bd6cb0e35da8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/GeoScopeSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/GeoScopeSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.Collection;
 
@@ -17,9 +17,9 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>GeoScopeSection class.</p>
@@ -37,9 +37,9 @@ public class GeoScopeSection extends AbstractEntityCollectionSection<TaxonDescri
        /**
         * <p>Constructor for GeoScopeSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public GeoScopeSection(CdmFormFactory formFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/MediaDetailsSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/MediaDetailsSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java
index 04c95b85cd8429c5393ceec23d15338f9195f500..dd04a3bf67646d7c974b14075b71ae8362538227 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/MediaDetailsSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/MediaDetailsSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionProvider;
@@ -17,11 +17,11 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.supplemental.MediaElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MediaElement;
 
 /**
  * <p>MediaDetailsSection class.</p>
@@ -40,9 +40,9 @@ public class MediaDetailsSection extends AbstractCdmDetailSection<Media> {
        /**
         * <p>Constructor for MediaDetailsSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ModifierElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
similarity index 67%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ModifierElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
index 5b4d14c6609559eaee4b8250533f7f0c1043cdf4..acf9ff6211276d965d96bf822ac0a268d318ce9d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ModifierElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierElement.java
@@ -8,18 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.description.Modifier;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.term.ModifierComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.term.ModifierComboElement;
 
 /**
  * <p>ModifierElement class.</p>
@@ -29,17 +28,14 @@ import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
  * @version 1.0
  */
 public class ModifierElement extends AbstractEntityCollectionElement<Modifier> {
-
-       private static final Logger logger = Logger
-                       .getLogger(ModifierElement.class);
        
        private ModifierComboElement combo_modifier;
 
        /**
         * <p>Constructor for ModifierElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.Modifier} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
@@ -66,7 +62,6 @@ public class ModifierElement extends AbstractEntityCollectionElement<Modifier> {
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
-               // TODO Auto-generated method stub
                
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ModifierSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ModifierSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java
index 5893825c7c6e9252d7c75829ce6e90f9f60ea848..4b8053f6cc009973c1ab02abb1ac0b0378bdf088 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ModifierSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ModifierSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.Collection;
 
@@ -17,9 +17,9 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.IModifiable;
 import eu.etaxonomy.cdm.model.description.Modifier;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>ModifierSection class.</p>
@@ -37,9 +37,9 @@ public class ModifierSection extends AbstractEntityCollectionSection<IModifiable
        /**
         * <p>Constructor for ModifierSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public ModifierSection(CdmFormFactory formFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/NaturalLanguageDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageDetailElement.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/NaturalLanguageDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageDetailElement.java
index fd136c06575feefb4d69e6bd14f1372ac56c0fc2..74503dee67ac9b0675670a8871d0e936d03f6062 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/NaturalLanguageDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.List;
 
@@ -23,13 +23,13 @@ import eu.etaxonomy.cdm.api.service.NaturalLanguageGenerator;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.LabelElement;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.LabelElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>NaturalLanguageDetailElement class.</p>
@@ -48,8 +48,8 @@ public class NaturalLanguageDetailElement extends AbstractCdmDetailElement<Taxon
        /**
         * <p>Constructor for NaturalLanguageDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public NaturalLanguageDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {
@@ -118,7 +118,7 @@ public class NaturalLanguageDetailElement extends AbstractCdmDetailElement<Taxon
                                @Override
                                public void run() {
                                        label.setText(aggregatedText);
-                                       EditorUtil.reflowDetailsViewer();
+                                       StoreUtil.reflowDetailsViewer();
                                }
                                
                        });

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/NaturalLanguageSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageSection.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/NaturalLanguageSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageSection.java
index f1ac3eb72170f3c70b3a97798a0a930bffedfec5..d576f5d5de7f721a6509db56ccb76ed2bde072bf 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/NaturalLanguageSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageSection.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>NaturalLanguageSection class.</p>
@@ -36,9 +36,9 @@ public class NaturalLanguageSection extends AbstractCdmDetailSection<TaxonDescri
        /**
         * <p>Constructor for NaturalLanguageSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ScopeElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
similarity index 72%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ScopeElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
index f2c7ceb4dd6caeda09be0c02350c8b7f02e3fb7a..181eb204b25cbe902ab9d8ec6f0541a8434fd0d9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ScopeElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeElement.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.description.Scope;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.term.ScopeComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.term.ScopeComboElement;
 
 /**
  * <p>ScopeElement class.</p>
@@ -36,8 +36,8 @@ public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
        /**
         * <p>Constructor for ScopeElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.description.Scope} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
@@ -64,7 +64,6 @@ public class ScopeElement extends AbstractEntityCollectionElement<Scope> {
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
-               // TODO Auto-generated method stub
                
        }
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ScopeSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ScopeSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
index c44407f0b936b587367ad6e04f853128a171f985..e3dd9c323bd23f24af4a8fa4370237a59141dc9d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/ScopeSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.Collection;
 
@@ -17,9 +17,9 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.Scope;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>ScopeSection class.</p>
@@ -36,9 +36,9 @@ public class ScopeSection extends AbstractEntityCollectionSection<TaxonDescripti
        /**
         * <p>Constructor for ScopeSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public ScopeSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StateDataElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StateDataElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
index fda042d3238c08948ea75b1db5e4dfb31860a632..26cb0719d07c05e380e3d29fe41ea50cd9c294de 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StateDataElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
@@ -17,15 +17,15 @@ import org.eclipse.ui.forms.widgets.Section;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.StateData;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
 
 /**
  * <p>StateDataElement class.</p>
@@ -45,8 +45,8 @@ public class StateDataElement extends AbstractEntityCollectionElement<StateData>
        /**
         * <p>Constructor for StateDataElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.StateData} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StateDataSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StateDataSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
index 4f1536cf3f74d894e62dfb4e1096802ebd878711..db44b0cab1d7166e65e679c12d5fa35f4bb0e40f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StateDataSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.Collection;
 
@@ -17,9 +17,9 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.StateData;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>StateDataSection class.</p>
@@ -37,9 +37,9 @@ public class StateDataSection extends AbstractEntityCollectionSection<Categorica
        /**
         * <p>Constructor for StateDataSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public StateDataSection(CdmFormFactory formFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StatisticalMeasurementValueElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StatisticalMeasurementValueElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
index 8384330b8b85633432093ac29a031a54c9051686..7293090986ee879147b8288089b7344c0fec4752 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StatisticalMeasurementValueElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
@@ -8,21 +8,21 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.term.StatisticalMeasureComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.term.StatisticalMeasureComboElement;
 
 /**
  * <p>StatisticalMeasurementValueElement class.</p>
@@ -44,8 +44,8 @@ public class StatisticalMeasurementValueElement extends
        /**
         * <p>Constructor for StatisticalMeasurementValueElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StatisticalMeasurementValueSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueSection.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StatisticalMeasurementValueSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueSection.java
index 4773b6db34058a432caec4982515af6bd6f3671e..f5628127b7fa7da4efeaf031cd1c3747f705b098 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/StatisticalMeasurementValueSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description;
+package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.Collection;
 
@@ -17,9 +17,9 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.StatisticalMeasurementValue;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>StatisticalMeasurementValueSection class.</p>
@@ -38,9 +38,9 @@ public class StatisticalMeasurementValueSection extends
        /**
         * <p>Constructor for StatisticalMeasurementValueSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public StatisticalMeasurementValueSection(CdmFormFactory formFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/AbstractDetailedDescriptionDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java
similarity index 72%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/AbstractDetailedDescriptionDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java
index c44c5f2ce0aa2293c1dfd79dc552e3875320efd0..4356d0f964fe1b8b69b57f2097e4718443c7c856 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/AbstractDetailedDescriptionDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java
@@ -8,14 +8,14 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description.detail;
+package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>Abstract AbstractDetailedDescriptionDetailElement class.</p>
@@ -32,8 +32,8 @@ public abstract class AbstractDetailedDescriptionDetailElement<T extends Descrip
        /**
         * <p>Constructor for AbstractDetailedDescriptionDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a T object.
         * @param style a int.
         * @param <T> a T object.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/CategoricalDataDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
similarity index 76%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/CategoricalDataDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
index 4fd3ad73c3f831aa212cd34028d2d17af373c1cf..01e0f3b090bb13b66f90f5628914681c1aef7665 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/CategoricalDataDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.description.detail;
+package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.model.description.CategoricalData;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.description.StateDataSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.section.description.StateDataSection;
 
 /**
  * <p>CategoricalDataDetailElement class.</p>
@@ -26,8 +26,8 @@ public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDet
        /**
         * <p>Constructor for CategoricalDataDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.CategoricalData} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/CommonNameDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/CommonNameDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
index 5cbc941a234d242e60569bd747db71018b9bf631..40673eca33256052ca19edc73d96eaa255e5d178 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/CommonNameDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CommonNameDetailElement.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description.detail;
+package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.model.description.CommonTaxonName;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.NamedAreaSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.LanguageComboElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.LanguageComboElement;
 
 /**
  * <p>CommonNameDetailElement class.</p>
@@ -41,8 +41,8 @@ public class CommonNameDetailElement extends AbstractDetailedDescriptionDetailEl
        /**
         * <p>Constructor for CommonNameDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.CommonTaxonName} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/DistributionDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/DistributionDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
index 5447799b78174d607d3c4805d502d9c0ecd8d5cf..a6836a9bd9b2a1262c2527c240b823913e2918f9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/DistributionDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/DistributionDetailElement.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description.detail;
+package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.description.Distribution;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.selection.NamedAreaSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.PresenceAbsenceTermComboElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.PresenceAbsenceTermComboElement;
 
 /**
  * <p>DistributionDetailElement class.</p>
@@ -38,8 +38,8 @@ public class DistributionDetailElement extends
        /**
         * <p>Constructor for DistributionDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.Distribution} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/IndividualsAssociationDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/IndividualsAssociationDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
index aa768197e798b8d8e9f9761cef2b3031de90e27e..2578265c378f609b2ee71f5ed966a79a0a0b3e58 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/IndividualsAssociationDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/IndividualsAssociationDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description.detail;
+package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import java.util.Map;
 
@@ -17,12 +17,12 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.selection.DerivedUnitBaseSelectionElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.selection.DerivedUnitBaseSelectionElement;
 
 /**
  * <p>IndividualsAssociationDetailElement class.</p>
@@ -41,8 +41,8 @@ public class IndividualsAssociationDetailElement extends AbstractDetailedDescrip
        /**
         * <p>Constructor for IndividualsAssociationDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.IndividualsAssociation} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/QuantitativeDataDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
similarity index 73%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/QuantitativeDataDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
index 4da04dd94bb4e597f3969969d677feb052c47133..146d4f527d809387e516bff388d00918e1dc6e56 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/QuantitativeDataDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
@@ -1,17 +1,17 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.description.detail;
+package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.model.description.QuantitativeData;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.term.MeasurementUnitComboElement;
-import eu.etaxonomy.taxeditor.section.description.StatisticalMeasurementValueSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.description.StatisticalMeasurementValueSection;
+import eu.etaxonomy.taxeditor.ui.term.MeasurementUnitComboElement;
 
 /**
  * <p>QuantitativeDataDetailElement class.</p>
@@ -28,8 +28,8 @@ public class QuantitativeDataDetailElement extends
        /**
         * <p>Constructor for QuantitativeDataDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.QuantitativeData} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/TaxonInteractionDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/TaxonInteractionDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
index e1f2231f4fe76ad092595293445d740f89dad075..802e10f4f4173e16c87206296b0de8de81c109c9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/TaxonInteractionDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TaxonInteractionDetailElement.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description.detail;
+package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonSelectionElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 
 /**
  * <p>TaxonInteractionDetailElement class.</p>
@@ -36,8 +36,8 @@ public class TaxonInteractionDetailElement extends AbstractDetailedDescriptionDe
        /**
         * <p>Constructor for TaxonInteractionDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.TaxonInteraction} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/TextDataDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TextDataDetailElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/TextDataDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TextDataDetailElement.java
index 06ac9203be9deb8800197c8e222c6cde203c371f..bda5525a7c7c5a77f07cbeb752090a0ffad837ec 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/detail/TextDataDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/TextDataDetailElement.java
@@ -8,14 +8,14 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.description.detail;
+package eu.etaxonomy.taxeditor.ui.section.description.detail;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.model.description.TextData;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.MultilanguageTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.MultilanguageTextElement;
 
 /**
  * <p>TextDataDetailElement class.</p>
@@ -31,8 +31,8 @@ public class TextDataDetailElement extends AbstractDetailedDescriptionDetailElem
        /**
         * <p>Constructor for TextDataDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.TextData} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/ChangeDescriptionElementType.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
similarity index 98%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/ChangeDescriptionElementType.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
index 7f5a3c86ae078c8a46c8653ddf7a24c3c4334b62..1ef89a156d4b7b028dfdfa4e845d2214985c09a1 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/ChangeDescriptionElementType.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
@@ -7,7 +7,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.editor.view.descriptive.operation;
+package eu.etaxonomy.taxeditor.ui.section.description.operation;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/feature/FeatureDistributionDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
similarity index 88%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/feature/FeatureDistributionDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
index f100d63f2864320e7c8f08971e40f0dc23f254d2..e1b133ef479141b916a567c4fb268046f715229f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/feature/FeatureDistributionDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.feature;
+package eu.etaxonomy.taxeditor.ui.section.feature;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -27,13 +27,13 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.BrowserElement;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.BrowserElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>FeatureDistributionDetailElement class.</p>
@@ -52,8 +52,8 @@ public class FeatureDistributionDetailElement extends AbstractCdmDetailElement<F
        /**
         * <p>Constructor for FeatureDistributionDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public FeatureDistributionDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/feature/FeatureDistributionDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailSection.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/feature/FeatureDistributionDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailSection.java
index 0e4e6f3564d903f8f5e128c25612a587e0f15b18..052df035fdc1f23ffe4374298fa9f16bb129c96d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/feature/FeatureDistributionDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailSection.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.feature;
+package eu.etaxonomy.taxeditor.ui.section.feature;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>FeatureDistributionDetailSection class.</p>
@@ -36,9 +36,9 @@ public class FeatureDistributionDetailSection extends AbstractCdmDetailSection<F
        /**
         * <p>Constructor for FeatureDistributionDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/GeographicalScopeDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/GeographicalScopeDetailSection.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/GeographicalScopeDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/GeographicalScopeDetailSection.java
index dbc6a3e7bae899987536cc6b1b4729671315a4fa..02f0803b13677cf7e8e1f3eb46721b01af925929 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/GeographicalScopeDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/GeographicalScopeDetailSection.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.key;
+package eu.etaxonomy.taxeditor.ui.section.key;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.IIdentificationKey;
 import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
index 63acdc35eaebc127cedb30abd1e13408b5dbd22e..633fc7cdc156a81f3a6f7136c9dbadf45a2f61ea 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
@@ -1,15 +1,15 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.key;
+package eu.etaxonomy.taxeditor.ui.section.key;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * @author n.hoffmann
@@ -23,7 +23,7 @@ public class PolytomousKeyDetailElement extends AbstractCdmDetailElement<Polytom
        }
 
        private ToggleableTextElement text_title;
-       // TODO
+       // TODO implement this
 //     private section_taxonomicScope;
        
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailSection.java
similarity index 76%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailSection.java
index ea51c3ed6450ed5d16224d2dbfa95da9b6272b98..a6c6908acc3b35b1f4bf6a0739fb33cae8eb02e4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailSection.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.key;
+package eu.etaxonomy.taxeditor.ui.section.key;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyNodeDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyNodeDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
index b62432ddadf5cd4b1ba53f44a212a107bf00eefc..4886dccd71c6f07d8a3f1130c56cfd0cadfa8337 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyNodeDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
@@ -1,21 +1,21 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.key;
+package eu.etaxonomy.taxeditor.ui.section.key;
 
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.KeyStatementElement;
-import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.FeatureSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.PolytomousKeyNodeSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.PolytomousKeySelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonBaseSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.KeyStatementElement;
+import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.FeatureSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.PolytomousKeyNodeSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.PolytomousKeySelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonBaseSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyNodeDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailSection.java
similarity index 76%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyNodeDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailSection.java
index 657f36d10685f1709c55b8e0c1bcc00037be7f6d..db99a991786acfd6a1303aa40756bf13ccc4e15a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/PolytomousKeyNodeDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailSection.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.key;
+package eu.etaxonomy.taxeditor.ui.section.key;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/ScopeRestrictionSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/ScopeRestrictionSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
index ae0a09c9384ca45bc748790cc0a5ba2c5c6667ca..cac2c9d668c6b6a3aae90c267e25bac5ccbca14a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/key/ScopeRestrictionSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.key;
+package eu.etaxonomy.taxeditor.ui.section.key;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.description.Scope;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AbstractTypeDesignationElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AbstractTypeDesignationElement.java
similarity index 74%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AbstractTypeDesignationElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AbstractTypeDesignationElement.java
index 25b07de7e381c8da8460437a2ee70707aacb4dd4..463bba89210b8e93d62bea5dd2cf5afca68f01cf 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AbstractTypeDesignationElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AbstractTypeDesignationElement.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.supplemental.AbstractReferencedEntityElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractReferencedEntityElement;
 
 /**
  * <p>Abstract AbstractTypeDesignationElement class.</p>
@@ -37,8 +37,8 @@ public abstract class AbstractTypeDesignationElement<T extends TypeDesignationBa
        /**
         * <p>Constructor for AbstractTypeDesignationElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a T object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AuthorshipDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AuthorshipDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
index c7ab7407942bf6af158615dbf0de576beb925a95..dc265ddffed1d6374e727f5b9c3997dbae9d73e5 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AuthorshipDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import java.util.Arrays;
 
@@ -18,16 +18,16 @@ import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEnableableFormElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.forms.selection.AbstractSelectionElement;
 import eu.etaxonomy.taxeditor.model.AuthorHelper;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
 
 /**
  * <p>AuthorshipDetailElement class.</p>
@@ -48,8 +48,8 @@ public class AuthorshipDetailElement extends AbstractCdmDetailElement<NonViralNa
        /**
         * <p>Constructor for AuthorshipDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public AuthorshipDetailElement(CdmFormFactory cdmFormFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AuthorshipDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AuthorshipDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java
index 6e605717b6faa8709f5079ea0541911322963956..c79dfd807cc5e0bb1ee1c5f5843b1a63dd54ca8f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/AuthorshipDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
@@ -16,11 +16,11 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>AuthorshipDetailSection class.</p>
@@ -36,9 +36,9 @@ public class AuthorshipDetailSection extends AbstractCdmDetailSection<NonViralNa
        /**
         * <p>Constructor for AuthorshipDetailSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         */
@@ -51,7 +51,7 @@ public class AuthorshipDetailSection extends AbstractCdmDetailSection<NonViralNa
         * {@inheritDoc}
         *
         * Author title is not in titleCache field
-        * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#setSectionTitle()
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#setSectionTitle()
         */
        @Override
        protected void setSectionTitle() {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/HybridDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailElement.java
similarity index 87%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/HybridDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailElement.java
index 1192f7026eabe4438bcaf2637975447a1dc00ee2..b55c3f5a17f5e86416e4285d80d9761a82855758 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/HybridDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/HybridDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailSection.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/HybridDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailSection.java
index a4dd312c56605cdef2cc4e174addd750db1b306c..cf653f578c31797d01eb0f140ec338e4885aa085 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/HybridDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
@@ -17,11 +17,11 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index 80d68c9c2dd3ce83d38685b1f3f4b40f9a14af14..127445c697f468a5645d5a95ec908972a6544fee 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -8,35 +8,31 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import java.util.Arrays;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTException;
 
 import eu.etaxonomy.cdm.model.name.BotanicalName;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.ZoologicalName;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.Page;
-import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEnableableFormElement;
-import eu.etaxonomy.taxeditor.forms.ISelectableElement;
-import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.SelectionArbitrator;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.ISelectableElement;
+import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
 
 /**
  * <p>NameDetailElement class.</p>
@@ -64,8 +60,8 @@ public class NameDetailElement extends AbstractCdmDetailElement<NonViralName> im
        /**
         * <p>Constructor for NameDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public NameDetailElement(CdmFormFactory cdmFormFactory, ICdmFormElement formElement,
@@ -103,16 +99,11 @@ public class NameDetailElement extends AbstractCdmDetailElement<NonViralName> im
                if(getEntity().hasProblem(ParserProblem.CheckRank)){
                        getEntity().removeParsingProblem(ParserProblem.CheckRank);
                        
-                       TaxonNameEditor nameEditor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(Page.NAME);
-                       nameEditor.getSelectedContainer().getNameViewer().clearErrors();
+                       // FIXME this has to be reafctored completely. See tickets #1959, #1663, #1957, #1958
+//                     TaxonNameEditor nameEditor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(Page.NAME);
+//                     nameEditor.getSelectedContainer().getNameViewer().clearErrors();
                }
        }
-
-//
-//     
-//     public void setEnabled(boolean enabled){
-//             setEnabled(enabled, null);
-//     }
        
        /** {@inheritDoc} */
        @Override
@@ -231,7 +222,7 @@ public class NameDetailElement extends AbstractCdmDetailElement<NonViralName> im
        /**
         * <p>Getter for the field <code>selectionArbitrator</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.SelectionArbitrator} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator} object.
         */
        public SelectionArbitrator getSelectionArbitrator() {
                return selectionArbitrator;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailSection.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailSection.java
index 48b836617700b950985803724c8fbe11eb7e7179..f1d41d64de4ac6b5ba89112398ad0f6da9de87c0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
@@ -16,11 +16,11 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>NameDetailSection class.</p>
@@ -36,9 +36,9 @@ public class NameDetailSection extends AbstractCdmDetailSection<NonViralName> im
        /**
         * <p>Constructor for NameDetailSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java
similarity index 76%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java
index 88f1d6f3ba0fb15198a7b22c021f8f0f15e47dad..847a889b808add93995e147938eea455ece2106a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java
@@ -8,22 +8,22 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
 
 import eu.etaxonomy.cdm.model.name.NameRelationship;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.LabelElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.AbstractSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.NameRelationshipTypeComboElement;
-import eu.etaxonomy.taxeditor.section.supplemental.AbstractReferencedEntityElement;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.LabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractReferencedEntityElement;
+import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.NameRelationshipTypeComboElement;
 
 /**
  * <p>NameRelationshipDetailElement class.</p>
@@ -42,8 +42,8 @@ public class NameRelationshipDetailElement extends AbstractReferencedEntityEleme
        /**
         * <p>Constructor for NameRelationshipDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.name.NameRelationship} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
@@ -85,7 +85,7 @@ public class NameRelationshipDetailElement extends AbstractReferencedEntityEleme
                        getEntity().setType(combo_relationshipType.getSelection());
                }
                else if(eventSource == selection_toName){
-                       EditorUtil.error(getClass(), "No API call available.", null);
+                       StoreUtil.error(getClass(), "No API call available.", null);
                }
                else if(eventSource == text_ruleConsidered){
                        getEntity().setRuleConsidered(text_ruleConsidered.getText());

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailSection.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailSection.java
index 396179a382ec12fd5432dfa2a90e9a3a18483db1..7f824791f02deba3856be86c1a7db42a7f6e6541 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import java.util.Collection;
 
@@ -21,11 +21,11 @@ import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>NameRelationshipDetailSection class.</p>
@@ -41,9 +41,9 @@ public class NameRelationshipDetailSection extends AbstractEntityCollectionSecti
        /**
         * <p>Constructor for NameRelationshipDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public NameRelationshipDetailSection(CdmFormFactory formFactory, ConversationHolder conversation,
@@ -62,7 +62,7 @@ public class NameRelationshipDetailSection extends AbstractEntityCollectionSecti
        public NameRelationship createNewElement() {
                
                NameRelationshipWizard wizard = new NameRelationshipWizard(this);
-               WizardDialog dialog = new WizardDialog(EditorUtil.getShell(), wizard);
+               WizardDialog dialog = new WizardDialog(StoreUtil.getShell(), wizard);
                int status = dialog.open();
                
                if(status == IStatus.OK)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizard.java
similarity index 92%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizard.java
index 9fbc762acf02db2ce23ef1d48be028ff45959763..ba2cd292280afc7bdaed16e4604e58ac325c5aa8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizard.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.wizard.Wizard;
@@ -32,7 +32,7 @@ public class NameRelationshipWizard extends Wizard implements IConversationEnabl
        /**
         * <p>Constructor for NameRelationshipWizard.</p>
         *
-        * @param callingSection a {@link eu.etaxonomy.taxeditor.section.name.NameRelationshipDetailSection} object.
+        * @param callingSection a {@link eu.etaxonomy.taxeditor.ui.section.name.NameRelationshipDetailSection} object.
         */
        public NameRelationshipWizard(NameRelationshipDetailSection callingSection) {
                this.callingSection = callingSection;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
index 5054009d004acee321c384805e6c66fe71c67ea8..59ff18fcff0f4411ca09a960c5f0ca75a9d7b341 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameRelationshipWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizardPage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.util.IPropertyChangeListener;
@@ -20,12 +20,12 @@ import org.eclipse.swt.widgets.Composite;
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.RootElement;
-import eu.etaxonomy.taxeditor.forms.selection.NameSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.NameRelationshipTypeComboElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.NameRelationshipTypeComboElement;
 
 /**
  * <p>NameRelationshipWizardPage class.</p>
@@ -68,7 +68,7 @@ public class NameRelationshipWizardPage extends WizardPage implements IPropertyC
        /**
         * <p>Constructor for NameRelationshipWizardPage.</p>
         *
-        * @param callingSection a {@link eu.etaxonomy.taxeditor.section.name.NameRelationshipDetailSection} object.
+        * @param callingSection a {@link eu.etaxonomy.taxeditor.ui.section.name.NameRelationshipDetailSection} object.
         */
        protected NameRelationshipWizardPage(NameRelationshipDetailSection callingSection) {
                super("NameRelationshipWizardPage");

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameTypeDesignationElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameTypeDesignationElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
index 69d8caa21d18f103620367a841d70c485408e1a8..20459811c274ccccb52e46624b9998657c501d8a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NameTypeDesignationElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
@@ -8,20 +8,20 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.selection.NameSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.NameTypeDesignationStatusComboElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.NameTypeDesignationStatusComboElement;
 
 /**
  * <p>NameTypeDesignationElement class.</p>
@@ -43,8 +43,8 @@ public class NameTypeDesignationElement extends
        /**
         * <p>Constructor for NameTypeDesignationElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.name.NameTypeDesignation} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NomenclaturalStatusElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NomenclaturalStatusElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
index 5b1ab2808575c7fd387a0f4ae74f426540226a0a..516f254bf647a37608793d68eb39c8affc8049fb 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NomenclaturalStatusElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusElement.java
@@ -8,22 +8,22 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEntityElement;
-import eu.etaxonomy.taxeditor.forms.ISelectableElement;
-import eu.etaxonomy.taxeditor.forms.SelectionArbitrator;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement;
-import eu.etaxonomy.taxeditor.section.supplemental.AbstractReferencedEntityElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEntityElement;
+import eu.etaxonomy.taxeditor.ui.forms.ISelectableElement;
+import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractReferencedEntityElement;
+import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
 
 /**
  * <p>NomenclaturalStatusElement class.</p>
@@ -43,11 +43,11 @@ public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<
        /**
         * <p>Constructor for NomenclaturalStatusElement.</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.name.NomenclaturalStatus} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         */
        public NomenclaturalStatusElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement,
                        NomenclaturalStatus element, SelectionListener removeListener, int style) {
@@ -81,7 +81,7 @@ public class NomenclaturalStatusElement extends AbstractReferencedEntityElement<
        /**
         * <p>Getter for the field <code>selectionArbitrator</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.SelectionArbitrator} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator} object.
         */
        public SelectionArbitrator getSelectionArbitrator() {
                return selectionArbitrator;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NomenclaturalStatusSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusSection.java
similarity index 84%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NomenclaturalStatusSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusSection.java
index fcd5d7ffca080e139018f046cf75d152478d09ac..1a8d5a05c4702cc67f87fee74b668dec7be44d86 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NomenclaturalStatusSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NomenclaturalStatusSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import java.util.Collection;
 
@@ -18,10 +18,10 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>NomenclaturalStatusSection class.</p>
@@ -37,9 +37,9 @@ public class NomenclaturalStatusSection extends AbstractEntityCollectionSection<
        /**
         * <p>Constructor for NomenclaturalStatusSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        public NomenclaturalStatusSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
index b1ad97843bd769c2e9ca8a18057921ca619457e8..5381a12dc52c6913ab890a27317925fbff97e757 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import java.util.Arrays;
 import java.util.List;
@@ -16,14 +16,14 @@ import java.util.List;
 import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EnumComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.forms.term.NomenclaturalCodeComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EnumComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.term.NomenclaturalCodeComboElement;
 
 /**
  * <p>NonViralNameDetailElement class.</p>
@@ -42,8 +42,8 @@ public class NonViralNameDetailElement extends AbstractCdmDetailElement<NonViral
        /**
         * <p>Constructor for NonViralNameDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public NonViralNameDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java
index c00472646f042b035b0d608423b1efe0d4c344ea..3271866ff149389527235fa20fad6b5e5cb1bd8f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
@@ -20,13 +20,13 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>NonViralNameDetailSection class.</p>
@@ -43,9 +43,9 @@ public class NonViralNameDetailSection extends AbstractCdmDetailSection<NonViral
        /**
         * <p>Constructor for NonViralNameDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */
@@ -65,7 +65,7 @@ public class NonViralNameDetailSection extends AbstractCdmDetailSection<NonViral
                
                        Action cloneAction = new Action("Clone", Action.AS_PUSH_BUTTON){
                                public void run() {
-                                       boolean confirm = EditorUtil.confirmDialog("Confirm cloning", "Do you really want to clone the name?");
+                                       boolean confirm = StoreUtil.confirmDialog("Confirm cloning", "Do you really want to clone the name?");
                                        
                                        if(confirm){
                                                NonViralName clonedName;

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameWizardPage.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameWizardPage.java
index 4eb8cd60811c810a6bd926de86f4b06d88f77bb2..a6c52e0ac76f9d1df36f3f8e8f50b21df2c15b3f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/NonViralNameWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameWizardPage.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>NonViralNameWizardPage class.</p>
@@ -38,7 +38,7 @@ public class NonViralNameWizardPage extends AbstractCdmEntityWizardPage<NonViral
        /**
         * <p>Constructor for NonViralNameWizardPage.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.name.NonViralName} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueElement.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueElement.java
index 035b0c1ef565753abed94ee982b3dcfaa33d3206..7a6111e8c718f81c429f328b8ff935ca4f862e13 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -22,17 +22,17 @@ import eu.etaxonomy.cdm.model.media.MediaRepresentation;
 import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.ISelectableElement;
-import eu.etaxonomy.taxeditor.forms.SelectionArbitrator;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.openurl.IOpenUrlEnabled;
-import eu.etaxonomy.taxeditor.forms.openurl.OpenUrlSelectorElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.ISelectableElement;
+import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.openurl.IOpenUrlEnabled;
+import eu.etaxonomy.taxeditor.ui.openurl.OpenUrlSelectorElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 
 /**
  * <p>ProtologueElement class.</p>
@@ -58,8 +58,8 @@ public class ProtologueElement extends AbstractEntityCollectionElement<Descripti
         * @param element a {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         */
        public ProtologueElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement, DescriptionElementBase element,
                        SelectionListener removeListener, int style) {
@@ -113,7 +113,7 @@ public class ProtologueElement extends AbstractEntityCollectionElement<Descripti
        /**
         * <p>Getter for the field <code>selectionArbitrator</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.SelectionArbitrator} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator} object.
         */
        public SelectionArbitrator getSelectionArbitrator() {
                return selectionArbitrator;
@@ -130,7 +130,7 @@ public class ProtologueElement extends AbstractEntityCollectionElement<Descripti
                        try {
                                mediaRepresentationPart.setUri(new URI(protologueUriText.getText()));
                        } catch (URISyntaxException e) {
-                               EditorUtil.warningDialog("Could not parse URI", getClass(), e.getMessage());
+                               StoreUtil.warningDialog("Could not parse URI", getClass(), e.getMessage());
                        }
                }       
        }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
index 7493b4ab28914686cd8849d1f544459c0478eb3a..80dee4defe476051e02bc4d91f6288c624c02b0a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/ProtologueSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import java.util.Collection;
 
@@ -21,10 +21,10 @@ import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>ProtologueSection class.</p>
@@ -40,8 +40,8 @@ public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName
        /**
         * <p>Constructor for ProtologueSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/SpecimenTypeDesignationElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/SpecimenTypeDesignationElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
index 2d315f7066b1c544118fc2c6f4e4727b6371d6e4..05215398a0bc149a445b3f4f66dab931d5579379 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/SpecimenTypeDesignationElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import org.eclipse.swt.events.SelectionListener;
 
@@ -16,14 +16,14 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.DerivedUnitBaseSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.SpecimenTypeDesignationStatusComboElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.selection.DerivedUnitBaseSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.SpecimenTypeDesignationStatusComboElement;
 
 /**
  * <p>SpecimenTypeDesignationElement class.</p>
@@ -42,8 +42,8 @@ public class SpecimenTypeDesignationElement extends
        /**
         * <p>Constructor for SpecimenTypeDesignationElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/TypeDesignationSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TypeDesignationSection.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/TypeDesignationSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TypeDesignationSection.java
index 29992757bf4e008561036cb5be6d2e6a55189fd4..8b40d8a0b2dbe6c7e03c83f1cef8762d31b3c2e7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/name/TypeDesignationSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TypeDesignationSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.name;
+package eu.etaxonomy.taxeditor.ui.section.name;
 
 import java.util.Collection;
 
@@ -21,10 +21,10 @@ import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>TypeDesignationSection class.</p>
@@ -40,9 +40,9 @@ public class TypeDesignationSection extends AbstractEntityCollectionSection<Taxo
        /**
         * <p>Constructor for TypeDesignationSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public TypeDesignationSection(CdmFormFactory formFactory, ConversationHolder conversation,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/AbstractEventDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AbstractEventDetailElement.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/AbstractEventDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AbstractEventDetailElement.java
index 9a34d83d09d1a8255674a2fb45453b3e644ad5fb..e84c355d6ff775ba67a7d04958a6970a856b2eba 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/AbstractEventDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AbstractEventDetailElement.java
@@ -8,19 +8,19 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.EventBase;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.TimePeriodElement;
-import eu.etaxonomy.taxeditor.forms.selection.AgentSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.TimePeriodElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
 
 /**
  * <p>Abstract AbstractEventDetailElement class.</p>
@@ -38,8 +38,8 @@ public abstract class AbstractEventDetailElement<T extends EventBase> extends Ab
        /**
         * <p>Constructor for AbstractEventDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a T object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectingAreasDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java
similarity index 84%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectingAreasDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java
index c1572e6bd9e31018d880259b18d86432c637fc48..98c342a039ac63fafa6cb38358ea1882e86b3ce5 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectingAreasDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectingAreasDetailSection.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.NamedAreaSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.NamedAreaSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>CollectingAreasDetailSection class.</p>
@@ -33,9 +33,9 @@ public class CollectingAreasDetailSection extends
        /**
         * <p>Constructor for CollectingAreasDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public CollectingAreasDetailSection(CdmFormFactory formFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectionDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionDetailElement.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectionDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionDetailElement.java
index d8ac27085c23998d37fc68c10d131b67a6dba3ce..2053dbc7765b9da00c552f007f624c624eff90eb 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectionDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionDetailElement.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import eu.etaxonomy.cdm.model.occurrence.Collection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.forms.selection.CollectionSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.InstitutionSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.CollectionSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.InstitutionSelectionElement;
 
 /**
  * <p>CollectionDetailElement class.</p>
@@ -46,8 +46,8 @@ public class CollectionDetailElement extends AbstractCdmDetailElement<Collection
        /**
         * <p>Constructor for CollectionDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public CollectionDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectionWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionWizardPage.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectionWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionWizardPage.java
index 8dcc0be173f9fbdc5b151bf8c9e90939d85f2b05..676507a0b7846e37af1a1a7443e891350cf01977 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/CollectionWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/CollectionWizardPage.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>CollectionWizardPage class.</p>
@@ -32,7 +32,7 @@ public class CollectionWizardPage extends AbstractCdmEntityWizardPage<Collection
        /**
         * <p>Constructor for CollectionWizardPage.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.occurrence.Collection} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index d2d43fbbc5384f3b89ead84c7164a66883fd33d4..62ed1b0a1ba61e0b814fd6bc1f2992007a0729d6 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -8,23 +8,23 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.NameSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.PreservationMethodComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.PreservationMethodComboElement;
 
 /**
  * <p>DerivedUnitBaseDetailElement class.</p>
@@ -57,8 +57,8 @@ public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement<Deriv
        /**
         * <p>Constructor for DerivedUnitBaseDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public DerivedUnitBaseDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {
@@ -77,7 +77,7 @@ public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement<Deriv
                        combo_preservationMethod = (PreservationMethodComboElement) formFactory.createTermComboElement(TermComboType.PRESERVATION_METHOD, formElement, "Preservation Method", entity.getPreservationMethod(), style);
                } catch (MethodNotSupportedByDerivedUnitTypeException e) {
                        // we ignore this
-                       EditorUtil.info(e.getMessage());
+                       StoreUtil.info(e.getMessage());
                }
                selection_storedUnder = (NameSelectionElement) formFactory.createSelectionElement(SelectionType.NAME, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), style);
                
@@ -85,7 +85,7 @@ public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement<Deriv
                        text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
                } catch (MethodNotSupportedByDerivedUnitTypeException e) {
                        // we ignore this
-                       EditorUtil.info(e.getMessage());
+                       StoreUtil.info(e.getMessage());
                }               
                // source
                
@@ -118,7 +118,7 @@ public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement<Deriv
                        try {
                                getEntity().setPreservationMethod(combo_preservationMethod.getSelection());
                        } catch (MethodNotSupportedByDerivedUnitTypeException e) {
-                               EditorUtil.errorDialog("MethodNotSupportedByDerivedUnitTypeException", this, "MethodNotSupportedByDerivedUnitTypeException when trying to set preservation method for derive unit", e);
+                               StoreUtil.errorDialog("MethodNotSupportedByDerivedUnitTypeException", this, "MethodNotSupportedByDerivedUnitTypeException when trying to set preservation method for derive unit", e);
                        }
                }
                else if(eventSource == selection_storedUnder){
@@ -128,7 +128,7 @@ public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement<Deriv
                        try {
                                getEntity().setExsiccatum(text_exsicatum.getText());
                        } catch (Exception e) {
-                               EditorUtil.error(this.getClass(), e);
+                               StoreUtil.error(this.getClass(), e);
                        }
                }
        }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java
index 2e2eafc12c41d0cbe1ecc881ace4eb968f7a8dec..f15e6a49f2b6caaa6c1bffedb8ba878bbfedc222 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>DerivedUnitBaseDetailSection class.</p>
@@ -31,9 +31,9 @@ public class DerivedUnitBaseDetailSection extends AbstractCdmDetailSection<Deriv
        /**
         * <p>Constructor for DerivedUnitBaseDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseWizardPage.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseWizardPage.java
index 7beab6673549c392d55e96ad3d4af04577a159e4..7bc85b998e2ee51e1a635234774a040afe2e119a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitBaseWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseWizardPage.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
similarity index 87%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
index 760f4c24170c0936131a92e70e8393fd8e5779d0..103fa93c71ca2e28f265c473ec9b1a5e2050321e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.ui.forms.widgets.Section;
 
@@ -16,12 +16,12 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeConfigurator;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>DerivedUnitFacadeDetailElement class.</p>
@@ -44,8 +44,8 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
        /**
         * <p>Constructor for DerivedUnitFacadeDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public DerivedUnitFacadeDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {
@@ -68,7 +68,7 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
                        section_fieldObservation.setEntity(facade);
                        
                } catch (DerivedUnitFacadeNotSupportedException e) {
-                       EditorUtil.errorDialog("Error", this, "SpecimenFacadeNotSupportedException while inititating SpecimenFacade", e);
+                       StoreUtil.errorDialog("Error", this, "SpecimenFacadeNotSupportedException while inititating SpecimenFacade", e);
                }
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java
index dcceaaf7820a5bb0ccbf3240765953963e4bc074..d416f998bf1cb5932e44f9ef0f6c93bfbfd52a11 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>DerivedUnitFacadeDetailSection class.</p>
@@ -36,9 +36,9 @@ public class DerivedUnitFacadeDetailSection extends AbstractCdmDetailSection<Der
        /**
         * <p>Constructor for DerivedUnitFacadeDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */
@@ -46,7 +46,6 @@ public class DerivedUnitFacadeDetailSection extends AbstractCdmDetailSection<Der
                        ICdmFormElement parentElement,
                        ISelectionProvider selectionProvider, int style) {
                super(formFactory, conversation, parentElement, selectionProvider, style);
-               // TODO Auto-generated constructor stub
        }
        
        /** {@inheritDoc} */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeWizardPage.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeWizardPage.java
index 07edae2da8bd657cd9eb39a8770f0b2bdb4163c9..a0313aae1867fc80df12323f7b2fb25856f62ce3 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeWizardPage.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>DerivedUnitFacadeWizardPage class.</p>
@@ -33,7 +33,7 @@ public class DerivedUnitFacadeWizardPage extends AbstractCdmEntityWizardPage<Der
        /**
         * <p>Constructor for DerivedUnitFacadeWizardPage.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DeterminationEventDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DeterminationEventDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
index 87685764f78408a8db03d4c35ba1e14cbc83c405..0f96fae98d2cec2548cb6ac718c00ebb47eb6310 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DeterminationEventDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
@@ -8,19 +8,19 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.selection.TaxonSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.DeterminationModifierComboElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.DeterminationModifierComboElement;
 
 /**
  * <p>DeterminationEventDetailElement class.</p>
@@ -40,8 +40,8 @@ public class DeterminationEventDetailElement extends
        /**
         * <p>Constructor for DeterminationEventDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.occurrence.DeterminationEvent} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DeterminationEventDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailSection.java
similarity index 87%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DeterminationEventDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailSection.java
index bbdf9367c2d363f81ce180161407284388a207dc..ad6ac2a1d20369d816d0f684a8c55b1eebc1a17e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DeterminationEventDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>DeterminationEventDetailSection class.</p>
@@ -32,9 +32,9 @@ public class DeterminationEventDetailSection extends
        /**
         * <p>Constructor for DeterminationEventDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public DeterminationEventDetailSection(CdmFormFactory formFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
index 8d25ea5c85a8c243e7760df2d9ae4fadb7a1abfb..5563028f1d59914651e9c8dc8894d1504b010bae 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.term.SexComboElement;
-import eu.etaxonomy.taxeditor.forms.term.StageComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.term.SexComboElement;
+import eu.etaxonomy.taxeditor.ui.term.StageComboElement;
 
 /**
  * <p>FieldObservationDetailElement class.</p>
@@ -49,8 +49,8 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
        /**
         * <p>Constructor for FieldObservationDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public FieldObservationDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailSection.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailSection.java
index 2f2a91ac3c4cfe2906fa91945730a54bd99302db..32e64f570f049ee35f53296103eda33381bc2fbf 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>FieldObservationDetailSection class.</p>
@@ -31,9 +31,9 @@ public class FieldObservationDetailSection extends AbstractCdmDetailSection<Deri
        /**
         * <p>Constructor for FieldObservationDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationWizardPage.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationWizardPage.java
index c6a273e29d69f9abfb73e635f2baee5d5f9d7e09..d9d1fcadf1997248e3df2b8f74bedde60e243d44 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/FieldObservationWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationWizardPage.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
index 5b57a15baedb01fb9f7437690edcdc722499464c..252e8f3e48ea777c8a782c3ca33aaa99086edc88 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
@@ -8,19 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
-
-import java.beans.EventSetDescriptor;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>GatheringEventDetailElement class.</p>
@@ -50,13 +48,12 @@ public class GatheringEventDetailElement extends AbstractCdmDetailElement<Derive
        /**
         * <p>Constructor for GatheringEventDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public GatheringEventDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement) {
                super(formFactory, formElement);
-               // TODO Auto-generated constructor stub
        }
 
        /** {@inheritDoc} */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java
index 287fe5b25e7001a5baf2fda913dc03adfca3d4a8..2551f41f780376162c1f1e72feb6abb5d33ff179 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * <p>GatheringEventDetailSection class.</p>
@@ -31,9 +31,9 @@ public class GatheringEventDetailSection extends AbstractCdmDetailSection<Derive
        /**
         * <p>Constructor for GatheringEventDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventWizardPage.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventWizardPage.java
index 7160b5afcb49e541ce322ffbef9ab9609d1fea03..6c493ecb1c5978e82a5715752f463e9d651b1a3c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GatheringEventWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventWizardPage.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
index fd2b9d4b296dcff19b7ef8aed3b3473d30992be8..949fc6f51e686d509c5a197373b7b769076062ec 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
@@ -8,22 +8,22 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.LanguageStringWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.PointElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.TimePeriodElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.forms.selection.AgentSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.CollectionSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.NamedAreaSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.LanguageStringWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.PointElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.TimePeriodElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.CollectionSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailSection.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailSection.java
index 300b3905d4601b99ef6ad8090d5b928f3ee7ecbe..4b6235b6c5428fd5373054072c339966b2686902 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralWizardPage.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralWizardPage.java
index ee2e4773ebf8eb1ae6fb439c82d1d81795afedcf..f434bcf78fda5a3aea687123f4690f01b6da405b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/GeneralWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralWizardPage.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/IDerivedUnitFacadeDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/IDerivedUnitFacadeDetailSection.java
similarity index 88%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/IDerivedUnitFacadeDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/IDerivedUnitFacadeDetailSection.java
index 09cefa81537dacbd9d790ef54984203cc07b086d..97fb00af28693f76cccd95c3c5bf367442d8c052 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/IDerivedUnitFacadeDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/IDerivedUnitFacadeDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/NamedAreaDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/NamedAreaDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java
index 376a4e2d5eace1fa20eb21852e4964792b179e07..1310c32f1e4b67b96ba01bb7d7040374e6e58ad0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/NamedAreaDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.selection.NamedAreaSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.NamedAreaSelectionElement;
 
 /**
  * <p>CollectingAreasDetailElement class.</p>
@@ -34,8 +34,8 @@ public class NamedAreaDetailElement extends
        /**
         * <p>Constructor for CollectingAreasDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.location.NamedArea} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SourceCollectionDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SourceCollectionDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java
index 2251e8a91082f133796ace67ad8328afc45f4a9f..d9454c3833e44e092d9ac546a06aff95f31e8aa5 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SourceCollectionDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>SourceCollectionDetailSection class.</p>
@@ -32,9 +32,9 @@ public class SourceCollectionDetailSection extends
        /**
         * <p>Constructor for SourceCollectionDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public SourceCollectionDetailSection(CdmFormFactory formFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SpecimenCollectionDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SpecimenCollectionDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java
index 56deb14bcd66245c828b1c3db1d85ec33c1bd62c..e089c97e18382b59017f1c85d395bd627e2f59c0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SpecimenCollectionDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.occurrence.Specimen;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.selection.DerivedUnitBaseSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.DerivedUnitBaseSelectionElement;
 
 /**
  * <p>SpecimenCollectionDetailElement class.</p>
@@ -35,8 +35,8 @@ public class SpecimenCollectionDetailElement extends
        /**
         * <p>Constructor for SpecimenCollectionDetailElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.occurrence.Specimen} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SpecimenCollectionDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SpecimenCollectionDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java
index 70603e8a0304bbc1c8e7bd65e6434899768d6982..192249c98a800bb2ed1ba78eab1c78589ca16673 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/SpecimenCollectionDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.occurrence;
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.occurrence.Specimen;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>SpecimenCollectionDetailSection class.</p>
@@ -32,9 +32,9 @@ public class SpecimenCollectionDetailSection extends
        /**
         * <p>Constructor for SpecimenCollectionDetailSection.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public SpecimenCollectionDetailSection(CdmFormFactory formFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/NomenclaturalReferenceDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/NomenclaturalReferenceDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailElement.java
index 40728cdb71e6447804df5183531919c0f771bb17..f4c14fd9a7d23c55f7aa8909b448dc29e8fc83a2 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/NomenclaturalReferenceDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailElement.java
@@ -8,19 +8,19 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.reference;
+package eu.etaxonomy.taxeditor.ui.section.reference;
 
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.ReferenceSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
 
 /**
  * <p>NomenclaturalReferenceDetailElement class.</p>
@@ -41,8 +41,8 @@ public class NomenclaturalReferenceDetailElement extends
        /**
         * <p>Constructor for NomenclaturalReferenceDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public NomenclaturalReferenceDetailElement(CdmFormFactory cdmFormFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/NomenclaturalReferenceDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/NomenclaturalReferenceDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java
index aeaca2fcc453009ec6af5811819bb6cbd38d1cf5..565d8728c5b92f68ad70eb2feca8420c430e887e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/NomenclaturalReferenceDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.reference;
+package eu.etaxonomy.taxeditor.ui.section.reference;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
@@ -17,11 +17,11 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>NomenclaturalReferenceDetailSection class.</p>
@@ -38,9 +38,9 @@ public class NomenclaturalReferenceDetailSection extends
        /**
         * <p>Constructor for NomenclaturalReferenceDetailSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
similarity index 91%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
index 15a192d6f0df76e59f3d5848d727929c39e75a2c..9e82abb85cab61b03f0101c46238546abd3bdf9e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.reference;
+package eu.etaxonomy.taxeditor.ui.section.reference;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -23,24 +23,23 @@ import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EnumComboType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IErrorIntolerableElement;
-import eu.etaxonomy.taxeditor.forms.IExceptionHandler;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.TimePeriodElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.forms.UriWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.openurl.OpenUrlSelectorElement;
-import eu.etaxonomy.taxeditor.forms.selection.AbstractSelectionElement;
-import eu.etaxonomy.taxeditor.forms.selection.ReferenceSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.ReferenceTypeComboElement;
 import eu.etaxonomy.taxeditor.model.AuthorHelper;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IErrorIntolerableElement;
+import eu.etaxonomy.taxeditor.ui.forms.IExceptionHandler;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.TimePeriodElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.UriWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EnumComboType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.ReferenceTypeComboElement;
 
 /**
  * <p>ReferenceBaseDetailElement class.</p>
@@ -79,8 +78,8 @@ public class ReferenceDetailElement extends AbstractCdmDetailElement<Reference>
        /**
         * <p>Constructor for ReferenceBaseDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public ReferenceDetailElement(CdmFormFactory cdmFormFactory,
@@ -390,7 +389,7 @@ public class ReferenceDetailElement extends AbstractCdmDetailElement<Reference>
                        try {
                                getEntity().setUri(text_uri.getUri());
                        } catch (URISyntaxException e) {
-                               EditorUtil.warningDialog("Invlid URI", getClass(), e.getLocalizedMessage());
+                               StoreUtil.warningDialog("Invlid URI", getClass(), e.getLocalizedMessage());
                        }
                }
                else if(eventSource == text_volume){

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailSection.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailSection.java
index 4687b1b7fde65727f7acdd58ae8272bc763427c5..a4862e28c6a3235c5732a85d693c59185e75a26d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.reference;
+package eu.etaxonomy.taxeditor.ui.section.reference;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
@@ -17,12 +17,12 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>ReferenceBaseDetailSection class.</p>
@@ -38,9 +38,9 @@ public class ReferenceDetailSection extends AbstractCdmDetailSection<Reference>
        /**
         * <p>Constructor for ReferenceBaseDetailSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         */
@@ -83,7 +83,7 @@ public class ReferenceDetailSection extends AbstractCdmDetailSection<Reference>
        @Override
        public void refresh() {
                super.refresh();
-               EditorUtil.refreshDetailsViewer();
+               StoreUtil.refreshDetailsViewer();
        }
 
        /* (non-Javadoc)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java
index 6b407c63ee47981f300f6ec7500c246fa3582a88..0940ba532edaacf7946f092f64ae12defe3edf77 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/reference/ReferenceWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java
@@ -8,19 +8,19 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.reference;
+package eu.etaxonomy.taxeditor.ui.section.reference;
 
 import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IExceptionHandler;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IExceptionHandler;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
  * <p>ReferenceBaseWizardPage class.</p>
@@ -34,7 +34,7 @@ public class ReferenceWizardPage extends AbstractCdmEntityWizardPage<Reference>
        /**
         * <p>Constructor for ReferenceBaseWizardPage.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractMediaRepresentationPartElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractMediaRepresentationPartElement.java
similarity index 73%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractMediaRepresentationPartElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractMediaRepresentationPartElement.java
index d4f681b14a8bdf07fc71e8ac75e9a3b63a043442..f486c9c05dfd5513b5571bede8e9164427a8768a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractMediaRepresentationPartElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractMediaRepresentationPartElement.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 
 /**
  * <p>Abstract AbstractMediaRepresentationPartElement class.</p>
@@ -40,8 +40,8 @@ public abstract class AbstractMediaRepresentationPartElement<T extends MediaRepr
        /**
         * <p>Constructor for AbstractMediaRepresentationPartElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a T object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractOriginalSourceElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractOriginalSourceElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
index 36df89487285c1db7d25b813e02d7bd487ebc48b..8006ca61dcd2ecc13427d823cc1b57640194d6e9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractOriginalSourceElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.OriginalSourceBase;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory; 
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
 
 /**
  * <p>Abstract AbstractOriginalSourceElement class.</p>
@@ -35,8 +35,8 @@ public abstract class AbstractOriginalSourceElement<T extends OriginalSourceBase
        /**
         * <p>Constructor for AbstractOriginalSourceElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a T object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractReferencedEntityElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractReferencedEntityElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractReferencedEntityElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractReferencedEntityElement.java
index a7b09a0f86eb7e16198a6ca6e9501917104ccd4c..6529dadeb579bb889ebd190faf0fb1aaf96558fb 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AbstractReferencedEntityElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractReferencedEntityElement.java
@@ -8,21 +8,19 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.selection.ReferenceSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
-import eu.etaxonomy.taxeditor.section.BulkEditorOpeningSelectionListener;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
 
 /**
  * <p>Abstract AbstractReferencedEntityElement class.</p>
@@ -33,11 +31,6 @@ import eu.etaxonomy.taxeditor.section.BulkEditorOpeningSelectionListener;
  */
 public abstract class AbstractReferencedEntityElement<T extends ReferencedEntityBase> extends
                AbstractEntityCollectionElement<T> {
-
-
-       private static final Logger logger = Logger
-                       .getLogger(AbstractReferencedEntityElement.class);
-       
        
        protected ReferenceSelectionElement selection_reference;
        protected TextWithLabelElement text_referenceDetail;
@@ -51,8 +44,8 @@ public abstract class AbstractReferencedEntityElement<T extends ReferencedEntity
        /**
         * <p>Constructor for AbstractReferencedEntityElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param entity a T object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AnnotationElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AnnotationElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
index 23813fbb96cf28e2c031e024af8a1229fbceffb6..295b8132c5754205ce4976db49514bf00c1a35f3 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AnnotationElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
@@ -1,18 +1,18 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.Annotation;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.term.AnnotationTypeComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.term.AnnotationTypeComboElement;
 
 /**
  * <p>AnnotationElement class.</p>
@@ -28,10 +28,10 @@ public class AnnotationElement extends AbstractEntityCollectionElement<Annotatio
        /**
         * <p>Constructor for AnnotationElement.</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param annotation a {@link eu.etaxonomy.cdm.model.common.Annotation} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         */
        public AnnotationElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement, Annotation annotation, SelectionListener removeListener, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AnnotationSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationSection.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AnnotationSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationSection.java
index 4ff0fae4a64b85a57f3a2c2e219604a3b62c006b..70af38fc490ea781a14a29e4e0ec793c393aceb4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/AnnotationSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationSection.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
 
@@ -10,10 +10,10 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Annotation;
 import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>AnnotationSection class.</p>
@@ -27,9 +27,9 @@ public class AnnotationSection extends AbstractEntityCollectionSection<Annotatab
        /**
         * <p>Constructor for AnnotationSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        public AnnotationSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/CreditElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/CreditElement.java
similarity index 74%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/CreditElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/CreditElement.java
index ab74aeed303e5dfddf82ffa40fdcfe2baa86432d..0c0aff109a798fd2c66d29ab3d8be27796544d08 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/CreditElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/CreditElement.java
@@ -1,18 +1,18 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.Credit;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.AgentSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
 
 /**
  * <p>CreditElement class.</p>
@@ -29,9 +29,9 @@ public class CreditElement extends AbstractEntityCollectionElement<Credit>{
        /**
         * <p>Constructor for CreditElement.</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param credit a {@link eu.etaxonomy.cdm.model.common.Credit} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/CreditSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/CreditSection.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/CreditSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/CreditSection.java
index 230ab785184ea4bf3c0e6ba54fcbbe3235de81d1..ba5b8495806971b332a528ada8a5a2ad72540793 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/CreditSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/CreditSection.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
 
@@ -9,9 +9,9 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.Credit;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>CreditSection class.</p>
@@ -25,9 +25,9 @@ public class CreditSection extends AbstractEntityCollectionSection<IdentifiableE
        /**
         * <p>Constructor for CreditSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        public CreditSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ExtensionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ExtensionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
index d1c85c38afa4fb04cc21eebd54783591d53e1c61..c62db242ac007488156821d2e250ead1f650cfed 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ExtensionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionElement.java
@@ -1,20 +1,20 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.ExtensionType;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.term.ExtensionTypeComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.term.ExtensionTypeComboElement;
 
 /**
  * <p>ExtensionElement class.</p>
@@ -31,11 +31,11 @@ public class ExtensionElement extends AbstractEntityCollectionElement<Extension>
        /**
         * <p>Constructor for ExtensionElement.</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.common.Extension} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         */
        public ExtensionElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement, Extension element,
                        SelectionListener removeListener, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ExtensionSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionSection.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ExtensionSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionSection.java
index 109c60fdd1d46b31baa07571013b100d628b841d..3178e86bdb652fd163c4efc73e517deeb7e00e81 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ExtensionSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionSection.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
 
@@ -9,9 +9,9 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.Extension;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>ExtensionSection class.</p>
@@ -24,9 +24,9 @@ public class ExtensionSection extends AbstractEntityCollectionSection<Identifiab
        /**
         * <p>Constructor for ExtensionSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        public ExtensionSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/HeadlineSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
similarity index 69%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/HeadlineSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
index 1d5752166eb0e782d547d99b440b7f542aeb803c..4ca3086f04ce919f611aa98e31d929dc5f17072c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/HeadlineSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.EmptyElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.EmptyElement;
 
 /**
  * <p>HeadlineSection class.</p>
@@ -25,8 +25,8 @@ public class HeadlineSection extends AbstractFormSection<VersionableEntity> {
        /**
         * <p>Constructor for HeadlineSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public HeadlineSection(CdmFormFactory cdmFormFactory, ICdmFormElement parentElement,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/IdentifiableSourceElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/IdentifiableSourceElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java
index 8e08b01929ff8071a99953c7e31f3ed0dff02f38..08506012ba02446f130db199e18328711787bcf3 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/IdentifiableSourceElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java
@@ -1,14 +1,14 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>IdentifiableSourceElement class.</p>
@@ -22,11 +22,11 @@ public class IdentifiableSourceElement extends AbstractOriginalSourceElement<Ide
        /**
         * <p>Constructor for IdentifiableSourceElement.</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.common.IdentifiableSource} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         */
        public IdentifiableSourceElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement, IdentifiableSource element,
                        SelectionListener removeListener, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ImageFileElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ImageFileElement.java
index 529a9dae1cbd6f45d6f35d9b1f9cdb854cad76d8..d249bcd00f98eabd43d1806bd6f92d2eabd79284 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/ImageFileElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ImageFileElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.io.IOException;
 import java.net.URI;
@@ -20,14 +20,14 @@ import org.eclipse.swt.events.SelectionListener;
 import eu.etaxonomy.cdm.api.service.IMediaService;
 import eu.etaxonomy.cdm.common.mediaMetaData.ImageMetaData;
 import eu.etaxonomy.cdm.model.media.ImageFile;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.ImageElement;
-import eu.etaxonomy.taxeditor.forms.KeyValueViewerElement;
-import eu.etaxonomy.taxeditor.forms.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.ImageElement;
+import eu.etaxonomy.taxeditor.ui.forms.KeyValueViewerElement;
+import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
 
 /**
  * <p>ImageFileElement class.</p>
@@ -46,8 +46,8 @@ public class ImageFileElement extends AbstractMediaRepresentationPartElement<Ima
        /**
         * <p>Constructor for ImageFileElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.media.ImageFile} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
@@ -118,16 +118,16 @@ public class ImageFileElement extends AbstractMediaRepresentationPartElement<Ima
                                
                                element_image.loadImage(new Runnable(){
                                        public void run() {
-                                               EditorUtil.reflowDetailsViewer();
-                                               EditorUtil.reflowSupplementalViewer();
+                                               StoreUtil.reflowDetailsViewer();
+                                               StoreUtil.reflowSupplementalViewer();
                                        }
                                });
                                
                        } catch (IOException e) {
-                               EditorUtil.error(getClass(), e);
+                               StoreUtil.error(getClass(), e);
                        }
                }  catch (Exception e) {
-                       EditorUtil.error(getClass(), "Image could not be shown: ", e);
+                       StoreUtil.error(getClass(), "Image could not be shown: ", e);
                }
        }
 
@@ -142,7 +142,7 @@ public class ImageFileElement extends AbstractMediaRepresentationPartElement<Ima
                        try {
                                getEntity().setUri(new URI(text_uri.getText()));
                        } catch (URISyntaxException e) {
-                               EditorUtil.warningDialog("Could not parse URI", getClass(), e.getMessage());
+                               StoreUtil.warningDialog("Could not parse URI", getClass(), e.getMessage());
                        }
                        showImage(getEntity().getUri());
                }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MarkerElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
similarity index 76%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MarkerElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
index 2e2c8af76102920483d23e18603fd22d46956d82..7c70ac19a28c0d089de70855ae71b1a60e2ceec2 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MarkerElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
@@ -1,19 +1,19 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
 
 /**
  * <p>MarkerElement class.</p>
@@ -30,8 +30,8 @@ public class MarkerElement extends AbstractEntityCollectionElement<Marker>{
         * @param element a {@link eu.etaxonomy.cdm.model.common.Marker} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         */
        public MarkerElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement, Marker element,
                        SelectionListener removeListener, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MarkerSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MarkerSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java
index 0b924050013a2f38086c6e90efe7404bade00d8c..ef1739018247ae863528d509ea00e2e0b92ee56d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MarkerSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
 
@@ -9,9 +9,9 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Marker;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>MarkerSection class.</p>
@@ -24,9 +24,9 @@ public class MarkerSection extends AbstractEntityCollectionSection<AnnotatableEn
        /**
         * <p>Constructor for MarkerSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        public MarkerSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaElement.java
index 0292fcdcfdeff13547a254b153986079d94dae91..c73794de315e23458847722c49f77a4115cd8d40 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.FocusEvent;
@@ -11,16 +11,16 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.LanguageStringWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.selection.AgentSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.LanguageStringWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.AgentSelectionElement;
 
 /**
  * <p>MediaElement class.</p>
@@ -39,11 +39,11 @@ public class MediaElement extends AbstractEntityCollectionElement<Media> {
        /**
         * <p>Constructor for MediaElement.</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.media.Media} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         */
        public MediaElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement, Media element,
                        SelectionListener removeListener, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationElement.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationElement.java
index 694f204a171d3ae74995fdbb71d8f70b9cb0f5ed..375d594636538941024f8b2324c0dea8f4862c96 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationElement.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 
 /**
  * <p>MediaRepresentationElement class.</p>
@@ -39,8 +39,8 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement<
        /**
         * <p>Constructor for MediaRepresentationElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.media.MediaRepresentation} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationPartSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationPartSection.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationPartSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationPartSection.java
index 9a85c5ea4248af460820c013205f0a3b3715f0c3..774281707db62f3f47564ac3bdf43a77f04e87ec 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationPartSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationPartSection.java
@@ -1,5 +1,5 @@
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
 
@@ -9,9 +9,9 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;
 import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>MediaRepresentationPartSection class.</p>
@@ -28,9 +28,9 @@ public class MediaRepresentationPartSection extends
        /**
         * <p>Constructor for MediaRepresentationPartSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public MediaRepresentationPartSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationSection.java
similarity index 82%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationSection.java
index 7df7fafd1c0f6bed0682087089bf0fbe2a6004a0..7a14518d1f03649b871f4bfdb8d898db675ba4a1 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaRepresentationSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaRepresentationSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
 
@@ -17,9 +17,9 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>MediaRepresentationSection class.</p>
@@ -36,9 +36,9 @@ public class MediaRepresentationSection extends AbstractEntityCollectionSection<
        /**
         * <p>Constructor for MediaRepresentationSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public MediaRepresentationSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaSection.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaSection.java
index dfa762e18aad63386bb089d23050dd9e1a1d9bca..776affa8f2612c358f1d1493b936b2cab85327a9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MediaSection.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
 
@@ -9,9 +9,9 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>MediaSection class.</p>
@@ -24,9 +24,9 @@ public class MediaSection extends AbstractEntityCollectionSection<IdentifiableMe
        /**
         * <p>Constructor for MediaSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        public MediaSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/RightsElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/RightsElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
index 1e22d800a364bca97f2ee0c2857971a61a4e15be..382f5876604b5d3d61e4abfe37e6c00fea830fca 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/RightsElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsElement.java
@@ -1,22 +1,22 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.media.Rights;
 import eu.etaxonomy.cdm.model.media.RightsTerm;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.selection.AbstractSelectionElement;
-import eu.etaxonomy.taxeditor.forms.term.AbstractTermComboElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement;
+import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
 
 /**
  * <p>RightsElement class.</p>
@@ -30,11 +30,11 @@ public class RightsElement extends AbstractEntityCollectionElement<Rights> {
        /**
         * <p>Constructor for RightsElement.</p>
         *
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param element a {@link eu.etaxonomy.cdm.model.media.Rights} object.
         * @param removeListener a {@link org.eclipse.swt.events.SelectionListener} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         */
        public RightsElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement, Rights element,
                        SelectionListener removeListener, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/RightsSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/RightsSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java
index 0a1d8ba2ff3ae2318df50c7967998cbd367b1f32..f798065883ce57a2966d5c71205a980985723846 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/RightsSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.media.Rights;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>RightsSection class.</p>
@@ -23,9 +23,9 @@ public class RightsSection extends AbstractEntityCollectionSection<IdentifiableE
        /**
         * <p>Constructor for RightsSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        public RightsSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/SourceSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/SourceSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
index 9f0521a91e7350f0d836688d18f4db5d861311c2..aa3393d621a33f6398234668e459f4346ebc3e0f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/SourceSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
@@ -1,16 +1,16 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import java.util.Collection;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
 
 /**
  * <p>SourceSection class.</p>
@@ -24,9 +24,9 @@ public class SourceSection extends AbstractEntityCollectionSection<IIdentifiable
        /**
         * <p>Constructor for SourceSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         */
        public SourceSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/VersionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionElement.java
similarity index 88%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/VersionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionElement.java
index 0a6e2c5521e6139a014f832cb12c29a0913f881e..7f408ea75f07e8b124d13adf1d22ababa5e34439 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/VersionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.widgets.Label;
 import org.joda.time.DateTime;
@@ -16,11 +16,11 @@ import org.joda.time.DateTime;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEntityElement;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEntityElement;
 
 /**
  * <p>VersionElement class.</p>
@@ -42,8 +42,8 @@ public class VersionElement extends AbstractCdmFormElement implements IEntityEle
         * <p>Constructor for VersionElement.</p>
         *
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.common.VersionableEntity} object.
         */
        public VersionElement(CdmFormFactory toolkit, ICdmFormElement parentElement, VersionableEntity entity, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/VersionSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionSection.java
similarity index 73%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/VersionSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionSection.java
index fdf1ab7e8a337f2eec669e94bbc7e626ebde9757..58cbef452db2f80746736097bd3f2f730678413c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/VersionSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/VersionSection.java
@@ -8,14 +8,14 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.supplemental;
+package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>VersionSection class.</p>
@@ -32,8 +32,8 @@ public class VersionSection extends AbstractFormSection<VersionableEntity>{
        /**
         * <p>Constructor for VersionSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public VersionSection(CdmFormFactory cdmFormFactory, ICdmFormElement parentElement,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/ParsingMessageElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessageElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/ParsingMessageElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessageElement.java
index 30f1bdbd6d8d42d937fab911c714c4801f45cccc..8438b31c8c93306bf8078bc45e1bd1c39ae8b3ca 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/ParsingMessageElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessageElement.java
@@ -8,10 +8,9 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.taxon;
+package eu.etaxonomy.taxeditor.ui.section.taxon;
 
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
@@ -19,10 +18,10 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>ParsingMessageElement class.</p>
@@ -32,9 +31,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class ParsingMessageElement extends AbstractCdmFormElement {
-
-       private static final Logger logger = Logger
-                       .getLogger(ParsingMessageElement.class);
        
        private Label parsingMessage;
 
@@ -43,8 +39,8 @@ public class ParsingMessageElement extends AbstractCdmFormElement {
        /**
         * <p>Constructor for ParsingMessageElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param parserProblem a {@link eu.etaxonomy.cdm.strategy.parser.ParserProblem} object.
         * @param style a int.
         */
@@ -63,7 +59,6 @@ public class ParsingMessageElement extends AbstractCdmFormElement {
 
        /** {@inheritDoc} */
        public void setSelected(boolean selected) {
-               // TODO Auto-generated method stub
                
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/ParsingMessagesSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessagesSection.java
similarity index 84%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/ParsingMessagesSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessagesSection.java
index 8df11424775d5f3c5732b009be3f6a2acbb0fd09..e2b13db95918a5402f211dc80fe40ab5b53d421d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/ParsingMessagesSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/ParsingMessagesSection.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.taxon;
+package eu.etaxonomy.taxeditor.ui.section.taxon;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.swt.SWT;
@@ -19,11 +19,11 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>ParsingMessagesSection class.</p>
@@ -43,9 +43,9 @@ public class ParsingMessagesSection extends AbstractCdmDetailSection<NonViralNam
        /**
         * <p>Constructor for ParsingMessagesSection.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         * @param style a int.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/TaxonBaseDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
similarity index 84%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/TaxonBaseDetailElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
index f838d96b52e475ea4e380c5bd70d35d7100cde99..dd58ba5f763a3f7210a455fcfe6d9d38e23f388e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/TaxonBaseDetailElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.taxon;
+package eu.etaxonomy.taxeditor.ui.section.taxon;
 
 import java.util.Arrays;
 
@@ -17,16 +17,16 @@ import org.eclipse.swt.SWT;
 
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.ToggleableTextElement;
-import eu.etaxonomy.taxeditor.forms.selection.ReferenceSelectionElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.name.NonViralNameDetailElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.ToggleableTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.ReferenceSelectionElement;
 
 /**
  * <p>TaxonBaseDetailElement class.</p>
@@ -54,8 +54,8 @@ public class TaxonBaseDetailElement extends AbstractCdmDetailElement<TaxonBase>{
        /**
         * <p>Constructor for TaxonBaseDetailElement.</p>
         *
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param formElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param formElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
         */
        public TaxonBaseDetailElement(CdmFormFactory cdmFormFactory,

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/TaxonBaseDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailSection.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/TaxonBaseDetailSection.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailSection.java
index c69a9fc6c089ba15a92050aaac98593268389db9..6329af4b4c1364a60f302ca94cbbdbc4caafc31b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/taxon/TaxonBaseDetailSection.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailSection.java
@@ -8,18 +8,18 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.section.taxon;
+package eu.etaxonomy.taxeditor.ui.section.taxon;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 
 /**
  * <p>TaxonBaseDetailSection class.</p>
@@ -35,9 +35,9 @@ public class TaxonBaseDetailSection extends AbstractCdmDetailSection<TaxonBase>
        /**
         * <p>Constructor for TaxonBaseDetailSection.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
         * @param selectionProvider a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
         */

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailElement.java
new file mode 100644 (file)
index 0000000..3bb09ce
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailElement.java
@@ -0,0 +1,27 @@
+package eu.etaxonomy.taxeditor.ui.section.user;
+
+import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+
+public class GroupsByUserDetailElement extends AbstractCdmDetailElement<User> {
+
+       public GroupsByUserDetailElement(CdmFormFactory formFactory,
+                       ICdmFormElement formElement) {
+               super(formFactory, formElement);
+       }
+
+       @Override
+       protected void createControls(ICdmFormElement formElement, User entity,
+                       int style) {
+               
+               
+       }
+
+       @Override
+       public void handleEvent(Object eventSource) {
+               
+       }
+
+}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailSection.java
new file mode 100644 (file)
index 0000000..e98b365
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailSection.java
@@ -0,0 +1,38 @@
+/**
+ * 
+ */
+package eu.etaxonomy.taxeditor.ui.section.user;
+
+import org.eclipse.jface.viewers.ISelectionProvider;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+
+/**
+ * @author n.hoffmann
+ *
+ */
+public class GroupsByUserDetailSection extends AbstractCdmDetailSection<User> {
+
+       public GroupsByUserDetailSection(CdmFormFactory formFactory,
+                       ConversationHolder conversation, ICdmFormElement parentElement,
+                       ISelectionProvider selectionProvider, int style) {
+               super(formFactory, conversation, parentElement, selectionProvider, style);
+       }
+
+       @Override
+       protected DetailType getDetailType() {
+               return DetailType.GROUPS_BY_USER;
+       }
+
+       @Override
+       public String getHeading() {
+               return "Groups";
+       }
+
+       
+}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
new file mode 100644 (file)
index 0000000..61b631c
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
@@ -0,0 +1,82 @@
+/**
+ * 
+ */
+package eu.etaxonomy.taxeditor.ui.section.user;
+
+import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
+import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.PersonSelectionElement;
+
+/**
+ * @author n.hoffmann
+ *
+ */
+public class UserDetailElement extends AbstractCdmDetailElement<User> {
+
+       private TextWithLabelElement text_username;
+       private TextWithLabelElement text_password;
+       private TextWithLabelElement text_passwordRepeat;
+       private TextWithLabelElement text_emailAdress;
+       private PersonSelectionElement selection_person;
+       private CheckboxElement checkbox_credentialsNonExpired;
+       private CheckboxElement checkbox_enabled;
+       private CheckboxElement checkbox_accountNonLocked;
+       private CheckboxElement checkbox_accountNonExpired;
+       
+       public UserDetailElement(CdmFormFactory formFactory,
+                       ICdmFormElement formElement) {
+               super(formFactory, formElement);
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
+        */
+       @Override
+       protected void createControls(ICdmFormElement formElement, User entity,
+                       int style) {
+               text_username = formFactory.createTextWithLabelElement(formElement, "Username", entity.getUsername(), style);
+               
+               text_emailAdress = formFactory.createTextWithLabelElement(formElement, "Email Adress", entity.getEmailAddress(), style);
+               
+               selection_person = (PersonSelectionElement) formFactory.createSelectionElement(SelectionType.PERSON, getConversationHolder(), formElement, "Person", entity.getPerson(), style);
+
+               checkbox_accountNonExpired = formFactory.createCheckbox(formElement, "Account Non Expired", entity.isAccountNonExpired(), style);
+               checkbox_accountNonLocked = formFactory.createCheckbox(formElement, "Account Non Locked", entity.isAccountNonLocked(), style);
+               checkbox_enabled = formFactory.createCheckbox(formElement, "Enabled", entity.isEnabled(), style);
+               checkbox_credentialsNonExpired = formFactory.createCheckbox(formElement, "Credentials Non Expired", entity.isCredentialsNonExpired(), style);
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)
+        */
+       @Override
+       public void handleEvent(Object eventSource) {
+               if(eventSource == text_username){
+                       getEntity().setUsername(text_username.getText());
+               }
+               else if(eventSource == text_emailAdress){
+                       getEntity().setEmailAddress(text_emailAdress.getText());
+               }
+               else if(eventSource == selection_person){
+                       getEntity().setPerson(selection_person.getSelection());
+               }
+               else if(eventSource == checkbox_accountNonExpired){
+                       getEntity().setAccountNonExpired(checkbox_accountNonExpired.getSelection());
+               }
+               else if(eventSource == checkbox_accountNonLocked){
+                       getEntity().setAccountNonLocked(checkbox_accountNonLocked.getSelection());
+               }
+               else if(eventSource == checkbox_enabled){
+                       getEntity().setEnabled(checkbox_enabled.getSelection());
+               }
+               else if(eventSource == checkbox_credentialsNonExpired){
+                       getEntity().setCredentialsNonExpired(checkbox_credentialsNonExpired.getSelection());
+               }
+       }
+
+}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java
new file mode 100644 (file)
index 0000000..c72b392
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailSection.java
@@ -0,0 +1,55 @@
+/**
+ * 
+ */
+package eu.etaxonomy.taxeditor.ui.section.user;
+
+import java.util.List;
+
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+
+/**
+ * @author n.hoffmann
+ *
+ */
+public class UserDetailSection extends AbstractCdmDetailSection<User> {
+
+       public UserDetailSection(CdmFormFactory formFactory,
+                       ConversationHolder conversation, ICdmFormElement parentElement,
+                       ISelectionProvider selectionProvider, int style) {
+               super(formFactory, conversation, parentElement, selectionProvider, style);
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.forms.ICdmFormElement#setPropertyChangeListeners(java.util.List)
+        */
+       @Override
+       public void setPropertyChangeListeners(
+                       List<IPropertyChangeListener> propertyChangeListeners) {
+
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getDetailType()
+        */
+       @Override
+       protected DetailType getDetailType() {
+               return DetailType.USER;
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading()
+        */
+       @Override
+       public String getHeading() {
+               return "User " + (getEntity() != null ? getEntity().getUsername() : "");
+       }
+
+}

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java
new file mode 100644 (file)
index 0000000..65f05e7
--- /dev/null
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailWizardPage.java
@@ -0,0 +1,37 @@
+/**
+ * 
+ */
+package eu.etaxonomy.taxeditor.ui.section.user;
+
+import org.eclipse.swt.SWT;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+
+/**
+ * @author n.hoffmann
+ *
+ */
+public class UserDetailWizardPage extends AbstractCdmEntityWizardPage<User> {
+
+       public UserDetailWizardPage(CdmFormFactory formFactory,
+                       ConversationHolder conversation, User entity) {
+               super(formFactory, conversation, entity);
+               setTitle("User");
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement)
+        */
+       @Override
+       public AbstractCdmDetailElement createElement(ICdmFormElement rootElement) {
+               UserDetailElement userElement = (UserDetailElement) formFactory.createCdmDetailElement(DetailType.USER, rootElement, SWT.NULL);
+               return userElement;
+       }
+
+}

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/AbstractSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElement.java
similarity index 89%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/AbstractSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElement.java
index 73cee62578c72ff20409a071b7b651368b580001..347658400c0bba1b8e8853a9bbbd2ae27ccab759 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/AbstractSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -18,18 +18,18 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEnableableFormElement;
-import eu.etaxonomy.taxeditor.forms.IEntityElement;
-import eu.etaxonomy.taxeditor.forms.ILabeledElement;
-import eu.etaxonomy.taxeditor.forms.ISelectableElement;
-import eu.etaxonomy.taxeditor.forms.SelectionArbitrator;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.preference.Resources;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEntityElement;
+import eu.etaxonomy.taxeditor.ui.forms.ILabeledElement;
+import eu.etaxonomy.taxeditor.ui.forms.ISelectableElement;
+import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
 
 /**
  * <p>Abstract AbstractSelectionElement class.</p>
@@ -68,9 +68,9 @@ public abstract class AbstractSelectionElement<T> extends AbstractCdmFormElement
        /**
         * <p>Constructor for AbstractSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation TODO
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a T object.
         * @param isEditable a boolean.
@@ -127,7 +127,7 @@ public abstract class AbstractSelectionElement<T> extends AbstractCdmFormElement
                addControl(text);
                
                text.setLayoutData(CdmFormFactory.FILL_HORIZONTALLY());
-               text.setBackground(EditorUtil.getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND));
+               text.setBackground(StoreUtil.getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND));
                
                button_selection = formFactory.createButton(selectableComposite, null, SWT.PUSH);
                button_selection.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
@@ -263,7 +263,7 @@ public abstract class AbstractSelectionElement<T> extends AbstractCdmFormElement
        /**
         * <p>Getter for the field <code>selectionArbitrator</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.forms.SelectionArbitrator} object.
+        * @return a {@link eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator} object.
         */
        public SelectionArbitrator getSelectionArbitrator() {
                return selectionArbitrator;
@@ -282,7 +282,7 @@ public abstract class AbstractSelectionElement<T> extends AbstractCdmFormElement
        public void setIrrelevant(boolean irrelevant) {
                String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_TEXT_DISABLED_BACKGROUND;
                
-               Color color = EditorUtil.getColor(colorId);
+               Color color = StoreUtil.getColor(colorId);
                text.setBackground(color);
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/AgentSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AgentSelectionElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/AgentSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AgentSelectionElement.java
index 815f89bbf9d8429bf2f5a9bcdab3a50d532b540b..12e8721cbad037200a7f25b8cd2a659d10bb5b10 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/AgentSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/AgentSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.AgentSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.AgentSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>AgentSelectionElement class.</p>
@@ -30,9 +30,9 @@ public class AgentSelectionElement extends AbstractSelectionElement<AgentBase> {
        /**
         * <p>Constructor for AgentSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.agent.AgentBase} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/ClassificationSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/ClassificationSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java
index 1f7a0c16192c99b37787974f3ab38ffa00293ba0..445202bc45288eea9b53ad41ff6396a088099222 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/ClassificationSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.ClassificationSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.ClassificationSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>ClassificationSelectionElement class.</p>
@@ -30,9 +30,9 @@ public class ClassificationSelectionElement extends AbstractSelectionElement<Cla
        /**
         * <p>Constructor for ClassificationSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.taxon.TaxonomicTree} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/CollectionSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/CollectionSelectionElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/CollectionSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/CollectionSelectionElement.java
index fcd151d489f45bb716c677e09d46e5934b8c9aa6..04723175fdb4686d10d39a7e9524258b6622741a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/CollectionSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/CollectionSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.CollectionSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.CollectionSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>CollectionSelectionElement class.</p>
@@ -30,9 +30,9 @@ public class CollectionSelectionElement extends AbstractSelectionElement<Collect
        /**
         * <p>Constructor for CollectionSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.occurrence.Collection} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/DerivedUnitBaseSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/DerivedUnitBaseSelectionElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/DerivedUnitBaseSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/DerivedUnitBaseSelectionElement.java
index ea44f60510de87e0b1cb39254e5253481c2c5680..fc0907daaa14c156417fa29ab0eddff86ae12f49 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/DerivedUnitBaseSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/DerivedUnitBaseSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.DerivedUnitSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.DerivedUnitSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>DerivedUnitBaseSelectionElement class.</p>
@@ -30,9 +30,9 @@ public class DerivedUnitBaseSelectionElement extends AbstractSelectionElement<De
        /**
         * <p>Constructor for DerivedUnitBaseSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/EditFromSelectionWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/EditFromSelectionWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
index 69279a821b42042068aad6de2cf67873052986f5..1cb6eefbd11bfc3b94648048109747e612fc671c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/EditFromSelectionWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.wizard.IWizardPage;
@@ -28,19 +28,19 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.section.agent.InstitutionWizardPage;
-import eu.etaxonomy.taxeditor.section.agent.PersonWizardPage;
-import eu.etaxonomy.taxeditor.section.agent.TeamWizardPage;
-import eu.etaxonomy.taxeditor.section.name.NonViralNameWizardPage;
-import eu.etaxonomy.taxeditor.section.occurrence.CollectionWizardPage;
-import eu.etaxonomy.taxeditor.section.occurrence.DerivedUnitBaseWizardPage;
-import eu.etaxonomy.taxeditor.section.occurrence.FieldObservationWizardPage;
-import eu.etaxonomy.taxeditor.section.occurrence.GatheringEventWizardPage;
-import eu.etaxonomy.taxeditor.section.occurrence.GeneralWizardPage;
-import eu.etaxonomy.taxeditor.section.reference.ReferenceWizardPage;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.agent.PersonWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.agent.TeamWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.CollectionWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceWizardPage;
 
 /**
  * <p>EditFromSelectionWizard class.</p>
@@ -56,7 +56,7 @@ public class EditFromSelectionWizard extends Wizard implements SelectionListener
        /**
         * <p>Constructor for EditFromSelectionWizard.</p>
         *
-        * @param selectionElement a {@link eu.etaxonomy.taxeditor.forms.selection.AbstractSelectionElement} object.
+        * @param selectionElement a {@link eu.etaxonomy.taxeditor.ui.selection.AbstractSelectionElement} object.
         */
        public EditFromSelectionWizard(AbstractSelectionElement selectionElement){
                this.selectionElement = selectionElement;               
@@ -107,7 +107,7 @@ public class EditFromSelectionWizard extends Wizard implements SelectionListener
                        addPage(new InstitutionWizardPage(formFactory, selectionElement.getConversationHolder(), (Institution) entity));
                }
                else{
-                       EditorUtil.warningDialog("Missing interface", this, "No detail element for current selection");
+                       StoreUtil.warningDialog("Missing interface", this, "No detail element for current selection");
                }
                
        }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FeatureSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureSelectionElement.java
similarity index 84%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FeatureSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureSelectionElement.java
index a7c65e1009d25e2abbef14d2a08f670083ff12b3..a30e64b5744bacf008c02fe5e25cbf57e0888dd4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FeatureSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.FeatureSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.FeatureSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FeatureTreeSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureTreeSelectionElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FeatureTreeSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureTreeSelectionElement.java
index 8deadf95b3912fce7bc2577ef0360ac022fc12c6..b05ae57cbb3ae16f016effe7596ddd307e24a011 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FeatureTreeSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FeatureTreeSelectionElement.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.FeatureTreeSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.FeatureTreeSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>FeatureTreeSelectionElement class.</p>
@@ -35,9 +35,9 @@ public class FeatureTreeSelectionElement extends AbstractSelectionElement<Featur
        /**
         * <p>Constructor for FeatureTreeSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.description.FeatureTree} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FieldObservationSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FieldObservationSelectionElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FieldObservationSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FieldObservationSelectionElement.java
index f3c9f08f14bea760537508a36b7319e26da6d358..1a2f7cd7f6896c0b185c2f317391b63ac6317b2e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/FieldObservationSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/FieldObservationSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.occurrence.FieldObservation;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.FieldObservationSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.FieldObservationSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>FieldObservationSelectionElement class.</p>
@@ -31,9 +31,9 @@ public class FieldObservationSelectionElement extends
        /**
         * <p>Constructor for FieldObservationSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/InstitutionSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/InstitutionSelectionElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/InstitutionSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/InstitutionSelectionElement.java
index 69064d4af7b2fbfd9e8dc7bdbf173b9ab719a8a7..f6e7be95399d82b5685ecc4cf633355c7cc3f09a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/InstitutionSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/InstitutionSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Institution;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.InstitutionSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.InstitutionSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>InstitutionSelectionElement class.</p>
@@ -34,9 +34,9 @@ public class InstitutionSelectionElement extends
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.agent.Institution} object.
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public InstitutionSelectionElement(CdmFormFactory toolkit, ConversationHolder conversation, ICdmFormElement parentElement, String labelString,
                        Institution selection, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NameSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElement.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NameSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElement.java
index e63ab7fb088e95dbfe2c28421b3db2bd1ab58da9..9342cc20196f97e5a6147fccd14d22a447243942 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NameSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElement.java
@@ -1,15 +1,15 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.NameSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.NameSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>NameSelectionElement class.</p>
@@ -25,9 +25,9 @@ public class NameSelectionElement extends AbstractSelectionElement<TaxonNameBase
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public NameSelectionElement(CdmFormFactory toolkit, ConversationHolder conversation, ICdmFormElement parentElement, String labelString,
                        TaxonNameBase selection, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NamedAreaSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NamedAreaSelectionElement.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NamedAreaSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NamedAreaSelectionElement.java
index f65308720d6fe24cb44df5fd32fa29760d44e0b3..f9c2972fd1c48076c00863f34c768c2bbcfa5f33 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NamedAreaSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NamedAreaSelectionElement.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.NamedAreaSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.NamedAreaSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>NamedAreaSelectionElement class.</p>
@@ -37,9 +37,9 @@ public class NamedAreaSelectionElement extends AbstractSelectionElement<NamedAre
        /**
         * <p>Constructor for NamedAreaSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.location.NamedArea} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NomenclaturalAuthorTeamSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NomenclaturalAuthorTeamSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java
index 2aaf1dab1e3e2733ac347441d81dbcdde1279bf2..33669f27fe71bfa071f68f3047001b25c80a8cf1 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/NomenclaturalAuthorTeamSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.NomenclaturalAuthorTeamSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.NomenclaturalAuthorTeamSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>NomenclaturalAuthorTeamSelectionElement class.</p>
@@ -30,9 +30,9 @@ public class NomenclaturalAuthorTeamSelectionElement extends AbstractSelectionEl
        /**
         * <p>Constructor for NomenclaturalAuthorTeamSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.agent.Team} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PersonSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PersonSelectionElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PersonSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PersonSelectionElement.java
index e4f2750b828dcb25c4fc7f223a003856d155003f..894e0fc13b9360f021de5494e381646451f56e1c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PersonSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PersonSelectionElement.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.PersonSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.PersonSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>PersonSelectionElement class.</p>
@@ -34,9 +34,9 @@ public class PersonSelectionElement extends AbstractSelectionElement<Person> {
        /**
         * <p>Constructor for PersonSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.agent.Person} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PolytomousKeyNodeSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeyNodeSelectionElement.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PolytomousKeyNodeSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeyNodeSelectionElement.java
index 9e7fdcf1c82e64fd661356b9dbe3f2b897375d7c..0132be8e68047555012c7c275f1d67c9c17226db 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PolytomousKeyNodeSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeyNodeSelectionElement.java
@@ -8,14 +8,14 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * @author n.hoffmann
@@ -45,7 +45,6 @@ public class PolytomousKeyNodeSelectionElement extends AbstractSelectionElement<
         */
        @Override
        public void widgetSelected(SelectionEvent e) {
-               // TODO Auto-generated method stub
                
        }
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PolytomousKeySelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeySelectionElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PolytomousKeySelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeySelectionElement.java
index 8a5229551250bcf73bad26b91567119d9811be0a..f71002b01a075ad10d22d7c5568c75c9d3d15a4a 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/PolytomousKeySelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/PolytomousKeySelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.PolytomousKeySelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.PolytomousKeySelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/ReferenceSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ReferenceSelectionElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/ReferenceSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ReferenceSelectionElement.java
index 85fad50a880f3b945c4173edb02f1d215cae5a04..8c0f1a0357e6c13a32cc250f3b76a7b75197e623 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/ReferenceSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ReferenceSelectionElement.java
@@ -1,17 +1,17 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.ReferenceSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.ReferenceSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>ReferenceSelectionElement class.</p>
@@ -27,9 +27,9 @@ public class ReferenceSelectionElement extends AbstractSelectionElement<Referenc
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase} object.
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public ReferenceSelectionElement(CdmFormFactory toolkit, ConversationHolder conversation, ICdmFormElement parentElement, String labelString,
                        Reference selection, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/SynonymSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/SynonymSelectionElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/SynonymSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/SynonymSelectionElement.java
index cc352f89531c945fd70f2a531c5a70d73a36de86..63d4e04c4c51ec277fea4b60a56df61707ca5ff4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/SynonymSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/SynonymSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TaxonBaseSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonBaseSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonBaseSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonBaseSelectionElement.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonBaseSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonBaseSelectionElement.java
index 36dc70908678723fd5a2034e4dce37022bf14582..43b402eabd80c605cd4d5edbb85dba477ea4600f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonBaseSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonBaseSelectionElement.java
@@ -1,15 +1,15 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TaxonBaseSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonBaseSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>TaxonBaseSelectionElement class.</p>
@@ -25,9 +25,9 @@ public class TaxonBaseSelectionElement extends AbstractSelectionElement<TaxonBas
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public TaxonBaseSelectionElement(CdmFormFactory toolkit, ConversationHolder conversation, ICdmFormElement parentElement, String labelString,
                        TaxonBase selection, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonNodeSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElement.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonNodeSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElement.java
index db81776704cfe25ba9367f4263e7a594afaf1410..9685a4f93943ee4e1949e307c2311d204762cd8b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonNodeSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionEvent;
@@ -16,9 +16,9 @@ import org.eclipse.swt.events.SelectionEvent;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TaxonNodeSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonNodeSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>TaxonNodeSelectionElement class.</p>
@@ -35,9 +35,9 @@ public class TaxonNodeSelectionElement extends AbstractSelectionElement<TaxonNod
        /**
         * <p>Constructor for TaxonNodeSelectionElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param entity a {@link eu.etaxonomy.cdm.model.taxon.TaxonNode} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElement.java
index c6319068e49860d30f559d9e2d9c280cb976bc6c..e7a901ec5b66c50e00f76611f523393a32c7bb9d 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TaxonSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TaxonSelectionElement.java
@@ -8,15 +8,15 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TaxonBaseSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonBaseSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * @author n.hoffmann

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TeamSelectionElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TeamSelectionElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TeamSelectionElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TeamSelectionElement.java
index 9dbb6e750cf8fadc6012b3225ff7736689ab0198..d64084eda1d008fc68cb96a4216d007513aea3e8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/TeamSelectionElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/TeamSelectionElement.java
@@ -8,16 +8,16 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.selection;
+package eu.etaxonomy.taxeditor.ui.selection;
 
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionEvent;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.agent.Team;
-import eu.etaxonomy.taxeditor.dialogs.filteredSelection.TeamSelectionDialog;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TeamSelectionDialog;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>TeamSelectionElement class.</p>
@@ -34,9 +34,9 @@ public class TeamSelectionElement extends AbstractSelectionElement<Team> {
        /**
         * <p>Constructor for TeamSelectionElement.</p>
         *
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.agent.Team} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractEnumComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java
similarity index 85%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractEnumComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java
index 7fa01719f07fda1937ade78580ea794c80b702c1..d9bdbe80a1e46195d11718ad985e02fb884bb98c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractEnumComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractEnumComboElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,13 +20,13 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Label;
 
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEnableableFormElement;
 import eu.etaxonomy.taxeditor.preference.Resources;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
 
 /**
  * <p>Abstract AbstractEnumComboElement class.</p>
@@ -49,8 +49,8 @@ public abstract class AbstractEnumComboElement<T extends Enum> extends AbstractC
        /**
         * <p>Constructor for AbstractEnumComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param <T> a T object.
         */
@@ -138,7 +138,7 @@ public abstract class AbstractEnumComboElement<T extends Enum> extends AbstractC
        public void setIrrelevant(boolean irrelevant) {
                String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
                
-               Color color = EditorUtil.getColor(colorId);
+               Color color = StoreUtil.getColor(colorId);
                combo.setBackground(color);
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractTermComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java
similarity index 88%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractTermComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java
index 29074f896a54fab623e3c8f00eb4c7580d1a6340..f06672c182e436056cb8a3e87c617140346d9016 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AbstractTermComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AbstractTermComboElement.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 
 import java.util.ArrayList;
@@ -22,16 +22,16 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.IEnableableFormElement;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.TermManager;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
 
 /**
  * <p>Abstract AbstractTermComboElement class.</p>
@@ -60,9 +60,9 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase> extend
        /**
         * <p>Constructor for AbstractTermComboElement.</p>
         *
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a T object.
         * @param visibleItems a int.
@@ -147,10 +147,10 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase> extend
                        if (label == null) {
                                if(term.getTitleCache() != null){
                                        label = term.getTitleCache();
-                                       EditorUtil.error(getClass(), "Term does not have a representation: " + term + ", " + term.getUuid(), null);
+                                       StoreUtil.error(getClass(), "Term does not have a representation: " + term + ", " + term.getUuid(), null);
                                }else{
                                        label = "Unknown";
-                                       EditorUtil.error(getClass(), "Representation Label and TitleCache empty for term: " + term + ", " + term.getUuid(), null);
+                                       StoreUtil.error(getClass(), "Representation Label and TitleCache empty for term: " + term + ", " + term.getUuid(), null);
                                }
                                
                        }
@@ -264,7 +264,7 @@ public abstract class AbstractTermComboElement<T extends DefinedTermBase> extend
        public void setIrrelevant(boolean irrelevant) {
                String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
                
-               Color color = EditorUtil.getColor(colorId);
+               Color color = StoreUtil.getColor(colorId);
                combo.setBackground(color);
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AnnotationTypeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AnnotationTypeComboElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AnnotationTypeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AnnotationTypeComboElement.java
index 310e8fe4a283c9594953f584eb7b93b7b48bff0c..f0368c818d0ca14a076e54a1d373afc6b6898d2e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/AnnotationTypeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/AnnotationTypeComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.common.AnnotationType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>AnnotationTypeComboElement class.</p>
@@ -30,8 +30,8 @@ public class AnnotationTypeComboElement extends AbstractTermComboElement<Annotat
        /**
         * <p>Constructor for AnnotationTypeComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.common.AnnotationType} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/DeterminationModifierComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/DeterminationModifierComboElement.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/DeterminationModifierComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/DeterminationModifierComboElement.java
index 42b4dcda1ce0d832b31b28dbcd7fd1a4795d51d9..6a60893b853e7e608f9495a660b8344d451a8011 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/DeterminationModifierComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/DeterminationModifierComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>DeterminationModifierComboElement class.</p>
@@ -30,8 +30,8 @@ public class DeterminationModifierComboElement extends AbstractTermComboElement<
        /**
         * <p>Constructor for DeterminationModifierComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.occurrence.DeterminationModifier} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/EmptyComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/EmptyComboElement.java
similarity index 84%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/EmptyComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/EmptyComboElement.java
index 9f4e37778aa642566767a5bbbbdafbb840205ebe..83647e794e9b04e2771ef19febb5f802ab4d801f 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/EmptyComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/EmptyComboElement.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,9 +16,9 @@ import java.util.List;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>EmptyComboElement class.</p>
@@ -36,8 +36,8 @@ public class EmptyComboElement<T extends DefinedTermBase> extends AbstractTermCo
        /**
         * <p>Constructor for EmptyComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param style a int.
         * @param <T> a T object.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ExtensionTypeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ExtensionTypeComboElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ExtensionTypeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ExtensionTypeComboElement.java
index 004e7afd38d34e3830aec20505dd665bce71eb3c..145d570709db7dbb1d1e7497ed490cc504147313 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ExtensionTypeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ExtensionTypeComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.common.ExtensionType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>ExtensionTypeComboElement class.</p>
@@ -33,8 +33,8 @@ public class ExtensionTypeComboElement extends AbstractTermComboElement<Extensio
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.common.ExtensionType} object.
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public ExtensionTypeComboElement(CdmFormFactory toolkit, ICdmFormElement parentElement, String labelString,
                        ExtensionType selection, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/LanguageComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/LanguageComboElement.java
similarity index 75%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/LanguageComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/LanguageComboElement.java
index e1806ec4d8fd1ee29c38071f966cc473f47328e3..0ba64e043e9fe9e1d421eaf21a835c104d2dac72 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/LanguageComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/LanguageComboElement.java
@@ -1,13 +1,13 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.common.Language;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>LanguageComboElement class.</p>
@@ -25,8 +25,8 @@ public class LanguageComboElement extends AbstractTermComboElement<Language> {
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.common.Language} object.
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public LanguageComboElement(CdmFormFactory toolkit, ICdmFormElement parentElement, String labelString, Language selection, int style) {
                super(toolkit, parentElement, labelString, selection, VISIBLE_ITEMS, style);

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/MarkerTypeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MarkerTypeComboElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/MarkerTypeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MarkerTypeComboElement.java
index 4e0b2c01aa3565cd12b99555b3834b85b555d831..715685d87302ded66da433a6e68d1c981b6d3332 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/MarkerTypeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MarkerTypeComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.common.MarkerType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>MarkerTypeComboElement class.</p>
@@ -33,8 +33,8 @@ public class MarkerTypeComboElement extends AbstractTermComboElement<MarkerType>
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.common.MarkerType} object.
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public MarkerTypeComboElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString,
                        MarkerType selection, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/MeasurementUnitComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MeasurementUnitComboElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/MeasurementUnitComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MeasurementUnitComboElement.java
index e3f962293e3ae512b53ddfeda3bc64ca449869ba..01b66174421bb3712608b243a2d77a80417a3a5b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/MeasurementUnitComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/MeasurementUnitComboElement.java
@@ -1,13 +1,13 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>MeasurementUnitComboElement class.</p>
@@ -23,8 +23,8 @@ public class MeasurementUnitComboElement extends AbstractTermComboElement<Measur
        /**
         * <p>Constructor for MeasurementUnitComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.description.MeasurementUnit} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ModifierComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ModifierComboElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ModifierComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ModifierComboElement.java
index 2037447904d88aef5fcc08ec05591a97b3e09ade..8cd80713b167a0f2a246cffd3eb272012ee9dd40 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ModifierComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ModifierComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.description.Modifier;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>ModifierComboElement class.</p>
@@ -30,8 +30,8 @@ public class ModifierComboElement extends AbstractTermComboElement<Modifier> {
        /**
         * <p>Constructor for ModifierComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.description.Modifier} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NameRelationshipTypeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameRelationshipTypeComboElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NameRelationshipTypeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameRelationshipTypeComboElement.java
index 0ab1c43292edb719899e3ed21c32e07eec8cfcad..c16bae61031e9f89e5ad19a1437b55328ae68992 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NameRelationshipTypeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameRelationshipTypeComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>NameRelationshipTypeComboElement class.</p>
@@ -30,8 +30,8 @@ public class NameRelationshipTypeComboElement extends AbstractTermComboElement<N
        /**
         * <p>Constructor for NameRelationshipTypeComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.name.NameRelationshipType} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NameTypeDesignationStatusComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameTypeDesignationStatusComboElement.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NameTypeDesignationStatusComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameTypeDesignationStatusComboElement.java
index eb0818398daf95b0db643dd481ea544a7f404b90..53f5c28c9aa988bab52ccf15bfbd245e8140c949 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NameTypeDesignationStatusComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NameTypeDesignationStatusComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>NameTypeDesignationStatusComboElement class.</p>
@@ -31,8 +31,8 @@ public class NameTypeDesignationStatusComboElement extends
        /**
         * <p>Constructor for NameTypeDesignationStatusComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NamedAreaTypeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NamedAreaTypeComboElement.java
similarity index 78%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NamedAreaTypeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NamedAreaTypeComboElement.java
index 967448f5910a2b228051f7b8c615255aee075fb0..5b0a3751cdd4848ff9b29db23bb21c4c6d72e039 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NamedAreaTypeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NamedAreaTypeComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.location.NamedAreaType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>NamedAreaTypeComboElement class.</p>
@@ -30,8 +30,8 @@ public class NamedAreaTypeComboElement extends AbstractTermComboElement<NamedAre
        /**
         * <p>Constructor for NamedAreaTypeComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.location.NamedAreaType} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NomenclaturalCodeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalCodeComboElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NomenclaturalCodeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalCodeComboElement.java
index e599a5de0400c4595246096b3e411eefd8cb490d..e27371bbf28bfa3458ea06f4ec3d2c340e980718 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NomenclaturalCodeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalCodeComboElement.java
@@ -8,11 +8,11 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>NomenclaturalCodeComboElement class.</p>
@@ -26,8 +26,8 @@ public class NomenclaturalCodeComboElement extends AbstractEnumComboElement<Nome
        /**
         * <p>Constructor for NomenclaturalCodeComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param nomenclaturalCode a {@link eu.etaxonomy.cdm.model.name.NomenclaturalCode} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NomenclaturalStatusTypeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalStatusTypeComboElement.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NomenclaturalStatusTypeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalStatusTypeComboElement.java
index 45c7388ccb690dcbc3b6efa99fba8c09f38884ca..4e30806ea533140f0b10c8ae5319bb37f952ef8e 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/NomenclaturalStatusTypeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/NomenclaturalStatusTypeComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>NomenclaturalStatusTypeComboElement class.</p>
@@ -34,8 +34,8 @@ public class NomenclaturalStatusTypeComboElement extends
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.name.NomenclaturalStatusType} object.
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public NomenclaturalStatusTypeComboElement(CdmFormFactory toolkit, ICdmFormElement parentElement,
                        String labelString, NomenclaturalStatusType selection, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/PresenceAbsenceTermComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PresenceAbsenceTermComboElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/PresenceAbsenceTermComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PresenceAbsenceTermComboElement.java
index 49c36e7dff66c03afef68093283725ffa4858b2b..b03ed89bebdcfd2b0706e7e5e50f52fb5a28d194 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/PresenceAbsenceTermComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PresenceAbsenceTermComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>PresenceAbsenceTermComboElement class.</p>
@@ -31,8 +31,8 @@ public class PresenceAbsenceTermComboElement extends
        /**
         * <p>Constructor for PresenceAbsenceTermComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.description.PresenceAbsenceTermBase} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/PreservationMethodComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PreservationMethodComboElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/PreservationMethodComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PreservationMethodComboElement.java
index 086c6b2dff6b93d7286a27b708fe740f2f0ec885..20f4fbb9714aff2f7756d3c96b425ba8a31ddc39 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/PreservationMethodComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/PreservationMethodComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>PreservationMethodComboElement class.</p>
@@ -30,8 +30,8 @@ public class PreservationMethodComboElement extends AbstractTermComboElement<Pre
        /**
         * <p>Constructor for PreservationMethodComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.occurrence.PreservationMethod} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/RankComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RankComboElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/RankComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RankComboElement.java
index 2a4d460965d547efb98809deee74ae8a23de00e6..4be334a3e7b0413fc570fc5ae5bd70a7cdf935d7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/RankComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RankComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.name.Rank;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>RankComboElement class.</p>
@@ -33,8 +33,8 @@ public class RankComboElement extends AbstractTermComboElement<Rank> {
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.name.Rank} object.
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public RankComboElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString,
                        Rank selection, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ReferenceSystemComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceSystemComboElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ReferenceSystemComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceSystemComboElement.java
index d4b2a6af649e1978fc789c4d4ba7ef28e351cd90..6a0e9d4dc50643cb664b4a7413cfd8897fdb70c4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ReferenceSystemComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceSystemComboElement.java
@@ -8,14 +8,14 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.location.ReferenceSystem;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.store.TermStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>ReferenceSystemComboElement class.</p>
@@ -31,8 +31,8 @@ public class ReferenceSystemComboElement extends AbstractTermComboElement<Refere
        /**
         * <p>Constructor for ReferenceSystemComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.location.ReferenceSystem} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ReferenceTypeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceTypeComboElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ReferenceTypeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceTypeComboElement.java
index e3e3ebb0c7bbe26e2e23d9b490530d6624dac830..5d0eb0211961f9da0a49fed7fbe6ce305efcd080 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ReferenceTypeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ReferenceTypeComboElement.java
@@ -8,12 +8,12 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>ReferenceTypeComboElement class.</p>
@@ -28,8 +28,8 @@ public class ReferenceTypeComboElement extends AbstractEnumComboElement<Referenc
         * <p>Constructor for ReferenceTypeComboElement.</p>
         *
         * @param style a int.
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param referenceType a {@link eu.etaxonomy.cdm.model.reference.ReferenceType} object.
         */

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/RightsTypeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RightsTypeComboElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/RightsTypeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RightsTypeComboElement.java
index c6d9a9a17737cd05aa223e3a85166f35d914aeff..9c0d585785decfa8fe6c7e28c692571efa92702b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/RightsTypeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/RightsTypeComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.media.RightsTerm;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>RightsTypeComboElement class.</p>
@@ -33,8 +33,8 @@ public class RightsTypeComboElement extends AbstractTermComboElement<RightsTerm>
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.media.RightsTerm} object.
         * @param style a int.
-        * @param toolkit a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param toolkit a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         */
        public RightsTypeComboElement(CdmFormFactory toolkit, ICdmFormElement parentElement, String labelString,
                        RightsTerm selection, int style) {

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ScopeComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ScopeComboElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ScopeComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ScopeComboElement.java
index a157385fdd7152c1ee05852223d07f417ed29052..d64d75e1259f55c2eebecb7ab676cf59e36737d8 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/ScopeComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/ScopeComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.description.Scope;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>ScopeComboElement class.</p>
@@ -30,8 +30,8 @@ public class ScopeComboElement extends AbstractTermComboElement<Scope> {
        /**
         * <p>Constructor for ScopeComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.description.Scope} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/SexComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SexComboElement.java
similarity index 80%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/SexComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SexComboElement.java
index 51f40490faacfc83b3b780c179c1f690699f7f89..fad77d977b7dfd584f2931b9574d97b48c119064 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/SexComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SexComboElement.java
@@ -8,14 +8,14 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.description.Sex;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>SexComboElement class.</p>
@@ -31,8 +31,8 @@ public class SexComboElement extends AbstractTermComboElement<Sex> {
        /**
         * <p>Constructor for SexComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.description.Sex} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/SpecimenTypeDesignationStatusComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SpecimenTypeDesignationStatusComboElement.java
similarity index 81%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/SpecimenTypeDesignationStatusComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SpecimenTypeDesignationStatusComboElement.java
index 4185c17c3c81fa0c1e5429917b5154fbcde2ffe9..86e7c3ee8fbe3b47a62123e0a0bbe9ae9e5d6faa 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/SpecimenTypeDesignationStatusComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/SpecimenTypeDesignationStatusComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>SpecimenTypeDesignationStatusComboElement class.</p>
@@ -31,8 +31,8 @@ public class SpecimenTypeDesignationStatusComboElement extends
        /**
         * <p>Constructor for SpecimenTypeDesignationStatusComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StageComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StageComboElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StageComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StageComboElement.java
index 1415ec7a6aafab88b3a9770ab9d04989d82845a3..ad598b991a5c74a1ab6cf896f86896da3a237c31 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StageComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StageComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.description.Stage;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>StageComboElement class.</p>
@@ -30,8 +30,8 @@ public class StageComboElement extends AbstractTermComboElement<Stage> {
        /**
         * <p>Constructor for StageComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.description.Stage} object.
         * @param style a int.
@@ -40,7 +40,6 @@ public class StageComboElement extends AbstractTermComboElement<Stage> {
                        ICdmFormElement parentElement, String labelString, Stage selection,
                        int style) {
                super(formFactory, parentElement, labelString, selection, VISIBLE_ITEMS, style);
-               // TODO Auto-generated constructor stub
        }
        
        /* (non-Javadoc)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StateComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StateComboElement.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StateComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StateComboElement.java
index 17120f89a232237c039abc0431f3e160c9795fb2..c55f64e43a1ebb6294c37ba4660ad6c35c7100c3 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StateComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StateComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.description.State;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>StateComboElement class.</p>
@@ -30,8 +30,8 @@ public class StateComboElement extends AbstractTermComboElement<State> {
        /**
         * <p>Constructor for StateComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.description.State} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StatisticalMeasureComboElement.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StatisticalMeasureComboElement.java
similarity index 79%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StatisticalMeasureComboElement.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StatisticalMeasureComboElement.java
index eb42b9ebb717dbf28cc90e9318d2c93e20eb60d0..38f270422a611dbe8c935034de21ae692a6487f0 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/term/StatisticalMeasureComboElement.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/term/StatisticalMeasureComboElement.java
@@ -8,13 +8,13 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.forms.term;
+package eu.etaxonomy.taxeditor.ui.term;
 
 import java.util.List;
 
 import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 
 /**
  * <p>StatisticalMeasureComboElement class.</p>
@@ -30,8 +30,8 @@ public class StatisticalMeasureComboElement extends AbstractTermComboElement<Sta
        /**
         * <p>Constructor for StatisticalMeasureComboElement.</p>
         *
-        * @param formFactory a {@link eu.etaxonomy.taxeditor.forms.CdmFormFactory} object.
-        * @param parentElement a {@link eu.etaxonomy.taxeditor.forms.ICdmFormElement} object.
+        * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory} object.
+        * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement} object.
         * @param labelString a {@link java.lang.String} object.
         * @param selection a {@link eu.etaxonomy.cdm.model.description.StatisticalMeasure} object.
         * @param style a int.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/GoogleLanguageApiWrapper.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
similarity index 99%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/GoogleLanguageApiWrapper.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
index 5cd624fe604d5c8fc72695e1367f07d3492e2389..64578f8ee2e612e10ae8c5cde6f23f8c97f0e271 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/GoogleLanguageApiWrapper.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/GoogleLanguageApiWrapper.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.translation;
+package eu.etaxonomy.taxeditor.ui.translation;
 
 import com.google.api.translate.Translate;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/ITranslationServiceWrapper.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/ITranslationServiceWrapper.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/ITranslationServiceWrapper.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/ITranslationServiceWrapper.java
index 03ff1214aab6eca89b1ca69652546da065fec7bd..e4c9d618279e05ae9dae7b3cc0dbe7890a838707 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/ITranslationServiceWrapper.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/ITranslationServiceWrapper.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.translation;
+package eu.etaxonomy.taxeditor.ui.translation;
 
 import eu.etaxonomy.cdm.model.common.Language;
 
@@ -28,7 +28,7 @@ public interface ITranslationServiceWrapper {
         * @param source a {@link eu.etaxonomy.cdm.model.common.Language} object.
         * @param target a {@link eu.etaxonomy.cdm.model.common.Language} object.
         * @return a {@link java.lang.String} object.
-        * @throws eu.etaxonomy.taxeditor.editor.translation.LanguageNotSupportedException if any.
+        * @throws eu.etaxonomy.taxeditor.ui.translation.LanguageNotSupportedException if any.
         */
        public String translate(String text, Language source, Language target) throws LanguageNotSupportedException;
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/LanguageNotSupportedException.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/LanguageNotSupportedException.java
similarity index 94%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/LanguageNotSupportedException.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/LanguageNotSupportedException.java
index d9dff9830c8a8fadcc2f51f5b3a78977f3c1101d..0dea1d8126fb6fd263d60d1cbc000c5be1d0e692 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/LanguageNotSupportedException.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/LanguageNotSupportedException.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.translation;
+package eu.etaxonomy.taxeditor.ui.translation;
 
 
 /**

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationMetaDataWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationMetaDataWizardPage.java
similarity index 93%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationMetaDataWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationMetaDataWizardPage.java
index 1d18402d39ff847ae43d99441aa8f59307ad7ab6..b27deeacf68c4f0c8903e8ac3715cea176602500 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationMetaDataWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationMetaDataWizardPage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.translation;
+package eu.etaxonomy.taxeditor.ui.translation;
 
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
@@ -16,7 +16,7 @@ import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 
 /**
  * <p>TranslationMetaDataWizardPage class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizard.java
similarity index 96%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizard.java
index 4885f02d189f7b56f28c4c9f57167151210980dd..dd079db6e55e2063c50d9bdc387a88bacc1d81f5 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizard.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.translation;
+package eu.etaxonomy.taxeditor.ui.translation;
 
 import java.util.Map;
 

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java
similarity index 89%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationWizardPage.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java
index 83655e07b521ccb8562904729b701b240a002435..4206a8949c05876468663f00dc0510d421c06c08 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/translation/TranslationWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/ui/translation/TranslationWizardPage.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.translation;
+package eu.etaxonomy.taxeditor.ui.translation;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,16 +27,16 @@ import org.eclipse.swt.widgets.Display;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.forms.LanguageStringWithLabelElement;
-import eu.etaxonomy.taxeditor.forms.MultilanguageTextElement;
-import eu.etaxonomy.taxeditor.forms.RootElement;
-import eu.etaxonomy.taxeditor.forms.term.EmptyComboElement;
-import eu.etaxonomy.taxeditor.forms.term.LanguageComboElement;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.forms.LanguageStringWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.forms.MultilanguageTextElement;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
+import eu.etaxonomy.taxeditor.ui.term.EmptyComboElement;
+import eu.etaxonomy.taxeditor.ui.term.LanguageComboElement;
 
 /**
  * <p>TranslationWizardPage class.</p>
@@ -197,9 +197,9 @@ public class TranslationWizardPage extends WizardPage{
                                        translatedText = service.translate(text, sourceLanguage, targetLanguage);
                                        text_target.setText(translatedText);
                                } catch (LanguageNotSupportedException e) {
-                                       EditorUtil.warningDialog("Language not supported", TranslationWizardPage.class, e.getMessage());
+                                       StoreUtil.warningDialog("Language not supported", TranslationWizardPage.class, e.getMessage());
                                } catch (Exception e){
-                                       EditorUtil.warningDialog("Error translating text", TranslationWizardPage.class, e.getMessage());
+                                       StoreUtil.warningDialog("Error translating text", TranslationWizardPage.class, e.getMessage());
                                }
                                
                        }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/AbstractAccountView.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractAccountViewPart.java
similarity index 84%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/AbstractAccountView.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractAccountViewPart.java
index 169e69b4f9bd4dc575d17e67c2c2b2865ef2d768..a395a7dd2b3cf4646033e9f5f281421943ee2dfd 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/AbstractAccountView.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractAccountViewPart.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.account;
+package eu.etaxonomy.taxeditor.view;
 
 import java.util.Collection;
 
@@ -17,7 +17,9 @@ import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusAdapter;
 import org.eclipse.swt.events.FocusEvent;
@@ -27,15 +29,13 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.IWorkbenchPart;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
 import eu.etaxonomy.taxeditor.model.IContextListener;
-import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -43,8 +43,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created Feb 16, 2011
  * @version 1.0
  */
-public abstract class AbstractAccountView<T> extends ViewPart implements
-               IConversationEnabled, IPostOperationEnabled {
+public abstract class AbstractAccountViewPart<T> extends AbstractCdmViewPart {
 
        private class ContextListener extends ContextListenerAdapter{
 
@@ -165,30 +164,10 @@ public abstract class AbstractAccountView<T> extends ViewPart implements
                return true;
        }
 
-       
        /**
         * @return
         */
        public abstract Collection getInput();
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.operation.IPostOperationEnabled#onComplete()
-        */
-       @Override
-       public boolean onComplete() {
-               return true;
-       }
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
-        */
-       @Override
-       public ConversationHolder getConversationHolder() {
-               if(conversation == null){
-                       conversation = CdmStore.createConversation();
-               }
-               return conversation;
-       }
        
        /* (non-Javadoc)
         * @see org.eclipse.ui.part.WorkbenchPart#dispose()
@@ -199,16 +178,33 @@ public abstract class AbstractAccountView<T> extends ViewPart implements
                super.dispose();
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-        */
-       /** {@inheritDoc} */
+       
        @Override
-       public void setFocus() {
-               if(getConversationHolder() != null){
-                       getConversationHolder().bind();
-               }
-               viewer.getControl().setFocus();
+       public void selectionChanged(IWorkbenchPart part, ISelection selection) {
+               // TODO Auto-generated method stub
+               
+       }
+
+       @Override
+       public Viewer getViewer() {
+               return viewer;
+       }
+
+       @Override
+       public void createViewer(Composite parent) {
+               // TODO Auto-generated method stub
+               
+       }
+
+       @Override
+       public void changed(Object object) {
+               // do nothing
+       }
+       
+
+       @Override
+       public boolean onComplete() {
+               return true;
        }
 
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractCdmDataViewer.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmDataViewer.java
similarity index 89%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractCdmDataViewer.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmDataViewer.java
index 37ac596067daf79e412fd7b643a42670ab153c5b..b663c387e9367890af752e1f797d3e60452a58c4 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractCdmDataViewer.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmDataViewer.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.view;
+package eu.etaxonomy.taxeditor.view;
 
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -23,11 +23,10 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.editor.view.detail.CdmSectionPart;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.RootElement;
-import eu.etaxonomy.taxeditor.model.AbstractCdmViewPart;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
+import eu.etaxonomy.taxeditor.view.detail.CdmSectionPart;
 
 /**
  * <p>Abstract AbstractCdmDataViewer class.</p>
@@ -57,7 +56,7 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
         * <p>Constructor for AbstractCdmDataViewer.</p>
         *
         * @param parent a {@link org.eclipse.swt.widgets.Composite} object.
-        * @param viewPart a {@link eu.etaxonomy.taxeditor.model.AbstractCdmViewPart} object.
+        * @param viewPart a {@link eu.etaxonomy.taxeditor.view.AbstractCdmViewPart} object.
         */
        public AbstractCdmDataViewer(Composite parent, AbstractCdmViewPart viewPart) {
                this.viewPart = viewPart;
@@ -216,7 +215,7 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
        /**
         * <p>removePart</p>
         *
-        * @param sectionPart a {@link eu.etaxonomy.taxeditor.editor.view.detail.CdmSectionPart} object.
+        * @param sectionPart a {@link eu.etaxonomy.taxeditor.view.detail.CdmSectionPart} object.
         */
        protected void removePart(CdmSectionPart sectionPart){
                managedForm.removePart(sectionPart);
@@ -226,7 +225,7 @@ public abstract class AbstractCdmDataViewer extends Viewer implements ISelection
        /**
         * <p>addPart</p>
         *
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         */
        protected void addPart(AbstractFormSection section){
                CdmSectionPart sectionPart = new CdmSectionPart(section);

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractCdmEditorViewPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmEditorViewPart.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractCdmEditorViewPart.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmEditorViewPart.java
index 2a14a46f9f1091d21268442ae2587aaea423f647..1240b09f8f7cb551cb04845f33f27a961b4a54b5 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractCdmEditorViewPart.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmEditorViewPart.java
@@ -1,14 +1,13 @@
 /**
  * 
  */
-package eu.etaxonomy.taxeditor.editor.view;
+package eu.etaxonomy.taxeditor.view;
 
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorPart;
 
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.model.AbstractCdmViewPart;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * <p>Abstract AbstractCdmEditorViewPart class.</p>
@@ -40,7 +39,7 @@ public abstract class AbstractCdmEditorViewPart extends AbstractCdmViewPart {
         * @return the currently active editor
         */
        public IEditorPart getEditor(){
-               return EditorUtil.getActiveEditor();
+               return StoreUtil.getActiveEditor();
        }
        
        /** {@inheritDoc} */

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractCdmViewPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
similarity index 97%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractCdmViewPart.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
index 4fd1f574c644c016a2f4c32038d7ecc5d5dca2af..dc0815a357853e05eb457d2a959d25cfa6a87804 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractCdmViewPart.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.model;
+package eu.etaxonomy.taxeditor.view;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
+import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
@@ -162,7 +163,6 @@ public abstract class AbstractCdmViewPart extends ViewPart implements ISelection
        
        /** {@inheritDoc} */
        public void update(CdmDataChangeMap changeEvents) {
-               // TODO Auto-generated method stub
                
        }
        

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractSplitableViewPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractSplitableViewPart.java
similarity index 94%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractSplitableViewPart.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractSplitableViewPart.java
index 0ea3ee84060d91f9580e4b8901d75c7afdb3c6c4..d1f5293eedb1822592bc237b19807946803deb3b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/AbstractSplitableViewPart.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractSplitableViewPart.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.view;
+package eu.etaxonomy.taxeditor.view;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.Viewer;
@@ -24,8 +24,7 @@ import org.eclipse.ui.ISelectionService;
 import org.eclipse.ui.part.PageBook;
 import org.eclipse.ui.part.ViewPart;
 
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
+import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 /**
  * <p>Abstract AbstractSplitableViewPart class.</p>
@@ -73,7 +72,7 @@ public abstract class AbstractSplitableViewPart extends ViewPart implements ISel
        public AbstractSplitableViewPart() {
                super();
                
-               dialogSettings = TaxeditorEditorPlugin.getDefault().getDialogSettings();
+               dialogSettings = TaxeditorStorePlugin.getDefault().getDialogSettings();
                
        }
        
@@ -105,10 +104,12 @@ public abstract class AbstractSplitableViewPart extends ViewPart implements ISel
                
                initOrientation();
                
+               // FIXME since this class is not used at the moment we will not have to fix this soon
+               // it might also become irrelevant in future uses
                // set the selection if there is an open editor
-               if(EditorUtil.getActiveMultiPageTaxonEditor() != null){
-                       selectionChanged(EditorUtil.getActiveMultiPageTaxonEditor(), EditorUtil.getCurrentSelection());
-               }
+//             if(EditorUtil.getActiveMultiPageTaxonEditor() != null){
+//                     selectionChanged(EditorUtil.getActiveMultiPageTaxonEditor(), EditorUtil.getCurrentSelection());
+//             }
        }
        
     private void initOrientation() {

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceContentProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceContentProvider.java
similarity index 96%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceContentProvider.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceContentProvider.java
index 77149e99b0b711a3f4b3f0258619d4ab8577fdae..9cf3e4d17576c684d70415bc003f227e1c894809 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceContentProvider.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceContentProvider.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.view;
+package eu.etaxonomy.taxeditor.view.datasource;
 
 import java.util.List;
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceLabelProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java
similarity index 98%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceLabelProvider.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java
index 6da590daace6a3cb2cfb78f6f494ce97de6253b9..50e000811fd08daf46db2a683f91cc0fda252239 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceLabelProvider.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.view;
+package eu.etaxonomy.taxeditor.view.datasource;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceViewPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java
similarity index 98%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceViewPart.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java
index 1c7fef77b0349fcbc3f96f86063acdfb8e023f8b..2ebb261e0e7e6d697ffd4eb2e25775b291409de7 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceViewPart.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.view;
+package eu.etaxonomy.taxeditor.view.datasource;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
@@ -128,7 +128,7 @@ public class CdmDataSourceViewPart extends ViewPart{
        }
        
        /** Constant <code>ID="eu.etaxonomy.taxeditor.store.datasource"{trunked}</code> */
-       public static String ID = "eu.etaxonomy.taxeditor.store.datasource.datasourceView";
+       public static String ID = "eu.etaxonomy.taxeditor.view.datasource";
        
        private TableViewer viewer;
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceViewerComparator.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java
similarity index 98%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceViewerComparator.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java
index b3b7be8d69e4084d63ba872ca3d8e060f35df0e2..89e1f8476e39d4522894821f2e6de8fd088cf0e4 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmDataSourceViewerComparator.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.view;
+package eu.etaxonomy.taxeditor.view.datasource;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmMetaDataAwareDataSourceContainer.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java
similarity index 97%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmMetaDataAwareDataSourceContainer.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java
index b03c0965fbc9445fb2556c342e73a44e32515876..ad4e6ccfeeedcd5fb025766979e57873698c2e75 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/view/CdmMetaDataAwareDataSourceContainer.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.view;
+package eu.etaxonomy.taxeditor.view.datasource;
 
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -94,7 +94,7 @@ public class CdmMetaDataAwareDataSourceContainer {
         * <p>Constructor for CdmMetaDataAwareDataSourceContainer.</p>
         *
         * @param dataSource a {@link eu.etaxonomy.cdm.database.ICdmDataSource} object.
-        * @param view a {@link eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart} object.
+        * @param view a {@link eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart} object.
         */
        public CdmMetaDataAwareDataSourceContainer(ICdmDataSource dataSource, CdmDataSourceViewPart view){
                this.dataSource = dataSource;
@@ -103,6 +103,7 @@ public class CdmMetaDataAwareDataSourceContainer {
                metaDataMap = getDefaultMetaDataMap();
                
                job = new MetaDataJob(dataSource.getName());
+               job.setPriority(Job.DECORATE);
                view.getService().schedule(job);
        }
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/AbstractDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java
similarity index 88%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/AbstractDataSourceHandler.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java
index 8fbb9a481fc763d82401eecb3c3bdd33fc8fbf74..4f10e1ee263c594c5ef7df435bb7b70090d777b4 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/AbstractDataSourceHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.handler;
+package eu.etaxonomy.taxeditor.view.datasource.handler;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -17,9 +17,9 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
-import eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContainer;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
+import eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer;
 
 /**
  * @author n.hoffmann
@@ -46,7 +46,7 @@ abstract class AbstractDataSourceHandler extends AbstractHandler {
         * <p>getSelectedDataSourceContainer</p>
         *
         * @param event a {@link org.eclipse.core.commands.ExecutionEvent} object.
-        * @return a {@link eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContainer} object.
+        * @return a {@link eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer} object.
         */
        protected CdmMetaDataAwareDataSourceContainer getSelectedDataSourceContainer(ExecutionEvent event){
                ISelection menuSelection = HandlerUtil.getActiveMenuSelection(event);

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/ChangeConnectionHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java
similarity index 94%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/ChangeConnectionHandler.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java
index 65385dedf7bfb913d6c141d332f650b33aa378d1..a2bc1af6cb4bb6645ed957670c7315214547bed2 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/ChangeConnectionHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.handler;
+package eu.etaxonomy.taxeditor.view.datasource.handler;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -17,9 +17,9 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
-import eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContainer;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer;
 
 /**
  * <p>ChangeConnectionHandler class.</p>

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CloseConnectionHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/CloseConnectionHandler.java
similarity index 92%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CloseConnectionHandler.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/CloseConnectionHandler.java
index e2c9aeca51ead5a7655b509e8dbb64a57bc2e7dd..62867a118ba330c1be7adce857ccf5a25f9f108c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CloseConnectionHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/CloseConnectionHandler.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.handler;
+package eu.etaxonomy.taxeditor.view.datasource.handler;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -17,9 +17,9 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
 
 /**
  * <p>CloseConnectionHandler class.</p>

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CreateDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/CreateDataSourceHandler.java
similarity index 95%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CreateDataSourceHandler.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/CreateDataSourceHandler.java
index 5b02b0ac41c6d8b74edeca0e4eb8adad810c4f6c..104cb8af4619fe13d2e79af8e06feeb80f06567c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CreateDataSourceHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/CreateDataSourceHandler.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.handler;
+package eu.etaxonomy.taxeditor.view.datasource.handler;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.runtime.IStatus;

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DataSourceMenuPropertyTester.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DataSourceMenuPropertyTester.java
similarity index 93%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DataSourceMenuPropertyTester.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DataSourceMenuPropertyTester.java
index e97653356511a95bd0009af6c018f2a1ac145d6b..491235fb56a1d3902a9fddb5fe84e0343792820f 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DataSourceMenuPropertyTester.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DataSourceMenuPropertyTester.java
@@ -8,14 +8,14 @@
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 
-package eu.etaxonomy.taxeditor.datasource.handler;
+package eu.etaxonomy.taxeditor.view.datasource.handler;
 
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
-import eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContainer;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer;
 
 /**
  * <p>DataSourceMenuPropertyTester class.</p>

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DeleteDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DeleteDataSourceHandler.java
similarity index 52%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DeleteDataSourceHandler.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DeleteDataSourceHandler.java
index 7ed505218e22d4353687c44914249fa0791190e5..0d3faffacfbf856233518c60959127c74e3cd5cb 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DeleteDataSourceHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DeleteDataSourceHandler.java
@@ -8,16 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.handler;
+package eu.etaxonomy.taxeditor.view.datasource.handler;
 
 import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.database.CdmPersistentDataSource;
 import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository;
-import eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContainer;
+import eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer;
 
 /**
  * <p>DeleteDataSourceHandler class.</p>
@@ -34,15 +35,21 @@ public class DeleteDataSourceHandler extends AbstractDataSourceHandler {
        /** {@inheritDoc} */
        @Override
        public boolean specificExecute(ExecutionEvent event) {
-               ISelection menuSelection = HandlerUtil.getActiveMenuSelection(event);
-               Object[] selectedObjects = ((StructuredSelection) menuSelection).toArray();
+               ISelection selection = HandlerUtil.getActivePart(event).getSite().getSelectionProvider().getSelection();
+               if(selection instanceof IStructuredSelection){
+                       Object[] selectedObjects = ((IStructuredSelection) selection).toArray();
                
-               // Delete from persistent data sources          
-               for(Object object : selectedObjects){
-                       CdmPersistentDataSource dataSource = (CdmPersistentDataSource) ((CdmMetaDataAwareDataSourceContainer) object).getDataSource();
-                       CdmDataSourceRepository.delete(dataSource);
+                       if(! MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Deletion", "Do you want to delete the selected datasources?")){
+                               return false;
+                       }
+                       // Delete from persistent data sources          
+                       for(Object object : selectedObjects){
+                               CdmPersistentDataSource dataSource = (CdmPersistentDataSource) ((CdmMetaDataAwareDataSourceContainer) object).getDataSource();
+                               CdmDataSourceRepository.delete(dataSource);
+                       }
+                       
+                       return true;
                }
-               
-               return true;
+               return false;
        }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/EditDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java
similarity index 89%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/EditDataSourceHandler.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java
index 256f3d7108a95b3d71d00693ff6c705e9073ca85..7bfc465b252483912ced60feb64d30976843939b 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/EditDataSourceHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java
@@ -8,17 +8,17 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.handler;
+package eu.etaxonomy.taxeditor.view.datasource.handler;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
-import eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContainer;
 import eu.etaxonomy.taxeditor.datasource.wizard.CdmDataSourceWizard;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
+import eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer;
 
 /**
  * <p>EditDataSourceHandler class.</p>

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/UpdateDataSourceHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java
similarity index 93%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/UpdateDataSourceHandler.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java
index 1b3adc54445ff1423c19230a97df9c2b9923bf41..80ff1d3b833197f9a90280dd6f28c713ace53193 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/UpdateDataSourceHandler.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.datasource.handler;
+package eu.etaxonomy.taxeditor.view.datasource.handler;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -19,11 +19,11 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.progress.IProgressConstants;
 
 import eu.etaxonomy.cdm.database.update.CdmUpdater;
-import eu.etaxonomy.taxeditor.datasource.view.CdmDataSourceViewPart;
-import eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContainer;
 import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
+import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart;
+import eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer;
 
 /**
  * <p>UpdateDataSourceHandler class.</p>

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/CdmSectionPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
similarity index 77%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/CdmSectionPart.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
index 09a393b986d8129d84db0748179db980601ee21e..9e78f57be1320bb2bc220941b85b4ace0f021513 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/CdmSectionPart.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.view.detail;
+package eu.etaxonomy.taxeditor.view.detail;
 
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
@@ -18,13 +18,13 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.name.container.AbstractGroupedContainer;
-import eu.etaxonomy.taxeditor.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.model.IElementHasDetails;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.IDerivedUnitFacadeDetailSection;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.IDerivedUnitFacadeDetailSection;
 
 /**
  * <p>CdmSectionPart class.</p>
@@ -40,7 +40,7 @@ public class CdmSectionPart<T> extends SectionPart implements IPropertyChangeLis
        /**
         * <p>Constructor for CdmSectionPart.</p>
         *
-        * @param section a {@link eu.etaxonomy.taxeditor.forms.AbstractFormSection} object.
+        * @param section a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection} object.
         * @param <T> a T object.
         */
        public CdmSectionPart(AbstractFormSection<T> section) {
@@ -51,8 +51,8 @@ public class CdmSectionPart<T> extends SectionPart implements IPropertyChangeLis
        /** {@inheritDoc} */
        @Override
        public boolean setFormInput(Object input) {
-               if(input instanceof AbstractGroupedContainer){
-                       input = ((AbstractGroupedContainer) input).getData();
+               if(input instanceof IElementHasDetails){
+                       input = ((IElementHasDetails) input).getData();
                }
                if((input instanceof TaxonBase) && (formSection instanceof ITaxonBaseDetailSection)){
                        ((ITaxonBaseDetailSection) formSection).setTaxonBase((TaxonBase) input);
@@ -63,7 +63,7 @@ public class CdmSectionPart<T> extends SectionPart implements IPropertyChangeLis
                        try {
                                input = DerivedUnitFacade.NewInstance((DerivedUnitBase) input, PreferencesUtil.getDerivedUnitConfigurator());
                        } catch (DerivedUnitFacadeNotSupportedException e) {
-                               EditorUtil.error(getClass(), e);
+                               StoreUtil.error(getClass(), e);
                        }
                }
                

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java
similarity index 87%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewPart.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java
index 1199efb50efcfaca15041d6dcb84fd4c47be4dc9..5d884ed617b466a02984094e37866ea877077702 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewPart.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.view.detail;
+package eu.etaxonomy.taxeditor.view.detail;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -19,11 +19,11 @@ import org.eclipse.ui.IWorkbenchPart;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmEditorViewPart;
-import eu.etaxonomy.taxeditor.model.AbstractCdmViewPart;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
+import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
 
 /**
  * <p>DetailsViewPart class.</p>
@@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
 public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartContentHasSupplementalData{
        
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.forms.det"{trunked}</code> */
-       public static String ID = "eu.etaxonomy.taxeditor.editor.forms.detailsView";
+       public static String ID = "eu.etaxonomy.taxeditor.view.detail";
 
        private DetailsViewer viewer;
 
@@ -50,7 +50,7 @@ public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartC
 
        /** {@inheritDoc} */
        public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-               if(EditorUtil.getActiveEditor() == null){
+               if(StoreUtil.getActiveEditor() == null){
                        showEmptyPage();
                        return;
                }
@@ -117,7 +117,6 @@ public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartC
         * @return a boolean.
         */
        public boolean onComplete() {
-               // TODO Auto-generated method stub
-               return false;
+               return true;
        }
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewer.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewer.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index ac64b51cf750d05610917d45d9a2d5de3917f709..0328c04bf82670c471005d2f7602bb154d2a823b 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewer.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.view.detail;
+package eu.etaxonomy.taxeditor.view.detail;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -21,6 +21,7 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
+import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
@@ -30,45 +31,47 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmDataViewer;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.DetailType;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.RootElement;
-import eu.etaxonomy.taxeditor.model.AbstractCdmViewPart;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.section.agent.PersonDetailSection;
-import eu.etaxonomy.taxeditor.section.agent.TeamDetailSection;
-import eu.etaxonomy.taxeditor.section.agent.TeamOrPersonBaseDetailSection;
-import eu.etaxonomy.taxeditor.section.description.DescribedSpecimenSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionDetailSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionElementDetailSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionElementMediaSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionElementSourceSection;
-import eu.etaxonomy.taxeditor.section.description.DescriptionSourceSection;
-import eu.etaxonomy.taxeditor.section.description.MediaDetailsSection;
-import eu.etaxonomy.taxeditor.section.description.NaturalLanguageSection;
-import eu.etaxonomy.taxeditor.section.description.ScopeSection;
-import eu.etaxonomy.taxeditor.section.feature.FeatureDistributionDetailSection;
-import eu.etaxonomy.taxeditor.section.key.GeographicalScopeDetailSection;
-import eu.etaxonomy.taxeditor.section.key.PolytomousKeyDetailSection;
-import eu.etaxonomy.taxeditor.section.key.PolytomousKeyNodeDetailSection;
-import eu.etaxonomy.taxeditor.section.key.ScopeRestrictionSection;
-import eu.etaxonomy.taxeditor.section.name.HybridDetailSection;
-import eu.etaxonomy.taxeditor.section.name.NameRelationshipDetailSection;
-import eu.etaxonomy.taxeditor.section.name.NomenclaturalStatusSection;
-import eu.etaxonomy.taxeditor.section.name.NonViralNameDetailSection;
-import eu.etaxonomy.taxeditor.section.name.ProtologueSection;
-import eu.etaxonomy.taxeditor.section.name.TypeDesignationSection;
-import eu.etaxonomy.taxeditor.section.occurrence.DerivedUnitBaseDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.FieldObservationDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.GatheringEventDetailSection;
-import eu.etaxonomy.taxeditor.section.occurrence.GeneralDetailSection;
-import eu.etaxonomy.taxeditor.section.reference.NomenclaturalReferenceDetailSection;
-import eu.etaxonomy.taxeditor.section.reference.ReferenceDetailSection;
-import eu.etaxonomy.taxeditor.section.taxon.ParsingMessagesSection;
-import eu.etaxonomy.taxeditor.section.taxon.TaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.section.agent.PersonDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.agent.TeamDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.agent.TeamOrPersonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescribedSpecimenSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementMediaSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionElementSourceSection;
+import eu.etaxonomy.taxeditor.ui.section.description.DescriptionSourceSection;
+import eu.etaxonomy.taxeditor.ui.section.description.MediaDetailsSection;
+import eu.etaxonomy.taxeditor.ui.section.description.NaturalLanguageSection;
+import eu.etaxonomy.taxeditor.ui.section.description.ScopeSection;
+import eu.etaxonomy.taxeditor.ui.section.feature.FeatureDistributionDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.key.GeographicalScopeDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.key.PolytomousKeyNodeDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.key.ScopeRestrictionSection;
+import eu.etaxonomy.taxeditor.ui.section.name.HybridDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.name.NameRelationshipDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.name.NomenclaturalStatusSection;
+import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.name.ProtologueSection;
+import eu.etaxonomy.taxeditor.ui.section.name.TypeDesignationSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalReferenceDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.taxon.ParsingMessagesSection;
+import eu.etaxonomy.taxeditor.ui.section.taxon.TaxonBaseDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.user.GroupsByUserDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.user.UserDetailSection;
+import eu.etaxonomy.taxeditor.view.AbstractCdmDataViewer;
+import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
 
 /**
  * <p>DetailsViewer class.</p>
@@ -94,7 +97,8 @@ public class DetailsViewer extends AbstractCdmDataViewer {
                DERIVED_UNIT,
                FEATURE_DISTRIBUTION,
                POLYTOMOUS_KEY,
-               POLYTOMOUS_KEY_NODE
+               POLYTOMOUS_KEY_NODE,
+               USER
        }
        
        private VIEW_PART currentViewPart;
@@ -105,7 +109,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
         * <p>Constructor for DetailsViewer.</p>
         *
         * @param parent a {@link org.eclipse.swt.widgets.Composite} object.
-        * @param viewPart a {@link eu.etaxonomy.taxeditor.model.AbstractCdmViewPart} object.
+        * @param viewPart a {@link eu.etaxonomy.taxeditor.view.AbstractCdmViewPart} object.
         */
        public DetailsViewer(Composite parent, AbstractCdmViewPart viewPart) {
                super(parent, viewPart);
@@ -124,7 +128,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
                        try {
                                input = DerivedUnitFacade.NewInstance((DerivedUnitBase) input, PreferencesUtil.getDerivedUnitConfigurator());
                        } catch (DerivedUnitFacadeNotSupportedException e) {
-                               EditorUtil.error(getClass(), e);
+                               StoreUtil.error(getClass(), e);
                        }
                }
                super.setInput(input);
@@ -231,6 +235,11 @@ public class DetailsViewer extends AbstractCdmDataViewer {
                                createPolytomousKeyNodeSection(rootElement);
                                currentViewPart = VIEW_PART.POLYTOMOUS_KEY_NODE;
                        }
+               }else if(getInput() instanceof User){
+                       if(currentViewPart != VIEW_PART.USER){
+                               createUserSection(rootElement);
+                               currentViewPart = VIEW_PART.USER;
+                       }
                }else{
                        destroySections();
                        currentViewPart = VIEW_PART.EMPTY;
@@ -239,7 +248,6 @@ public class DetailsViewer extends AbstractCdmDataViewer {
                layout();
        }
 
-
        /* (non-Javadoc)
         * @see org.eclipse.jface.viewers.Viewer#getSelection()
         */
@@ -543,8 +551,20 @@ public class DetailsViewer extends AbstractCdmDataViewer {
                destroySections();
                
                PolytomousKeyNodeDetailSection polytomousKeyNodeDetailSection = (PolytomousKeyNodeDetailSection)
-               formFactory.createCdmDetailSection(DetailType.POLYTOMOUS_KEY_NODE, getConversationHolder(), parent, this, Section.TWISTIE | Section.EXPANDED);
+                       formFactory.createCdmDetailSection(DetailType.POLYTOMOUS_KEY_NODE, getConversationHolder(), parent, this, Section.TWISTIE | Section.EXPANDED);
        
                addPart(polytomousKeyNodeDetailSection);
        }
+       
+       private void createUserSection(RootElement parent) {
+               destroySections();
+               
+               UserDetailSection userDetailSection = (UserDetailSection) 
+                       formFactory.createCdmDetailSection(DetailType.USER, getConversationHolder(), parent, this, Section.TWISTIE | Section.EXPANDED);
+               
+               GroupsByUserDetailSection groupByUserDetailSection = (GroupsByUserDetailSection) formFactory.createCdmDetailSection(DetailType.GROUPS_BY_USER, getConversationHolder(), parent, this, Section.TWISTIE | Section.EXPANDED);
+               
+               addPart(userDetailSection);
+               addPart(groupByUserDetailSection);
+       }
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/group/view/GroupLabelProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/group/GroupLabelProvider.java
similarity index 93%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/group/view/GroupLabelProvider.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/group/GroupLabelProvider.java
index f04f9bb4e949b69c7b0f0ee2f398e2fc0fecf400..1a3236389cf2e8024c5bad48759987a69f2ff89c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/group/view/GroupLabelProvider.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/group/GroupLabelProvider.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.account.group.view;
+package eu.etaxonomy.taxeditor.view.group;
 
 import org.eclipse.jface.viewers.LabelProvider;
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/group/view/GroupView.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/group/GroupViewPart.java
similarity index 79%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/group/view/GroupView.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/group/GroupViewPart.java
index f553464eb4af894eae6369019fb094c39b0389b2..ffe362701ae86b479a4a5ad73cfdbf0fcb9c779c 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/group/view/GroupView.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/group/GroupViewPart.java
@@ -8,24 +8,28 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.account.group.view;
+package eu.etaxonomy.taxeditor.view.group;
 
 import java.util.Collection;
 
 import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.IWorkbenchPart;
 
 import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.model.common.Group;
-import eu.etaxonomy.taxeditor.account.AbstractAccountView;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.view.AbstractAccountViewPart;
 
 /**
  * @author n.hoffmann
  * @created Feb 16, 2011
  * @version 1.0
  */
-public class GroupView extends AbstractAccountView<Group>{
+public class GroupViewPart extends AbstractAccountViewPart<Group>{
 
        public static String ID = "eu.etaxonomy.taxeditor.store.groupView";
 
@@ -50,6 +54,5 @@ public class GroupView extends AbstractAccountView<Group>{
         */
        @Override
        protected void createColumns(TableViewer viewer) {
-       }
-       
+       }       
 }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/reporting/ReportingViewPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/reporting/ReportingViewPart.java
similarity index 93%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/reporting/ReportingViewPart.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/reporting/ReportingViewPart.java
index 379969da75ff4a2736b2e9937d79b48dcb72dff6..44f9e1932bec2774459ee8edc2bd80b701501c9d 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/reporting/ReportingViewPart.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/reporting/ReportingViewPart.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.reporting;
+package eu.etaxonomy.taxeditor.view.reporting;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -41,8 +41,7 @@ public class ReportingViewPart extends ViewPart {
         */
        @Override
        public void setFocus() {
-               // TODO Auto-generated method stub
-
+               
        }
 
 }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewPart.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewPart.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewPart.java
index b2a16bb8537b135d264f0188cbda4811b3b81ec5..8dc4e14297f79439018ea1a35bbc4d312c628b03 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewPart.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewPart.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.view.supplementaldata;
+package eu.etaxonomy.taxeditor.view.supplementaldata;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -18,10 +18,10 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.part.EditorPart;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmEditorViewPart;
-import eu.etaxonomy.taxeditor.model.AbstractCdmViewPart;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
+import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
 
 
 /**
@@ -34,7 +34,7 @@ import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 public class SupplementalDataViewPart extends AbstractCdmEditorViewPart {
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.supp"{trunked}</code> */
-       public static final String ID = "eu.etaxonomy.taxeditor.editor.view.supplementalData";
+       public static final String ID = "eu.etaxonomy.taxeditor.view.supplementalData";
 
        private SupplementalDataViewer viewer;
        
@@ -50,7 +50,7 @@ public class SupplementalDataViewPart extends AbstractCdmEditorViewPart {
 
        /** {@inheritDoc} */
        public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-               if(EditorUtil.getActiveEditor() == null){
+               if(StoreUtil.getActiveEditor() == null){
                        showEmptyPage();
                        return;
                }

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewer.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java
similarity index 83%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewer.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java
index d247b10a161a80f92f8988556e5963a48dd1d6e9..373191faea9462d6f8bd62b365cc8053e87c3861 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/supplementaldata/SupplementalDataViewer.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.view.supplementaldata;
+package eu.etaxonomy.taxeditor.view.supplementaldata;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -22,22 +22,22 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.media.IdentifiableMediaEntity;
-import eu.etaxonomy.taxeditor.editor.name.container.AbstractGroupedContainer;
-import eu.etaxonomy.taxeditor.editor.view.AbstractCdmDataViewer;
-import eu.etaxonomy.taxeditor.editor.view.detail.DetailsViewer;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.forms.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.forms.RootElement;
-import eu.etaxonomy.taxeditor.model.AbstractCdmViewPart;
-import eu.etaxonomy.taxeditor.section.supplemental.AnnotationSection;
-import eu.etaxonomy.taxeditor.section.supplemental.CreditSection;
-import eu.etaxonomy.taxeditor.section.supplemental.ExtensionSection;
-import eu.etaxonomy.taxeditor.section.supplemental.HeadlineSection;
-import eu.etaxonomy.taxeditor.section.supplemental.MarkerSection;
-import eu.etaxonomy.taxeditor.section.supplemental.MediaSection;
-import eu.etaxonomy.taxeditor.section.supplemental.RightsSection;
-import eu.etaxonomy.taxeditor.section.supplemental.SourceSection;
-import eu.etaxonomy.taxeditor.section.supplemental.VersionSection;
+import eu.etaxonomy.taxeditor.model.IElementHasDetails;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.RootElement;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AnnotationSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.CreditSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.ExtensionSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.HeadlineSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MarkerSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.MediaSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.RightsSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.SourceSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.VersionSection;
+import eu.etaxonomy.taxeditor.view.AbstractCdmDataViewer;
+import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
+import eu.etaxonomy.taxeditor.view.detail.DetailsViewer;
 
 /**
  * <p>SupplementalDataViewer class.</p>
@@ -63,7 +63,7 @@ public class SupplementalDataViewer extends AbstractCdmDataViewer implements ISe
         * <p>Constructor for SupplementalDataViewer.</p>
         *
         * @param parent a {@link org.eclipse.swt.widgets.Composite} object.
-        * @param viewPart a {@link eu.etaxonomy.taxeditor.model.AbstractCdmViewPart} object.
+        * @param viewPart a {@link eu.etaxonomy.taxeditor.view.AbstractCdmViewPart} object.
         */
        public SupplementalDataViewer(Composite parent, AbstractCdmViewPart viewPart) {
                super(parent, viewPart);
@@ -85,7 +85,6 @@ public class SupplementalDataViewer extends AbstractCdmDataViewer implements ISe
        /** {@inheritDoc} */
        @Override
        public void setSelection(ISelection selection, boolean reveal) {
-               // TODO Auto-generated method stub
 
        }
 
@@ -98,8 +97,8 @@ public class SupplementalDataViewer extends AbstractCdmDataViewer implements ISe
                
                Object input;
                
-               if(getInput() instanceof AbstractGroupedContainer){
-                       input = ((AbstractGroupedContainer<?>) getInput()).getData();
+               if(getInput() instanceof IElementHasDetails){
+                       input = ((IElementHasDetails) getInput()).getData();
                }else{
                        input = getInput();
                }

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserContentProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserContentProvider.java
similarity index 91%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserContentProvider.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserContentProvider.java
index 1d50ed7a27b205d47bb66ac343087191e7feb6bf..ed87450111b338c5c28d4d9b6a2daf11b686cba7 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserContentProvider.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserContentProvider.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.account.user.view;
+package eu.etaxonomy.taxeditor.view.user;
 
 import java.util.List;
 
@@ -33,7 +33,6 @@ public class UserContentProvider implements IStructuredContentProvider {
         * <p>dispose</p>
         */
        public void dispose() {
-               // TODO Auto-generated method stub
 
        }
 
@@ -42,7 +41,6 @@ public class UserContentProvider implements IStructuredContentProvider {
         */
        /** {@inheritDoc} */
        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-               // TODO Auto-generated method stub
 
        }
 

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserLabelProvider.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserLabelProvider.java
similarity index 96%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserLabelProvider.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserLabelProvider.java
index 8f8e4da3b4b4435c6ef80e596194d6b3f25b5b04..99fd15149ae1646ad053dd0340b0eebf7f4a70f0 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserLabelProvider.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserLabelProvider.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.account.user.view;
+package eu.etaxonomy.taxeditor.view.user;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserView.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserView.java
similarity index 91%
rename from taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserView.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserView.java
index 34f9cfd8bf2615a697a73bf8bcef2a40fabd94f7..cf34cab5d056cbbfc5c7b312b2767f9cad80f8b4 100644 (file)
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/account/user/view/UserView.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/view/user/UserView.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.account.user.view;
+package eu.etaxonomy.taxeditor.view.user;
 
 import java.util.List;
 
@@ -20,8 +20,8 @@ import org.eclipse.swt.widgets.Table;
 
 import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.model.common.User;
-import eu.etaxonomy.taxeditor.account.AbstractAccountView;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.view.AbstractAccountViewPart;
 
 /**
  * <p>UserManagerView class.</p>
@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created 01.07.2009
  * @version 1.0
  */
-public class UserView extends AbstractAccountView<User>{
+public class UserView extends AbstractAccountViewPart<User>{
        
        
        /** Constant <code>ID="eu.etaxonomy.taxeditor.store.userManage"{trunked}</code> */