Merge branch 'release/4.7.0' 4.7.0
authorjenkins <jenkins-int@bgbm.org>
Tue, 16 May 2017 15:19:19 +0000 (17:19 +0200)
committerjenkins <jenkins-int@bgbm.org>
Tue, 16 May 2017 15:19:19 +0000 (17:19 +0200)
198 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties
eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties
eu.etaxonomy.taxeditor.application/build.properties
eu.etaxonomy.taxeditor.application/fragment.e4xmi [new file with mode: 0644]
eu.etaxonomy.taxeditor.application/plugin.xml
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/admin/UserGroupContributionItem.java [deleted file]
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java [deleted file]
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/P2Util.java
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle.properties
eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle_de.properties
eu.etaxonomy.taxeditor.bulkeditor/build.properties
eu.etaxonomy.taxeditor.bulkeditor/fragment.e4xmi [new file with mode: 0644]
eu.etaxonomy.taxeditor.bulkeditor/plugin.xml
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/IEntityCreator.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/Messages.java
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/messages.properties
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/org.osgi.core-1.0.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/osgi-3.6.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/plexus-classworlds-1.2-alpha-9.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/plexus-container-default-1.0-alpha-30.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/stax-1.2.0.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/stax-api-1.0.1.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.6.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar [deleted file]
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmAuthenticatedHttpInvokerRequestExecutor.java
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/DeleteTaxonBaseHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/DeleteDerivateHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/searchFilter/DerivateSearchCompositeController.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.feature.jre.linux64/feature.xml
eu.etaxonomy.taxeditor.feature.jre.linux64/pom.xml
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/pom.xml
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/build.properties
eu.etaxonomy.taxeditor.navigation/fragment.e4xmi [new file with mode: 0644]
eu.etaxonomy.taxeditor.navigation/plugin.xml
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingChangeAcceptedTaxonToSynonymHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RemotingMoveTaxonNodeHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/SetSecReferenceForSubtreeHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetSecundumForSubtreeOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties
eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties
eu.etaxonomy.taxeditor.store/build.properties
eu.etaxonomy.taxeditor.store/fragment.e4xmi [new file with mode: 0644]
eu.etaxonomy.taxeditor.store/plugin.xml
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/AbstractPreferenceWizard.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/DatabasePreferencesPage.java [changed mode: 0644->0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/DatabasePreferencesWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/ImportPreferencesWizard.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/ListComponent.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/NameDetailsViewComposite.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermMenu.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenDatabasePreferencesWizardHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenDatabaseRepairWizardHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenImportPreferenceHandler.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportConfiguratorWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbcdImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/DarwinCoreArchiveExportWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelDistributionUpdateWizard.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileAndChooseVocIdWizardOage.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/OutputModelExportWizard.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/RISImportWizard.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/ConfiguratorComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/SetSecundumConfiguratorWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/SetSecundumForSubtreeConfigurationWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/deleteConfigurator/DeleteConfiguratorDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/deleteConfigurator/DeleteMediaConfiguratorComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/ProtologueSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportView.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/GbifResponseImportView.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SaveImportedSpecimenAction.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java [changed mode: 0644->0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/TestSpecimenImportView.java [new file with mode: 0755]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/SessionsViewPart.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/specimenSearch/SpecimenProviderSelectionController.java
eu.etaxonomy.taxeditor.test/.settings/org.eclipse.jdt.core.prefs
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/pom.xml
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/IOServiceExportTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/CdmEntitySessionAwareTest.java
eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.jdt.core.prefs
eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.webapp/build.properties
eu.etaxonomy.taxeditor.webapp/pom.xml
eu.etaxonomy.taxeditor.workbench/.classpath [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/.project [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle.properties [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/OSGI-INF/l10n/bundle_de.properties [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/build.properties [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/fragment.e4xmi [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/plugin.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/pom.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/Activator.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/AppModelId.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenExternalAboutPlatformHandler.java [moved from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalAboutPlatformHandler.java with 64% similarity]
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenExternalParserHelpHandler.java [moved from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/OpenExternalParserHelpHandler.java with 69% similarity]
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenPartHandler.java [new file with mode: 0644]
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/update/InstallNewSoftwareHandler.java [moved from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/InstallNewSoftwareHandler.java with 83% similarity]
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/update/PreloadingRepositoryHandler.java [moved from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/PreloadingRepositoryHandler.java with 83% similarity]
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/update/UpdateHandler.java [moved from eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/update/UpdateHandler.java with 97% similarity]
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
eu.etaxonomy.taxeditor/pom.xml
eu.etaxonomy.taxeditor/rcp.target
pom.xml

index a4db339..e0cd674 100644 (file)
@@ -2,25 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
 Export-Package: eu.etaxonomy.taxeditor
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: eu.etaxonomy.cdm.database,
- org.apache.log4j,
- org.eclipse.equinox.app,
- org.eclipse.equinox.p2.repository.metadata,
- org.osgi.framework,
- org.osgi.service.packageadmin,
- org.springframework.remoting
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  eu.etaxonomy.taxeditor.store,
  eu.etaxonomy.taxeditor.navigation,
- eu.etaxonomy.taxeditor.bulkeditor,
  eu.etaxonomy.taxeditor.editor,
  eu.etaxonomy.taxeditor.printpublisher,
  eu.etaxonomy.taxeditor.molecular;resolution:=optional,
@@ -37,3 +27,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.equinox.p2.engine,
  org.eclipse.equinox.p2.metadata.repository,
  org.eclipse.equinox.p2.repository
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Import-Package: eu.etaxonomy.cdm.database,
+ javax.annotation;version="1.0.0";resolution:=optional,
+ javax.inject;version="1.0.0",
+ org.apache.log4j,
+ org.eclipse.equinox.app,
+ org.eclipse.equinox.p2.repository.metadata,
+ org.osgi.framework,
+ org.osgi.service.packageadmin,
+ org.springframework.remoting
index d1ad816..7a99367 100644 (file)
@@ -15,41 +15,9 @@ perspective.name.0 = Polytomous Key
 perspective.name.1 = Uses\r
 perspective.name.2 = Derivatives\r
 perspective.name.3 = Checklist\r
-menu.label = General\r
-menu.label.0 = Edit\r
-menu.label.1 = Window\r
-menu.label.2 = Help\r
-menu.label.3 = New\r
-menu.label.4 = Admin\r
-command.label = Close\r
-command.label.0 = Close All\r
-command.label.1 = Save\r
-command.label.2 = Save All\r
-command.label.3 = Import...\r
-command.label.4 = Export...\r
-command.label.5 = Exit\r
-command.label.6 = Undo\r
-command.label.7 = Redo\r
-command.label.8 = Cut\r
-command.label.9 = Copy\r
-command.label.10 = Paste\r
-command.label.11 = Delete\r
-command.label.12 = Preferences\r
-command.label.13 = Help Contents\r
-command.label.14 = Search\r
-command.label.15 = Dynamic Help\r
-command.label.16 = Parser Help Website\r
-command.label.17 = Check for Updates\r
-command.label.18 = Install New Software...\r
-command.label.19 = About Taxonomic Editor\r
-command.label.20 = About the EDIT Platform\r
-command.label.21 = New\r
-command.label.22 = Save\r
-command.label.23 = Database Preferences\r
-command.label.24 = Database Repair Functionality\r
 product.name = EDIT Taxonomic Editor\r
-command.name = Parser Help\r
-command.name.0 = About the EDIT Platform\r
 activity.description = Disable unwanted eclipse UI\r
 activity.name = Disable\r
-product.name.0 = EDIT Taxonomic Editor
\ No newline at end of file
+product.name.0 = EDIT Taxonomic Editor\r
+command.label.25 = Import Preferences\r
+command.label.23 = Server-sided Preferences
\ No newline at end of file
index ba37a6c..ae085c8 100644 (file)
@@ -45,8 +45,9 @@ command.label.19 = \u00dcber den Taxonomischen Editor
 command.label.20 = \u00dcber die EDIT Platform
 command.label.21 = Neu
 command.label.22 = Speichern
-command.label.23 = Datenbank Präferenzen
+command.label.23 = Serverseitige Präferenzen
 command.label.24 = Datenbank Reparatur Funktionalität
+command.label.25 = Import Präferenzen
 product.name = EDIT Taxonomischer Editor
 command.name = Parser Hilfe
 command.name.0 = \u00dcber die EDIT Platform
index 46fe7ef..62fdc72 100644 (file)
@@ -1,5 +1,3 @@
-source.. = src/main/java/,\
-           src/test/java/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
@@ -7,4 +5,7 @@ bin.includes = META-INF/,\
                icons/,\
                OSGI-INF/l10n/plugin.properties,\
                OSGI-INF/l10n/plugin_de.properties,\
-               splash.bmp,\              
+               splash.bmp,\
+               fragment.e4xmi
+source.. = src/main/java/,\
+           src/test/java/
diff --git a/eu.etaxonomy.taxeditor.application/fragment.e4xmi b/eu.etaxonomy.taxeditor.application/fragment.e4xmi
new file mode 100644 (file)
index 0000000..1e9ad5b
--- /dev/null
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmlns:ui="http://www.eclipse.org/ui/2010/UIModel/application/ui" xmi:id="_pdAMoB4DEeehWtOSgLepjA">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_0q2vsB4EEeehWtOSgLepjA" featurename="descriptors" parentElementId="org.eclipse.e4.legacy.ide.application"/>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_bM7nAB4IEeehWtOSgLepjA" featurename="menuContributions" parentElementId="org.eclipse.e4.legacy.ide.application">
+    <elements xsi:type="menu:MenuContribution" xmi:id="_q5WDAB6sEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.menucontribution.menu" parentId="org.eclipse.ui.main.menu">
+      <children xsi:type="menu:Menu" xmi:id="_0MhekB6sEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.file" label="%menu.label">
+        <children xsi:type="menu:Menu" xmi:id="_zznkcB6uEeePLJ5to5QrXQ" elementId="eu.etaxonomy.navigation.menu.new" label="%menu.label.3"/>
+        <children xsi:type="menu:MenuSeparator" xmi:id="_5ETa8B6uEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.menuseparator.0"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_ubXMsB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.close" label="%command.label" command="_LVTo8B62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_EafiMB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_yGpysB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.closeAll" label="%command.label.0" command="_MrLPsB62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_KSpoYB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:MenuSeparator" xmi:id="_BmuOUB63EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.menuseparator.3"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_jE5VoB60EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.import" label="%command.label.3" command="_dlo3oB60EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_0UicAB61EeePLJ5to5QrXQ" coreExpressionId="isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_xT7KsB61EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.export" label="%command.label.4" command="_CYHrgB62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_21J-oB61EeePLJ5to5QrXQ" coreExpressionId="isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:MenuSeparator" xmi:id="_XE1yMB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.menuseparator.1"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_YM8CsB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.save" label="%command.label.1" command="_PkWcQB62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_MogFcB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_czNDMB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.saveAll" label="%command.label.2" command="_RWLmQB62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_PVsrgB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:MenuSeparator" xmi:id="_gBC4MB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.filemenu.io"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_jC1OMB62EeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.handledmenuitem.exit" label="%command.label.5" command="_TvLd8B62EeePLJ5to5QrXQ">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_Q9yDoB7SEeeC-JvycL9ysA" coreExpressionId="isCdmStoreConnected"/>
+        </children>
+      </children>
+      <children xsi:type="menu:Menu" xmi:id="__9a5wB6sEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.edit" toBeRendered="false" visible="false" label="%menu.label.0"/>
+      <children xsi:type="menu:Menu" xmi:id="_BFCCEB6tEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.window" label="%menu.label.1">
+        <children xsi:type="menu:MenuSeparator" xmi:id="_zfx_cB7PEeeC-JvycL9ysA" elementId="eu.etaxonomy.taxeditor.application.windowMenu.last"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_35iN8B7PEeeC-JvycL9ysA" elementId="org.eclipse.ui.main.menu.window.preferences" label="%command.label.12" command="_l9kXoB7PEeeC-JvycL9ysA"/>
+      </children>
+      <children xsi:type="menu:Menu" xmi:id="_KDFiMB6tEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.admin" label="%menu.label.4">
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_RsV7EB-IEeeIA_2gwq7JKg" elementId="org.eclipse.ui.main.menu.admin.dbpreferences" label="%command.label.23" command="_JXXNIB-IEeeIA_2gwq7JKg">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_ckfJUB-IEeeIA_2gwq7JKg" coreExpressionId="hasROLE_PROJECT_MANAGER_AND_isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_VgPDcB-IEeeIA_2gwq7JKg" elementId="org.eclipse.ui.main.menu.admin.dbrepair" label="%command.label.24" command="_LuEl0B-IEeeIA_2gwq7JKg">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_06_ZIB-TEeeIA_2gwq7JKg" coreExpressionId="hasROLE_PROJECT_MANAGER_AND_isCdmStoreConnected"/>
+        </children>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_E80JgCaQEeeO2YpaECSmsg" elementId="org.eclipse.ui.main.menu.admin.import_preferences" label="Import Preferences"/>
+      </children>
+      <children xsi:type="menu:Menu" xmi:id="_MG8QUB6tEeePLJ5to5QrXQ" elementId="org.eclipse.ui.main.menu.help" label="%menu.label.2">
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_6vgg4B6gEeePLJ5to5QrXQ" elementId="id.commandlabel16" label="%command.label.16" command="_ye6jsB6gEeePLJ5to5QrXQ"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_i-R80B6fEeePLJ5to5QrXQ" elementId="id.commandlabel20" label="%command.label.20" command="_V9LTcB6eEeePLJ5to5QrXQ"/>
+      </children>
+    </elements>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_vvQmIB4JEeehWtOSgLepjA" featurename="handlers" parentElementId="org.eclipse.e4.legacy.ide.application">
+    <elements xsi:type="commands:Handler" xmi:id="_haDmcB6eEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.OpenExternalAboutPlatformHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.application/eu.etaxonomy.taxeditor.OpenExternalAboutPlatformHandler" command="_V9LTcB6eEeePLJ5to5QrXQ"/>
+    <elements xsi:type="commands:Handler" xmi:id="_3wxe4B6gEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.OpenExternalParserHelpHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.application/eu.etaxonomy.taxeditor.OpenExternalParserHelpHandler" command="_ye6jsB6gEeePLJ5to5QrXQ"/>
+    <elements xsi:type="commands:Handler" xmi:id="_cwy_oB-LEeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.handler.OpenDatabaseRepairWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenDatabaseRepairWizardHandler" command="_LuEl0B-IEeeIA_2gwq7JKg"/>
+    <elements xsi:type="commands:Handler" xmi:id="_pZ84gB-LEeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.handler.OpenDatabasePreferencesWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenDatabasePreferencesWizardHandler" command="_JXXNIB-IEeeIA_2gwq7JKg"/>
+    <elements xsi:type="commands:Handler" xmi:id="_fAnCkCaQEeeO2YpaECSmsg" elementId="eu.etaxonomy.taxeditor.handler.OpenImportPreferenceHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/target.classes.eu.etaxonomy.taxeditor.handler.OpenImportPreferenceHandler" command="_q1JAkCaQEeeO2YpaECSmsg"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_1jM6sB4JEeehWtOSgLepjA" featurename="commands" parentElementId="org.eclipse.e4.legacy.ide.application">
+    <elements xsi:type="commands:Command" xmi:id="_V9LTcB6eEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.help.aboutPlatform" commandName="%command.name.0"/>
+    <elements xsi:type="commands:Command" xmi:id="_ye6jsB6gEeePLJ5to5QrXQ" elementId="eu.etaxonomy.taxeditor.application.help.parser" commandName="%command.name"/>
+    <elements xsi:type="commands:Command" xmi:id="_dlo3oB60EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.import" commandName="%command.label.3"/>
+    <elements xsi:type="commands:Command" xmi:id="_CYHrgB62EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.export" commandName="%command.label.4"/>
+    <elements xsi:type="commands:Command" xmi:id="_LVTo8B62EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.close" commandName="%command.label"/>
+    <elements xsi:type="commands:Command" xmi:id="_MrLPsB62EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.closeAll" commandName="%command.label.0"/>
+    <elements xsi:type="commands:Command" xmi:id="_PkWcQB62EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.save" commandName="%command.label.1"/>
+    <elements xsi:type="commands:Command" xmi:id="_RWLmQB62EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.saveAll" commandName="%command.label.2"/>
+    <elements xsi:type="commands:Command" xmi:id="_TvLd8B62EeePLJ5to5QrXQ" elementId="org.eclipse.ui.file.exit" commandName="%command.label.5"/>
+    <elements xsi:type="commands:Command" xmi:id="_5pfmIB7DEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.undo" commandName="%command.label.6"/>
+    <elements xsi:type="commands:Command" xmi:id="_EarQwB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.redo" commandName="%command.label.7"/>
+    <elements xsi:type="commands:Command" xmi:id="_PhIAwB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.cut" commandName="%command.label.8"/>
+    <elements xsi:type="commands:Command" xmi:id="_RxxNsB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.copy" commandName="%command.label.9"/>
+    <elements xsi:type="commands:Command" xmi:id="_TmIHQB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.paste" commandName="%command.label.10"/>
+    <elements xsi:type="commands:Command" xmi:id="_WOTDYB7EEeeRW_RHu3JLqQ" elementId="org.eclipse.ui.edit.delete" commandName="%command.label.11"/>
+    <elements xsi:type="commands:Command" xmi:id="_l9kXoB7PEeeC-JvycL9ysA" elementId="org.eclipse.ui.window.preferences" commandName="%command.label.12"/>
+    <elements xsi:type="commands:Command" xmi:id="_hooiQB7QEeeC-JvycL9ysA" elementId="org.eclipse.ui.newWizard" commandName="%command.label.21"/>
+    <elements xsi:type="commands:Command" xmi:id="_JXXNIB-IEeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.application.DatabaseSettings" commandName="%command.label.23"/>
+    <elements xsi:type="commands:Command" xmi:id="_LuEl0B-IEeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.application.DatabaseRepairFunctionality" commandName="%command.label.24"/>
+    <elements xsi:type="commands:Command" xmi:id="_q1JAkCaQEeeO2YpaECSmsg" elementId="eu.etaxonomy.taxeditor.application.ImportSettings" commandName="%command.label.25"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_nOhPoB9zEeeIA_2gwq7JKg" featurename="trimContributions" parentElementId="org.eclipse.e4.legacy.ide.application">
+    <elements xsi:type="menu:TrimContribution" xmi:id="_FIbzwB92EeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.application.trimcontribution.0" parentId="org.eclipse.ui.main.toolbar" positionInParent="after=additions">
+      <children xsi:type="menu:ToolBar" xmi:id="_KDVngB92EeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.application.toolbar.0">
+        <children xsi:type="menu:HandledToolItem" xmi:id="_KvxPsB92EeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.application.handledtoolitem.xxxx" label="%command.label.21" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/new_wiz.png" command="_hooiQB7QEeeC-JvycL9ysA">
+          <visibleWhen xsi:type="ui:CoreExpression" xmi:id="__HsucB93EeeIA_2gwq7JKg"/>
+        </children>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_ARn5AB96EeeIA_2gwq7JKg" elementId="eu.etaxonomy.taxeditor.application.handledtoolitem.commandlabel22" label="%command.label.22" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/save_edit.gif" command="_PkWcQB62EeePLJ5to5QrXQ"/>
+      </children>
+    </elements>
+  </fragments>
+</fragment:ModelFragments>
index fdad8b2..75ac6bd 100644 (file)
       </view>
    </extension-->
    <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu">
-         <menu
-               id="org.eclipse.ui.main.menu.file"
-               label="%menu.label">
-         </menu>
-         <menu
-               id="org.eclipse.ui.main.menu.edit"
-               label="%menu.label.0">
-         </menu>
-         <menu
-               id="org.eclipse.ui.main.menu.window"
-               label="%menu.label.1">
-         </menu>
-          <menu
-               id="org.eclipse.ui.main.menu.admin"
-               label="%menu.label.4">
-         </menu>
-         <menu
-               id="org.eclipse.ui.main.menu.help"
-               label="%menu.label.2">
-         </menu>
-        
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.file">
-         <menu
-               id="eu.etaxonomy.navigation.menu.new"
-               label="%menu.label.3">
-         </menu>
-         <separator
-               name="eu.etaxonomy.taxeditor.application.filemenu.new"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.file.close"
-               label="%command.label"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.ui.file.closeAll"
-               label="%command.label.0"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.application.filemenu.close"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.file.save"
-               label="%command.label.1"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.ui.file.saveAll"
-               label="%command.label.2"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.application.filemenu.save"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.file.import"
-               label="%command.label.3"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.ui.file.export"
-               label="%command.label.4"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.application.filemenu.io"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.file.exit"
-               id="eu.etaxonomy.taxeditor.application.menu.exit"
-               label="%command.label.5"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.edit">
-         <command
-               commandId="org.eclipse.ui.edit.undo"
-               label="%command.label.6">
-         </command>
-         <command
-               commandId="org.eclipse.ui.edit.redo"
-               label="%command.label.7"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.ui.edit.separator1"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.edit.cut"
-               label="%command.label.8"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.ui.edit.copy"
-               label="%command.label.9"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.ui.edit.paste"
-               label="%command.label.10"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.ui.edit.separator2"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.edit.delete"
-               label="%command.label.11"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.window">
-         <separator
-               name="eu.etaxonomy.taxeditor.application.windowMenu.last"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.window.preferences"
-               label="%command.label.12"
-               style="push">
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="menu:org.eclipse.ui.main.menu.admin">
-         <command
-               commandId="eu.etaxonomy.taxeditor.application.DatabaseSettings"
-               label="%command.label.23"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <and>
-                  <reference
-                        definitionId="hasROLE_PROJECT_MANAGER">
-                  </reference>
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-               </and>
-            </visibleWhen>
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.application.DatabaseRepairFunctionality"
-               label="%command.label.24"
-               style="push">
-                <visibleWhen
-                  checkEnabled="true">
-               <and>
-                  <reference
-                        definitionId="hasROLE_PROJECT_MANAGER">
-                  </reference>
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-               </and>
-            </visibleWhen>
-         </command>
-         <dynamic
-               class="eu.etaxonomy.taxeditor.admin.UserGroupContributionItem"
-               id="eu.etaxonomy.taxeditor.admin.UserGroupContributionItem">
-            <visibleWhen
-                  checkEnabled="true">
-               <and>
-                  <reference
-                        definitionId="hasROLE_PROJECT_MANAGER">
-                  </reference>
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-               </and>
-            </visibleWhen>
-         </dynamic>
-      </menuContribution>
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.help">
-         <command
-               commandId="org.eclipse.ui.help.helpContents"
-               label="%command.label.13"
-               style="push">
-         </command>
-         <command
-               commandId="org.eclipse.ui.help.helpSearch"
-               label="%command.label.14"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.ui.help.separator0"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.help.dynamicHelp"
-               label="%command.label.15"
-               style="push">
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.application.help.parser"
-               label="%command.label.16"
-               style="push">
-         </command>
-         <separator
-               name="eu.etaxonomy.taxeditor.ui.help.separator1"
-               visible="true">
-         </separator>
-         <!--command
-               commandId="eu.etaxonomy.taxeditor.install"
-               label="%command.label.18"
-               style="push"/-->
-         <command
-               commandId="eu.etaxonomy.taxeditor.update"
-               label="%command.label.17"
-               style="push"/>    
-         <separator
-               name="eu.etaxonomy.taxeditor.ui.help.separator2"
-               visible="true">
-         </separator>
-         <command
-               commandId="org.eclipse.ui.help.aboutAction"
-               label="%command.label.19">
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.application.help.aboutPlatform"
-               label="%command.label.20"
-               style="push">
-         </command>
-      </menuContribution>
-            <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar">
-         <toolbar
-               id="eu.etaxonomy.taxeditor.editor.main">
-            <command
-                  commandId="org.eclipse.ui.newWizard"
-                  label="%command.label.21"
-                  style="push">
-            </command>
-            <command
-                  commandId="org.eclipse.ui.file.save"
-                  label="%command.label.22"
-                  style="push">
-            </command>
-         </toolbar>
-      </menuContribution>
-   </extension>
-   <extension
          id="product"
          point="org.eclipse.core.runtime.products">
       <product
          </property>
       </product>
    </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.OpenExternalParserHelpHandler"
-            id="eu.etaxonomy.taxeditor.application.help.parser"
-            name="%command.name">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.OpenExternalAboutPlatformHandler"
-            id="eu.etaxonomy.taxeditor.application.help.aboutPlatform"
-            name="%command.name.0">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.update.UpdateHandler"
-            id="eu.etaxonomy.taxeditor.update"
-            name="%command.label.17">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.update.InstallNewSoftwareHandler"
-            id="eu.etaxonomy.taxeditor.install"
-            name="%command.label.18">
-      </command>
-   </extension>
    
    
        <extension
        </property>
     </product>
  </extension>
+ <extension
+       point="org.eclipse.ui.actionSets">
+    <actionSet
+          id="org.eclipse.ui.edit.text.actionSet.annotationNavigation"
+          label="Annotation Navigation"
+          visible="false">
+    </actionSet>
+    <actionSet
+          id="org.eclipse.ui.edit.text.actionSet.navigation"
+          label="Editor Navigation"
+          visible="false">
+    </actionSet>
+ </extension>
 
 </plugin>
index 37f5f9d..09aa01c 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/admin/UserGroupContributionItem.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/admin/UserGroupContributionItem.java
deleted file mode 100644 (file)
index 4b99ceb..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2017 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.admin;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.action.IContributionItem;
-
-import eu.etaxonomy.taxeditor.bulkeditor.command.OpenBulkEditorContributionItem;
-import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputType;
-
-/**
- * @author pplitzner
- * @date Mar 9, 2017
- *
- */
-public class UserGroupContributionItem extends OpenBulkEditorContributionItem {
-
-    /** {@inheritDoc} */
-    @Override
-    protected IContributionItem[] getContributionItems() {
-        List<IContributionItem> contributionItems = new ArrayList<IContributionItem>();
-        contributionItems.add(BulkEditorInputType.USER.createContributionItem());
-        contributionItems.add(BulkEditorInputType.GROUP.createContributionItem());
-        return contributionItems.toArray(new IContributionItem[contributionItems.size()]);
-    }
-}
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java
deleted file mode 100644 (file)
index d40480c..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 
- */
-package eu.etaxonomy.taxeditor.perspective;
-
-import org.eclipse.ui.IPageLayout;
-
-import eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView;
-import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
-import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
-
-/**
- * @author n.hoffmann
- *
- */
-public class BulkEditing extends Default {
-
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
-        */
-       @Override
-       public void createInitialLayout(IPageLayout layout) {
-               
-               layout.addView(DetailsViewPart.ID, IPageLayout.RIGHT, 0.5f, layout.getEditorArea());
-               
-               layout.addView(SupplementalDataViewPart.ID, IPageLayout.BOTTOM, 0.3f, DetailsViewPart.ID);
-               
-               layout.addView(ReferencingObjectsView.ID, IPageLayout.BOTTOM, 0.3f, SupplementalDataViewPart.ID);
-               
-               createAdditionalFolder(layout, layout.getEditorArea());
-       }
-
-}
index da44bf1..d622535 100644 (file)
@@ -9,7 +9,6 @@
 package eu.etaxonomy.taxeditor.perspective;
 
 import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPlaceholderFolderLayout;
 import org.eclipse.ui.progress.IProgressConstants;
 
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
@@ -24,10 +23,6 @@ import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
  */
 public class DerivatePerspective extends Default {
 
-    protected IPlaceholderFolderLayout folderAdditional;
-
-    public static final String ADDITIONAL = "additional";
-
     @Override
     public void createInitialLayout(IPageLayout layout) {
         layout.addView(TaxonNavigator.ID, IPageLayout.LEFT, 0.25f, layout.getEditorArea());
index e39cdb6..dcc0a84 100644 (file)
@@ -79,7 +79,7 @@ public class P2Util {
         repoElements.addAll(savedRepoElements);
 
         ElementUtils.updateRepositoryUsingElements(ProvisioningUI.getDefaultUI(),repoElements
-                .toArray(new MetadataRepositoryElement[]{} ), null);
+                .toArray(new MetadataRepositoryElement[]{} ));
 
     }
 
index 084a95d..439bea9 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
@@ -13,14 +13,16 @@ Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
  eu.etaxonomy.taxeditor.bulkeditor.input,
  eu.etaxonomy.taxeditor.bulkeditor.internal,
  eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: eu.etaxonomy.taxeditor.workbench,
+ org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.editors,
  org.eclipse.core.expressions,
  eu.etaxonomy.taxeditor.store,
- eu.etaxonomy.taxeditor.cdmlib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ActivationPolicy: lazy
+ eu.etaxonomy.taxeditor.cdmlib,
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0.v20160229-1459",
+ org.eclipse.e4.ui.workbench
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: eu.etaxonomy.taxeditor.editor,
  org.eclipse.core.runtime,
  org.eclipse.equinox.app,
@@ -31,3 +33,4 @@ Import-Package: eu.etaxonomy.taxeditor.editor,
  org.eclipse.jface.text.source,
  org.eclipse.ui.views.properties,
  org.osgi.framework
+Bundle-ActivationPolicy: lazy
index 1db7f65..45e622a 100644 (file)
@@ -35,4 +35,6 @@ command.label.OPEN_REFERENCING_OBJECTS_VIEW = Referencing Objects View
 command.name.OPEN_REFERENCING_OBJECTS_VIEW = Open Referencing Objects View
 command.name.OPEN_BULK_EDITOR_FOR_TAXON_NODE = Open bulk editor for taxon  node
 viewCommandMapping.viewerName.REFERENCING_OBJECTS_VIEW = Referencing Objects View
-viewCommandMapping.viewerName.BULK_EDITOR = Bulk Editor
\ No newline at end of file
+viewCommandMapping.viewerName.BULK_EDITOR = Bulk Editor
+handledmenuitem.label.1 = Users
+handledmenuitem.label.2 = Groups
index 96df15a..5c0c984 100644 (file)
@@ -35,4 +35,6 @@ command.label.OPEN_REFERENCING_OBJECTS_VIEW = Referenzierende Objekte
 command.name.OPEN_REFERENCING_OBJECTS_VIEW = Öffne Referenzierende Objekte
 command.name.OPEN_BULK_EDITOR_FOR_TAXON_NODE = Öffne Bulk Editor für Taxonknoten
 viewCommandMapping.viewerName.REFERENCING_OBJECTS_VIEW = Referenzierende Objekte
-viewCommandMapping.viewerName.BULK_EDITOR = Bulk Editor
\ No newline at end of file
+viewCommandMapping.viewerName.BULK_EDITOR = Bulk Editor
+handledmenuitem.label.1 = Nutzer
+handledmenuitem.label.2 = Nutzergruppen
\ No newline at end of file
index bc33896..15f1371 100644 (file)
@@ -8,5 +8,6 @@ bin.includes = META-INF/,\
                OSGI-INF/l10n/bundle.properties,\\r
                OSGI-INF/l10n/bundle_de.properties,\\r
                src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties,\\r
-               src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties\r
+               src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties,\\r
+               fragment.e4xmi\r
                
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/fragment.e4xmi b/eu.etaxonomy.taxeditor.bulkeditor/fragment.e4xmi
new file mode 100644 (file)
index 0000000..05f6c0e
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmlns:ui="http://www.eclipse.org/ui/2010/UIModel/application/ui" xmi:id="_i8pkACAyEeeepOgM49meig">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_HJWmwCAzEeeepOgM49meig" featurename="commands" parentElementId="org.eclipse.e4.legacy.ide.application">
+    <elements xsi:type="commands:Command" xmi:id="_Kc-ToCAzEeeepOgM49meig" elementId="taxeditor-bulkeditor.dynamicopenmenu" commandName="%command.name.1">
+      <parameters xmi:id="_PWg1cCAzEeeepOgM49meig" elementId="taxeditor-bulkeditor.commandParameter.inputType" name="Bulk Editor Class" optional="false"/>
+    </elements>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_l_8NMCQUEeelPNxAg-e3TA" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.admin">
+    <elements xsi:type="menu:MenuSeparator" xmi:id="_zph3kDF2Eee-JvlKXQGppA" elementId="eu.etaxonomy.taxeditor.bulkeditor.menuseparator.0"/>
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_pgPrMCQUEeelPNxAg-e3TA" elementId="eu.etaxonomy.taxeditor.bulkeditor.menu.admin.bulk_users" label="%handledmenuitem.label.1" command="_Kc-ToCAzEeeepOgM49meig">
+      <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_4YPk8CQ6EeeKsvEah5BAoQ" coreExpressionId="hasROLE_PROJECT_MANAGER_AND_isCdmStoreConnected"/>
+      <parameters xmi:id="_7uF7sCQUEeelPNxAg-e3TA" elementId="eu.etaxonomy.taxeditor.bulkeditor.menu.admin.userBulk.userParam" name="taxeditor-bulkeditor.commandParameter.inputType" value="bulkeditor.input.user"/>
+    </elements>
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_pNpDACQ6EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.bulkeditor.menu.admin.bulk_groups" label="%handledmenuitem.label.2" command="_Kc-ToCAzEeeepOgM49meig">
+      <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_6CFQkCQ6EeeKsvEah5BAoQ" coreExpressionId="hasROLE_PROJECT_MANAGER_AND_isCdmStoreConnected"/>
+      <parameters xmi:id="_pNpDASQ6EeeKsvEah5BAoQ" elementId="eu.etaxonomy.taxeditor.bulkeditor.menu.admin.groupBulk.groupParam" name="taxeditor-bulkeditor.commandParameter.inputType" value="bulkeditor.input.group"/>
+    </elements>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_gHUPICkFEeeCvszP-_feIA" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.window" positionInList="first">
+    <elements xsi:type="menu:Menu" xmi:id="_jpxCMCkFEeeCvszP-_feIA" elementId="bulkeditor.menus.openmenu" label="%menu.label" mnemonics="">
+      <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_nae6wCkFEeeCvszP-_feIA" coreExpressionId="isCdmStoreConnected"/>
+    </elements>
+  </fragments>
+</fragment:ModelFragments>
index 6983d48..6d4d10b 100644 (file)
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">
-         <menu
-               id="bulkeditor.menus.openmenu"
-               label="%menu.label">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </menu>
-         <menu
-               label="%menu.label.0">
-            <visibleWhen
-                  checkEnabled="true">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </menu>
-      </menuContribution>
-      <menuContribution
             locationURI="menu:bulkeditor.menus.openmenu">
          <dynamic
                class="eu.etaxonomy.taxeditor.bulkeditor.command.OpenBulkEditorContributionItem"
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
+            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=eu.etaxonomy.taxeditor.store.showViewMenu.supplemental">
+         <separator
+               name="eu.etaxonomy.taxeditor.bulkeditor.separator1"
+               visible="true">
+         </separator>
          <command
                commandId="eu.etaxonomy.taxeditor.openReferencingObjectsViewFromMenu"
                label="%command.label.OPEN_REFERENCING_OBJECTS_VIEW"
             viewerName="%viewCommandMapping.viewerName.BULK_EDITOR">
       </viewCommandMapping>
    </extension>
+   <extension
+         id="id1"
+         point="org.eclipse.e4.workbench.model">
+      <fragment
+            apply="always"
+            uri="fragment.e4xmi">
+      </fragment>
+   </extension>
 <!-- start set marker -->
 
 </plugin>
index c1fc0b2..f3d6dfb 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.6.0</version>
+               <version>4.7.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index decdc7e..4601d24 100644 (file)
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* 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.
 */
@@ -11,8 +11,6 @@ package eu.etaxonomy.taxeditor.annotatedlineeditor;
 
 import java.util.Map;
 
-import eu.etaxonomy.cdm.model.common.ICdmBase;
-
 
 /**
  * <p>IEntityCreator interface.</p>
@@ -22,7 +20,7 @@ import eu.etaxonomy.cdm.model.common.ICdmBase;
  * @version 1.0
  */
 public interface IEntityCreator<T> {
-       
+
        /**
         * <p>createEntity</p>
         *
@@ -31,7 +29,7 @@ public interface IEntityCreator<T> {
         * @return a T object.
         */
        T createEntity(String text);
-       
+
        /**
         * <p>createEntity</p>
         *
@@ -40,21 +38,21 @@ public interface IEntityCreator<T> {
         * @return a T object.
         */
        T createEntity(Object key, String text);
-       
+
        /**
         * Get a map of keys for all objects that can be created by this entity creator
         * along with their string representations.
         *
         * @return a {@link java.util.Map} object.
         */
-       Map<Object, String> getKeyLabelPairs();
-       
+       Map<? extends Object, String> getKeyLabelPairs();
+
        /**
         * Return a flag indicating whether this creator also saves the entities
         *
         * @return true or false
         */
        boolean savesEntity();
-       
+
 
 }
index ecc6c89..2d49f3b 100644 (file)
@@ -41,7 +41,7 @@ public class DynamicNewObjectMenu extends CompoundContributionItem {
                        .getLogger(DynamicNewObjectMenu.class);
 
        private final IHandlerService handlerService = (IHandlerService) BulkEditorUtil.getService(IHandlerService.class);
-       private Map<Object, String> classLabelPairs;
+       private Map<? extends Object, String> classLabelPairs;
 
        /** {@inheritDoc} */
        @Override
@@ -88,7 +88,7 @@ public class DynamicNewObjectMenu extends CompoundContributionItem {
         * Get class label pairs from Annotated Line Editor's entity creator.
         * @return
         */
-       private Map<Object, String> getClassLabelPairs() {
+       private Map<? extends Object, String> getClassLabelPairs() {
                IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
                if (editor != null){
                        IEditorInput input = editor.getEditorInput();
index cbc2768..ece5e4b 100644 (file)
@@ -32,6 +32,7 @@ import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.MediaDeletionConfigurator;
 import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
+import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator;
 import eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator;
 import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
@@ -51,6 +52,7 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin;
+import eu.etaxonomy.taxeditor.bulkeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.DeleteResultMessagingUtils;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -66,7 +68,11 @@ public class DeleteHandler extends AbstractHandler {
 
 
 
-       /* (non-Javadoc)
+    private static final String SKIP = "Skip";
+    private static final String DELETE = "Delete";
+    private static final String CONFIRM_DELETION = "Confirm Deletion";
+
+    /* (non-Javadoc)
         * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
         */
        @Override
@@ -103,8 +109,15 @@ public class DeleteHandler extends AbstractHandler {
                                            controller = CdmStore.getCurrentApplicationConfiguration();
                                            if (object instanceof SpecimenOrObservationBase){
                                                IOccurrenceService service = controller.getOccurrenceService();
+                                               config = new SpecimenDeleteConfigurator();
+
+                                DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), CONFIRM_DELETION,  null,  Messages.BulkEditor_DeleteHandler_reallyDeleteSpecimen, MessageDialog.WARNING, new String[] { DELETE, SKIP }, 0, true);
+                                int result_dialog= dialog.open();
+                                if (result_dialog != Status.OK){
+                                    return null;
+                                }
                                                        if (object != null){
-                                                               result = service.isDeletable(((SpecimenOrObservationBase) object).getUuid(), null);
+                                                               result = service.isDeletable(((SpecimenOrObservationBase) object).getUuid(), config);
                                                                errorMessage = "The specimen or observation ";
 
                                                        }
@@ -124,7 +137,7 @@ public class DeleteHandler extends AbstractHandler {
                                                if (object != null){
                                                    config = new NameDeletionConfigurator();
 
-                                                   DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion",  null,  "Do you really want to delete the name?\nThis operation is irreversible!", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0, true);
+                                                   DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), CONFIRM_DELETION,  null,  "Do you really want to delete the name?\nThis operation is irreversible!", MessageDialog.WARNING, new String[] { DELETE, SKIP }, 0, true);
                                                    int result_dialog= dialog.open();
                                                    if (result_dialog != Status.OK){
                                                        return null;
@@ -140,7 +153,7 @@ public class DeleteHandler extends AbstractHandler {
                                                                Synonym synonym = HibernateProxyHelper.deproxy(object, Synonym.class);
                                                                config = new SynonymDeletionConfigurator();
                                                                errorMessage = "The synonym ";
-                                                               DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion",  null,  "Do you really want to delete the synonym?", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0, true);
+                                                               DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), CONFIRM_DELETION,  null,  "Do you really want to delete the synonym?", MessageDialog.WARNING, new String[] { DELETE, SKIP }, 0, true);
                                     int result_dialog= dialog.open();
                                     if (result_dialog != Status.OK){
                                          return null;
@@ -159,7 +172,7 @@ public class DeleteHandler extends AbstractHandler {
                                                                config = new TaxonDeletionConfigurator();
                                                                ((TaxonDeletionConfigurator) config).setDeleteInAllClassifications(true);
                                                                DeleteConfiguratorDialog dialog;
-                                                           dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion",  null,  "Do you really want to delete the taxon?", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0, true);
+                                                           dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), CONFIRM_DELETION,  null,  "Do you really want to delete the taxon?", MessageDialog.WARNING, new String[] { DELETE, SKIP }, 0, true);
                                                                int result_dialog= dialog.open();
                                     if (result_dialog != Status.OK){
                                          return null;
@@ -174,7 +187,7 @@ public class DeleteHandler extends AbstractHandler {
                                               config = new MediaDeletionConfigurator();
                                               Media media = HibernateProxyHelper.deproxy(object, Media.class);
                                               DeleteConfiguratorDialog dialog;
-                                                  dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), "Confirm Deletion",  null,  "Do you really want to delete the media?", MessageDialog.WARNING, new String[] { "Delete", "Skip" }, 0, true);
+                                                  dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), CONFIRM_DELETION,  null,  "Do you really want to delete the media?", MessageDialog.WARNING, new String[] { DELETE, SKIP }, 0, true);
                                                   int result_dialog= dialog.open();
                                if (result_dialog != Status.OK){
                                    return null;
index 9464f33..6d00f41 100644 (file)
@@ -13,13 +13,14 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
+import eu.etaxonomy.cdm.api.service.DeleteResult;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
 import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
+import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator;
 import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
 import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider;
 import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.OccurrenceCreator;
@@ -111,14 +112,23 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
         * @throws ReferencedObjectUndeletableException */
        @Override
     public boolean delete(SpecimenOrObservationBase entity, DeleteConfiguratorBase config ) throws ReferencedObjectUndeletableException {
-               return CdmStore.getService(IOccurrenceService.class).delete(entity) != null;
+           DeleteResult deleteResult;
+           SpecimenDeleteConfigurator specimenConfig;
+           if (config instanceof SpecimenDeleteConfigurator){
+               specimenConfig = (SpecimenDeleteConfigurator)config;
+           }else{
+               specimenConfig = new SpecimenDeleteConfigurator();
+           }
+           deleteResult = CdmStore.getService(IOccurrenceService.class).delete(entity.getUuid(), specimenConfig);
+
+               return deleteResult.isOk();
        }
 
        /** {@inheritDoc} */
        @Override
     public SpecimenOrObservationBase<?> save(SpecimenOrObservationBase entity) {
            return CdmStore.getService(IOccurrenceService.class).merge(entity, true).getMergedEntity();
-          
+
        }
 
        @Override
index 8cb943b..6c6e9a7 100644 (file)
@@ -1,16 +1,18 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
 package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
 
-import java.util.HashMap;
+import java.util.Comparator;
+import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 import eu.etaxonomy.cdm.model.name.Rank;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
@@ -32,7 +34,8 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
         * @see eu.etaxonomy.taxeditor.bulkeditor.IEntityCreator#createEntity(java.lang.String)
         */
        /** {@inheritDoc} */
-       public TaxonNameBase createEntity(String text) {
+    @Override
+    public TaxonNameBase createEntity(String text) {
                TaxonNameBase name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
                name.setTitleCache(text, true);
                //name.setTitleCache(text);
@@ -43,7 +46,8 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
         * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.Class, java.lang.String)
         */
        /** {@inheritDoc} */
-       public TaxonNameBase createEntity(Object key, String text) {
+    @Override
+    public TaxonNameBase createEntity(Object key, String text) {
                return ParseHandler.parseName(text, (Rank) key);
        }
 
@@ -55,9 +59,14 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
         *
         * @return a {@link java.util.Map} object.
         */
-       public Map<Object, String> getKeyLabelPairs() {
-               Map<Object, String> result = new HashMap<Object, String>();
-               for (Rank rank : CdmStore.getTermManager().getPreferredTerms(Rank.class)) {
+        @Override
+    public Map<Rank, String> getKeyLabelPairs() {
+               Map<Rank, String> result = new TreeMap<Rank, String>(
+                (Comparator<Rank>) (o1, o2) -> o2.compareTo(o1)
+        );
+               List<Rank> ranks = CdmStore.getTermManager().getPreferredTerms(Rank.class);
+               //Collections.reverse(ranks);
+               for (Rank rank : ranks) {
                        result.put(rank, rank.getLabel());
                }
                return result;
index 768046e..3a3cf34 100755 (executable)
@@ -18,6 +18,9 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {
     private static final String BUNDLE_NAME = "src/main/java/eu.etaxonomy.taxeditor.bulkeditor.l10n.messages"; //$NON-NLS-1$
     public static String ReferencingObjectsLabelProvider_No_description_available;
+    public static String ConvertPerson2TeamHandler_warning;
+    public static String ConvertPerson2TeamHandler_lable;
+    public static String BulkEditor_DeleteHandler_reallyDeleteSpecimen;
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);
index 5cb5303..0a32298 100755 (executable)
@@ -1 +1,4 @@
 ReferencingObjectsLabelProvider_No_description_available=No description available
+ConvertPerson2TeamHandler_warning=While reloading the data an exception occured
+ConvertPerson2TeamHandler_lable=Convert Person to Team
+BulkEditor_DeleteHandler_reallyDeleteSpecimen=Do you really want to delete the specimen/field unit? This is irreversible.
\ No newline at end of file
index bfcb11a..916de6b 100755 (executable)
@@ -1 +1,4 @@
-ReferencingObjectsLabelProvider_No_description_available=Keine Beschreibung verfügbar
\ No newline at end of file
+ReferencingObjectsLabelProvider_No_description_available=Keine Beschreibung verfügbar
+ConvertPerson2TeamHandler_warning=Beim Neuladen der Daten ist ein Fehler aufgetreten
+ConvertPerson2TeamHandler_lable=Wandle Person in Team um
+BulkEditor_DeleteHandler_reallyDeleteSpecimen=Möchten Sie das Specimen/die FieldUnit wirklich löschen, dieser Vorgang kann nicht rückgängig gemacht werden.
\ No newline at end of file
index 64c2e14..70768f7 100644 (file)
@@ -1,21 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-5.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-2.21.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/istack-commons-tools-2.21.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lucene-core-5.4.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/codemodel-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/easymock-2.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/FastInfoset-1.2.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/libthrift-0.9.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/mapstruct-1.0.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.38.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/poi-3.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/postgresql-9.4-1206-jdbc4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/relaxngDatatype-20020414.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/rngom-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/Saxon-HE-9.7.0-2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-core-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-database-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.4.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-nop-1.7.13.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jandex-2.0.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/javassist-3.20.0-GA.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/javax.el-2.2.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/javax.el-api-2.2.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.12.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-jxc-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.7.6.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-arq-2.13.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-core-2.13.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jena-tdb-1.1.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/json-20090211.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jsonld-java-0.5.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jta-1.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.7.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.6.5.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/junit-4.12.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="src" path="src/main/resources"/>
+       <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/codemodel-2.2.11.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.7.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.7.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/doxia-core-1.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.6.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/dtd-parser-1.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/easymock-2.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.11.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/FastInfoset-1.2.13.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/h2-1.4.190.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-2.21.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/istack-commons-tools-2.21.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.5.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.6.5.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jackson-core-2.6.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.6.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jandex-2.0.0.Final.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/javassist-3.20.0-GA.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/javax.el-2.2.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/javax.el-api-2.2.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.12.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.2.11.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb-jxc-2.2.11.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.2.11.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2.11.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.3.0.Final.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.7.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jdom2-2.0.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jena-arq-2.13.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jena-core-2.13.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jena-tdb-1.1.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/joda-time-2.9.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/json-20090211.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jsonld-java-0.5.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jta-1.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/junit-4.12.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.7.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/libthrift-0.9.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-backward-codecs-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-core-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-facet-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-join-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-memory-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-misc-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-queries-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/mapstruct-1.0.0.Final.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.38.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/plexus-component-annotations-1.5.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/plexus-utils-3.0.15.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/poi-3.13.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.13.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.13.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/postgresql-9.4-1206-jdbc4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/relaxngDatatype-20020414.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/rngom-2.2.11.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/Saxon-HE-9.7.0-2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.13.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/slf4j-nop-1.7.13.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/spring-aop-4.2.4.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/spring-aspects-4.2.4.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/spring-beans-4.2.4.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/springfox-swagger-common-2.3.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/springfox-swagger2-2.3.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/standard-1.1.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/stax-ex-1.7.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.5.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/swagger-models-1.5.5.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/tools.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/txw2-2.2.11.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/unitils-core-3.4.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/unitils-database-3.4.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.4.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.4.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.4.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.4.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.4.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.4.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.4.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
index d7092d2..9bd5bac 100644 (file)
@@ -2,11 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
  com.google.api.translate,
+ com.sun.istack,
+ com.sun.istack.internal.tools,
+ com.sun.istack.internal.ws,
+ com.sun.istack.localization,
+ com.sun.istack.logging,
+ com.sun.istack.tools,
  eu.etaxonomy.cdm,
  eu.etaxonomy.cdm.api.application,
  eu.etaxonomy.cdm.api.cache,
@@ -62,6 +68,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.io.csv.caryophyllales.out,
  eu.etaxonomy.cdm.io.csv.redlist.demo,
  eu.etaxonomy.cdm.io.csv.redlist.out,
+ eu.etaxonomy.cdm.io.distribution.excelupdate,
  eu.etaxonomy.cdm.io.dwca,
  eu.etaxonomy.cdm.io.dwca.in,
  eu.etaxonomy.cdm.io.dwca.jaxb,
@@ -72,8 +79,10 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.io.jaxb,
  eu.etaxonomy.cdm.io.markup,
  eu.etaxonomy.cdm.io.markup.handler,
+ eu.etaxonomy.cdm.io.outputmodel,
  eu.etaxonomy.cdm.io.pilotOutputHtml,
  eu.etaxonomy.cdm.io.reference.endnote.in,
+ eu.etaxonomy.cdm.io.reference.ris.in,
  eu.etaxonomy.cdm.io.sdd,
  eu.etaxonomy.cdm.io.sdd.ikeyplus,
  eu.etaxonomy.cdm.io.sdd.in,
@@ -275,13 +284,129 @@ Export-Package: com.google.api,
    org.apache.log4j.spi,
    org.w3c.dom,
    org.xml.sax",
+ org.apache.lucene,
+ org.apache.lucene.analysis,
+ org.apache.lucene.analysis.ar,
+ org.apache.lucene.analysis.bg,
+ org.apache.lucene.analysis.br,
+ org.apache.lucene.analysis.ca,
+ org.apache.lucene.analysis.charfilter,
+ org.apache.lucene.analysis.cjk,
+ org.apache.lucene.analysis.ckb,
+ org.apache.lucene.analysis.cn,
+ org.apache.lucene.analysis.commongrams,
+ org.apache.lucene.analysis.compound,
+ org.apache.lucene.analysis.compound.hyphenation,
+ org.apache.lucene.analysis.core,
+ org.apache.lucene.analysis.custom,
+ org.apache.lucene.analysis.cz,
+ org.apache.lucene.analysis.da,
+ org.apache.lucene.analysis.de,
+ org.apache.lucene.analysis.el,
+ org.apache.lucene.analysis.en,
+ org.apache.lucene.analysis.es,
+ org.apache.lucene.analysis.eu,
+ org.apache.lucene.analysis.fa,
+ org.apache.lucene.analysis.fi,
+ org.apache.lucene.analysis.fr,
+ org.apache.lucene.analysis.ga,
+ org.apache.lucene.analysis.gl,
+ org.apache.lucene.analysis.hi,
+ org.apache.lucene.analysis.hu,
+ org.apache.lucene.analysis.hunspell,
+ org.apache.lucene.analysis.hy,
+ org.apache.lucene.analysis.id,
+ org.apache.lucene.analysis.in,
+ org.apache.lucene.analysis.it,
+ org.apache.lucene.analysis.lt,
+ org.apache.lucene.analysis.lv,
+ org.apache.lucene.analysis.miscellaneous,
+ org.apache.lucene.analysis.ngram,
+ org.apache.lucene.analysis.nl,
+ org.apache.lucene.analysis.no,
+ org.apache.lucene.analysis.path,
+ org.apache.lucene.analysis.pattern,
+ org.apache.lucene.analysis.payloads,
+ org.apache.lucene.analysis.position,
+ org.apache.lucene.analysis.pt,
+ org.apache.lucene.analysis.query,
+ org.apache.lucene.analysis.reverse,
+ org.apache.lucene.analysis.ro,
+ org.apache.lucene.analysis.ru,
+ org.apache.lucene.analysis.shingle,
+ org.apache.lucene.analysis.sinks,
+ org.apache.lucene.analysis.snowball,
+ org.apache.lucene.analysis.sr,
+ org.apache.lucene.analysis.standard,
+ org.apache.lucene.analysis.standard.std40,
+ org.apache.lucene.analysis.sv,
+ org.apache.lucene.analysis.synonym,
+ org.apache.lucene.analysis.th,
+ org.apache.lucene.analysis.tokenattributes,
+ org.apache.lucene.analysis.tr,
+ org.apache.lucene.analysis.util,
+ org.apache.lucene.analysis.wikipedia,
+ org.apache.lucene.bkdtree,
+ org.apache.lucene.codecs,
+ org.apache.lucene.codecs.blocktree,
+ org.apache.lucene.codecs.compressing,
+ org.apache.lucene.codecs.idversion,
+ org.apache.lucene.codecs.lucene50,
+ org.apache.lucene.codecs.lucene53,
+ org.apache.lucene.codecs.lucene54,
+ org.apache.lucene.codecs.perfield,
+ org.apache.lucene.collation,
+ org.apache.lucene.collation.tokenattributes,
+ org.apache.lucene.document,
  org.apache.lucene.index,
+ org.apache.lucene.payloads,
+ org.apache.lucene.queryparser.analyzing,
  org.apache.lucene.queryparser.classic,
+ org.apache.lucene.queryparser.complexPhrase,
+ org.apache.lucene.queryparser.ext,
+ org.apache.lucene.queryparser.flexible.core,
+ org.apache.lucene.queryparser.flexible.core.builders,
+ org.apache.lucene.queryparser.flexible.core.config,
+ org.apache.lucene.queryparser.flexible.core.messages,
+ org.apache.lucene.queryparser.flexible.core.nodes,
+ org.apache.lucene.queryparser.flexible.core.parser,
+ org.apache.lucene.queryparser.flexible.core.processors,
+ org.apache.lucene.queryparser.flexible.core.util,
+ org.apache.lucene.queryparser.flexible.messages,
+ org.apache.lucene.queryparser.flexible.precedence,
+ org.apache.lucene.queryparser.flexible.precedence.processors,
+ org.apache.lucene.queryparser.flexible.standard,
+ org.apache.lucene.queryparser.flexible.standard.builders,
+ org.apache.lucene.queryparser.flexible.standard.config,
+ org.apache.lucene.queryparser.flexible.standard.nodes,
+ org.apache.lucene.queryparser.flexible.standard.parser,
+ org.apache.lucene.queryparser.flexible.standard.processors,
+ org.apache.lucene.queryparser.simple,
+ org.apache.lucene.queryparser.surround.parser,
+ org.apache.lucene.queryparser.surround.query,
+ org.apache.lucene.queryparser.xml,
+ org.apache.lucene.queryparser.xml.builders,
+ org.apache.lucene.rangetree,
+ org.apache.lucene.sandbox.queries,
+ org.apache.lucene.sandbox.queries.regex,
+ org.apache.lucene.search,
+ org.apache.lucene.search.similarities,
+ org.apache.lucene.search.spans,
+ org.apache.lucene.search.spell,
+ org.apache.lucene.search.suggest,
+ org.apache.lucene.search.suggest.analyzing,
+ org.apache.lucene.search.suggest.document,
+ org.apache.lucene.search.suggest.fst,
+ org.apache.lucene.search.suggest.jaspell,
+ org.apache.lucene.search.suggest.tst,
+ org.apache.lucene.store,
  org.apache.lucene.util,
+ org.apache.lucene.util.automaton,
+ org.apache.lucene.util.fst,
+ org.apache.lucene.util.mutable,
+ org.apache.lucene.util.packed,
  org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
  org.apache.xerces.dom,
- org.eclipse.osgi.internal.loader,
- org.eclipse.osgi.util,
  org.h2.jdbc,
  org.hamcrest,
  org.hibernate,
@@ -306,6 +431,10 @@ Export-Package: com.google.api,
  org.hibernate.proxy,
  org.hibernate.proxy.pojo.javassist,
  org.hibernate.search,
+ org.hibernate.search.backend.impl.lucene,
+ org.hibernate.search.backend.impl.lucene.analysis,
+ org.hibernate.search.backend.impl.lucene.overrides,
+ org.hibernate.search.backend.impl.lucene.works,
  org.hibernate.search.spatial.impl,
  org.hibernate.type,
  org.jadira.usertype.dateandtime.joda,
@@ -340,13 +469,6 @@ Export-Package: com.google.api,
  org.joda.time.tz;uses:="org.joda.time",
  org.junit;uses:="org.hamcrest",
  org.junit.runner,
- org.odftoolkit.odfdom,
- org.odftoolkit.odfdom.doc,
- org.odftoolkit.odfdom.doc.office,
- org.odftoolkit.odfdom.doc.style,
- org.odftoolkit.odfdom.dom.element,
- org.odftoolkit.odfdom.dom.element.style,
- org.odftoolkit.odfdom.dom.style,
  org.slf4j,
  org.springframework.aop,
  org.springframework.aop.framework,
@@ -509,49 +631,28 @@ Export-Package: com.google.api,
    org.springframework.ui,
    javax.servlet.http"
 Bundle-Vendor: EDIT
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.equinox.common,
  org.apache.commons.httpclient;bundle-version="3.1.0",
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.e4.core.di.annotations;bundle-version="1.5.0",
+ org.eclipse.e4.ui.services;bundle-version="1.2.100"
 Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
- lib/antlr-2.7.7.jar,
- lib/aopalliance-1.0.jar,
  lib/apache-log4j-extras-1.2.17.jar,
  lib/aspectjrt-1.8.8.jar,
  lib/aspectjweaver-1.8.8.jar,
- lib/avro-1.6.3.jar,
- lib/batik-anim-1.7.jar,
- lib/batik-awt-util-1.7.jar,
- lib/batik-bridge-1.7.jar,
- lib/batik-css-1.7.jar,
- lib/batik-dom-1.7.jar,
- lib/batik-ext-1.8.jar,
- lib/batik-extension-1.7.jar,
- lib/batik-gvt-1.7.jar,
- lib/batik-js-1.7.jar,
- lib/batik-parser-1.7.jar,
- lib/batik-script-1.7.jar,
- lib/batik-svg-dom-1.7.jar,
- lib/batik-svggen-1.7.jar,
- lib/batik-transcoder-1.7.jar,
- lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
- lib/c3p0-0.9.5.2.jar,
- lib/cdmlib-commons-4.6.0.jar,
- lib/cdmlib-ext-4.6.0.jar,
- lib/cdmlib-io-4.6.0.jar,
- lib/cdmlib-model-4.6.0.jar,
- lib/cdmlib-persistence-4.6.0.jar,
- lib/cdmlib-print-4.6.0.jar,
- lib/cdmlib-remote-4.6.0.jar,
- lib/cdmlib-services-4.6.0.jar,
- lib/cdmlib-test-4.6.0.jar,
- lib/cglib-3.2.0.jar,
- lib/cglib-nodep-3.2.0.jar,
- lib/classmate-1.3.1.jar,
- lib/codemodel-2.2.11.jar,
+ lib/cdmlib-commons-4.7.0.jar,
+ lib/cdmlib-ext-4.7.0.jar,
+ lib/cdmlib-io-4.7.0.jar,
+ lib/cdmlib-model-4.7.0.jar,
+ lib/cdmlib-persistence-4.7.0.jar,
+ lib/cdmlib-print-4.7.0.jar,
+ lib/cdmlib-remote-4.7.0.jar,
+ lib/cdmlib-services-4.7.0.jar,
+ lib/cdmlib-test-4.7.0.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
  lib/commons-beanutils-1.9.2.jar,
@@ -564,24 +665,13 @@ Bundle-ClassPath: .,
  lib/commons-lang3-3.3.2.jar,
  lib/commons-logging-1.2.jar,
  lib/commons-pool-1.5.4.jar,
- lib/concurrent-1.3.4.jar,
  lib/dbunit-2.4.9.jar,
  lib/dom4j-1.6.1.jar,
- lib/doxia-core-1.6.jar,
- lib/doxia-logging-api-1.6.jar,
- lib/doxia-module-apt-1.6.jar,
- lib/doxia-module-xhtml-1.6.jar,
- lib/doxia-sink-api-1.6.jar,
  lib/dozer-5.3.0.jar,
  lib/dtd-parser-1.1.jar,
- lib/easymock-2.3.jar,
- lib/easymockclassextension-2.3.jar,
  lib/ehcache-core-2.6.11.jar,
  lib/ezmorph-1.0.6.jar,
- lib/FastInfoset-1.2.13.jar,
- lib/fop-1.1.jar,
  lib/google-api-translate-java-0.92.jar,
- lib/guava-19.0.jar,
  lib/h2-1.4.190.jar,
  lib/h2mig_pagestore_addon.jar,
  lib/hamcrest-core-1.3.jar,
@@ -606,13 +696,70 @@ Bundle-ClassPath: .,
  lib/httpmime-4.5.1.jar,
  lib/icu4j-2.6.1.jar,
  lib/identificationKeyAPI-1.0.jar,
- lib/istack-commons-runtime-2.21.jar,
- lib/istack-commons-tools-2.21.jar,
  lib/itextpdf-5.5.8.jar,
  lib/jackson-annotations-2.6.5.jar,
  lib/jackson-core-2.6.5.jar,
- lib/jackson-core-asl-1.8.8.jar,
+ lib/jboss-logging-3.3.0.Final.jar,
+ lib/jdom-1.1.3.jar,
+ lib/jdom2-2.0.6.jar,
+ lib/joda-time-2.9.1.jar,
+ lib/log4j-1.2.17.jar,
+ lib/lsid-client-1.1.2.jar,
+ lib/sanselan-0.97-incubator.jar,
+ lib/spring-aop-4.2.4.RELEASE.jar,
+ lib/spring-aspects-4.2.4.RELEASE.jar,
+ lib/spring-beans-4.2.4.RELEASE.jar,
+ lib/spring-context-4.2.4.RELEASE.jar,
+ lib/spring-context-support-4.2.4.RELEASE.jar,
+ lib/spring-core-4.2.4.RELEASE.jar,
+ lib/spring-expression-4.2.4.RELEASE.jar,
+ lib/spring-jdbc-4.2.4.RELEASE.jar,
+ lib/spring-modules-cache-0.7.jar,
+ lib/spring-orm-4.2.4.RELEASE.jar,
+ lib/spring-oxm-4.2.4.RELEASE.jar,
+ lib/spring-plugin-core-1.2.0.RELEASE.jar,
+ lib/spring-plugin-metadata-1.2.0.RELEASE.jar,
+ lib/spring-security-config-4.0.3.RELEASE.jar,
+ lib/spring-security-core-4.0.3.RELEASE.jar,
+ lib/spring-security-web-4.0.3.RELEASE.jar,
+ lib/spring-test-4.2.4.RELEASE.jar,
+ lib/spring-tx-4.2.4.RELEASE.jar,
+ lib/spring-web-4.2.4.RELEASE.jar,
+ lib/spring-webmvc-4.2.4.RELEASE.jar,
+ lib/springfox-core-2.3.1.jar,
+ lib/springfox-schema-2.3.1.jar,
+ lib/springfox-spi-2.3.1.jar,
+ lib/springfox-spring-web-2.3.1.jar,
+ lib/springfox-swagger-common-2.3.1.jar,
+ lib/springfox-swagger2-2.3.1.jar,
+ lib/standard-1.1.2.jar,
+ lib/tools.jar,
+ lib/txw2-2.2.11.jar,
+ lib/usertype.jodatime-2.0.1.jar,
+ lib/usertype.spi-2.0.1.jar,
+ lib/validation-api-1.1.0.Final.jar,
+ lib/wsdl4j-1.6.3.jar,
+ lib/xalan-2.7.0.jar,
+ lib/xercesImpl-2.11.0.jar,
+ lib/xml-apis-1.0.b2.jar,
+ lib/xml-apis-ext-1.3.04.jar,
+ lib/xml-resolver-1.2.jar,
+ lib/xmlbeans-2.6.0.jar,
+ lib/xmlgraphics-commons-1.5.jar,
+ lib/xmlpull-1.1.3.1.jar,
+ lib/xmlunit-1.6.jar,
+ lib/xom-1.2.5.jar,
+ lib/xpp3_min-1.1.4c.jar,
+ lib/xpp3-1.1.4c.jar,
+ lib/xsom-20140925.jar,
+ lib/xstream-1.4.8.jar,
+ lib/yjp-controller-api-redist-9.0.8.jar,
+ lib/spring-security-oauth2-2.0.11.RELEASE.jar,
+ lib/opencsv-2.3.jar,
+ lib/jdbc4-2.0.jar,
+ lib/junit-4.12.jar,
  lib/jackson-databind-2.6.5.jar,
+ lib/jackson-core-asl-1.8.8.jar,
  lib/jackson-mapper-asl-1.8.8.jar,
  lib/jakarta-regexp-1.4.jar,
  lib/jandex-2.0.0.Final.jar,
@@ -628,42 +775,53 @@ Bundle-ClassPath: .,
  lib/jaxb1-impl-2.2-EA.jar,
  lib/jaxen-1.1.4.jar,
  lib/jaxen-1.1.6.jar,
- lib/jboss-logging-3.3.0.Final.jar,
  lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
  lib/jcl-over-slf4j-1.7.6.jar,
- lib/jdbc4-2.0.jar,
- lib/jdom-1.1.3.jar,
- lib/jdom2-2.0.6.jar,
  lib/jena-arq-2.13.0.jar,
  lib/jena-core-2.13.0.jar,
  lib/jena-iri-1.1.2.jar,
  lib/jena-tdb-1.1.2.jar,
- lib/joda-time-2.9.1.jar,
  lib/json-20090211.jar,
  lib/json-lib-2.4-jdk15.jar,
  lib/jsonld-java-0.5.1.jar,
  lib/jsr250-api-1.0.jar,
  lib/jta-1.1.jar,
  lib/jtds-1.3.1.jar,
- lib/junit-4.12.jar,
  lib/junit-benchmarks-0.7.2.jar,
+ lib/batik-dom-1.7.jar,
+ lib/batik-anim-1.7.jar,
+ lib/batik-awt-util-1.7.jar,
+ lib/batik-bridge-1.7.jar,
+ lib/batik-css-1.7.jar,
+ lib/batik-ext-1.8.jar,
+ lib/batik-extension-1.7.jar,
+ lib/batik-gvt-1.7.jar,
+ lib/batik-js-1.7.jar,
+ lib/batik-parser-1.7.jar,
+ lib/batik-script-1.7.jar,
+ lib/batik-svg-dom-1.7.jar,
+ lib/batik-svggen-1.7.jar,
+ lib/batik-transcoder-1.7.jar,
+ lib/batik-util-1.7.jar,
+ lib/c3p0-0.9.5.2.jar,
+ lib/slf4j-api-1.7.13.jar,
+ lib/slf4j-log4j12-1.7.13.jar,
+ lib/slf4j-nop-1.7.13.jar,
+ lib/antlr-2.7.7.jar,
+ lib/aopalliance-1.0.jar,
+ lib/avro-1.6.3.jar,
+ lib/cglib-3.2.0.jar,
+ lib/cglib-nodep-3.2.0.jar,
+ lib/classmate-1.3.1.jar,
+ lib/codemodel-2.2.11.jar,
+ lib/concurrent-1.3.4.jar,
+ lib/easymock-2.3.jar,
+ lib/easymockclassextension-2.3.jar,
+ lib/FastInfoset-1.2.13.jar,
+ lib/fop-1.1.jar,
+ lib/guava-19.0.jar,
  lib/libthrift-0.9.2.jar,
- lib/log4j-1.2.17.jar,
- lib/lsid-client-1.1.2.jar,
  lib/lsid-server-1.1.2.jar,
- lib/lucene-analyzers-common-5.4.1.jar,
- lib/lucene-backward-codecs-5.4.1.jar,
- lib/lucene-core-5.4.1.jar,
- lib/lucene-facet-5.4.1.jar,
- lib/lucene-grouping-5.4.1.jar,
- lib/lucene-highlighter-5.4.1.jar,
- lib/lucene-join-5.4.1.jar,
- lib/lucene-memory-5.4.1.jar,
- lib/lucene-misc-5.4.1.jar,
- lib/lucene-queries-5.4.1.jar,
- lib/lucene-queryparser-5.4.1.jar,
- lib/lucene-sandbox-5.4.1.jar,
- lib/lucene-suggest-5.4.1.jar,
  lib/mapstruct-1.0.0.Final.jar,
  lib/mchange-commons-java-0.2.11.jar,
  lib/mysql-connector-java-5.1.38.jar,
@@ -671,64 +829,19 @@ Bundle-ClassPath: .,
  lib/odfdom-0.8.jar,
  lib/odfdom-java-0.8.7.jar,
  lib/ognl-2.6.9.jar,
- lib/opencsv-2.3.jar,
- lib/org.osgi.core-1.0.0.jar,
- lib/osgi-3.6.0.jar,
  lib/paranamer-2.3.jar,
- lib/plexus-classworlds-1.2-alpha-9.jar,
- lib/plexus-component-annotations-1.5.5.jar,
- lib/plexus-container-default-1.0-alpha-30.jar,
- lib/plexus-utils-3.0.15.jar,
  lib/poi-3.13.jar,
  lib/poi-ooxml-3.13.jar,
  lib/poi-ooxml-schemas-3.13.jar,
  lib/postgresql-9.4-1206-jdbc4.jar,
  lib/relaxngDatatype-20020414.jar,
  lib/rngom-2.2.11.jar,
- lib/sanselan-0.97-incubator.jar,
  lib/Saxon-HE-9.7.0-2.jar,
  lib/servlet-api-2.5.jar,
- lib/slf4j-api-1.7.13.jar,
- lib/slf4j-log4j12-1.7.13.jar,
- lib/slf4j-nop-1.7.13.jar,
  lib/snappy-java-1.0.4.1.jar,
  lib/solr-analysis-extras-3.6.2.jar,
  lib/solr-core-3.6.2.jar,
  lib/solr-solrj-3.6.2.jar,
- lib/spring-aop-4.2.4.RELEASE.jar,
- lib/spring-aspects-4.2.4.RELEASE.jar,
- lib/spring-beans-4.2.4.RELEASE.jar,
- lib/spring-context-4.2.4.RELEASE.jar,
- lib/spring-context-support-4.2.4.RELEASE.jar,
- lib/spring-core-4.2.4.RELEASE.jar,
- lib/spring-expression-4.2.4.RELEASE.jar,
- lib/spring-jdbc-4.2.4.RELEASE.jar,
- lib/spring-modules-cache-0.7.jar,
- lib/spring-orm-4.2.4.RELEASE.jar,
- lib/spring-oxm-4.2.4.RELEASE.jar,
- lib/spring-plugin-core-1.2.0.RELEASE.jar,
- lib/spring-plugin-metadata-1.2.0.RELEASE.jar,
- lib/spring-security-config-4.0.3.RELEASE.jar,
- lib/spring-security-core-4.0.3.RELEASE.jar,
- lib/spring-security-web-4.0.3.RELEASE.jar,
- lib/spring-test-4.2.4.RELEASE.jar,
- lib/spring-tx-4.2.4.RELEASE.jar,
- lib/spring-web-4.2.4.RELEASE.jar,
- lib/spring-webmvc-4.2.4.RELEASE.jar,
- lib/springfox-core-2.3.1.jar,
- lib/springfox-schema-2.3.1.jar,
- lib/springfox-spi-2.3.1.jar,
- lib/springfox-spring-web-2.3.1.jar,
- lib/springfox-swagger-common-2.3.1.jar,
- lib/springfox-swagger2-2.3.1.jar,
- lib/standard-1.1.2.jar,
- lib/stax-1.2.0.jar,
- lib/stax-api-1.0.1.jar,
- lib/stax-ex-1.7.7.jar,
- lib/swagger-annotations-1.5.6.jar,
- lib/swagger-models-1.5.5.jar,
- lib/tools.jar,
- lib/txw2-2.2.11.jar,
  lib/unitils-core-3.4.2.jar,
  lib/unitils-database-3.4.2.jar,
  lib/unitils-dbmaintainer-3.4.2.jar,
@@ -738,24 +851,12 @@ Bundle-ClassPath: .,
  lib/unitils-mock-3.4.2.jar,
  lib/unitils-orm-3.4.2.jar,
  lib/unitils-spring-3.4.2.jar,
- lib/usertype.jodatime-2.0.1.jar,
- lib/usertype.spi-2.0.1.jar,
- lib/validation-api-1.1.0.Final.jar,
- lib/wsdl4j-1.6.3.jar,
- lib/xalan-2.7.0.jar,
- lib/xercesImpl-2.11.0.jar,
- lib/xml-apis-1.0.b2.jar,
- lib/xml-apis-ext-1.3.04.jar,
- lib/xml-resolver-1.2.jar,
- lib/xmlbeans-2.6.0.jar,
- lib/xmlgraphics-commons-1.5.jar,
- lib/xmlpull-1.1.3.1.jar,
- lib/xmlunit-1.6.jar,
- lib/xom-1.2.5.jar,
- lib/xpp3_min-1.1.4c.jar,
- lib/xpp3-1.1.4c.jar,
- lib/xsom-20140925.jar,
- lib/xstream-1.4.8.jar,
- lib/yjp-controller-api-redist-9.0.8.jar,
- lib/spring-security-oauth2-2.0.11.RELEASE.jar
+ lib/lucene-core-5.4.1.jar,
+ lib/istack-commons-runtime-2.21.jar,
+ lib/istack-commons-tools-2.21.jar,
+ lib/lucene-queryparser-5.4.1.jar,
+ lib/lucene-analyzers-3.6.2.jar,
+ lib/lucene-analyzers-common-5.4.1.jar,
+ lib/lucene-sandbox-5.4.1.jar,
+ lib/lucene-suggest-5.4.1.jar
 Import-Package: eu.etaxonomy.cdm.api.application
index 4bdb6e2..a14ab66 100644 (file)
@@ -2,42 +2,19 @@ bin.includes = META-INF/,\
                .,\
                resources/cdm.map.ser,\
                lib/activation-1.1.1.jar,\
-               lib/antlr-2.7.7.jar,\
-               lib/aopalliance-1.0.jar,\
                lib/apache-log4j-extras-1.2.17.jar,\
                lib/aspectjrt-1.8.8.jar,\
                lib/aspectjweaver-1.8.8.jar,\
-               lib/avro-1.6.3.jar,\
-               lib/batik-anim-1.7.jar,\
-               lib/batik-awt-util-1.7.jar,\
-               lib/batik-bridge-1.7.jar,\
-               lib/batik-css-1.7.jar,\
-               lib/batik-dom-1.7.jar,\
-               lib/batik-ext-1.8.jar,\
-               lib/batik-extension-1.7.jar,\
-               lib/batik-gvt-1.7.jar,\
-               lib/batik-js-1.7.jar,\
-               lib/batik-parser-1.7.jar,\
-               lib/batik-script-1.7.jar,\
-               lib/batik-svg-dom-1.7.jar,\
-               lib/batik-svggen-1.7.jar,\
-               lib/batik-transcoder-1.7.jar,\
-               lib/batik-util-1.7.jar,\
                lib/batik-xml-1.7.jar,\
-               lib/c3p0-0.9.5.2.jar,\
-               lib/cdmlib-commons-4.6.0.jar,\
-               lib/cdmlib-ext-4.6.0.jar,\
-               lib/cdmlib-io-4.6.0.jar,\
-               lib/cdmlib-model-4.6.0.jar,\
-               lib/cdmlib-persistence-4.6.0.jar,\
-               lib/cdmlib-print-4.6.0.jar,\
-               lib/cdmlib-remote-4.6.0.jar,\
-               lib/cdmlib-services-4.6.0.jar,\
-               lib/cdmlib-test-4.6.0.jar,\
-               lib/cglib-3.2.0.jar,\
-               lib/cglib-nodep-3.2.0.jar,\
-               lib/classmate-1.3.1.jar,\
-               lib/codemodel-2.2.11.jar,\
+               lib/cdmlib-commons-4.7.0.jar,\
+               lib/cdmlib-ext-4.7.0.jar,\
+               lib/cdmlib-io-4.7.0.jar,\
+               lib/cdmlib-model-4.7.0.jar,\
+               lib/cdmlib-persistence-4.7.0.jar,\
+               lib/cdmlib-print-4.7.0.jar,\
+               lib/cdmlib-remote-4.7.0.jar,\
+               lib/cdmlib-services-4.7.0.jar,\
+               lib/cdmlib-test-4.7.0.jar,\
                lib/com.springsource.org.aopalliance-1.0.0.jar,\
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\
                lib/commons-beanutils-1.9.2.jar,\
@@ -50,24 +27,13 @@ bin.includes = META-INF/,\
                lib/commons-lang3-3.3.2.jar,\
                lib/commons-logging-1.2.jar,\
                lib/commons-pool-1.5.4.jar,\
-               lib/concurrent-1.3.4.jar,\
                lib/dbunit-2.4.9.jar,\
                lib/dom4j-1.6.1.jar,\
-               lib/doxia-core-1.6.jar,\
-               lib/doxia-logging-api-1.6.jar,\
-               lib/doxia-module-apt-1.6.jar,\
-               lib/doxia-module-xhtml-1.6.jar,\
-               lib/doxia-sink-api-1.6.jar,\
                lib/dozer-5.3.0.jar,\
                lib/dtd-parser-1.1.jar,\
-               lib/easymock-2.3.jar,\
-               lib/easymockclassextension-2.3.jar,\
                lib/ehcache-core-2.6.11.jar,\
                lib/ezmorph-1.0.6.jar,\
-               lib/FastInfoset-1.2.13.jar,\
-               lib/fop-1.1.jar,\
                lib/google-api-translate-java-0.92.jar,\
-               lib/guava-19.0.jar,\
                lib/h2-1.4.190.jar,\
                lib/h2mig_pagestore_addon.jar,\
                lib/hamcrest-core-1.3.jar,\
@@ -92,13 +58,70 @@ bin.includes = META-INF/,\
                lib/httpmime-4.5.1.jar,\
                lib/icu4j-2.6.1.jar,\
                lib/identificationKeyAPI-1.0.jar,\
-               lib/istack-commons-runtime-2.21.jar,\
-               lib/istack-commons-tools-2.21.jar,\
                lib/itextpdf-5.5.8.jar,\
                lib/jackson-annotations-2.6.5.jar,\
                lib/jackson-core-2.6.5.jar,\
-               lib/jackson-core-asl-1.8.8.jar,\
+               lib/jboss-logging-3.3.0.Final.jar,\
+               lib/jdom-1.1.3.jar,\
+               lib/jdom2-2.0.6.jar,\
+               lib/joda-time-2.9.1.jar,\
+               lib/log4j-1.2.17.jar,\
+               lib/lsid-client-1.1.2.jar,\
+               lib/sanselan-0.97-incubator.jar,\
+               lib/spring-aop-4.2.4.RELEASE.jar,\
+               lib/spring-aspects-4.2.4.RELEASE.jar,\
+               lib/spring-beans-4.2.4.RELEASE.jar,\
+               lib/spring-context-4.2.4.RELEASE.jar,\
+               lib/spring-context-support-4.2.4.RELEASE.jar,\
+               lib/spring-core-4.2.4.RELEASE.jar,\
+               lib/spring-expression-4.2.4.RELEASE.jar,\
+               lib/spring-jdbc-4.2.4.RELEASE.jar,\
+               lib/spring-modules-cache-0.7.jar,\
+               lib/spring-orm-4.2.4.RELEASE.jar,\
+               lib/spring-oxm-4.2.4.RELEASE.jar,\
+               lib/spring-plugin-core-1.2.0.RELEASE.jar,\
+               lib/spring-plugin-metadata-1.2.0.RELEASE.jar,\
+               lib/spring-security-config-4.0.3.RELEASE.jar,\
+               lib/spring-security-core-4.0.3.RELEASE.jar,\
+               lib/spring-security-web-4.0.3.RELEASE.jar,\
+               lib/spring-test-4.2.4.RELEASE.jar,\
+               lib/spring-tx-4.2.4.RELEASE.jar,\
+               lib/spring-web-4.2.4.RELEASE.jar,\
+               lib/spring-webmvc-4.2.4.RELEASE.jar,\
+               lib/springfox-core-2.3.1.jar,\
+               lib/springfox-schema-2.3.1.jar,\
+               lib/springfox-spi-2.3.1.jar,\
+               lib/springfox-spring-web-2.3.1.jar,\
+               lib/springfox-swagger-common-2.3.1.jar,\
+               lib/springfox-swagger2-2.3.1.jar,\
+               lib/standard-1.1.2.jar,\
+               lib/tools.jar,\
+               lib/txw2-2.2.11.jar,\
+               lib/usertype.jodatime-2.0.1.jar,\
+               lib/usertype.spi-2.0.1.jar,\
+               lib/validation-api-1.1.0.Final.jar,\
+               lib/wsdl4j-1.6.3.jar,\
+               lib/xalan-2.7.0.jar,\
+               lib/xercesImpl-2.11.0.jar,\
+               lib/xml-apis-1.0.b2.jar,\
+               lib/xml-apis-ext-1.3.04.jar,\
+               lib/xml-resolver-1.2.jar,\
+               lib/xmlbeans-2.6.0.jar,\
+               lib/xmlgraphics-commons-1.5.jar,\
+               lib/xmlpull-1.1.3.1.jar,\
+               lib/xmlunit-1.6.jar,\
+               lib/xom-1.2.5.jar,\
+               lib/xpp3_min-1.1.4c.jar,\
+               lib/xpp3-1.1.4c.jar,\
+               lib/xsom-20140925.jar,\
+               lib/xstream-1.4.8.jar,\
+               lib/yjp-controller-api-redist-9.0.8.jar,\
+               lib/spring-security-oauth2-2.0.11.RELEASE.jar,\
+               lib/opencsv-2.3.jar,\
+               lib/jdbc4-2.0.jar,\
+               lib/junit-4.12.jar,\
                lib/jackson-databind-2.6.5.jar,\
+               lib/jackson-core-asl-1.8.8.jar,\
                lib/jackson-mapper-asl-1.8.8.jar,\
                lib/jakarta-regexp-1.4.jar,\
                lib/jandex-2.0.0.Final.jar,\
@@ -114,42 +137,53 @@ bin.includes = META-INF/,\
                lib/jaxb1-impl-2.2-EA.jar,\
                lib/jaxen-1.1.4.jar,\
                lib/jaxen-1.1.6.jar,\
-               lib/jboss-logging-3.3.0.Final.jar,\
                lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,\
                lib/jcl-over-slf4j-1.7.6.jar,\
-               lib/jdbc4-2.0.jar,\
-               lib/jdom-1.1.3.jar,\
-               lib/jdom2-2.0.6.jar,\
                lib/jena-arq-2.13.0.jar,\
                lib/jena-core-2.13.0.jar,\
                lib/jena-iri-1.1.2.jar,\
                lib/jena-tdb-1.1.2.jar,\
-               lib/joda-time-2.9.1.jar,\
                lib/json-20090211.jar,\
                lib/json-lib-2.4-jdk15.jar,\
                lib/jsonld-java-0.5.1.jar,\
                lib/jsr250-api-1.0.jar,\
                lib/jta-1.1.jar,\
                lib/jtds-1.3.1.jar,\
-               lib/junit-4.12.jar,\
                lib/junit-benchmarks-0.7.2.jar,\
+               lib/batik-dom-1.7.jar,\
+               lib/batik-anim-1.7.jar,\
+               lib/batik-awt-util-1.7.jar,\
+               lib/batik-bridge-1.7.jar,\
+               lib/batik-css-1.7.jar,\
+               lib/batik-ext-1.8.jar,\
+               lib/batik-extension-1.7.jar,\
+               lib/batik-gvt-1.7.jar,\
+               lib/batik-js-1.7.jar,\
+               lib/batik-parser-1.7.jar,\
+               lib/batik-script-1.7.jar,\
+               lib/batik-svg-dom-1.7.jar,\
+               lib/batik-svggen-1.7.jar,\
+               lib/batik-transcoder-1.7.jar,\
+               lib/batik-util-1.7.jar,\
+               lib/c3p0-0.9.5.2.jar,\
+               lib/slf4j-api-1.7.13.jar,\
+               lib/slf4j-log4j12-1.7.13.jar,\
+               lib/slf4j-nop-1.7.13.jar,\
+               lib/antlr-2.7.7.jar,\
+               lib/aopalliance-1.0.jar,\
+               lib/avro-1.6.3.jar,\
+               lib/cglib-3.2.0.jar,\
+               lib/cglib-nodep-3.2.0.jar,\
+               lib/classmate-1.3.1.jar,\
+               lib/codemodel-2.2.11.jar,\
+               lib/concurrent-1.3.4.jar,\
+               lib/easymock-2.3.jar,\
+               lib/easymockclassextension-2.3.jar,\
+               lib/FastInfoset-1.2.13.jar,\
+               lib/fop-1.1.jar,\
+               lib/guava-19.0.jar,\
                lib/libthrift-0.9.2.jar,\
-               lib/log4j-1.2.17.jar,\
-               lib/lsid-client-1.1.2.jar,\
                lib/lsid-server-1.1.2.jar,\
-               lib/lucene-analyzers-common-5.4.1.jar,\
-               lib/lucene-backward-codecs-5.4.1.jar,\
-               lib/lucene-core-5.4.1.jar,\
-               lib/lucene-facet-5.4.1.jar,\
-               lib/lucene-grouping-5.4.1.jar,\
-               lib/lucene-highlighter-5.4.1.jar,\
-               lib/lucene-join-5.4.1.jar,\
-               lib/lucene-memory-5.4.1.jar,\
-               lib/lucene-misc-5.4.1.jar,\
-               lib/lucene-queries-5.4.1.jar,\
-               lib/lucene-queryparser-5.4.1.jar,\
-               lib/lucene-sandbox-5.4.1.jar,\
-               lib/lucene-suggest-5.4.1.jar,\
                lib/mapstruct-1.0.0.Final.jar,\
                lib/mchange-commons-java-0.2.11.jar,\
                lib/mysql-connector-java-5.1.38.jar,\
@@ -157,64 +191,19 @@ bin.includes = META-INF/,\
                lib/odfdom-0.8.jar,\
                lib/odfdom-java-0.8.7.jar,\
                lib/ognl-2.6.9.jar,\
-               lib/opencsv-2.3.jar,\
-               lib/org.osgi.core-1.0.0.jar,\
-               lib/osgi-3.6.0.jar,\
                lib/paranamer-2.3.jar,\
-               lib/plexus-classworlds-1.2-alpha-9.jar,\
-               lib/plexus-component-annotations-1.5.5.jar,\
-               lib/plexus-container-default-1.0-alpha-30.jar,\
-               lib/plexus-utils-3.0.15.jar,\
                lib/poi-3.13.jar,\
                lib/poi-ooxml-3.13.jar,\
                lib/poi-ooxml-schemas-3.13.jar,\
                lib/postgresql-9.4-1206-jdbc4.jar,\
                lib/relaxngDatatype-20020414.jar,\
                lib/rngom-2.2.11.jar,\
-               lib/sanselan-0.97-incubator.jar,\
                lib/Saxon-HE-9.7.0-2.jar,\
                lib/servlet-api-2.5.jar,\
-               lib/slf4j-api-1.7.13.jar,\
-               lib/slf4j-log4j12-1.7.13.jar,\
-               lib/slf4j-nop-1.7.13.jar,\
                lib/snappy-java-1.0.4.1.jar,\
                lib/solr-analysis-extras-3.6.2.jar,\
                lib/solr-core-3.6.2.jar,\
                lib/solr-solrj-3.6.2.jar,\
-               lib/spring-aop-4.2.4.RELEASE.jar,\
-               lib/spring-aspects-4.2.4.RELEASE.jar,\
-               lib/spring-beans-4.2.4.RELEASE.jar,\
-               lib/spring-context-4.2.4.RELEASE.jar,\
-               lib/spring-context-support-4.2.4.RELEASE.jar,\
-               lib/spring-core-4.2.4.RELEASE.jar,\
-               lib/spring-expression-4.2.4.RELEASE.jar,\
-               lib/spring-jdbc-4.2.4.RELEASE.jar,\
-               lib/spring-modules-cache-0.7.jar,\
-               lib/spring-orm-4.2.4.RELEASE.jar,\
-               lib/spring-oxm-4.2.4.RELEASE.jar,\
-               lib/spring-plugin-core-1.2.0.RELEASE.jar,\
-               lib/spring-plugin-metadata-1.2.0.RELEASE.jar,\
-               lib/spring-security-config-4.0.3.RELEASE.jar,\
-               lib/spring-security-core-4.0.3.RELEASE.jar,\
-               lib/spring-security-web-4.0.3.RELEASE.jar,\
-               lib/spring-test-4.2.4.RELEASE.jar,\
-               lib/spring-tx-4.2.4.RELEASE.jar,\
-               lib/spring-web-4.2.4.RELEASE.jar,\
-               lib/spring-webmvc-4.2.4.RELEASE.jar,\
-               lib/springfox-core-2.3.1.jar,\
-               lib/springfox-schema-2.3.1.jar,\
-               lib/springfox-spi-2.3.1.jar,\
-               lib/springfox-spring-web-2.3.1.jar,\
-               lib/springfox-swagger-common-2.3.1.jar,\
-               lib/springfox-swagger2-2.3.1.jar,\
-               lib/standard-1.1.2.jar,\
-               lib/stax-1.2.0.jar,\
-               lib/stax-api-1.0.1.jar,\
-               lib/stax-ex-1.7.7.jar,\
-               lib/swagger-annotations-1.5.6.jar,\
-               lib/swagger-models-1.5.5.jar,\
-               lib/tools.jar,\
-               lib/txw2-2.2.11.jar,\
                lib/unitils-core-3.4.2.jar,\
                lib/unitils-database-3.4.2.jar,\
                lib/unitils-dbmaintainer-3.4.2.jar,\
@@ -224,26 +213,14 @@ bin.includes = META-INF/,\
                lib/unitils-mock-3.4.2.jar,\
                lib/unitils-orm-3.4.2.jar,\
                lib/unitils-spring-3.4.2.jar,\
-               lib/usertype.jodatime-2.0.1.jar,\
-               lib/usertype.spi-2.0.1.jar,\
-               lib/validation-api-1.1.0.Final.jar,\
-               lib/wsdl4j-1.6.3.jar,\
-               lib/xalan-2.7.0.jar,\
-               lib/xercesImpl-2.11.0.jar,\
-               lib/xml-apis-1.0.b2.jar,\
-               lib/xml-apis-ext-1.3.04.jar,\
-               lib/xml-resolver-1.2.jar,\
-               lib/xmlbeans-2.6.0.jar,\
-               lib/xmlgraphics-commons-1.5.jar,\
-               lib/xmlpull-1.1.3.1.jar,\
-               lib/xmlunit-1.6.jar,\
-               lib/xom-1.2.5.jar,\
-               lib/xpp3_min-1.1.4c.jar,\
-               lib/xpp3-1.1.4c.jar,\
-               lib/xsom-20140925.jar,\
-               lib/xstream-1.4.8.jar,\
-               lib/yjp-controller-api-redist-9.0.8.jar,\
-               lib/spring-security-oauth2-2.0.11.RELEASE.jar
+               lib/lucene-core-5.4.1.jar,\
+               lib/istack-commons-runtime-2.21.jar,\
+               lib/istack-commons-tools-2.21.jar,\
+               lib/lucene-queryparser-5.4.1.jar,\
+               lib/lucene-analyzers-3.6.2.jar,\
+               lib/lucene-analyzers-common-5.4.1.jar,\
+               lib/lucene-sandbox-5.4.1.jar,\
+               lib/lucene-suggest-5.4.1.jar
 
 jars.compile.order = .
 output.. = bin/
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar
deleted file mode 100644 (file)
index 4f595c6..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar
deleted file mode 100644 (file)
index aa3d909..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar
deleted file mode 100644 (file)
index 9080348..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar
deleted file mode 100644 (file)
index ca6607e..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar
deleted file mode 100644 (file)
index 7ddd397..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar
new file mode 100644 (file)
index 0000000..752c714
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.1.jar
deleted file mode 100644 (file)
index 67b83ee..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-backward-codecs-5.4.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.1.jar
deleted file mode 100644 (file)
index 941d1d1..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-5.4.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.1.jar
deleted file mode 100644 (file)
index 06ed59d..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-5.4.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.1.jar
deleted file mode 100644 (file)
index 381ea47..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-5.4.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.1.jar
deleted file mode 100644 (file)
index 16a3e87..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-join-5.4.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.1.jar
deleted file mode 100644 (file)
index 6b65fe2..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-5.4.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.1.jar
deleted file mode 100644 (file)
index 8d36fe7..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-5.4.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.1.jar
deleted file mode 100644 (file)
index 168771d..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-5.4.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.osgi.core-1.0.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.osgi.core-1.0.0.jar
deleted file mode 100644 (file)
index dcddc09..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.osgi.core-1.0.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/osgi-3.6.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/osgi-3.6.0.jar
deleted file mode 100644 (file)
index b2bd56e..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/osgi-3.6.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-classworlds-1.2-alpha-9.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-classworlds-1.2-alpha-9.jar
deleted file mode 100644 (file)
index 1aa4fd1..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-classworlds-1.2-alpha-9.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar
deleted file mode 100644 (file)
index e4de16f..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-component-annotations-1.5.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-container-default-1.0-alpha-30.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-container-default-1.0-alpha-30.jar
deleted file mode 100644 (file)
index 97785bb..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-container-default-1.0-alpha-30.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar
deleted file mode 100644 (file)
index feab196..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-3.0.15.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/stax-1.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/stax-1.2.0.jar
deleted file mode 100644 (file)
index 0df112a..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/stax-1.2.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/stax-api-1.0.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/stax-api-1.0.1.jar
deleted file mode 100644 (file)
index d9a1665..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/stax-api-1.0.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar
deleted file mode 100644 (file)
index 31a6aad..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/stax-ex-1.7.7.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.6.jar
deleted file mode 100644 (file)
index 5bea844..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.5.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar
deleted file mode 100644 (file)
index a14a5ff..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/swagger-models-1.5.5.jar and /dev/null differ
index 8da8b8e..f11ee68 100644 (file)
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>4.6.0</version>\r
+    <version>4.7.0</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
       <artifactId>commons-pool</artifactId>\r
       <version>1.5.4</version>\r
     </dependency>\r
-\r
  \r
     <!-- For Unit Tests End -->\r
 \r
       <version>1.1.0.Final</version>\r
     </dependency>\r
     <!-- For Hibernate Mapping End -->\r
-\r
-       <dependency>\r
-               <groupId>com.itextpdf</groupId>\r
-               <artifactId>itextpdf</artifactId>\r
-               <version>5.5.8</version>\r
-               <scope>compile</scope>\r
-       </dependency>\r
-\r
+    \r
   </dependencies>\r
 </project>\r
 \r
index 88f0aab..5365fe2 100644 (file)
@@ -146,10 +146,6 @@ public class CdmServiceCacher extends CdmCacher implements ICdmEntitySessionMana
         return cachedCdmEntity;
     }
 
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.cache.CdmCacher#load(eu.etaxonomy.cdm.model.common.CdmBase)
-     */
     @Override
     public CdmBase load(CdmBase cdmEntity) {
         CdmBase cachedCdmEntity = getFromCache(cdmEntity.getUuid());
@@ -160,9 +156,6 @@ public class CdmServiceCacher extends CdmCacher implements ICdmEntitySessionMana
         return cachedCdmEntity;
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionManagerObserver#changed()
-     */
     @Override
     public void changed() {
         ICdmEntitySession cdmEntitySession = cdmEntitySessionManager.getActiveSession();
index 15b7e66..dcf68ba 100644 (file)
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.service;
 import java.io.IOException;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.http.client.methods.HttpPost;
 import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor;
 import org.springframework.remoting.httpinvoker.HttpInvokerClientConfiguration;
index ecfae0e..c2fa594 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.zest.layouts,
  eu.etaxonomy.taxeditor.cdmlib,
  org.eclipse.ui.ide
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.databinding.beans,
  org.eclipse.core.databinding.observable.list,
index 838b951..e04dadc 100644 (file)
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.separator4"
-               visible="true">
-         </separator>
-         <dynamic
-               class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
-               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
-         </dynamic>
-         <dynamic
-               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
-               id="eu.etaxonomy.taxeditor.editor.derivativeEditor.CdmViewerContextMenu">
-         </dynamic>
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.separator1"
-               visible="true">
-         </separator>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
                label="%command.label.LINK_WITH_TAXON_SELECTION"
                label="%command.label.54"
                style="push">
          </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator1"
+               visible="true">
+         </separator>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
+         </dynamic>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator1"
+               visible="true">
+         </separator>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.derivativeEditor.CdmViewerContextMenu">
+         </dynamic>
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
index 015d34e..b53d1ab 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 7241f84..e427b39 100644 (file)
@@ -122,6 +122,17 @@ IDirtyMarkable, IPartContentHasDetails, ISecuredEditor, IPartContentHasMedia {
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void pageChange(int newPageIndex) {
+        if(getCurrentPage()==-1){
+            return;
+        }
+        super.pageChange(newPageIndex);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void doSave(IProgressMonitor monitor) {
index 72aba13..597f3fd 100644 (file)
@@ -250,6 +250,8 @@ public class Messages extends NLS {
     public static String ValidationDaemon_RUNNING_DAEMON;
     public static String ValidationDaemon_VALIDATION_EXCEPTION;
     public static String ValidationDaemon_VALIDATION_STOPPED;
+    public static String DeleteDerivateHandler_LABEL;
+    public static String DeleteDerivateHandler_SUCCESSFULL_BUT_EXCEPTIONS;
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);
index 93392a7..394a2db 100644 (file)
@@ -206,6 +206,8 @@ OpenRelatedConceptHandler_COULD_NOT_OPEN_MESSAGE=Could not open the taxon: %s
 ListenToSelectionChangeContextMenu_LINK=Link with taxon selection
 ListenToSelectionChangeContextMenu_UNLINK=Unlink from taxon selection
 DeleteDerivateHandler_INVALID_SELECTION=Selection is not valid for this delete handler
+DeleteDerivateHandler_LABEL=Delete of derivates
+DeleteDerivateHandler_SUCCESSFULL_BUT_EXCEPTIONS=Delete was successfull, but with exceptions
 DeleteDescriptionElementOperation_DESC_NOT_FOUND=Couldn't find element's description!
 DeleteHandler_CONFIRM_DELETION=Confirm Deletion
 DeleteHandler_CONFIRM_DELETION_MESSAGE=Do you really want to delete the media?
index 870b8f5..5e2ca74 100644 (file)
@@ -206,17 +206,20 @@ OpenRelatedConceptHandler_COULD_NOT_OPEN_MESSAGE=Konnte Taxon nicht 
 ListenToSelectionChangeContextMenu_LINK=Verknüpfe mit Taxonauswahl
 ListenToSelectionChangeContextMenu_UNLINK=Verknüpfung mit Taxonauswahl aufheben
 DeleteDerivateHandler_INVALID_SELECTION=Auswahl ungültig
+DeleteDerivateHandler_LABEL=Löschen von Derivaten
+DeleteDerivateHandler_SUCCESSFULL_BUT_EXCEPTIONS=Löschen war erfolgreich, aber es gab Exceptions
+DeleteDerivateHandler_CANCELLED=Das Löschen wurde abgebrochen
 OpenDerivativeEditorForDescriptionElement_NO_SPECIMENS=Keine Specimens gefunden
 OpenDerivativeEditorForDescriptionElement_NO_SPECIMENS_MESSAGE=Keine Specimens für die Auswahl. (Gibt es vielleicht noch ungespeicherte Änderungen?)
 OpenDerivativeEditorForTaxonNode_COULD_NOT_OPEN=Specimen-Editor konnte nicht geöffnet werden
 DeleteDescriptionElementOperation_DESC_NOT_FOUND=Beschreibung konnte nicht gefunden werden!
 DeleteHandler_CONFIRM_DELETION=Löschen bestätigen
-DeleteHandler_CONFIRM_DELETION_MESSAGE=Wollen sie wirklich das Medienobjektlöschen?
+DeleteHandler_CONFIRM_DELETION_MESSAGE=Wollen sie wirklich das Medienobjekt löschen?
 DeleteHandler_DELETE=Löschen
 DeleteHandler_INVALID_SELECTION=Auswahl ungültig für den DeleteHandler
 DeleteHandler_SKIP=Überspringen
 DeleteMediaHandler_CONFIRM=Löschen bestätigen
-DeleteMediaHandler_CONFIRM_MESSAGE=Wollen sie wirklich das Medienobjektlöschen?
+DeleteMediaHandler_CONFIRM_MESSAGE=Wollen sie wirklich das Medienobjekt löschen?
 DeleteMediaHandler_DELETE=Löschen
 DeleteMediaHandler_SKIP=Überspringen
 DerivateSearchComposite_ALL=Alle
index 6154ad8..859552a 100644 (file)
@@ -207,6 +207,7 @@ public class TaxonNameEditor extends EditorPart implements
                ISelectionProvider selectionProvider = getSite().getSelectionProvider();
                getSite().registerContextMenu(TaxonNameEditor.ID, menuManager,
                                selectionProvider);
+               menuManager.setRemoveAllWhenShown(true);
 
                parent.setData(taxon);
 
@@ -254,7 +255,7 @@ public class TaxonNameEditor extends EditorPart implements
         * @return a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.
         */
        public Taxon getTaxon() {
-               return (Taxon) HibernateProxyHelper.deproxy(taxon);
+               return HibernateProxyHelper.deproxy(taxon);
        }
 
        /**
index 9dda2a9..5194c7a 100644 (file)
@@ -107,17 +107,19 @@ public class DeleteTaxonBaseHandler extends AbstractHandler implements IHandler,
 
                AbstractUtility.executeOperation(operation);
                DeleteResult result = ((DeleteTaxonBaseOperation)operation).getResult();
-               if (result.isError()){
-            DeleteResultMessagingUtils.messageDialogWithDetails(result, Messages.DeleteDerivateOperation_DELETE_FAILED, TaxeditorEditorPlugin.PLUGIN_ID);
-        } else {
-            this.editor.redraw();
-                   if (!result.getUpdatedObjects().isEmpty()){
-                DeleteResultMessagingUtils.messageDialogWithDetails(result, Messages.DeleteTaxonBaseHandler_DELETE_SYNONYM_SUCCESSFULL_BUT_REMAINING_RELATED_OBJECTS, TaxeditorEditorPlugin.PLUGIN_ID);
-            }
-               }
-                   if (!result.getUpdatedObjects().isEmpty()){
+               if (result != null){
+               if (result.isError()){
+                DeleteResultMessagingUtils.messageDialogWithDetails(result, Messages.DeleteDerivateOperation_DELETE_FAILED, TaxeditorEditorPlugin.PLUGIN_ID);
+            } else if (selectedElement instanceof Synonym){
+                this.editor.redraw();
+                   if (!result.getExceptions().isEmpty()){
+                    DeleteResultMessagingUtils.messageDialogWithDetails(result, Messages.DeleteTaxonBaseHandler_DELETE_SYNONYM_SUCCESSFULL_BUT_REMAINING_RELATED_OBJECTS, TaxeditorEditorPlugin.PLUGIN_ID);
+                }
+               } else if (selectedElement instanceof Taxon && !result.getExceptions().isEmpty()){
+               this.editor.redraw();
                 DeleteResultMessagingUtils.messageDialogWithDetails(result, Messages.DeleteTaxonBaseHandler_DELETE_MISAPPLIEDNAME_SUCCESSFULL_BUT_REMAINING_RELATED_OBJECTS, TaxeditorEditorPlugin.PLUGIN_ID);
-                   }
+               }
+               }
 
 
        }
index 0a56c3c..e81437b 100644 (file)
@@ -61,8 +61,8 @@ public class MoveSynonymToAnotherAcceptedTaxonHandler extends AbstractHandler im
                List<UUID> excludeTaxa = new ArrayList<UUID>();
                excludeTaxa.add(oldParent.getUuid());
 
-                               
-               TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), Messages.MoveSynonymToAnotherAcceptedTaxonHandler_SELECT_ACC_TAXON, excludeTaxa, null, ((TaxonEditorInput)input).getTaxonNode().getClassification());
+
+               TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), Messages.MoveSynonymToAnotherAcceptedTaxonHandler_SELECT_ACC_TAXON, excludeTaxa,  ((TaxonEditorInput)input).getTaxonNode(), ((TaxonEditorInput)input).getTaxonNode().getClassification());
 
                if(newParentNode!=null){
                   MoveSynonymToAnotherAcceptedTaxonOperation operation = new MoveSynonymToAnotherAcceptedTaxonOperation(Messages.MoveSynonymToAnotherAcceptedTaxonHandler_CHANGE_ACC_TAXON, EditorUtil.getUndoContext(),
index abf93ef..ab72538 100644 (file)
@@ -19,7 +19,6 @@ import org.eclipse.ui.IWorkbenchPage;
 import eu.etaxonomy.cdm.api.application.ICdmRepository;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
-import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
 import eu.etaxonomy.cdm.api.service.config.TaxonBaseDeletionConfigurator;
 import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
 import eu.etaxonomy.cdm.model.reference.Reference;
@@ -86,11 +85,8 @@ public class DeleteMisapplicationOperation extends DeleteTaxonBaseOperation {
                controller = CdmStore.getCurrentApplicationConfiguration();
 
                ITaxonService service = controller.getTaxonService();
-               TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
-               NameDeletionConfigurator nameConfig = new NameDeletionConfigurator();
-               nameConfig.setRemoveAllNameRelationships(true);
-               config.setNameDeletionConfig(nameConfig);
-               result = service.deleteTaxon(misapplication.getUuid(), config, null);
+
+               result = service.deleteTaxon(misapplication.getUuid(), (TaxonDeletionConfigurator)configurator, null);
                monitor.worked(40);
 
                return postExecute(null);
index 605da77..f8a9f0e 100644 (file)
@@ -471,7 +471,11 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
     //FIXME:Remoting hack to make this work for remoting
     //This should actually be resolved using remoting post operations
     public void remove(Object obj) {
+        if (obj instanceof TreeNode){
+            obj = ((TreeNode)obj).getValue();
+        }
         rootElements.remove(obj);
+        Object o = this.derivateToRootEntityMap.remove(obj);
         viewer.setInput(rootElements);
     }
 
index e7a0de1..34c7cec 100644 (file)
@@ -9,29 +9,40 @@
 
 package eu.etaxonomy.taxeditor.editor.view.derivate.handler;
 
-import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.core.commands.operations.AbstractOperation;
 import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeNode;
+import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
+import eu.etaxonomy.cdm.api.service.DeleteResult;
+import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.config.SpecimenDeleteConfigurator;
+import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
 import eu.etaxonomy.cdm.model.molecular.SingleRead;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
+import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
 import eu.etaxonomy.taxeditor.editor.view.derivate.operation.DeleteDerivateOperation;
-import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.model.DeleteResultMessagingUtils;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.operation.RemotingCdmHandler;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.dialog.configurator.deleteConfigurator.DeleteConfiguratorDialog;
 import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
 
 /**
@@ -40,11 +51,140 @@ import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
  * @date Oct 21, 2014
  *
  */
-public class DeleteDerivateHandler extends AbstractHandler {
+public class DeleteDerivateHandler extends RemotingCdmHandler {
 
-    /** {@inheritDoc} */
+    SpecimenDeleteConfigurator deleteConfigurator;
+    IEditorPart editor;
+    TreeNode node;
+
+    /**
+     * @param label
+     */
+    public DeleteDerivateHandler(String label) {
+        super(label);
+
+    }
+
+    /**
+     * @param label
+     */
+    public DeleteDerivateHandler() {
+        super(Messages.DeleteDerivateHandler_LABEL);
+
+    }
+
+//    /** {@inheritDoc} */
+//    @Override
+//    public Object execute(ExecutionEvent event) throws ExecutionException {
+//        IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getActiveSite(event).getSelectionProvider().getSelection();
+//
+//        IWorkbenchPart part = HandlerUtil.getActivePart(event);
+//        IPostOperationEnabled postOperationEnabled = (part instanceof IPostOperationEnabled) ? (IPostOperationEnabled) part : null;
+//
+//        try {
+//            String label = event.getCommand().getName();
+//
+//            IUndoContext undoContext = EditorUtil.getUndoContext();
+//
+//            if(selection.size()>0){
+//                Object object = selection.iterator().next();
+//
+//                if(object instanceof TreeNode){
+//                    Object value = ((TreeNode) object).getValue();
+//                    if(value instanceof SpecimenOrObservationBase<?> || value instanceof Sequence || value instanceof SingleRead){
+//                        if(postOperationEnabled instanceof IConversationEnabled){
+//                            ConversationHolder conversationHolder = ((IConversationEnabled) postOperationEnabled).getConversationHolder();
+//                            label += " "+DerivateLabelProvider.getDerivateText(value, conversationHolder); //$NON-NLS-1$
+//                        }
+//                        SpecimenDeleteConfigurator config = new SpecimenDeleteConfigurator();
+//                        boolean deepDelete = event.getCommand().getId().equals("eu.etaxonomy.taxeditor.editor.derivate.deepDelete"); //$NON-NLS-1$
+//                        config.setDeleteChildren(deepDelete);
+//                        config.setDeleteMolecularData(deepDelete);
+//                        DeleteDerivateOperation deleteDerivateOperation = new DeleteDerivateOperation(label, undoContext, (CdmBase) value, (TreeNode) object, postOperationEnabled, config);
+//                        IStatus status = AbstractUtility.executeOperation(deleteDerivateOperation);
+//                        DerivateView derivateView = (DerivateView)postOperationEnabled;
+//                        if(derivateView.postOperation(null)){
+//                            derivateView.remove(object);
+//
+//                           // derivateView.updateRootEntities();
+//                            //update DerivateView
+//
+//
+//                        }
+//                    }
+//                }
+//                else{
+//                    MessagingUtils.error(getClass(), Messages.DeleteDerivateHandler_INVALID_SELECTION, null);
+//                }
+//            }
+//
+//        } catch (NotDefinedException e) {
+//            MessagingUtils.warn(getClass(), "Command name not set"); //$NON-NLS-1$
+//        }
+//        return null;
+//    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public IStatus allowOperations(ExecutionEvent event) {
+        //check whether object can be deleted
+        editor = HandlerUtil.getActiveEditor(event);
+        IStructuredSelection selection = (IStructuredSelection) HandlerUtil
+                .getCurrentSelection(event);
+        AbstractPostOperation operation;
+        deleteConfigurator = new SpecimenDeleteConfigurator();
+
+        String confirmationQuestion = Messages.DeleteDerivateOperation_REALLY_DELETE;
+        if(deleteConfigurator.isDeleteChildren()){
+            confirmationQuestion += Messages.DeleteDerivateOperation_AND_CHILDREN;
+        }
+
+        if(editor.isDirty()){
+            MessagingUtils.warningDialog(DerivateView.VIEW_HAS_UNSAVED_CHANGES, this, DerivateView.YOU_NEED_TO_SAVE_BEFORE_PERFORMING_THIS_ACTION);
+            return Status.CANCEL_STATUS;
+        }
+
+        confirmationQuestion += "?"; //$NON-NLS-1$
+        if(!DeleteConfiguratorDialog.openConfirmWithConfigurator(deleteConfigurator, null, Messages.DeleteDerivateOperation_CONFIRM, confirmationQuestion)){
+            return Status.CANCEL_STATUS;
+        }
+        Object object = selection.iterator().next();
+        DeleteResult deleteResult;
+        if(object instanceof TreeNode){
+            Object value = ((TreeNode) object).getValue();
+            if(value instanceof SpecimenOrObservationBase<?> || value instanceof Sequence || value instanceof SingleRead){
+                if (value instanceof Sequence || value instanceof SingleRead){
+                    deleteResult = CdmStore.getService(ISequenceService.class).isDeletable(((CdmBase)value).getUuid(), deleteConfigurator);
+                } else{
+                    deleteResult = CdmStore.getService(IOccurrenceService.class).isDeletable(((CdmBase)value).getUuid(), deleteConfigurator);
+                }
+                if (deleteResult.isOk() || deleteResult.getExceptions().isEmpty()){ return Status.OK_STATUS;}
+                else{
+                    if (!deleteResult.isOk()){
+                        DeleteResultMessagingUtils.messageDialogWithDetails(deleteResult, Messages.DeleteDerivateOperation_DELETE_FAILED, TaxeditorEditorPlugin.PLUGIN_ID);
+                    } else {
+                        if (!deleteResult.getExceptions().isEmpty()){
+                            DeleteResultMessagingUtils.messageDialogWithDetails(deleteResult, Messages.DeleteDerivateHandler_SUCCESSFULL_BUT_EXCEPTIONS, TaxeditorEditorPlugin.PLUGIN_ID);
+                        }
+                    }
+
+                    return Status.CANCEL_STATUS;
+                    }
+            }
+
+        }
+
+        return Status.CANCEL_STATUS;
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     @Override
-    public Object execute(ExecutionEvent event) throws ExecutionException {
+    public AbstractOperation prepareOperation(ExecutionEvent event) {
         IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getActiveSite(event).getSelectionProvider().getSelection();
 
         IWorkbenchPart part = HandlerUtil.getActivePart(event);
@@ -59,28 +199,40 @@ public class DeleteDerivateHandler extends AbstractHandler {
                 Object object = selection.iterator().next();
 
                 if(object instanceof TreeNode){
+                    node = (TreeNode)object;
                     Object value = ((TreeNode) object).getValue();
                     if(value instanceof SpecimenOrObservationBase<?> || value instanceof Sequence || value instanceof SingleRead){
                         if(postOperationEnabled instanceof IConversationEnabled){
                             ConversationHolder conversationHolder = ((IConversationEnabled) postOperationEnabled).getConversationHolder();
                             label += " "+DerivateLabelProvider.getDerivateText(value, conversationHolder); //$NON-NLS-1$
                         }
-                        SpecimenDeleteConfigurator config = new SpecimenDeleteConfigurator();
-                        boolean deepDelete = event.getCommand().getId().equals("eu.etaxonomy.taxeditor.editor.derivate.deepDelete"); //$NON-NLS-1$
-                        config.setDeleteChildren(deepDelete);
-                        config.setDeleteMolecularData(deepDelete);
-                        DeleteDerivateOperation deleteDerivateOperation = new DeleteDerivateOperation(label, undoContext, (CdmBase) value, (TreeNode) object, postOperationEnabled, config);
-                        AbstractUtility.executeOperation(deleteDerivateOperation);
+
+
+                        DeleteDerivateOperation deleteDerivateOperation = new DeleteDerivateOperation(label, undoContext, (CdmBase) value, (TreeNode) object, postOperationEnabled, this.deleteConfigurator);
+                        return deleteDerivateOperation;
                     }
                 }
-                else{
-                    MessagingUtils.error(getClass(), Messages.DeleteDerivateHandler_INVALID_SELECTION, null);
-                }
             }
-
         } catch (NotDefinedException e) {
             MessagingUtils.warn(getClass(), "Command name not set"); //$NON-NLS-1$
         }
         return null;
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onComplete() {
+
+        IPostOperationEnabled postOperationEnabled = (editor instanceof IPostOperationEnabled) ? (IPostOperationEnabled) editor : null;
+        if (postOperationEnabled != null){
+            DerivateView derivateView = (DerivateView)postOperationEnabled;
+          if(derivateView.postOperation(null)){
+              derivateView.remove(node);
+
+          }
+        }
     }
 }
index 8a9d902..831f117 100644 (file)
@@ -16,7 +16,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.viewers.TreeNode;
-import org.eclipse.ui.ISaveablePart;
 
 import eu.etaxonomy.cdm.api.service.DeleteResult;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
@@ -26,12 +25,10 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
 import eu.etaxonomy.cdm.model.molecular.SingleRead;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.ui.dialog.configurator.deleteConfigurator.DeleteConfiguratorDialog;
 
 /**
  *
@@ -60,20 +57,7 @@ public class DeleteDerivateOperation extends AbstractPostOperation<CdmBase> {
     /** {@inheritDoc} */
     @Override
     public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        if(getPostOperationEnabled() instanceof ISaveablePart){
-            String confirmationQuestion = Messages.DeleteDerivateOperation_REALLY_DELETE;
-            if(deleteConfigurator.isDeleteChildren()){
-                confirmationQuestion += Messages.DeleteDerivateOperation_AND_CHILDREN;
-            }
-            confirmationQuestion += "?"; //$NON-NLS-1$
-            if(!DeleteConfiguratorDialog.openConfirmWithConfigurator(deleteConfigurator, null, Messages.DeleteDerivateOperation_CONFIRM, confirmationQuestion)){
-                return Status.CANCEL_STATUS;
-            }
-            if(((ISaveablePart) getPostOperationEnabled()).isDirty()){
-                MessagingUtils.warningDialog(DerivateView.VIEW_HAS_UNSAVED_CHANGES, this, DerivateView.YOU_NEED_TO_SAVE_BEFORE_PERFORMING_THIS_ACTION);
-                return Status.CANCEL_STATUS;
-            }
-        }
+
         DeleteResult deleteResult;
         if(element instanceof SingleRead && treeNode!=null
                 && treeNode.getValue().equals(element)
@@ -86,18 +70,10 @@ public class DeleteDerivateOperation extends AbstractPostOperation<CdmBase> {
         } else {
             deleteResult = CdmStore.getService(IOccurrenceService.class).delete(element.getUuid(), deleteConfigurator);
         }
-        if(deleteResult.isOk()){
-            if(getPostOperationEnabled() instanceof DerivateView){
-                DerivateView derivateView = (DerivateView) getPostOperationEnabled();
-                derivateView.remove(element);
-                //update DerivateView
-                derivateView.getConversationHolder().commit();
-                IStatus returnStatus = postExecute(null);
-                return returnStatus;
-            }
-        }
-        else{
+
+        if (!deleteResult.isOk()) {
             MessagingUtils.warningDialog(Messages.DeleteDerivateOperation_DELETE_FAILED, this, deleteResult.toString());
+
             return Status.CANCEL_STATUS;
         }
         return Status.OK_STATUS;
index bf84e95..165cf74 100644 (file)
@@ -91,6 +91,8 @@ public class DerivateSearchCompositeController implements Listener{
         default:
             break;
         }
+        derivativeEditor.getCdmEntitySession().dispose();
+        derivativeEditor.getCdmEntitySession().bind();
 
         SearchManager searchManager = new SearchManager();
         List<SpecimenOrObservationBase> occurrences = searchManager.findOccurrences(config, true);
@@ -177,7 +179,7 @@ public class DerivateSearchCompositeController implements Listener{
             derivateSearchComposite.getComboTaxonAssignment().setEnabled(false);
         }
     }
-    
+
     public void setFocusOnSearchField(){
        derivateSearchComposite.getSearchField().setFocus();
     }
index 19fc669..1da0001 100644 (file)
@@ -17,8 +17,6 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeSelection;
@@ -105,10 +103,7 @@ public class DeleteHandler extends AbstractHandler {
                                        // TODO use undo context specific to editor
                     MediaDeletionConfigurator config = new MediaDeletionConfigurator();
 
-                    DeleteConfiguratorDialog dialog;
-                    dialog = new DeleteConfiguratorDialog(config, HandlerUtil.getActiveShell(event), Messages.DeleteHandler_CONFIRM_DELETION,  null,  Messages.DeleteHandler_CONFIRM_DELETION_MESSAGE, MessageDialog.WARNING, new String[] { Messages.DeleteHandler_DELETE, Messages.DeleteHandler_SKIP }, 0);
-                    int result_dialog= dialog.open();
-                    if (result_dialog != Status.OK){
+                    if (!DeleteConfiguratorDialog.openConfirmWithConfigurator(config, HandlerUtil.getActiveShell(event), Messages.DeleteHandler_CONFIRM_DELETION,  Messages.DeleteHandler_CONFIRM_DELETION_MESSAGE)){
                         return null;
                     }
 
index 8059f63..7e3eb9f 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.jre.linux64"
       label="Taxonomic Editor JRE Linux64"
-      version="4.6.0"
+      version="4.7.0.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux"
index 224b9dc..cde72c1 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature.jre.linux64</artifactId>
index d5d7dce..2029653 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="4.6.0"
+      version="4.7.0"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
       <update label="EDIT Taxonomic Editor" url="http://wp5.e-taxonomy.eu/taxeditor/update"/>
    </url>
 
-   <plugin
-         id="org.eclipse.ant.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.commands"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.contenttype"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.databinding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.databinding.beans"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.expressions"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filebuffers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.jobs"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.resources"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime.compatibility.auth"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.runtime.compatibility.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
+   <includes
+         id="org.eclipse.zest"
+         version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.core.variables"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.eclipse.emf.common"
+         version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.equinox.app"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.eclipse.emf.ecore"
+         version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.equinox.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.eclipse.rcp"
+         version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.equinox.preferences"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.eclipse.equinox.p2.user.ui"
+         version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.equinox.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="org.eclipse.help"
+         version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.equinox.security"
+         id="org.apache.log4j"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.security.macosx"
-         os="macosx"
+         id="org.hamcrest.library"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.help"
+         id="org.apache.commons.codec"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jface"
+         id="org.apache.commons.httpclient"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jface.databinding"
+         id="org.eclipse.nebula.widgets.compositetable"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jface.text"
+         id="org.hamcrest.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.osgi"
+         id="org.eclipse.ecf"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.osgi.services"
+         id="org.eclipse.ecf.filetransfer"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt"
+         id="org.eclipse.ecf.provider.filetransfer"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.text"
+         id="org.eclipse.ecf.identity"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ui"
+         id="org.eclipse.ui.ide"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ui.ide"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.ui.navigator"
          download-size="0"
          install-size="0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ui.views"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.properties.tabbed"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench.texteditor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.update.core.win32"
-         os="win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
+         id="org.eclipse.jface.text"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         fragment="true"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.core.resources.win32.x86"
-         os="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
+         id="org.eclipse.core.filebuffers"
+         download-size="119"
+         install-size="260"
+         version="3.6.0.v20160503-1849"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.security.win32.x86"
-         os="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
+         id="org.eclipse.core.filesystem"
+         download-size="65"
+         install-size="122"
+         version="1.6.1.v20161113-2349"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.swt.win32.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
+         id="org.eclipse.text"
+         download-size="262"
+         install-size="528"
+         version="3.6.0.v20160503-1849"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ui.win32"
-         os="win32"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
+         id="org.eclipse.core.resources"
+         download-size="862"
+         install-size="1850"
+         version="3.11.1.v20161107-2032"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.core.filesystem.linux.x86"
-         os="linux"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
+         id="org.eclipse.ui.workbench.texteditor"
+         download-size="651"
+         install-size="1377"
+         version="3.10.1.v20160818-1626"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.core.net.linux.x86"
-         os="linux"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
+         id="org.eclipse.ltk.core.refactoring"
+         download-size="336"
+         install-size="752"
+         version="3.7.0.v20160419-0705"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.launcher.gtk.linux.x86"
-         os="linux"
-         ws="gtk"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.swt.gtk.linux.x86"
-         os="linux"
-         ws="gtk"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
+         id="org.eclipse.ltk.ui.refactoring"
+         download-size="491"
+         install-size="1013"
+         version="3.8.0.v20160518-1817"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.equinox.launcher.cocoa.macosx"
-         os="macosx"
-         ws="cocoa"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.equinox.launcher.win32.win32.x86"
-         os="win32"
-         ws="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.ui.cocoa"
-         os="macosx"
-         ws="cocoa"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
+         id="org.eclipse.compare"
+         download-size="780"
+         install-size="1626"
+         version="3.7.0.v20161024-1724"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.core.databinding.property"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         id="org.eclipse.team.core"
+         download-size="416"
+         install-size="874"
+         version="3.8.0.v20160418-1534"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.core.databinding.observable"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         id="org.eclipse.team.ui"
+         download-size="1500"
+         install-size="3218"
+         version="3.8.0.v20160518-1906"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ecf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         id="org.eclipse.compare.core"
+         download-size="65"
+         install-size="122"
+         version="3.6.0.v20160418-1534"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ecf.filetransfer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         id="org.eclipse.ui.views"
+         download-size="107"
+         install-size="194"
+         version="3.8.101.v20160816-1954"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.compare.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.identity"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.launcher"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.simpleconfigurator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
-         os="macosx"
-         ws="cocoa"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.swt.cocoa.macosx.x86_64"
-         os="macosx"
-         ws="cocoa"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.linux.x86_64"
-         os="linux"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.launcher.gtk.linux.x86_64"
-         os="linux"
-         ws="gtk"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.swt.gtk.linux.x86_64"
-         os="linux"
-         ws="gtk"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.compare"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ltk.core.refactoring"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ltk.ui.refactoring"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.team.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.ds"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.ui.sdk"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.updatechecker"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.operations"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.metadata"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.director"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.engine"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.artifact.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.metadata.repository"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.jarprocessor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.zest.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.zest.layouts"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.draw2d"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ui.views.log"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.win32.x86_64"
-         os="win32"
-         ws="win32"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.net.win32.x86_64"
-         os="win32"
-         ws="win32"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.launcher.win32.win32.x86_64"
-         os="win32"
-         ws="win32"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
-   <plugin
-         id="org.eclipse.swt.win32.win32.x86_64"
-         os="win32"
-         ws="win32"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="javax.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.core.filesystem.macosx"
-         os="macosx"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.webapp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.jasper"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jsp.jasper.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.registry"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.help.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.nebula.widgets.compositetable"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.servlet.jsp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.el"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.jsp.jasper"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.transport.ecf"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer.httpclient"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.touchpoint.eclipse"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.frameworkadmin"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.frameworkadmin.equinox"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.console"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.simpleconfigurator.manipulator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.ui.sdk.scheduler"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.garbagecollector"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.directorywatcher"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.updatesite"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.extensionlocation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.director.app"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.publisher"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.repository.tools"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.provider.filetransfer.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ecf.ssl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.codec"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.touchpoint.natives"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.publisher.eclipse"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.update.configurator"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.httpclient"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.ibm.icu"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.sat4j.pb"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.lucene.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.sat4j.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
+         id="org.eclipse.ui.views.properties.tabbed"
+         download-size="107"
+         install-size="220"
+         version="3.7.0.v20160310-0903"
          unpack="false"/>
 
    <plugin
-         id="org.apache.lucene.analysis"
+         id="org.eclipse.jdt.annotation"
          download-size="0"
          install-size="0"
          version="0.0.0"
index d9f812c..4cd32c4 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.6.0</version>
+               <version>4.7.0</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index 869a2b6..8bd9a55 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="4.6.0"
+      version="4.7.0"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="eu.etaxonomy.taxeditor.workbench"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
index 6018dd4..8e2c37a 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 8b7ba11..684e02a 100644 (file)
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.help.ui,
  org.eclipse.help.webapp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
index 41625f5..2590ad2 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.6.0</version>
+               <version>4.7.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 301288f..e25ab39 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,
@@ -239,4 +239,4 @@ Export-Package: info.bioinfweb.commons,
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.swing
 Require-Bundle: org.eclipse.swt
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
index 6760040..9a0d965 100644 (file)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0</version>
   </parent>
 
   <build>
index e1ba5e7..a8da56f 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.databinding;bundle-version="1.4.0",
  org.eclipse.jface.databinding;bundle-version="1.5.0",
  org.eclipse.core.databinding.property;bundle-version="1.4.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.molecular,
index b659618..156a0c7 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.6.0</version>
+    <version>4.7.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 2a5308b..ccddd57 100644 (file)
@@ -2,7 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
+Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
@@ -18,13 +19,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.expressions,
  eu.etaxonomy.taxeditor.cdmlib,
  eu.etaxonomy.taxeditor.store,
- eu.etaxonomy.taxeditor.editor
-Bundle-ActivationPolicy: lazy
+ eu.etaxonomy.taxeditor.editor,
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0.v20160229-1459"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,
  org.eclipse.equinox.app,
+ org.eclipse.osgi.util;version="1.1.0",
  org.eclipse.ui.forms.widgets,
  org.osgi.framework
-Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
index 69ef8f5..a91e33b 100644 (file)
@@ -1,6 +1,3 @@
-source.. = src/main/java/,\
-           src/test/java/,\
-           src/test/resources/
 output.. = target/classes/
 bin.includes = META-INF/,\
                .,\
@@ -10,7 +7,8 @@ bin.includes = META-INF/,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/l10n/bundle_de.properties,\
                src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties,\
-               src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
-               
-               
-
+               src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties,\
+               fragment.e4xmi
+source.. = src/main/java/,\
+           src/test/java/,\
+           src/test/resources/
diff --git a/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi b/eu.etaxonomy.taxeditor.navigation/fragment.e4xmi
new file mode 100644 (file)
index 0000000..8b4287e
--- /dev/null
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmi:id="_OhwnQCTfEeeiN5lBIuqN3g">
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_oDvMsCTfEeeiN5lBIuqN3g" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.toolbar.0">
+    <elements xsi:type="menu:ToolControl" xmi:id="_7kZI4CTfEeeiN5lBIuqN3g" elementId="eu.etaxonomy.taxeditor.navigation.toolcontrol.search_bar" contributionURI="bundleclass://eu.etaxonomy.taxeditor.navigation/eu.etaxonomy.taxeditor.navigation.search.SearchBar"/>
+  </fragments>
+</fragment:ModelFragments>
index 57af053..bd413e5 100644 (file)
@@ -39,7 +39,7 @@
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.file">
+            locationURI="menu:eu.etaxonomy.taxeditor.workbench.menu.file">
          <separator
                name="eu.etaxonomy.taxeditor.navigation.recentnames.separator"
                visible="true">
                name="taxeditor-navigation.separator1"
                visible="true">
          </separator>
-         <dynamic
-               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
-               id="eu.etaxonomy.taxeditor.navigation.cdmViewerContextMenu">
-         </dynamic>
-         <separator
-               name="eu.etaxonomy.taxeditor.navigation.separator2">
-         </separator>
          <command
                commandId="eu.etaxonomy.taxeditor.navigator.command.update.changeAcceptedToSynonym"
                label="%command.label.6"
                name="taxeditor-navigation.separator2"
                visible="true">
          </separator>
-         <!--command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.createChildTaxon"
-               label="New Child"
-               style="push">
-         </command>
-         <command
-               commandId="eu.etaxonomy.taxeditor.navigation.command.quickCreateChildTaxon"
-               label="Quick Add Child "
-               style="push">
-         </command-->
          <command
                commandId="org.eclipse.ui.file.import"
                label="%command.label.8"
                   </reference></and>
             </visibleWhen>
          </command>
-      </menuContribution>
-      <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar">
-         <toolbar
-               id="eu.etaxonomy.taxeditor.navigation.search.toolbar">
-            <control
-                  class="eu.etaxonomy.taxeditor.navigation.search.SearchBar">
-            </control>
-         </toolbar>
+         <separator
+               name="eu.etaxonomy.taxeditor.navigation.separator2"
+               visible="true">
+         </separator>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+               id="eu.etaxonomy.taxeditor.navigation.cdmViewerContextMenu">
+         </dynamic>
+         <!--command
+               commandId="eu.etaxonomy.taxeditor.navigation.command.createChildTaxon"
+               label="New Child"
+               style="push">
+         </command>
+         <command
+               commandId="eu.etaxonomy.taxeditor.navigation.command.quickCreateChildTaxon"
+               label="Quick Add Child "
+               style="push">
+         </command-->
       </menuContribution>
       <menuContribution
             locationURI="menu:eu.etaxonomy.navigation.menu.new">
          </test>
       </definition>
    </extension>
+   <extension
+         id="id1"
+         point="org.eclipse.e4.workbench.model">
+      <fragment
+            apply="always"
+            uri="fragment.e4xmi">
+      </fragment>
+   </extension>
 </plugin>
index 23fb473..e7bddee 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.6.0</version>
+               <version>4.7.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 8fe81b9..348685a 100644 (file)
@@ -1,7 +1,7 @@
 ChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON=Choose the accepted taxon
-ChangeAcceptedTaxonToSynonymHandler_CREATE_FAILED=Could not create Taxon
+ChangeAcceptedTaxonToSynonymHandler_CREATE_FAILED=Could not create taxon
 ChangeAcceptedTaxonToSynonymHandler_MOVE_SYNONYMY=Moving to synonymy
-ChangeAcceptedTaxonToSynonymHandler_MOVE_SYNONYMY_MESSAGE=The operation move accepted taxon to synonymy is available only for a single taxon.
+ChangeAcceptedTaxonToSynonymHandler_MOVE_SYNONYMY_MESSAGE=The operation "move accepted taxon to synonymy" is available only for a single taxon.
 ChangeAcceptedTaxonToSynonymHandler_PREREQUISITE=Prerequisite not met
 ChangeAcceptedTaxonToSynonymHandler_PREREQUISITE_MESSAGE=The accepted taxon must not have any childen. You need to move all childen to another taxon node in the TaxonNavigator before attempting to turn the accepted taxon into a synonym.
 ChangeAcceptedTaxonToSynonymOperation_CREATE_FAIL=Synonym creation not possible
@@ -27,7 +27,7 @@ DeleteHandler_SKIP=Skip
 DeleteHandler_THERE_ARE_CHILDNODES=\ There are childnodes, which will be deleted, too.
 DeleteHandler_THERE_ARE_CHILDREN=\ The tree has children, they will be deleted, too.
 DeleteOperation_ABORT=Delete abort
-DeleteOperation_ABORT_MESSAGE=The object could not be deleted, maybe there was no object selected.
+DeleteOperation_ABORT_MESSAGE=The object could not be deleted Maybe there was no object selected.
 DeleteOperation_DELETE_FAIL=TaxonNode could not be deleted.
 DeleteOperation_DELETE_SUCCESS=TaxonNode was successfully deleted, but related object(s) could not be deleted
 DeleteOperation_FAILED=Delete failed
@@ -149,4 +149,4 @@ TreeNodeDropAdapter_MOVING=Moving taxon
 TreeNodeDropAdapter_MOVING_MESSAGE=The operation move accepted taxon to other parent is available only for a single taxon.
 TreeNodeDropAdapter_TARGET_NODE=Target node
 TreeNodeDropAdapter_UNSAVED_PARENT=Unsaved Parent Taxon
-TreeNodeDropAdapter_UNSAVED_PARENT_MESSAGE=There are unsaved changes in the parent taxon. Pleas save first.
+TreeNodeDropAdapter_UNSAVED_PARENT_MESSAGE=There are unsaved changes in the parent taxon. Please save first.
index b94050f..122d06d 100644 (file)
@@ -1,97 +1,97 @@
-ChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON=Choose the accepted taxon
-ChangeAcceptedTaxonToSynonymHandler_CREATE_FAILED=Could not create Taxon
-ChangeAcceptedTaxonToSynonymHandler_MOVE_SYNONYMY=Moving to synonymy
-ChangeAcceptedTaxonToSynonymHandler_MOVE_SYNONYMY_MESSAGE=The operation move accepted taxon to synonymy is available only for a single taxon.
-ChangeAcceptedTaxonToSynonymHandler_PREREQUISITE=Prerequisite not met
-ChangeAcceptedTaxonToSynonymHandler_PREREQUISITE_MESSAGE=The accepted taxon must not have any childen. You need to move all childen to another taxon node in the TaxonNavigator before attempting to turn the accepted taxon into a synonym.
-ChangeAcceptedTaxonToSynonymOperation_CREATE_FAIL=Synonym creation not possible
-ChangeAcceptedTaxonToSynonymOperation_CREATE_SUCCESS=Synonym created but taxon deletion not possible.
-ChangeAcceptedTaxonToSynonymOperation_OP_FAIL=Operation failed
-ClassificationLabelProvider_UNNAMED_TREE=Unnamed Taxonomic Tree
-CloneClassificationHandler_CLONE_CLASSIFICATION=Clone classification
-CreateClassificationHierarchyHandler_CREATE_HIERARCHY=Create Taxon Hierarchy
-CreateClassificationHierarchyHandler_FAILED=Failed to open Editor
-CreateClassificationHierarchyHandler_FAILED_MESSAGE=Could not open distribution view. The hierarchy is corrupted\!
-CreateNewTaxonHierarchyOperation_ADD_HIERARCHY=Add Hierarchy successful
-CreateNewTaxonHierarchyOperation_ADD_HIERARCHY_MESSAGE=New classification is %s\nCreated Genus: %d\nCreated Subspecies: %d
-CreateTaxonNode_CREATE_FAILED=Could not create taxon node
+ChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON=Wählen Sie das akzeptierte Taxon
+ChangeAcceptedTaxonToSynonymHandler_CREATE_FAILED=Konnte Taxon nicht erstellen
+ChangeAcceptedTaxonToSynonymHandler_MOVE_SYNONYMY=Verschieben zur Synonymie
+ChangeAcceptedTaxonToSynonymHandler_MOVE_SYNONYMY_MESSAGE=Die Option "Akzeptiertes Taxon zur Synonymie verschieben" ist nur für ein einzelnes Taxon verfügbar
+ChangeAcceptedTaxonToSynonymHandler_PREREQUISITE=Vorbedingung nicht erfüllt
+ChangeAcceptedTaxonToSynonymHandler_PREREQUISITE_MESSAGE=Das akzeptierte Taxon darf keine Kindtaxa haben. Alle Kindtaxa müssen mit dem Taxonnavigator zu einem anderen Taxon verschoben werden, bevor das Taxon in die Synonymie verschoben werden kann.
+ChangeAcceptedTaxonToSynonymOperation_CREATE_FAIL=Synonymerstellung nicht möglich
+ChangeAcceptedTaxonToSynonymOperation_CREATE_SUCCESS=Synonym erstellt, aber das Löschen des Taxons ist nicht möglich.
+ChangeAcceptedTaxonToSynonymOperation_OP_FAIL=Vorgang fehlgeschlagen
+ClassificationLabelProvider_UNNAMED_TREE=Unbenannter taxonomischer BaumTree
+CloneClassificationHandler_CLONE_CLASSIFICATION=Klassifikation duplizieren
+CreateClassificationHierarchyHandler_CREATE_HIERARCHY=Taxonhierarchie erstellen
+CreateClassificationHierarchyHandler_FAILED=Öffnen des Editors fehlgeschlagen
+CreateClassificationHierarchyHandler_FAILED_MESSAGE=Konnte Verbreitungs-View nicht öffnen.
+CreateNewTaxonHierarchyOperation_ADD_HIERARCHY=Hierarchie erfolgreich hinzugefügt
+CreateNewTaxonHierarchyOperation_ADD_HIERARCHY_MESSAGE=Neue Klassifikation ist %s\nErstellte Gattungen: %d\nErstellte Unterarten: %d
+CreateTaxonNode_CREATE_FAILED=Konnte Taxonknoten nicht herstellen
 DeleteHandler_9=Command name not set
-DeleteHandler_CONFIRM=Confirm deletion
-DeleteHandler_CONFIRM_DELETE=Confirm Deletion
-DeleteHandler_CONFIRM_MESSAGE=Do you want to delete the selected key(s)?
-DeleteHandler_DELETE_ALL=Delete all children
-DeleteHandler_DELETE_CLASSIFICATION=Do you really want to delete the classification?
-DeleteHandler_DELETE_NODE=Do you really want to delete the selected node(s)?
-DeleteHandler_MOVE_TO_PARENT=Move children to parent node
-DeleteHandler_SKIP=Skip
-DeleteHandler_THERE_ARE_CHILDNODES=\ There are childnodes, which will be deleted, too.
-DeleteHandler_THERE_ARE_CHILDREN=\ The tree has children, they will be deleted, too.
-DeleteOperation_ABORT=Delete abort
-DeleteOperation_ABORT_MESSAGE=The object could not be deleted, maybe there was no object selected.
-DeleteOperation_DELETE_FAIL=TaxonNode could not be deleted.
-DeleteOperation_DELETE_SUCCESS=TaxonNode was successfully deleted, but related object(s) could not be deleted
-DeleteOperation_FAILED=Delete failed
-EditPolytomousKeyNodesHandler_OPEN_KEYS=Opening Polytomous Keys
-MoveFactualDataHandler_CHOOSE_TAXON=Choose the accepted taxon
-MoveFactualDataHandler_CREATE_FAILED=Could not create Taxon
-MoveFactualDataHandler_UNSAVED_SOURCE=Unsaved Source Taxon
-MoveFactualDataHandler_UNSAVED_SOURCE_MESSAGE=There are unsaved changes in the source taxon. Please save first.
-MoveFactualDataHandler_UNSAVED_TARGET=Unsaved Target Taxon
-MoveFactualDataHandler_UNSAVED_TARGET_MESSAGE=There are unsaved changes in the target taxon. Please save first.
-MoveTaxonHandler_CHOOSE_ABOVE=Choose the taxon above the moved taxon.
-MoveTaxonHandler_CHOOSE_PARENT=Choose new parent
-MoveTaxonHandler_MOVE_TO_PARENT=Move taxon to new parent
-MoveTaxonHandler_TARGET_NODE=Target node
-MoveTaxonHandler_TARGET_NODE_MESSAGE=The choosen target node should be the parent?
-MoveTaxonHandler_UNSAVED_PARENT=Unsaved Parent Taxon
-MoveTaxonHandler_UNSAVED_PARENT_MESSAGE=There are unsaved changes in the parent taxon. Please save first.
-MoveTaxonOperation_NOT_IMPLEMENTED=Not implemented yet.
-NavigationUtil_CREATE_FAILED=Could not create Taxon
-NavigationUtil_INCORRECT_STATE=Incorrect state
+DeleteHandler_CONFIRM=Löschen bestätigen
+DeleteHandler_CONFIRM_DELETE=Löschen bestätigen
+DeleteHandler_CONFIRM_MESSAGE=Wollen wie Sie die ausgewählten Schlüssen löschen?
+DeleteHandler_DELETE_ALL=Alle Kinder löschen
+DeleteHandler_DELETE_CLASSIFICATION=Wollen Sie die Klassifikation wirklich löschen?
+DeleteHandler_DELETE_NODE=Wollen Sie die ausgewählten Knoten wirklich löschen?
+DeleteHandler_MOVE_TO_PARENT=Verschiebe Kinder zu Elternknoten
+DeleteHandler_SKIP=Überspringen
+DeleteHandler_THERE_ARE_CHILDNODES=\ Es sind Kindknoten vorhanden, die auch gelöscht werden.
+DeleteHandler_THERE_ARE_CHILDREN=\ Der Baum hat Kindknoten, die auch gelöscht werden.
+DeleteOperation_ABORT=Löschen abbrechen
+DeleteOperation_ABORT_MESSAGE=Das Objekt konnte nicht gelöscht werden. Vielleicht wurde kein Objekt ausgewählt.
+DeleteOperation_DELETE_FAIL=Taxonknoten konnte nicht gelöscht werden.
+DeleteOperation_DELETE_SUCCESS=Taxonknoten erfolgreich gelöscht, aber referenzierende Objekte konnten nicht gelöscht werden.
+DeleteOperation_FAILED=Löschen fehlgeschlagen
+EditPolytomousKeyNodesHandler_OPEN_KEYS=Polytome Schlüssel öffnen
+MoveFactualDataHandler_CHOOSE_TAXON=Wählen Sie das akzeptierte Taxon
+MoveFactualDataHandler_CREATE_FAILED=Konnte Taxon nicht erstellen
+MoveFactualDataHandler_UNSAVED_SOURCE=Ungespeichertes Quell-Taxon
+MoveFactualDataHandler_UNSAVED_SOURCE_MESSAGE=Es gibt ungespeicherte Änderungen im Quell-Taxon. Bitte speichen Sie erst.
+MoveFactualDataHandler_UNSAVED_TARGET=Ungespeichertes Ziel-Taxon
+MoveFactualDataHandler_UNSAVED_TARGET_MESSAGE=Es gibt ungespeicherte Änderungen im Ziel-Taxon. Bitte speichen Sie erst.
+MoveTaxonHandler_CHOOSE_ABOVE=Wählen Sie das übergeordnete Taxon des zu verschiebenden Taxons.
+MoveTaxonHandler_CHOOSE_PARENT=Wählen Sie das Elterntaxon
+MoveTaxonHandler_MOVE_TO_PARENT=Verschiebe Taxon zum neuen Elterntaxon
+MoveTaxonHandler_TARGET_NODE=Zielknoten
+MoveTaxonHandler_TARGET_NODE_MESSAGE=Soll der Zielknoten der Elternknoten sein?
+MoveTaxonHandler_UNSAVED_PARENT=Ungespeichertes Eltern-Taxon
+MoveTaxonHandler_UNSAVED_PARENT_MESSAGE=Es gibt ungespeicherte Änderungen im Eltern-Taxon. Bitte speichen Sie erst.
+MoveTaxonOperation_NOT_IMPLEMENTED=Noch nicht implementiert
+NavigationUtil_CREATE_FAILED=Konnte Taxon nicht erstellen
+NavigationUtil_INCORRECT_STATE=Ungütliger Zustand
 NavigationUtil_INCORRECT_STATE_MESSAGE=The accepted taxon is not in a taxonomic view. This should not have happened.
-NavigationUtil_MULTI_TREE=The accepted taxon is in multiple taxonomic trees. We currently do not know which one you want to open. This case is not handled yet by the software.
+NavigationUtil_MULTI_TREE=Das akzeptierte Taxon ist in mehreren taxonomischen Bäumen vorhanden. Dieser Zustand wird noch nicht von der Software unterstützt.
 NavigationUtil_NOT_FOUND=Cdm entity not found
 NavigationUtil_NOT_FOUND_MESSAGE=CDM entity could not be found in the database.
-NavigationUtil_NOT_IMPLEMENTED=Not implemented yet
-NavigationUtil_OPEN_ERROR=Error opening the editor
-NavigationUtil_ORPHAN_NAME_MESSAGE=You chose to open a name that has no connection to a taxon. The Editor does not support editing of such a content type at the moment.
-NavigationUtil_ORPHAN_TAXON=This taxon is not connected to a classification. Currently editing of such taxa is not supported yet.
+NavigationUtil_NOT_IMPLEMENTED=Noch nicht implementiert
+NavigationUtil_OPEN_ERROR=Fehler beim Öffnen des Editors
+NavigationUtil_ORPHAN_NAME_MESSAGE=Sie versuchen eine Namen ohne Verbindung zu einem Taxon zu öffnen. Der Taxonomic Editor unterstützt aktuell kein Editieren solcher Objekte.
+NavigationUtil_ORPHAN_TAXON=Das Taxon ist in keine Klassifikation vorhanden. Der Taxonomic Editor unterstützt aktuell kein Editieren solcher Objekte.
 NavigationUtil_UNKNOWN_TYPE=Unknown type
 NavigationUtil_UNKNOWN_TYPE_MESSAGE=There is no editor available to open this object.
 NavigationUtil_UNSUPPORTED_TYPE=Unsupported Type
 NavigationUtil_UNSUPPORTED_TYPE_MESSAGE=No editor exists for the current selection: 
-PolytomousKeyViewLabels_DELETE=Delete Polytomous Key
-PolytomousKeyViewLabels_OPEN_ERROR=Error opening Polytomous Key Editor
-PolytomousKeyViewLabels_UPDATE=Update All Polytomous Key Nodes
-PolytomousKeyViewPart_EXCEPTION=An exception occured while trying to open a selection
-PolytomousKeyViewPart_INIT=Initiating Polytomous Key Viewer
-PolytomousKeyViewPart_SHUTDOWN=Shutting down Polytomous Key Viewer
-PolytomousKeyViewPartDataChangeBehavior_CLEAR=Clearing Polytomous Key Viewer session
-PolytomousKeyViewPartDataChangeBehavior_REFRESH=Refreshing viewer
-PolytomousKeyViewPartDataChangeBehavior_UPDATE=Updating Polytomous Key Viewer
-RefreshPolytomousKeyNodesHandler_REFRESH=Refresh Polytomous Key Nodes
-RefreshPolytomousKeyNodesHandler_REFRESHING=Refreshing Polytomous Key Nodes
-RemotingChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON=Choose the accepted taxon
-RemotingChangeAcceptedTaxonToSynonymOperation_CHANGE_OP=Change Accepted Taxon to Synonym operation
-RemotingDeletePolytomousKeyOperation_DELETE_OP=Delete Polytomous Key operation
-RemotingDeleteTaxonNodeHandler_NODE_DELETED=Node already deleted
-RemotingDeleteTaxonNodeHandler_NODE_DELETED_MESSAGE=The taxon node was already deleted. Please reopen the taxon navigator to refresh the view.
-RemotingDeleteTaxonNodeOperation_DELETE_OP=Delete Taxon Node operation
-RemotingMoveFactualDataHandler_CHOOSE_TAXA=Choose the accepted taxon
-RemotingMoveFactualDataHandler_CREATE_FAILED=Could not create Taxon
-RemotingMoveFactualDataOperation_MOVE_OP=Move Factual Data operation
-RemotingMoveTaxonNodeHandler_BEHIND=Behind
-RemotingMoveTaxonNodeHandler_CANCEL=Cancel
-RemotingMoveTaxonNodeHandler_CHILD=Child
-RemotingMoveTaxonNodeHandler_CHOOSE_PARENT=Choose new parent
-RemotingMoveTaxonNodeHandler_CHOOSE_TAXON=Choose the taxon above the moved taxon.
-RemotingMoveTaxonNodeHandler_TARGET_NODE=Target node
-RemotingMoveTaxonNodeHandler_TARGET_NODE_MESSAGE=Do you want to move the Taxonnode as child or behind the target node.
-RemotingMoveTaxonNodeHandler_UNSAVED_PARENT=Unsaved Parent Taxon
-RemotingMoveTaxonNodeHandler_UNSAVED_PARENT_MESSAGE=There are unsaved changes in the parent taxon. Please save first.
-RemotingMoveTaxonOperation_MOVE_OP=Move Taxon operation
-RemotingUpdatePolytomousKeyAllNodesOperation_UPDATE_OP=Update All Polytomous Key Nodes operation
-Root_CREATE_CLASSIFICATION=Creating initial classification
+PolytomousKeyViewLabels_DELETE=Polytomen Schlüssel löschen
+PolytomousKeyViewLabels_OPEN_ERROR=Öffnen des Polytomer-Schlüssel-Editors fehlgeschlagen
+PolytomousKeyViewLabels_UPDATE=Alle polytomen Schlüssen aktualisieren
+PolytomousKeyViewPart_EXCEPTION=Ein Fehler ist beim Öffnen der Auswahl aufgetreten
+PolytomousKeyViewPart_INIT=Polytomer-Schlüssel-Editor wird initialisiert
+PolytomousKeyViewPart_SHUTDOWN=Schließe Polytomer-Schlüssel-Editor
+PolytomousKeyViewPartDataChangeBehavior_CLEAR=Lösche Sitzung des Polytomer-Schlüssel-Editors
+PolytomousKeyViewPartDataChangeBehavior_REFRESH=Polytomer-Schlüssel-Editor aktualisieren
+PolytomousKeyViewPartDataChangeBehavior_UPDATE=Polytomer-Schlüssel-Editor updaten
+RefreshPolytomousKeyNodesHandler_REFRESH=Polytome Schlüssel updaten
+RefreshPolytomousKeyNodesHandler_REFRESHING=Polytome Schlüssel aktualisieren
+RemotingChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON=Wählen Sie das akzeptierte Taxon
+RemotingChangeAcceptedTaxonToSynonymOperation_CHANGE_OP=Akzeptiertes Taxon in Synonym umwandeln
+RemotingDeletePolytomousKeyOperation_DELETE_OP=Polytomen Schlüssel löschen
+RemotingDeleteTaxonNodeHandler_NODE_DELETED=Taxonknoten schon gelöscht
+RemotingDeleteTaxonNodeHandler_NODE_DELETED_MESSAGE=Der Taxonknoten wurde schon gelöscht. Bitte Öffnen Sie den Taxonnavigator erneut um die Anzeige zu aktualisieren.
+RemotingDeleteTaxonNodeOperation_DELETE_OP=Taxonknoten löschen
+RemotingMoveFactualDataHandler_CHOOSE_TAXA=Wählen Sie das akzeptierte Taxon
+RemotingMoveFactualDataHandler_CREATE_FAILED=Konnte Taxon nicht erstellen
+RemotingMoveFactualDataOperation_MOVE_OP=Faktendaten verschieben
+RemotingMoveTaxonNodeHandler_BEHIND=Hinter
+RemotingMoveTaxonNodeHandler_CANCEL=Abbrechen
+RemotingMoveTaxonNodeHandler_CHILD=Kind
+RemotingMoveTaxonNodeHandler_CHOOSE_PARENT=Neuen Elternknoten wählen
+RemotingMoveTaxonNodeHandler_CHOOSE_TAXON=Wählen sie das Taxon über dem zu verschiebenden Taxon.
+RemotingMoveTaxonNodeHandler_TARGET_NODE=Zielknoten.
+RemotingMoveTaxonNodeHandler_TARGET_NODE_MESSAGE=Wollen Sie den Taxonknoten als Kind oder hinter den Zielknoten verschieben.
+RemotingMoveTaxonNodeHandler_UNSAVED_PARENT=Ungespeichertes Eltern-Taxon
+RemotingMoveTaxonNodeHandler_UNSAVED_PARENT_MESSAGE=Es gibt ungespeicherte Änderungen im Eltern-Taxon. Bitte speichen Sie erst.
+RemotingMoveTaxonOperation_MOVE_OP=Taxon verschieben
+RemotingUpdatePolytomousKeyAllNodesOperation_UPDATE_OP=Alle polytomen Schlüssel updaten
+Root_CREATE_CLASSIFICATION=Initiale Klassifikation erstellen
 Root_MY_CLASSIFICATION=My Classification
 SearchBar_0=Benutze "*" f\u00FCr Platzhalter-Suche
 SearchBar_1=Suche
@@ -105,49 +105,49 @@ SearchBar_9=Umgangsprachliche Namen
 SearchResultLabelProvider_NAME=Name: 
 SearchResultLabelProvider_SYNONYM=Synonym: 
 SearchResultLabelProvider_TAXON=Taxon: 
-SearchResultView_CANCELLED=Cancelled
-SearchResultView_CNT_ENTITIES_FOUND=%d entities found
-SearchResultView_NO_RESULTS=Search returned no results
-SearchResultView_PERFORMING_SEARCH=Performing Search
-SearchResultView_REMOVE_SEARCH_RESULTS=Getting rid of search results
-SearchResultView_SEARCH=Search: '%s'
-SearchResultView_SEARCH_FOR=Search for:
-SearchResultView_SEARCH_STRING=Search String:
-SearchResultView_SEARCHING=Searching...
+SearchResultView_CANCELLED=Abgebrochen
+SearchResultView_CNT_ENTITIES_FOUND=%d Ergebnisse gefunden
+SearchResultView_NO_RESULTS=Die Suche lieferte keine Ergebnisse
+SearchResultView_PERFORMING_SEARCH=Suche...
+SearchResultView_REMOVE_SEARCH_RESULTS=Lösche Suchergebnisse
+SearchResultView_SEARCH=Suche: '%s'
+SearchResultView_SEARCH_FOR=Suche nach:
+SearchResultView_SEARCH_STRING=Such-Text:
+SearchResultView_SEARCHING=Suche...
 SearchResultView_STATUS=Status:
-SetSecundumForSubtreeOperation_CHANGE_SEC_OP=Change secundum reference for all children
-SetSecundumForSubtreeOperation_SET_SEC_TASK=Set secundum reference for subtree
-TaxonLinkHelper_CREATE_FAIL=Could not create Taxon
-TaxonNavigator_LOAD_DATASOURCE=Loading datasources
-TaxonNavigator_RESTORE=Restoring Taxon Navigator
-TaxonNavigator_SAVE_TASK=Saving Taxon Navigator State
-TaxonNavigator_TAXON_TREE=Taxonomic Tree
-TaxonNavigatorDataChangeBehavior_CLEAR_SESSION=Clearing Taxon Navigators session
-TaxonNavigatorDataChangeBehavior_REFRESH_VIEWER=Refreshing viewer
-TaxonNavigatorDataChangeBehavior_UPDATE_NAVIGATOR=Updating Taxon Navigator
-TaxonNavigatorLabels_CHANGE_ACC_TAXON=Change Accepted Taxon to Synonym
-TaxonNavigatorLabels_CLOSE_IMPOSSIBLE=Could not close related taxon name editor. Please close it manually and try again.
-TaxonNavigatorLabels_DELETE_TAXON=Delete Taxon Node
-TaxonNavigatorLabels_MOVE_FACTUAL_DATA=Move Factual Data
-TaxonNavigatorLabels_MOVE_TAXON=Move Taxon
-TaxonNavigatorLabels_NO_CHILDREN_ALLOWED=The chosen taxon must not have any childen. You need to move all childen to another taxon node in the TaxonNavigator before attempting to turn the accepted taxon into a synonym.
-TaxonNavigatorLabels_NOT_A_NODE=Selected object is not a taxon tree node
-TaxonNavigatorLabels_NOT_TAXON_SELECTED=No taxon tree node selected for operation.
-TaxonNavigatorLabels_ONLY_SINGLE_TAXON=The chosen operation is available only for a single taxon.
-TaxonNavigatorLabels_SET_SEC_FOR_CHILDREN=Set new Secundum Reference for all children.
-TaxonNavigatorLabels_UNSAVED_CHANGES=There are unsaved changes in the source taxon. Please save first.
-TaxonNodeLabelProvider_NO_TAXON=>NO TAXON<
-TaxonNodeLabelProvider_NODE_WITH_NO_TAXON=The taxon node does not have a taxon attached to it. Please check your import. TaxonNode: %s
+SetSecundumForSubtreeOperation_CHANGE_SEC_OP=Secundum Referenz für alle Kinder ändern
+SetSecundumForSubtreeOperation_SET_SEC_TASK=Secundum Referenz für Teilbaum setzen
+TaxonLinkHelper_CREATE_FAIL=Konnte Taxon nicht erstellen
+TaxonNavigator_LOAD_DATASOURCE=Lade Datenquellen
+TaxonNavigator_RESTORE=Taxonnavigator wiederherstellen
+TaxonNavigator_SAVE_TASK=Speicher Zustand des Taxonnavigators
+TaxonNavigator_TAXON_TREE=Taxonomische Baum
+TaxonNavigatorDataChangeBehavior_CLEAR_SESSION=Lösche Sitzund des Taxonnavigators
+TaxonNavigatorDataChangeBehavior_REFRESH_VIEWER=Taxonnavigator aktualisieren
+TaxonNavigatorDataChangeBehavior_UPDATE_NAVIGATOR=Taxonnavigator updaten
+TaxonNavigatorLabels_CHANGE_ACC_TAXON=Akzeptiertes Taxon in Synonym umwandeln
+TaxonNavigatorLabels_CLOSE_IMPOSSIBLE=Konnte den Namenseditor nicht schließen. Bitte schließen Sie ihn manuell und versuchen es erneut.
+TaxonNavigatorLabels_DELETE_TAXON=Taxonknoten löschen
+TaxonNavigatorLabels_MOVE_FACTUAL_DATA=Faktendaten verschieben
+TaxonNavigatorLabels_MOVE_TAXON=Taxon verschieben
+TaxonNavigatorLabels_NO_CHILDREN_ALLOWED=Das ausgewählte Taxon darf keine Kindtaxa haben. Alle Kindtaxa müssen mit dem Taxonnavigator zu einem anderen Taxon verschoben werden, bevor das Taxon in ein Synonym umgewandelt werden kann.
+TaxonNavigatorLabels_NOT_A_NODE=Ausgewähltes Objekt ist kein Taxonknoten
+TaxonNavigatorLabels_NOT_TAXON_SELECTED=Kein Taxonknoten ausgewählt
+TaxonNavigatorLabels_ONLY_SINGLE_TAXON=Dieser Vorgang ist nur für einzelne Taxa möglich.
+TaxonNavigatorLabels_SET_SEC_FOR_CHILDREN=Neue secundum Referenz für alle Kinder setzen
+TaxonNavigatorLabels_UNSAVED_CHANGES=Es gibt Änderungen in dem Quell-Taxon. Bitte speichern Sie erst.
+TaxonNodeLabelProvider_NO_TAXON=>KEIN TAXON<
+TaxonNodeLabelProvider_NODE_WITH_NO_TAXON=Der Taxonknoten enthält kein Taxon. Bitte überprüfen Sie den Import. Taxonknoten: %s
 TaxonNodeLabelProvider_TAXON=Taxon: 
 TreeNodeDropAdapter_10=\ 
-TreeNodeDropAdapter_BEHIND=Behind
-TreeNodeDropAdapter_CANCEL=Cancel
-TreeNodeDropAdapter_CHILD=Child
-TreeNodeDropAdapter_MOVE_BEHIND=Do you want to move the Taxonnode as child or behind the target node.
-TreeNodeDropAdapter_MOVE_TAXON=Move Taxon
-TreeNodeDropAdapter_MOVING=Moving taxon
-TreeNodeDropAdapter_MOVING_MESSAGE=The operation move accepted taxon to other parent is available only for a single taxon.
-TreeNodeDropAdapter_TARGET_NODE=Target node
-TreeNodeDropAdapter_UNSAVED_PARENT=Unsaved Parent Taxon
-TreeNodeDropAdapter_UNSAVED_PARENT_MESSAGE=There are unsaved changes in the parent taxon. Pleas save first.
+TreeNodeDropAdapter_BEHIND=Hinter
+TreeNodeDropAdapter_CANCEL=Abbrechen
+TreeNodeDropAdapter_CHILD=Kind
+TreeNodeDropAdapter_MOVE_BEHIND=Wollen Sie den Taxonknoten als Kind oder hinter den Zielknoten verschieben.
+TreeNodeDropAdapter_MOVE_TAXON=Taxon verschieben
+TreeNodeDropAdapter_MOVING=Verschiebe Taxon
+TreeNodeDropAdapter_MOVING_MESSAGE=Dieser Vorgang ist nur für einzelne Taxa möglich.
+TreeNodeDropAdapter_TARGET_NODE=Zielknoten
+TreeNodeDropAdapter_UNSAVED_PARENT=Ungespeichertes Eltern-Taxon
+TreeNodeDropAdapter_UNSAVED_PARENT_MESSAGE=Es gibt Änderungen in dem Eltern-Taxon. Bitte speichern Sie erst.
 
index b480b10..a23f478 100644 (file)
@@ -16,7 +16,6 @@ import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolderMock;
-import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.navigation.l10n.Messages;
 import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigatorLabels;
@@ -37,7 +36,7 @@ public class RemotingChangeAcceptedTaxonToSynonymHandler extends RemotingCdmHand
             .getLogger(RemotingChangeAcceptedTaxonToSynonymHandler.class);
 
 
-    private ITaxonTreeNode oldTaxonNode;
+    private TaxonNode oldTaxonNode;
 
        /**
      * @param label
@@ -67,15 +66,15 @@ public class RemotingChangeAcceptedTaxonToSynonymHandler extends RemotingCdmHand
 
         // check that selected object is a taxon node
         Object obj = selection.iterator().next();
-        if(obj instanceof ITaxonTreeNode) {
-            oldTaxonNode = (ITaxonTreeNode)obj;
+        if(obj instanceof TaxonNode) {
+            oldTaxonNode = (TaxonNode)obj;
         } else {
             return new Status(IStatus.ERROR,
                     "unknown", //$NON-NLS-1$
                     TaxonNavigatorLabels.SELECTED_OBJECT_NOT_TREE_NODE_MESSAGE);
         }
         // check that the source taxon node does not have children
-        if(((TaxonNode)oldTaxonNode).getCountChildren() > 0) {
+        if(oldTaxonNode.getCountChildren() > 0) {
             return new Status(IStatus.ERROR,
                     "unknown", //$NON-NLS-1$
                     TaxonNavigatorLabels.SOURCE_TAXON_HAS_CHILDREN_MESSAGE);
@@ -83,7 +82,7 @@ public class RemotingChangeAcceptedTaxonToSynonymHandler extends RemotingCdmHand
         }
 
         // check if corresponding name editor is closed
-        boolean editorClosed = NavigatorHandlerUtils.closeObsoleteEditor(event, (TaxonNode) oldTaxonNode);
+        boolean editorClosed = NavigatorHandlerUtils.closeObsoleteEditor(event, oldTaxonNode);
         if(editorClosed != true) {
             return new Status(IStatus.ERROR,
                     "unknown", //$NON-NLS-1$
@@ -98,13 +97,13 @@ public class RemotingChangeAcceptedTaxonToSynonymHandler extends RemotingCdmHand
     @Override
     public AbstractOperation prepareOperation(ExecutionEvent event) {
         List<UUID> excludeTaxa = new ArrayList<UUID>();
-        excludeTaxa.add(((TaxonNode)oldTaxonNode).getTaxon().getUuid());
+        excludeTaxa.add(oldTaxonNode.getTaxon().getUuid());
         TaxonNode newAcceptedTaxonNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event),
                 new ConversationHolderMock(),
                 Messages.RemotingChangeAcceptedTaxonToSynonymHandler_CHOOSE_TAXON,
                 excludeTaxa,
-                null,
-                ((TaxonNode)oldTaxonNode).getClassification());
+                oldTaxonNode,
+                oldTaxonNode.getClassification());
 
         if (newAcceptedTaxonNode == null) {
             return null;
index bbedbc1..2f98ab9 100644 (file)
@@ -113,7 +113,7 @@ public class RemotingMoveTaxonNodeHandler extends RemotingCdmHandler {
                     new ConversationHolderMock(),
                     Messages.RemotingMoveTaxonNodeHandler_CHOOSE_PARENT,
                     excludeTaxa,
-                    null,
+                    oldTaxonNode,
                     oldTaxonNode.getClassification());
         }
 
index 6627094..8d49f3d 100755 (executable)
@@ -8,10 +8,6 @@
 */
 package eu.etaxonomy.taxeditor.navigation.navigator.handler;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
 import org.apache.log4j.Logger;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.operations.AbstractOperation;
@@ -22,7 +18,8 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.cdm.api.service.config.SetSecundumForSubtreeConfigurator;
+import eu.etaxonomy.cdm.io.common.SetSecundumForSubtreeConfigurator;
+import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigatorLabels;
@@ -70,8 +67,12 @@ public class SetSecReferenceForSubtreeHandler extends RemotingCdmHandler {
            // check that selected object is a taxon node
            Object obj = selection.iterator().next();
            if(obj instanceof ITaxonTreeNode) {
-               taxonNode = (ITaxonTreeNode)obj;
-           } else {
+               if (obj instanceof Classification){
+                   taxonNode = ((Classification)obj).getRootNode();
+               }else{
+                   taxonNode = (ITaxonTreeNode)obj;
+               }
+          } else{
                return new Status(IStatus.ERROR,
                        "unknown", //$NON-NLS-1$
                        TaxonNavigatorLabels.SELECTED_OBJECT_NOT_TREE_NODE_MESSAGE);
@@ -110,13 +111,7 @@ public class SetSecReferenceForSubtreeHandler extends RemotingCdmHandler {
         */
        @Override
        public AbstractOperation prepareOperation(ExecutionEvent event) {
-           List<UUID> excludeTaxa = new ArrayList<UUID>();
-           excludeTaxa.add(((TaxonNode)taxonNode).getTaxon().getUuid());
-
-
-
-
-           SetSecundumForSubtreeOperation operation =
+          SetSecundumForSubtreeOperation operation =
                    new SetSecundumForSubtreeOperation(event.getTrigger(),
                            false,
                            taxonNode.getUuid(),
index 77bcde7..2649537 100755 (executable)
@@ -10,15 +10,25 @@ package eu.etaxonomy.taxeditor.navigation.navigator.operation;
 
 import java.util.UUID;
 
+import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.progress.IProgressConstants;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.application.CdmChangeEvent.Action;
-import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
-import eu.etaxonomy.cdm.api.service.config.SetSecundumForSubtreeConfigurator;
+import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
+import eu.etaxonomy.cdm.io.common.SetSecundumForSubtreeConfigurator;
+import eu.etaxonomy.cdm.io.service.IIOService;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.navigation.l10n.Messages;
+import eu.etaxonomy.taxeditor.operation.IPostMoniteredOperationEnabled;
 import eu.etaxonomy.taxeditor.operation.RemotingCdmUpdateOperation;
 
 /**
@@ -26,12 +36,14 @@ import eu.etaxonomy.taxeditor.operation.RemotingCdmUpdateOperation;
  * @date 10.02.2017
  *
  */
-public class SetSecundumForSubtreeOperation extends RemotingCdmUpdateOperation{
+public class SetSecundumForSubtreeOperation extends RemotingCdmUpdateOperation implements IPostMoniteredOperationEnabled{
 
     private final static String LABEL = Messages.SetSecundumForSubtreeOperation_CHANGE_SEC_OP;
-
+    private static final Logger logger = Logger
+            .getLogger(SetSecundumForSubtreeOperation.class);
     UUID parentUuid;
     SetSecundumForSubtreeConfigurator config;
+    UpdateResult updateResult = new UpdateResult();
 
     /**
      * @param label
@@ -53,10 +65,59 @@ public class SetSecundumForSubtreeOperation extends RemotingCdmUpdateOperation{
      */
     @Override
     protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
-        monitor.beginTask(Messages.SetSecundumForSubtreeOperation_SET_SEC_TASK, 10);
-        UpdateResult result =  CdmApplicationState.getService(ITaxonNodeService.class).setSecundumForSubtree(config, null);
-        monitor.done();
-        return result;
+        Job job = createJob(monitor);
+        // configure the job
+        job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
+        job.setUser(true);
+        // schedule job
+        job.schedule();
+
+        return updateResult;
+
+
     }
 
-}
+
+    private Job createJob(IProgressMonitor monitor){
+        Assert.isNotNull(config, "Configuration may not be null");
+
+        final Display display = Display.getDefault();
+
+        Job job = new Job(Messages.SetSecundumForSubtreeOperation_SET_SEC_TASK) {
+
+
+            @Override
+            protected IStatus run(IProgressMonitor monitor) {
+                                  IIOService ioService = CdmApplicationState.getIOService();
+                   final UUID uuid = ioService.monitUpdateData(config);
+                   Display.getDefault().asyncExec(new Runnable() {
+                       @Override
+                       public void run() {
+                           AbstractUtility.executeMoniteredOperation("Update: " + config.getClass().getSimpleName(),
+                                   uuid,
+                                   1000,
+                                   false,
+                                   SetSecundumForSubtreeOperation.this,
+                                   null);
+                       }
+                   });
+                   return Status.OK_STATUS;
+
+            }
+        };
+            return job;
+        }
+
+
+
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void postOperation(IRemotingProgressMonitor monitor) {
+        // TODO Auto-generated method stub
+
+    }
+ }
index 9d4c93f..ee748ad 100644 (file)
@@ -9,6 +9,8 @@
 
 package eu.etaxonomy.taxeditor.navigation.search;
 
+import javax.annotation.PostConstruct;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
@@ -32,7 +34,6 @@ import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.menus.WorkbenchWindowControlContribution;
 import org.eclipse.ui.swt.IFocusService;
 
 import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;
@@ -52,7 +53,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created 15.04.2009
  * @version 1.0
  */
-public class SearchBar extends WorkbenchWindowControlContribution implements IContextListener{
+public class SearchBar implements IContextListener{
        private Text text_search;
        private String secondaryId;
        private ToolBar toolBar;
@@ -62,7 +63,7 @@ public class SearchBar extends WorkbenchWindowControlContribution implements ICo
        final private ConfigurationSelectionListener configurationListener = new ConfigurationSelectionListener();
 
        /** {@inheritDoc} */
-       @Override
+       @PostConstruct
        protected Control createControl(Composite parent) {
                Composite composite = new Composite(parent, SWT.NONE);
 
@@ -81,7 +82,7 @@ public class SearchBar extends WorkbenchWindowControlContribution implements ICo
         */
        private void registerAtFocusService() {
                IFocusService focusService =
-                       (IFocusService) PlatformUI.getWorkbench().getService(IFocusService.class);
+                       PlatformUI.getWorkbench().getService(IFocusService.class);
                if (focusService != null) {
                        focusService.addFocusTracker(text_search, "navigation.textControlId");
                }
index f7744fb..ff365b1 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
@@ -15,4 +15,4 @@ Import-Package: org.apache.log4j,
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-Activator: eu.etaxonomy.taxeditor.printpublisher.internal.PrintpublisherPlugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
index e2c9827..049370b 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>4.6.0</version>
+               <version>4.7.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 12115ea..86ba63d 100644 (file)
@@ -2,9 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 4.6.0
+Bundle-Version: 4.7.0
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
+Bundle-Localization: OSGI-INF/l10n/bundle
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.cdm.database,
  eu.etaxonomy.taxeditor.datasource,
@@ -70,8 +71,22 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.core.databinding.beans,
  org.eclipse.core.databinding.observable,
  org.eclipse.core.databinding.property,
- org.eclipse.jface.databinding
+ org.eclipse.jface.databinding,
+ eu.etaxonomy.taxeditor.workbench,
+ org.eclipse.e4.core.di.annotations;bundle-version="1.5.0",
+ org.eclipse.e4.ui.di;bundle-version="1.1.100",
+ org.eclipse.e4.ui.workbench,
+ org.eclipse.e4.core.di,
+ org.eclipse.e4.core.commands;bundle-version="0.11.100",
+ org.eclipse.e4.ui.services;bundle-version="1.2.100",
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0",
+ org.eclipse.e4.core.contexts;bundle-version="1.5.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
 Import-Package: eu.etaxonomy.taxeditor.webapp,
+ javax.annotation;version="1.0.0";resolution:=optional,
+ javax.inject;version="1.0.0",
  org.eclipse.core.commands,
  org.eclipse.core.commands.operations,
  org.eclipse.core.expressions,
@@ -93,6 +108,3 @@ Import-Package: eu.etaxonomy.taxeditor.webapp,
  org.eclipse.ui.ide.undo,
  org.osgi.framework,
  org.osgi.service.prefs;version="1.1.1"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-Localization: OSGI-INF/l10n/bundle
index 411f2a9..dd326a2 100644 (file)
@@ -41,7 +41,6 @@ view.name.6 = Derivative Search
 view.name.7 = Specimen Search\r
 \r
 editor.name = Defined Term Editor\r
-menu.label = Show View\r
 command.label = Derivative Search\r
 command.label.0 = Details\r
 command.label.1 = Supplemental\r
@@ -175,4 +174,8 @@ command.name.OPEN_TAXONNODE_WIZARD = Open Taxon Node Wizard
 command.name.INSPECT_ACTIVE_SESSIONS = Inspect Active Session\r
 viewCommandMapping.viewerName.CLASSIFICATION_WIZARD = Classification Wizard\r
 viewCommandMapping.viewerName.TAXON_NODE_WIZARD = Taxon node Wizard\r
-command.label.CHANGE_PASSWORD = Change password
\ No newline at end of file
+command.label.CHANGE_PASSWORD = Change password\r
+wizard.name.22 = CDM light (csv)\r
+wizard.name.23 = Excel Distribution Data Update\r
+wizard.name.24 = RIS Reference\r
+command.label.25 = Import Preferences
\ No newline at end of file
index e4276d7..8f2376c 100644 (file)
@@ -41,7 +41,6 @@ view.name.6 = Derivatsuche
 view.name.7 = Specimensuche
 view.name.8 = GBif Specimen Import
 editor.name = Editor f\u00fcr definierte Begriffe 
-menu.label = Zeige Ansicht
 command.label = Derivatsuche
 command.label.0 = Details
 command.label.1 = Zusatzdaten
@@ -176,4 +175,8 @@ command.name.OPEN_TAXONNODE_WIZARD = \u00d6ffne Taxonknoten-Wizard
 command.name.INSPECT_ACTIVE_SESSIONS = Aktive Session untersuchen
 viewCommandMapping.viewerName.CLASSIFICATION_WIZARD = Klassifikations-Wizard
 viewCommandMapping.viewerName.TAXON_NODE_WIZARD = Taxonknoten-Wizard
-command.label.CHANGE_PASSWORD = Kennwort ändern
\ No newline at end of file
+command.label.CHANGE_PASSWORD = Kennwort ändern
+wizard.name.22 = CDM light (csv)
+wizard.name.23 = Excel Verbreitungsdaten Update
+wizard.name.24 = RIS Referenzen
+command.label.25 = Import Präferenzen
\ No newline at end of file
index d3038a6..65edf2e 100644 (file)
@@ -11,5 +11,6 @@ bin.includes = META-INF/,\
                OSGI-INF/l10n/bundle.properties,\
                OSGI-INF/l10n/bundle_de.properties,\
                src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties,\
-               src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+               src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties,\
+               fragment.e4xmi
 
diff --git a/eu.etaxonomy.taxeditor.store/fragment.e4xmi b/eu.etaxonomy.taxeditor.store/fragment.e4xmi
new file mode 100644 (file)
index 0000000..e55d3cb
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ASCII"?>
+<fragment:ModelFragments xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/descriptor/basic" xmlns:commands="http://www.eclipse.org/ui/2010/UIModel/application/commands" xmlns:fragment="http://www.eclipse.org/ui/2010/UIModel/fragment" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xmlns:ui="http://www.eclipse.org/ui/2010/UIModel/application/ui" xmi:id="_OhwnQCTfEeeiN5lBIuqN3g">
+  <imports xsi:type="commands:Command" xmi:id="_bnVKsCZxEeeQLpuomSmVoQ" elementId="eu.etaxonomy.taxeditor.command.openPart"/>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_xVa1wCXXEeex9MwMOgUeWw" featurename="descriptors" parentElementId="org.eclipse.e4.legacy.ide.application">
+    <elements xsi:type="basic:PartDescriptor" xmi:id="_2xmxoCXXEeex9MwMOgUeWw" elementId="eu.etaxonomy.taxeditor.store.partdescriptor.sessionsView" label="%view.name.SESSIONS" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart"/>
+  </fragments>
+  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_3rW8wCXaEeex9MwMOgUeWw" featurename="children" parentElementId="eu.etaxonomy.taxeditor.menu.showView" positionInList="after:bulkeditor.menus.openmenu">
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_K6sowCaGEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showViewMenu.details" label="%command.label.0" command="_bnVKsCZxEeeQLpuomSmVoQ">
+      <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_Qi6uICaJEeeTEd_pKXBflg" coreExpressionId="isCdmStoreConnected"/>
+      <parameters xmi:id="_h2OecCaIEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.sessionView" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.view.detail"/>
+    </elements>
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_TlufMCaGEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showViewMenu.supplemental" label="%command.label.1" command="_bnVKsCZxEeeQLpuomSmVoQ">
+      <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_SwGXYCaJEeeTEd_pKXBflg" coreExpressionId="isCdmStoreConnected"/>
+      <parameters xmi:id="_pebl8CaIEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.sessionView" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.view.supplementalData"/>
+    </elements>
+    <elements xsi:type="menu:MenuSeparator" xmi:id="_sI4r8CaGEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.0"/>
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_0Dn4cCaHEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showViewMenu.datasource" label="%command.label.2" command="_bnVKsCZxEeeQLpuomSmVoQ">
+      <parameters xmi:id="_54in8CaIEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.sessionView" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.view.datasource"/>
+    </elements>
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_1riRcCaHEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showViewMenu.logView" toBeRendered="false" visible="false" label="%command.label.3" command="_bnVKsCZxEeeQLpuomSmVoQ">
+      <parameters xmi:id="_9VpA8CaIEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.sessionView" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="org.eclipse.pde.runtime.LogView"/>
+    </elements>
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_3DcfkCaHEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showViewMenu.reporting" label="%command.label.4" command="_bnVKsCZxEeeQLpuomSmVoQ">
+      <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_UrBzACaJEeeTEd_pKXBflg" coreExpressionId="isCdmStoreConnected"/>
+      <parameters xmi:id="_-z-nMCaIEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.sessionView" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.reporting.viewPart"/>
+    </elements>
+    <elements xsi:type="menu:HandledMenuItem" xmi:id="_jFskQCZyEeeQLpuomSmVoQ" elementId="eu.etaxonomy.taxeditor.store.showViewMenu.sessions" label="%view.name.SESSIONS" command="_bnVKsCZxEeeQLpuomSmVoQ">
+      <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_W-C-gCaJEeeTEd_pKXBflg" coreExpressionId="isCdmStoreConnected"/>
+      <parameters xmi:id="_BylIUCZzEeeQLpuomSmVoQ" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.sessionView" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.store.partdescriptor.sessionsView"/>
+    </elements>
+  </fragments>
+</fragment:ModelFragments>
index dba3174..d8c95af 100755 (executable)
    </extension>
    <extension
          point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">
-         <menu
-               id="eu.etaxonomy.taxeditor.menu.showView"
-               label="%menu.label">
-            <command
-                  commandId="org.eclipse.ui.views.showView"
-                  id="eu.etaxonomy.taxeditor.store.showViewMenu.details"
-                  label="%command.label.0"
-                  style="push">
-               <parameter
-                     name="org.eclipse.ui.views.showView.viewId"
-                     value="eu.etaxonomy.taxeditor.view.detail">
-               </parameter>
-               <visibleWhen
-                     checkEnabled="true">
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="org.eclipse.ui.views.showView"
-                  id="org.eclipse.ui.views.showView.supplemental"
-                     label="%command.label.1"
-                  style="push">
-               <parameter
-                     name="org.eclipse.ui.views.showView.viewId"
-                     value="eu.etaxonomy.taxeditor.view.supplementalData">
-               </parameter>
-               <visibleWhen
-                     checkEnabled="true">
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-               </visibleWhen>
-            </command>
-            <!-- Originally used by validation framework, currently not in use -->
-       <!--        <command
-                        id="org.eclipse.ui.views.showView.problems"
-                    commandId="org.eclipse.ui.views.showView"
-                    label="Problems"
-                    style="push">
-                 <parameter
-                       name="org.eclipse.ui.views.showView.viewId"
-                       value="org.eclipse.ui.views.ProblemView">
-                 </parameter>
-              </command>  -->
-            <separator
-                  name="eu.etaxonomy.taxeditor.store.showViewMenu.internal"
-                  visible="true">
-            </separator>
-            <command
-                  commandId="org.eclipse.ui.views.showView"
-                  label="%command.label.2"
-                  style="push">
-               <parameter
-                     name="org.eclipse.ui.views.showView.viewId"
-                     value="eu.etaxonomy.taxeditor.view.datasource">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.eclipse.ui.views.showView"
-                  label="%command.label.3"
-                  style="push">
-               <parameter
-                     name="org.eclipse.ui.views.showView.viewId"
-                     value="org.eclipse.pde.runtime.LogView">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.eclipse.ui.views.showView"
-                  label="%command.label.4"
-                  style="push">
-               <parameter
-                     name="org.eclipse.ui.views.showView.viewId"
-                     value="eu.etaxonomy.taxeditor.reporting.viewPart">
-               </parameter>
-               <visibleWhen
-                     checkEnabled="true">
-                  <and>
-                     <reference
-                           definitionId="isShowExperimentalFeatures">
-                     </reference>
-                     <reference
-                           definitionId="isCdmStoreConnected">
-                     </reference>
-                  </and>
-               </visibleWhen>
-            </command>
-            <command
-                  commandId="org.eclipse.ui.views.showView"
-                  label="%command.label.SESSION"
-                  style="push">
-               <parameter
-                     name="org.eclipse.ui.views.showView.viewId"
-                     value="eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart">
-               </parameter>
-               <visibleWhen
-                     checkEnabled="true">
-                  <reference
-                        definitionId="isCdmStoreConnected">
-                  </reference>
-               </visibleWhen>
-            </command>
-         </menu>
-      </menuContribution>
       <menuContribution 
          allPopups="false" 
-                 locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last"> 
+                 locationURI="menu:eu.etaxonomy.taxeditor.workbench.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last"> 
            <dynamic 
                     class="eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermMenu" 
                    id="eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermMenu"> 
         </dynamic> 
       </menuContribution>
       <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu.file?after=eu.etaxonomy.taxeditor.application.filemenu.io">
+            locationURI="menu:eu.etaxonomy.taxeditor.workbench.menu.file?after=eu.etaxonomy.taxeditor.application.filemenu.io">
          <command
                commandId="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow"
                label="%command.label.CONNECT"
             </reference>
          </activeWhen>
       </handler>
+       <handler
+            class="eu.etaxonomy.taxeditor.handler.OpenImportPreferenceHandler"
+            commandId="eu.etaxonomy.taxeditor.store.open.OpenImportPreferenceHandler">
+            <activeWhen>
+            <reference
+                  definitionId="hasROLE_PROJECT_MANAGER">
+            </reference>
+         </activeWhen>
+      </handler>
       <handler
             class="eu.etaxonomy.taxeditor.handler.SwitchUserHandler"
             commandId="eu.etaxonomy.taxeditor.store.operations.showLoginWindow">
                typeId="eu.etaxonomy.taxeditor.uuidParameterType">
          </commandParameter>
       </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.handler.OpenDatabasePreferencesWizardHandler"
-            id="eu.etaxonomy.taxeditor.application.DatabaseSettings"
-            name="%command.label.23">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.handler.OpenDatabaseRepairWizardHandler"
-            id="eu.etaxonomy.taxeditor.application.DatabaseRepairFunctionality"
-            name="%command.label.24">
-      </command>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
             id="eu.etaxonomy.taxeditor.io.import.abcd"
             name="%wizard.name.3">
       </wizard>
+       <wizard
+            category="eu.etaxonomy.taxeditor.import.category.cdm"
+            class="eu.etaxonomy.taxeditor.io.wizard.ExcelDistributionUpdateWizard"
+            id="eu.etaxonomy.taxeditor.io.import.excelDistribution"
+            name="%wizard.name.23">
+          <enabledWhen>
+            <reference
+                  definitionId="isShowExperimentalFeatures">
+            </reference></enabledWhen>
+      </wizard>
+       <wizard
+            category="eu.etaxonomy.taxeditor.import.category.cdm"
+            class="eu.etaxonomy.taxeditor.io.wizard.RISImportWizard"
+            id="eu.etaxonomy.taxeditor.io.import.risImport"
+            name="%wizard.name.24">
+          
+      </wizard>
       <wizard
             category="eu.etaxonomy.taxeditor.import.category.cdm"
             class="eu.etaxonomy.taxeditor.io.wizard.SddImportWizard"
             id="eu.etaxonomy.taxeditor.io.export.csv_print"
             name="%wizard.name.20">
       </wizard>
+      <wizard
+            category="eu.etaxonomy.taxeditor.export.category.cdm"
+            class="eu.etaxonomy.taxeditor.io.wizard.OutputModelExportWizard"
+            id="eu.etaxonomy.taxeditor.io.export.output_model"
+            name="%wizard.name.22">
+      </wizard>
    </extension>
    <extension
          point="org.eclipse.ui.newWizards">
             </iterate>
          </with>
       </definition>
+      <definition
+            id="hasROLE_PROJECT_MANAGER_AND_isCdmStoreConnected">
+         <and>
+            <reference
+                  definitionId="hasROLE_PROJECT_MANAGER">
+            </reference>
+            <reference
+                  definitionId="isCdmStoreConnected">
+            </reference>
+         </and>
+      </definition>
 </extension>
 <extension
       point="org.eclipse.ui.activities">
          viewerName="%viewCommandMapping.viewerName.TAXON_NODE_WIZARD">
    </viewCommandMapping>
 </extension>
+<extension
+      id="id1"
+      point="org.eclipse.e4.workbench.model">
+   <fragment
+         apply="always"
+         uri="fragment.e4xmi">
+   </fragment>
+</extension>
 </plugin>
index fb676eb..7f8e710 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>4.6.0</version>
+       <version>4.7.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/AbstractPreferenceWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/databaseAdmin/wizard/AbstractPreferenceWizard.java
new file mode 100755 (executable)
index 0000000..ff1efca
--- /dev/null
@@ -0,0 +1,62 @@
+/**
+* Copyright (C) 2017 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.databaseAdmin.wizard;
+
+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.Composite;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+
+/**
+ * @author k.luther
+ * @date 26.04.2017
+ *
+ */
+public abstract class AbstractPreferenceWizard extends WizardPage {
+    /**
+     * @param pageName
+     */
+    protected AbstractPreferenceWizard(String pageName) {
+        super(pageName);
+
+    }
+    protected TabFolder tabFolder;
+    protected Composite composite;
+    /***
+     * Adds a tab to the page.
+     * @param text the tab label
+     */
+     public Composite addTab(String text)    {
+         if (tabFolder == null){
+             // initialize tab folder
+             if (composite == null) {
+                 composite = new Composite(getShell(), SWT.NONE);
+             }
+             tabFolder = new TabFolder(composite, SWT.NONE);
+             tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH));
+         }
+
+         TabItem item = new TabItem(tabFolder, SWT.NONE);
+         item.setText(text);
+
+         Composite currentTab = new Composite(tabFolder, SWT.NULL);
+         GridLayout layout = new GridLayout();
+         currentTab.setLayout(layout);
+         currentTab.setFont(composite.getFont());
+        // currentTab.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+         item.setControl(currentTab);
+         return currentTab;
+
+     }
+
+}
old mode 100644 (file)
new mode 100755 (executable)
index e6b52b3..6f3ac0c
@@ -13,19 +13,16 @@ import java.util.List;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
 
+import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.taxeditor.l10n.Messages;
@@ -39,7 +36,7 @@ import