/runtime-taxeditor.product
/target
/workspace
+/*.patch
+/eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.core.resources.prefs
+/eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.m2e.core.prefs
+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
+ <classpathentry kind="src" path="src/main/resources/"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Bundle-ManifestVersion: 2
Bundle-Name: Application
Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
Bundle-Vendor: EDIT
Bundle-Localization: OSGI-INF/l10n/plugin
id="eu.etaxonomy.taxeditor.application.perspective.taxonomic"
name="%perspective.name">
</perspective>
- <!--perspective
- class="eu.etaxonomy.taxeditor.perspective.BulkEditing"
- id="eu.etaxonomy.taxeditor.application.perspective.bulkeditor"
- name="Bulk Editing">
- </perspective-->
<perspective
class="eu.etaxonomy.taxeditor.perspective.PolytomousKey"
id="eu.etaxonomy.taxeditor.application.perspective.polytomous"
restorable="true">
</view>
</extension-->
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="eu.etaxonomy.taxeditor.application.perspective.bulkeditor">
- <showInPart
- id="eu.etaxonomy.taxeditor.editor.forms.detailsView">
- </showInPart>
- <showInPart
- id="eu.etaxonomy.taxeditor.bulkeditor.referencingobjectsview">
- </showInPart>
- </perspectiveExtension>
- <perspectiveExtension
- targetID="eu.etaxonomy.taxeditor.application.perspective.polytomous">
- <showInPart
- id="eu.etaxonomy.taxeditor.editor.forms.detailsView">
- </showInPart>
- </perspectiveExtension>
- <perspectiveExtension
- targetID="eu.etaxonomy.taxeditor.application.perspective.uses">
- <showInPart
- id="eu.etaxonomy.taxeditor.editor.forms.detailsView">
- </showInPart>
- </perspectiveExtension>
- </extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Bulkeditor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?eclipse version="3.4"?>\r
-<plugin>\r
-\r
- <extension\r
- id="application"\r
- point="org.eclipse.core.runtime.applications">\r
- <application>\r
- <run\r
- class="eu.etaxonomy.taxeditor.bulkeditor.Application">\r
- </run>\r
- </application>\r
- </extension>\r
- <extension\r
- point="org.eclipse.ui.editors">\r
- <editor\r
- class="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"\r
- default="false"\r
- id="bulkeditor.editor"\r
- name="%editor.name">\r
- </editor>\r
- <editor\r
- class="eu.etaxonomy.taxeditor.nameditor.TaxonNameEditor"\r
- default="false"\r
- id="nameeditor.editor"\r
- name="%editor.name.0">\r
- </editor>\r
- <editor\r
- class="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"\r
- default="false"\r
- id="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"\r
- name="%editor.name.1">\r
- </editor>\r
- </extension>\r
- <extension\r
- point="org.eclipse.ui.menus">\r
- <menuContribution\r
- locationURI="menu:org.eclipse.ui.main.menu.window?before=eu.etaxonomy.taxeditor.application.windowMenu.last">\r
- <menu\r
- id="bulkeditor.menus.openmenu"\r
- label="%menu.label">\r
- <visibleWhen\r
- checkEnabled="true">\r
- <reference\r
- definitionId="isCdmStoreConnected">\r
- </reference>\r
- </visibleWhen>\r
- </menu>\r
- <menu\r
- label="%menu.label.0">\r
- <visibleWhen\r
- checkEnabled="true">\r
- <reference\r
- definitionId="isCdmStoreConnected">\r
- </reference>\r
- </visibleWhen>\r
- </menu>\r
- </menuContribution>\r
- <menuContribution\r
- locationURI="menu:bulkeditor.menus.openmenu">\r
- <dynamic\r
- class="eu.etaxonomy.taxeditor.bulkeditor.command.OpenBulkEditorContributionItem"\r
- id="taxeditor-bulkeditor.dynamicopenmenu">\r
- <visibleWhen\r
- checkEnabled="true">\r
- <reference\r
- definitionId="isCdmStoreConnected">\r
- </reference>\r
- </visibleWhen>\r
- </dynamic>\r
- <!--command\r
- commandId="taxeditor-nameeditor.commands.open"\r
- label="Open Name Editor"\r
- style="push">\r
- <visibleWhen\r
- checkEnabled="false">\r
- <reference\r
- definitionId="pigsFly">\r
- </reference>\r
- </visibleWhen>\r
- </command-->\r
- </menuContribution>\r
- <menuContribution\r
- locationURI="popup:#BulkEditorContext">\r
- <command\r
- commandId="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"\r
- label="%command.label"\r
- style="push">\r
- <visibleWhen>\r
- <reference\r
- definitionId="isTaxonBulkEditorInput">\r
- </reference>\r
- </visibleWhen>\r
- </command>\r
- <separator\r
- name="taxeditor-bulkeditor.separator1"\r
- visible="true">\r
- </separator>\r
- <menu\r
- label="%menu.label.1">\r
- <dynamic\r
- class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"\r
- id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">\r
- <visibleWhen\r
- checkEnabled="false">\r
- <reference\r
- definitionId="isCdmStoreConnected">\r
- </reference>\r
- </visibleWhen>\r
- </dynamic>\r
- <visibleWhen\r
- checkEnabled="true">\r
- <reference\r
- definitionId="isCdmStoreConnected">\r
- </reference>\r
- </visibleWhen>\r
- </menu>\r
- <separator\r
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+ <extension
+ id="application"
+ point="org.eclipse.core.runtime.applications">
+ <application>
+ <run
+ class="eu.etaxonomy.taxeditor.bulkeditor.Application">
+ </run>
+ </application>
+ </extension>
+ <extension
+ point="org.eclipse.ui.editors">
+ <editor
+ class="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"
+ default="false"
+ id="bulkeditor.editor"
+ name="%editor.name">
+ </editor>
+ <editor
+ class="eu.etaxonomy.taxeditor.nameditor.TaxonNameEditor"
+ default="false"
+ id="nameeditor.editor"
+ name="%editor.name.0">
+ </editor>
+ <editor
+ class="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
+ default="false"
+ id="eu.etaxonomy.taxeditor.dataimport.DataImportEditor"
+ name="%editor.name.1">
+ </editor>
+ </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="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"
+ id="taxeditor-bulkeditor.dynamicopenmenu">
+ <visibleWhen
+ checkEnabled="true">
+ <reference
+ definitionId="isCdmStoreConnected">
+ </reference>
+ </visibleWhen>
+ </dynamic>
+ </menuContribution>
+ <menuContribution
+ locationURI="popup:#BulkEditorContext">
+ <dynamic
+ class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+ id="eu.etaxonomy.taxeditor.bulkeditor.cdmViewerContextMenu">
+ </dynamic>
+ <separator
+ name="taxeditor-bulkeditor.separator1"
+ visible="true">
+ </separator>
+ <menu
+ label="%menu.label.1">
+ <dynamic
+ class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"
+ id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">
+ <visibleWhen
+ checkEnabled="false">
+ <reference
+ definitionId="isCdmStoreConnected">
+ </reference>
+ </visibleWhen>
+ </dynamic>
+ <visibleWhen
+ checkEnabled="true">
+ <reference
+ definitionId="isCdmStoreConnected">
+ </reference>
+ </visibleWhen>
+ </menu>
+ <separator
name="taxeditor-bulkeditor.separator4"\r
visible="true">\r
- </separator>\r
- <command\r
- commandId="bulkeditor.commands.setmergetarget"\r
- label="%command.label.0"\r
- style="push">\r
- <visibleWhen>\r
- <reference\r
- definitionId="isMergeEnabled">\r
- </reference>\r
- </visibleWhen>\r
- </command>\r
- \r
- <command\r
- commandId="bulkeditor.commands.setmergecandidate"\r
- label="%command.label.1"\r
- style="push">\r
- <visibleWhen>\r
- <reference\r
- definitionId="isMergeEnabled">\r
- </reference>\r
- </visibleWhen>\r
- </command>\r
- <command\r
- commandId="bulkeditor.commands.removemergecandidate"\r
- label="%command.label.2"\r
- style="push">\r
- <visibleWhen>\r
- <reference\r
- definitionId="isMergeEnabled">\r
- </reference>\r
- </visibleWhen>\r
- </command>\r
- <!--menuContribution\r
- locationURI="popup:org.eclipse.ui.popup.any"--> \r
- <command\r
- commandId="bulkeditor.commands.mergegroup"\r
- label="%command.label.3"\r
- style="push">\r
- <visibleWhen>\r
- <reference\r
- definitionId="isMergeEnabled">\r
- </reference>\r
- </visibleWhen>\r
- </command>\r
+ </separator>
+ <command
+ commandId="bulkeditor.commands.setmergetarget"
+ label="%command.label.0"
+ style="push">
+ <visibleWhen>
+ <reference
+ definitionId="isMergeEnabled">
+ </reference>
+ </visibleWhen>
+ </command>
+
+ <command
+ commandId="bulkeditor.commands.setmergecandidate"
+ label="%command.label.1"
+ style="push">
+ <visibleWhen>
+ <reference
+ definitionId="isMergeEnabled">
+ </reference>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="bulkeditor.commands.removemergecandidate"
+ label="%command.label.2"
+ style="push">
+ <visibleWhen>
+ <reference
+ definitionId="isMergeEnabled">
+ </reference>
+ </visibleWhen>
+ </command>
+ <!--menuContribution
+ locationURI="popup:org.eclipse.ui.popup.any"-->
+ <command
+ commandId="bulkeditor.commands.mergegroup"
+ label="%command.label.3"
+ style="push">
+ <visibleWhen>
+ <reference
+ definitionId="isMergeEnabled">
+ </reference>
+ </visibleWhen>
+ </command>
<separator\r
name="eu.etaxonomy.taxeditor.bulkeditor.separator1"\r
visible="true">\r
</separator>\r
- <command\r
- commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"\r
- label="%command.label.5"\r
- style="push">\r
- <visibleWhen\r
- checkEnabled="true">\r
- <and>\r
- <reference\r
- definitionId="isConvertEnabled">\r
- </reference>\r
- <reference \r
- definitionId="isTeam">\r
- </reference>\r
- </and>\r
- </visibleWhen>\r
- </command>\r
- <command\r
- commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"\r
- label="%command.label.6"\r
- style="push">\r
- <visibleWhen \r
- checkEnabled="true">>\r
- <and>\r
- <reference\r
- definitionId="isConvertEnabled">\r
- </reference>\r
- <reference \r
- definitionId="isPerson">\r
- </reference>\r
- </and>\r
- </visibleWhen>\r
- </command>\r
- <separator\r
- name="taxeditor-bulkeditor.separator2"\r
- visible="true">\r
- </separator>\r
- <menu\r
- label="%menu.label.2">\r
- <dynamic\r
- class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicMarkerTypeEditingMenu"\r
- id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">\r
- </dynamic>\r
- <visibleWhen\r
- checkEnabled="true">\r
- <reference\r
- definitionId="isCdmStoreConnected">\r
- </reference>\r
- </visibleWhen>\r
- </menu>\r
- <separator\r
- name="taxeditor-bulkeditor.separator3"\r
- visible="true">\r
- </separator>\r
- <command\r
- commandId="eu.etaxonomy.taxeditor.bulkeditor.delete"\r
- label="%command.label.4"\r
- style="push">\r
- <visibleWhen\r
- checkEnabled="true">\r
- <reference\r
- definitionId="isCdmStoreConnected">\r
- </reference>\r
- </visibleWhen>\r
- </command>\r
- </menuContribution>\r
- </extension>\r
- <extension\r
- point="org.eclipse.ui.commands">\r
- <command\r
- defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.MergeGroupHandler"\r
- id="bulkeditor.commands.mergegroup"\r
- name="%command.name">\r
- </command>\r
- <command\r
- defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeTargetHandler"\r
- id="bulkeditor.commands.setmergetarget"\r
- name="%command.name.0">\r
- </command>\r
- <command\r
- defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.OpenBulkEditorHandler"\r
- id="taxeditor-bulkeditor.dynamicopenmenu"\r
- name="%command.name.1">\r
- <commandParameter\r
- id="taxeditor-bulkeditor.commandParameter.inputType"\r
- name="%commandParameter.name"\r
- values="eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues">\r
- </commandParameter>\r
- </command>\r
- <command\r
- defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.NewObjectHandler"\r
- id="taxeditor-bulkeditor.dynamicnewobjectcommand"\r
- name="%command.name.2">\r
- </command>\r
- <command\r
- defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.DeleteObjectHandler"\r
- id="taxeditor-bulkeditor.dynamicdeleteobjectcommand"\r
- name="%command.name.3">\r
- </command>\r
- <command\r
- defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeCandidateHandler"\r
- id="bulkeditor.commands.setmergecandidate"\r
- name="%command.name.4">\r
- </command>\r
- <command\r
- defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.RemoveMergeCandidateHandler"\r
- id="bulkeditor.commands.removemergecandidate"\r
- name="%command.name.5">\r
- </command>\r
- <command\r
- defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMarkerFlagHandler"\r
- id="taxeditor-bulkeditor.command.setMarkerFlag"\r
- name="%command.name.6">\r
- </command>\r
- <command\r
- id="eu.etaxonomy.taxeditor.bulkeditor.delete"\r
- name="%command.name.7">\r
- </command>\r
- <command\r
- id="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"\r
- name="%command.name.8">\r
- </command>\r
- <command\r
- id="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"\r
- name="%command.name.10">\r
- </command>\r
- <!--command\r
- defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.NewEntityHandler"\r
- id="eu.etaxonomy.taxeditor.bulkeditor.command.new"\r
- name="New Entity">\r
- </command-->\r
- </extension>\r
- <extension\r
- point="org.eclipse.ui.editors.markerAnnotationSpecification">\r
- <specification\r
- annotationType="merge_candidate_annotation"\r
- colorPreferenceKey="merge_candidate_annotation_color"\r
- colorPreferenceValue="220,220,255"\r
- highlightPreferenceValue="true"\r
- icon="icons/merge_candidate.gif"\r
- includeOnPreferencePage="true"\r
- label="%specification.label"\r
- overviewRulerPreferenceKey="merge_candidate_annotation_overview"\r
- overviewRulerPreferenceValue="true"\r
- presentationLayer="0"\r
- symbolicIcon="task"\r
- textPreferenceKey="merge_candidate_annotation_text"\r
- textPreferenceValue="false"\r
- textStylePreferenceValue="BOX"\r
- verticalRulerPreferenceKey="merge_candidate_annotation_vertical"\r
- verticalRulerPreferenceValue="true">\r
- </specification>\r
- <specification\r
- annotationType="merge_target_annotation"\r
- colorPreferenceKey="merge_target_annotation_color"\r
- colorPreferenceValue="220,220,255"\r
- highlightPreferenceValue="true"\r
- icon="icons/merge_target.gif"\r
- includeOnPreferencePage="true"\r
- label="%specification.label.0"\r
- overviewRulerPreferenceKey="merge_target_annotation_overview"\r
- overviewRulerPreferenceValue="true"\r
- presentationLayer="1"\r
- symbolicIcon="task"\r
- textPreferenceKey="merge_target_annotation_text"\r
- textPreferenceValue="false"\r
- textStylePreferenceValue="BOX"\r
- verticalRulerPreferenceKey="merge_target_annotation_vertical"\r
- verticalRulerPreferenceValue="true">\r
- </specification> \r
- </extension>\r
- <extension\r
- point="org.eclipse.ui.editors.annotationTypes">\r
- <type\r
- name="merge_candidate_annotation">\r
- </type>\r
- <type\r
- name="merge_target_annotation">\r
- </type>\r
- </extension>\r
- <extension\r
- point="org.eclipse.ui.views">\r
- <view\r
- class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"\r
- id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"\r
- name="%view.name"\r
- restorable="false">\r
- </view>\r
- </extension> \r
- <extension\r
- point="org.eclipse.core.expressions.definitions">\r
- <definition\r
- id="isMergeEnabled">\r
- <with\r
- variable="activeEditor">\r
- <test\r
- property="taxeditor-bulkeditor.propertyTester.isMergingEnabled">\r
- </test>\r
- </with>\r
- </definition>\r
- <definition\r
- id="isConvertEnabled">\r
- <with\r
- variable="activeEditor">\r
- <test\r
- property="taxeditor-bulkeditor.propertyTester.isConvertingEnabled">\r
- </test>\r
- </with>\r
- </definition>\r
- <definition\r
- id="isTaxonBulkEditorInput">\r
- <with\r
- variable="activeEditor">\r
- <test\r
- property="taxeditor-bulkeditor.propertyTester.isTaxonEditor">\r
- </test>\r
- </with>\r
- </definition>\r
- <definition\r
- id="isTeam">\r
- <with\r
- variable="selection">\r
- <test\r
- property="eu.etaxonomy.taxeditor.bulkeditor.command.isTeam">\r
- </test>\r
- </with>\r
- </definition>\r
- <definition\r
- id="isPerson">\r
- <with\r
- variable="selection">\r
- <test\r
- property="eu.etaxonomy.taxeditor.bulkeditor.command.isPerson">\r
- </test>\r
- </with>\r
- </definition>\r
- </extension>\r
- <extension\r
- point="org.eclipse.core.expressions.propertyTesters">\r
- <propertyTester\r
- class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"\r
- id="taxeditor-bulkeditor.PropertyTester"\r
- namespace="taxeditor-bulkeditor.propertyTester"\r
- properties="isMergingEnabled, isDerivedUnitEditor, isTaxonEditor, isGroupEditor, isConvertingEnabled"\r
- type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">\r
- </propertyTester>\r
- <propertyTester\r
- class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"\r
- id="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"\r
- namespace="eu.etaxonomy.taxeditor.bulkeditor.command"\r
- properties="isTeam, isPerson"\r
- type="java.lang.Object">\r
- </propertyTester>\r
- </extension>\r
- <extension\r
- point="org.eclipse.ui.handlers">\r
- <handler\r
- class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:cut"\r
- commandId="org.eclipse.ui.edit.cut">\r
- <activeWhen>\r
- <with\r
- variable="activeFocusControlId">\r
- <equals\r
- value="bulkeditor.textControlId">\r
- </equals>\r
- </with>\r
- </activeWhen>\r
- </handler>\r
- <handler\r
- class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:copy"\r
- commandId="org.eclipse.ui.edit.copy">\r
- <activeWhen>\r
- <with\r
- variable="activeFocusControlId">\r
- <equals\r
- value="bulkeditor.textControlId">\r
- </equals>\r
- </with>\r
- </activeWhen>\r
- </handler>\r
- <handler\r
- class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:paste"\r
- commandId="org.eclipse.ui.edit.paste">\r
- <activeWhen>\r
- <with\r
- variable="activeFocusControlId">\r
- <equals\r
- value="bulkeditor.textControlId">\r
- </equals>\r
- </with>\r
- </activeWhen>\r
- </handler>\r
- <handler\r
- class="eu.etaxonomy.taxeditor.bulkeditor.handler.DeleteHandler"\r
- commandId="eu.etaxonomy.taxeditor.bulkeditor.delete">\r
- <activeWhen>\r
- <with\r
- variable="selection">\r
- <instanceof\r
- value="eu.etaxonomy.taxeditor.model.LineSelection">\r
- </instanceof>\r
- </with>\r
- </activeWhen>\r
- </handler>\r
- <handler\r
- class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertTeam2PersonHandler"\r
- commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person">\r
- </handler>\r
- <handler\r
- class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertPerson2TeamHandler"\r
- commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team">\r
- </handler>\r
- \r
- </extension>\r
- <extension\r
- point="org.eclipse.ui.preferencePages">\r
- <page\r
- category="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"\r
- class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorMarkerPreferencePage"\r
- id="eu.etaxonomy.taxeditor.preferences.bulkeditor.markerTypes"\r
- name="%page.name">\r
- </page>\r
- <page\r
- category="eu.etaxonomy.taxeditor.preferences.general"\r
- class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorGeneralPreferencePage"\r
- id="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"\r
- name="%page.name.0">\r
- </page>\r
- </extension>\r
- <extension\r
- point="org.eclipse.ui.perspectiveExtensions">\r
- <perspectiveExtension\r
- targetID="*">\r
- <showInPart\r
- id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"></showInPart>\r
- <showInPart\r
- id="eu.etaxonomy.taxeditor.view.detail">\r
- </showInPart>\r
- </perspectiveExtension>\r
- </extension>\r
-<!-- start set marker -->\r
-\r
-</plugin>\r
+ <command
+ commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
+ label="%command.label.5"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ <and>
+ <reference
+ definitionId="isConvertEnabled">
+ </reference>
+ <reference
+ definitionId="isTeam">
+ </reference>
+ </and>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
+ label="%command.label.6"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">>
+ <and>
+ <reference
+ definitionId="isConvertEnabled">
+ </reference>
+ <reference
+ definitionId="isPerson">
+ </reference>
+ </and>
+ </visibleWhen>
+ </command>
+ <separator
+ name="taxeditor-bulkeditor.separator2"
+ visible="true">
+ </separator>
+ <menu
+ label="%menu.label.2">
+ <dynamic
+ class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicMarkerTypeEditingMenu"
+ id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">
+ </dynamic>
+ <visibleWhen
+ checkEnabled="true">
+ <reference
+ definitionId="isCdmStoreConnected">
+ </reference>
+ </visibleWhen>
+ </menu>
+ <separator
+ name="taxeditor-bulkeditor.separator3"
+ visible="true">
+ </separator>
+ <command
+ commandId="eu.etaxonomy.taxeditor.bulkeditor.delete"
+ label="%command.label.4"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ <reference
+ definitionId="isCdmStoreConnected">
+ </reference>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ <menuContribution
+ allPopups="false"
+ locationURI="popup:eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects">
+ <dynamic
+ class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+ id="eu.etaxonomy.taxeditor.referencingObjectsView.cdmViewerContextMenu">
+ </dynamic>
+ </menuContribution>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.MergeGroupHandler"
+ id="bulkeditor.commands.mergegroup"
+ name="%command.name">
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeTargetHandler"
+ id="bulkeditor.commands.setmergetarget"
+ name="%command.name.0">
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.OpenBulkEditorHandler"
+ id="taxeditor-bulkeditor.dynamicopenmenu"
+ name="%command.name.1">
+ <commandParameter
+ id="taxeditor-bulkeditor.commandParameter.inputType"
+ name="%commandParameter.name"
+ values="eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputTypeValues">
+ </commandParameter>
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.NewObjectHandler"
+ id="taxeditor-bulkeditor.dynamicnewobjectcommand"
+ name="%command.name.2">
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.annotatedlineeditor.handler.DeleteObjectHandler"
+ id="taxeditor-bulkeditor.dynamicdeleteobjectcommand"
+ name="%command.name.3">
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMergeCandidateHandler"
+ id="bulkeditor.commands.setmergecandidate"
+ name="%command.name.4">
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.RemoveMergeCandidateHandler"
+ id="bulkeditor.commands.removemergecandidate"
+ name="%command.name.5">
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.SetMarkerFlagHandler"
+ id="taxeditor-bulkeditor.command.setMarkerFlag"
+ name="%command.name.6">
+ </command>
+ <command
+ id="eu.etaxonomy.taxeditor.bulkeditor.delete"
+ name="%command.name.7">
+ </command>
+ <command
+ id="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person"
+ name="%command.name.8">
+ </command>
+ <command
+ id="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team"
+ name="%command.name.10">
+ </command>
+ <command
+ id="eu.etaxonomy.taxeditor.openReferencingObjectsView"
+ name="Open Referencing Objects View">
+ </command>
+ <!--command
+ defaultHandler="eu.etaxonomy.taxeditor.bulkeditor.handler.NewEntityHandler"
+ id="eu.etaxonomy.taxeditor.bulkeditor.command.new"
+ name="New Entity">
+ </command-->
+ </extension>
+ <extension
+ point="org.eclipse.ui.editors.markerAnnotationSpecification">
+ <specification
+ annotationType="merge_candidate_annotation"
+ colorPreferenceKey="merge_candidate_annotation_color"
+ colorPreferenceValue="220,220,255"
+ highlightPreferenceValue="true"
+ icon="icons/merge_candidate.gif"
+ includeOnPreferencePage="true"
+ label="%specification.label"
+ overviewRulerPreferenceKey="merge_candidate_annotation_overview"
+ overviewRulerPreferenceValue="true"
+ presentationLayer="0"
+ symbolicIcon="task"
+ textPreferenceKey="merge_candidate_annotation_text"
+ textPreferenceValue="false"
+ textStylePreferenceValue="BOX"
+ verticalRulerPreferenceKey="merge_candidate_annotation_vertical"
+ verticalRulerPreferenceValue="true">
+ </specification>
+ <specification
+ annotationType="merge_target_annotation"
+ colorPreferenceKey="merge_target_annotation_color"
+ colorPreferenceValue="220,220,255"
+ highlightPreferenceValue="true"
+ icon="icons/merge_target.gif"
+ includeOnPreferencePage="true"
+ label="%specification.label.0"
+ overviewRulerPreferenceKey="merge_target_annotation_overview"
+ overviewRulerPreferenceValue="true"
+ presentationLayer="1"
+ symbolicIcon="task"
+ textPreferenceKey="merge_target_annotation_text"
+ textPreferenceValue="false"
+ textStylePreferenceValue="BOX"
+ verticalRulerPreferenceKey="merge_target_annotation_vertical"
+ verticalRulerPreferenceValue="true">
+ </specification>
+ </extension>
+ <extension
+ point="org.eclipse.ui.editors.annotationTypes">
+ <type
+ name="merge_candidate_annotation">
+ </type>
+ <type
+ name="merge_target_annotation">
+ </type>
+ </extension>
+ <extension
+ point="org.eclipse.ui.views">
+ <view
+ class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"
+ id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"
+ name="%view.name"
+ restorable="false">
+ </view>
+ </extension>
+ <extension
+ point="org.eclipse.core.expressions.definitions">
+ <definition
+ id="isMergeEnabled">
+ <with
+ variable="activeEditor">
+ <test
+ property="taxeditor-bulkeditor.propertyTester.isMergingEnabled">
+ </test>
+ </with>
+ </definition>
+ <definition
+ id="isConvertEnabled">
+ <with
+ variable="activeEditor">
+ <test
+ property="taxeditor-bulkeditor.propertyTester.isConvertingEnabled">
+ </test>
+ </with>
+ </definition>
+ <definition
+ id="isTaxonBulkEditorInput">
+ <with
+ variable="activeEditor">
+ <test
+ property="taxeditor-bulkeditor.propertyTester.isTaxonEditor">
+ </test>
+ </with>
+ </definition>
+ <definition
+ id="isTeam">
+ <with
+ variable="selection">
+ <test
+ property="eu.etaxonomy.taxeditor.bulkeditor.command.isTeam">
+ </test>
+ </with>
+ </definition>
+ <definition
+ id="isPerson">
+ <with
+ variable="selection">
+ <test
+ property="eu.etaxonomy.taxeditor.bulkeditor.command.isPerson">
+ </test>
+ </with>
+ </definition>
+ </extension>
+ <extension
+ point="org.eclipse.core.expressions.propertyTesters">
+ <propertyTester
+ class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorPropertyTester"
+ id="taxeditor-bulkeditor.PropertyTester"
+ namespace="taxeditor-bulkeditor.propertyTester"
+ properties="isMergingEnabled, isDerivedUnitEditor, isTaxonEditor, isGroupEditor, isConvertingEnabled"
+ type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
+ </propertyTester>
+ <propertyTester
+ class="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
+ id="eu.etaxonomy.taxeditor.bulkeditor.command.BulkEditorMenuPropertyTester"
+ namespace="eu.etaxonomy.taxeditor.bulkeditor.command"
+ properties="isTeam, isPerson"
+ type="java.lang.Object">
+ </propertyTester>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:cut"
+ commandId="org.eclipse.ui.edit.cut">
+ <activeWhen>
+ <with
+ variable="activeFocusControlId">
+ <equals
+ value="bulkeditor.textControlId">
+ </equals>
+ </with>
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:copy"
+ commandId="org.eclipse.ui.edit.copy">
+ <activeWhen>
+ <with
+ variable="activeFocusControlId">
+ <equals
+ value="bulkeditor.textControlId">
+ </equals>
+ </with>
+ </activeWhen>
+ </handler>
+ <handler
+ class="org.eclipse.ui.internal.handlers.WidgetMethodHandler:paste"
+ commandId="org.eclipse.ui.edit.paste">
+ <activeWhen>
+ <with
+ variable="activeFocusControlId">
+ <equals
+ value="bulkeditor.textControlId">
+ </equals>
+ </with>
+ </activeWhen>
+ </handler>
+ <handler
+ class="eu.etaxonomy.taxeditor.bulkeditor.handler.DeleteHandler"
+ commandId="eu.etaxonomy.taxeditor.bulkeditor.delete">
+ <activeWhen>
+ <with
+ variable="selection">
+ <instanceof
+ value="eu.etaxonomy.taxeditor.model.LineSelection">
+ </instanceof>
+ </with>
+ </activeWhen>
+ </handler>
+ <handler
+ class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertTeam2PersonHandler"
+ commandId="eu.etaxonomy.taxeditor.bulkeditor.convertTeam2Person">
+ </handler>
+ <handler
+ class="eu.etaxonomy.taxeditor.bulkeditor.handler.ConvertPerson2TeamHandler"
+ commandId="eu.etaxonomy.taxeditor.bulkeditor.convertPerson2Team">
+ </handler>
+ <handler
+ class="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
+ commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView">
+ <activeWhen>
+ <with
+ variable="activePartId">
+ <equals
+ value="bulkeditor.editor">
+ </equals>
+ </with>
+ </activeWhen>
+ </handler>
+
+ </extension>
+ <extension
+ point="org.eclipse.ui.preferencePages">
+ <page
+ category="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
+ class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorMarkerPreferencePage"
+ id="eu.etaxonomy.taxeditor.preferences.bulkeditor.markerTypes"
+ name="%page.name">
+ </page>
+ <page
+ category="eu.etaxonomy.taxeditor.preferences.general"
+ class="eu.etaxonomy.taxeditor.bulkeditor.preference.BulkEditorGeneralPreferencePage"
+ id="eu.etaxonomy.taxeditor.preferences.bulkeditor.general"
+ name="%page.name.0">
+ </page>
+ </extension>
+ <extension
+ point="eu.etaxonomy.taxeditor.store.cdmViewer">
+ <viewCommandMapping
+ commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView"
+ selection="java.lang.Object"
+ viewerName="Referencing Objects View">
+ </viewCommandMapping>
+ </extension>
+<!-- start set marker -->
+
+</plugin>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.jface.viewers.TreeNode;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Table;
import org.eclipse.ui.IWorkbenchPart;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
import eu.etaxonomy.taxeditor.model.DescriptionHelper;
-import eu.etaxonomy.taxeditor.model.LineSelection;
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
/**
- * <p>ReferencingObjectsView class.</p>
- *
* @author p.ciardelli
* @created 08.07.2009
* @version 1.0
private static final Logger logger = Logger
.getLogger(ReferencingObjectsView.class);
- /** Constant <code>ID="eu.etaxonomy.taxeditor.bulkeditor.refer"{trunked}</code> */
public static final String ID = "eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects";
private TableViewer viewer;
cdmEntitySession = CdmStore.getCurrentSessionManager().bindNullSession();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#createViewer(org.eclipse.swt.widgets.Composite)
- */
/** {@inheritDoc} */
@Override
public void createViewer(Composite parent) {
viewer.setContentProvider(new ReferencingObjectsContentProvider());
viewer.setLabelProvider(new ReferencingObjectsLabelProvider());
viewer.setCellModifier(new ICellModifier() {
-
@Override
public void modify(Object element, String property, Object value) {
- // TODO Auto-generated method stub
-
}
@Override
return true;
}
});
-// viewer.setInput(new ArrayList<CdmBase>());
+
+ //create context menu
+ MenuManager menuManager = new MenuManager();
+ getSite().registerContextMenu(menuManager, viewer);
+ Control control = viewer.getControl();
+ Menu menu = menuManager.createContextMenu(control);
+ control.setMenu(menu);
+
+ // Propagate selection from viewer
+ getSite().setSelectionProvider(viewer);
}
/**
public void setFocus() {
cdmEntitySession.bind();
}
- /**
- * <p>updateReferencingObjects</p>
- *
- * @param entity a {@link eu.etaxonomy.cdm.model.common.IdentifiableEntity} object.
- */
+
public void updateReferencingObjects(final UUID entityUUID, final Class objectClass) {
final Display display = Display.getCurrent();
class ReferencingClassComparator implements Comparator<CdmBase> {
- /* (non-Javadoc)
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
@Override
public int compare(CdmBase o1, CdmBase o2) {
String string1 = o1.getClass().getSimpleName();
}
}
- /**
- *
- */
private void updateView(List<CdmBase> referencingObjects) {
if (viewer != null && !viewer.getControl().isDisposed()){
try{
/** {@inheritDoc} */
@Override
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- if(! (part instanceof BulkEditor)){
- setContentDescription("");
- showEmptyPage();
- return;
- }
-
- if(! (selection instanceof LineSelection)){
- return;
- }
- LineSelection lineSelection = (LineSelection) selection;
-
- if(lineSelection.size() != 1){
- return;
- }
-
- if(! (lineSelection.getFirstElement() instanceof IdentifiableEntity)){
- return;
- }
-
- showViewer(part, lineSelection);
+ if(part == this){
+ return;
+ }
+ if(selection instanceof IStructuredSelection){
+ showViewer(part, (IStructuredSelection) selection);
+ }
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#showViewer(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
- */
/** {@inheritDoc} */
@Override
public void showViewer(IWorkbenchPart part, IStructuredSelection selection) {
// this.part = part;
- updateReferencingObjects(((IdentifiableEntity) selection.getFirstElement()).getUuid(),selection.getFirstElement().getClass() );
+ Object firstElement = selection.getFirstElement();
+ if(firstElement instanceof TreeNode){
+ firstElement = ((TreeNode) firstElement).getValue();
+ }
+ if(firstElement instanceof IdentifiableEntity){
+ updateReferencingObjects(((IdentifiableEntity) firstElement).getUuid(),firstElement.getClass() );
+ }
+ else{
+ setContentDescription("");
+ }
}
/** {@inheritDoc} */
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#getViewer()
- */
/** {@inheritDoc} */
@Override
public Viewer getViewer() {
return viewer;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#dirtyStateChanged()
- */
/** {@inheritDoc} */
@Override
public void changed(Object object) {
// no editing in this view
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#onComplete()
- */
/** {@inheritDoc} */
@Override
public boolean onComplete() {
}
public void refresh(){
-
selectionService.removePostSelectionListener(this);
selectionService.removeSelectionListener(this);
selectionService.addPostSelectionListener(this);
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.12.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.12.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.12.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.12.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.12.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.12.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.12.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.12.4.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry exported="true" kind="lib" path="lib/activation-1.1.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/aspectjrt-1.7.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.7.1.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/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.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-js-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-xml-1.7.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.13.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.13.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.13.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.13.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.13.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.13.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.13.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-3.13.0-SNAPSHOT.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/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.8.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-csv-1.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.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.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.3.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/easymock-3.1.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.9.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/guava-r05.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.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/hibernate-c3p0-4.1.10.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-5.0.7.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-5.0.1.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-core-5.0.7.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-5.0.7.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-5.0.7.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-5.0.7.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.1-api-1.0.0.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-4.2.0.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-5.5.2.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-5.5.2.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-5.2.2.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-cdi-5.2.2.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/httpclient-cache-4.2.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.4.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-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.4.0.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/javassist-3.17.1-GA.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.7.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2-EA.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2-EA.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/jboss-logging-3.1.3.GA.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/joda-time-2.1.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/jtds-1.3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.5.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-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-facet-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-memory-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-misc-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-phonetic-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-queries-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-spatial-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/lucene-stempel-3.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.3.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.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.eclipse.equinox.common-3.6.0.v20110523.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>
<classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/p6spy-2.1.4.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-2.0.5.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.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.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.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/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-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-beans-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-context-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-context-support-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-core-3.2.2.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.RELEASE.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/spring-context-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-context-support-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-core-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-expression-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-jdbc-4.2.4.RELEASE.jar"/>
<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.3.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-orm-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-oxm-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-plugin-core-1.2.0.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-plugin-metadata-1.2.0.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-security-config-4.0.3.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-security-core-4.0.3.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-security-web-4.0.3.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-test-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-tx-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-web-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/spring-webmvc-4.2.4.RELEASE.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/springfox-core-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/springfox-schema-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/springfox-spi-2.3.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/springfox-spring-web-2.3.1.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.0.0.GA.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xalan-2.6.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.6.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xmlParserAPIs-2.6.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.6.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xom-1.2.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xstream-1.4.4.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xsom-20140925.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/xstream-1.4.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Bundle-ManifestVersion: 2
Bundle-Name: CDM Library Dependencies Plugin
Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Eclipse-BundleShape: dir
Export-Package: com.google.api,
com.google.api.detect,
eu.etaxonomy.cdm.strategy.merge,
eu.etaxonomy.cdm.strategy.parser,
eu.etaxonomy.cdm.strategy.parser.location,
+ eu.etaxonomy.cdm.test.integration,
eu.etaxonomy.cdm.validation,
eu.etaxonomy.cdm.validation.annotation,
eu.etaxonomy.cdm.validation.constraint,
org.w3c.dom,
org.xml.sax",
org.apache.lucene.index,
- org.apache.lucene.queryParser,
+ org.apache.lucene.queryparser.classic,
org.apache.lucene.util,
org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
org.apache.xerces.dom,
org.hibernate.persister.collection,
org.hibernate.persister.entity,
org.hibernate.pretty,
- org.hibernate.property,
org.hibernate.proxy,
org.hibernate.proxy.pojo.javassist,
org.hibernate.search,
org.springframework.security.core.context,
org.springframework.security.core.userdetails,
org.springframework.security.provisioning,
- org.springframework.security.remoting.httpinvoker,
org.springframework.stereotype,
org.springframework.transaction;uses:="org.springframework.core",
org.springframework.transaction.annotation;uses:="javax.ejb,org.springframework.transaction.interceptor",
lib/activation-1.1.1.jar,
lib/antlr-2.7.7.jar,
lib/aopalliance-1.0.jar,
- lib/aspectjrt-1.7.1.jar,
- lib/aspectjweaver-1.7.1.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.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-transcoder-1.7.jar,
lib/batik-util-1.7.jar,
lib/batik-xml-1.7.jar,
- lib/c3p0-0.9.2.jar,
- lib/cglib-nodep-2.2.2.jar,
+ lib/c3p0-0.9.5.2.jar,
+ lib/cdmlib-commons-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-io-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-model-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-print-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-services-3.13.0-SNAPSHOT.jar,
+ lib/cdmlib-test-3.13.0-SNAPSHOT.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/com.springsource.org.aopalliance-1.0.0.jar,
lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
- lib/commons-beanutils-1.8.3.jar,
- lib/commons-codec-20041127.091804.jar,
- lib/commons-collections-3.2.1.jar,
+ lib/commons-beanutils-1.9.2.jar,
+ lib/commons-codec-1.10.jar,
+ lib/commons-collections-3.2.2.jar,
+ lib/commons-csv-1.0.jar,
lib/commons-dbcp-1.4.jar,
lib/commons-io-2.4.jar,
lib/commons-lang-2.6.jar,
- lib/commons-logging-1.1.2.jar,
+ 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.3.jar,
- lib/doxia-logging-api-1.3.jar,
- lib/doxia-module-apt-1.3.jar,
- lib/doxia-module-xhtml-1.3.jar,
- lib/doxia-sink-api-1.3.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/easymock-3.1.jar,
+ lib/dtd-parser-1.1.jar,
+ lib/easymock-2.3.jar,
lib/easymockclassextension-2.3.jar,
- lib/ehcache-core-2.6.9.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/guava-r05.jar,
- lib/h2-1.3.170.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,
- lib/hibernate-c3p0-4.1.10.Final.jar,
+ lib/hibernate-c3p0-5.0.7.Final.jar,
lib/hibernate-cglib-repack-2.1_3.jar,
- lib/hibernate-commons-annotations-4.0.1.Final.jar,
- lib/hibernate-core-4.1.10.Final.jar,
- lib/hibernate-ehcache-4.1.10.Final.jar,
- lib/hibernate-entitymanager-4.1.10.Final.jar,
- lib/hibernate-envers-4.1.10.Final.jar,
- lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,
+ lib/hibernate-commons-annotations-5.0.1.Final.jar,
+ lib/hibernate-core-5.0.7.Final.jar,
+ lib/hibernate-ehcache-5.0.7.Final.jar,
+ lib/hibernate-entitymanager-5.0.7.Final.jar,
+ lib/hibernate-envers-5.0.7.Final.jar,
+ lib/hibernate-jpa-2.1-api-1.0.0.Final.jar,
lib/hibernate-search-4.2.0.Final.jar,
lib/hibernate-search-analyzers-4.2.0.Final.jar,
- lib/hibernate-search-engine-4.2.0.Final.jar,
- lib/hibernate-search-orm-4.2.0.Final.jar,
- lib/hibernate-validator-4.3.1.Final.jar,
- lib/hsqldb-1.8.0.10.jar,
- lib/httpclient-4.2.3.jar,
- lib/httpcore-4.2.4.jar,
+ lib/hibernate-search-engine-5.5.2.Final.jar,
+ lib/hibernate-search-orm-5.5.2.Final.jar,
+ lib/hibernate-validator-5.2.2.Final.jar,
+ lib/hibernate-validator-cdi-5.2.2.Final.jar,
+ lib/hsqldb-2.3.3.jar,
+ lib/httpclient-4.5.1.jar,
+ lib/httpclient-cache-4.2.6.jar,
+ lib/httpcore-4.4.4.jar,
+ lib/httpmime-4.5.1.jar,
lib/icu4j-2.6.1.jar,
- lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
- lib/identificationKeyAPI-1.0-SNAPSHOT.jar,
- lib/itextpdf-5.4.0.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/jackson-databind-2.6.5.jar,
lib/jackson-mapper-asl-1.8.8.jar,
lib/jakarta-regexp-1.4.jar,
- lib/javassist-3.17.1-GA.jar,
- lib/jaxb-api-2.2.7.jar,
- lib/jaxb-impl-2.2-EA.jar,
- lib/jaxb-xjc-2.2-EA.jar,
+ lib/jandex-2.0.0.Final.jar,
+ lib/javassist-3.20.0-GA.jar,
+ lib/javax.el-2.2.6.jar,
+ lib/javax.el-api-2.2.5.jar,
+ lib/javax.servlet-api-3.1.0.jar,
+ lib/jaxb-api-2.2.12.jar,
+ lib/jaxb-core-2.2.11.jar,
+ lib/jaxb-jxc-2.2.11.jar,
+ lib/jaxb-runtime-2.2.11.jar,
+ lib/jaxb-xjc-2.2.11.jar,
lib/jaxb1-impl-2.2-EA.jar,
lib/jaxen-1.1.4.jar,
- lib/jboss-logging-3.1.3.GA.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/joda-time-2.1.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/jtds-1.3.0.jar,
- lib/junit-4.11.jar,
- lib/junit-benchmarks-0.5.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/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-3.6.2.jar,
- lib/lucene-core-3.6.2.jar,
- lib/lucene-facet-3.6.2.jar,
- lib/lucene-grouping-3.6.2.jar,
- lib/lucene-highlighter-3.6.2.jar,
- lib/lucene-kuromoji-3.6.2.jar,
- lib/lucene-memory-3.6.2.jar,
- lib/lucene-misc-3.6.2.jar,
- lib/lucene-phonetic-3.6.2.jar,
- lib/lucene-queries-3.6.2.jar,
- lib/lucene-smartcn-3.6.2.jar,
- lib/lucene-spatial-3.6.2.jar,
- lib/lucene-spellchecker-3.6.2.jar,
- lib/lucene-stempel-3.6.2.jar,
- lib/mchange-commons-java-0.2.3.3.jar,
- lib/mysql-connector-java-5.1.24.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,
lib/objenesis-1.2.jar,
+ 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.eclipse.equinox.common-3.6.0.v20110523.jar,
- lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar,
lib/org.osgi.core-1.0.0.jar,
- lib/org.springframework.aop-3.2.2.RELEASE.jar,
- lib/org.springframework.aspects-3.2.2.RELEASE.jar,
- lib/org.springframework.beans-3.2.2.RELEASE.jar,
- lib/org.springframework.context-3.2.2.RELEASE.jar,
- lib/org.springframework.core-3.2.2.RELEASE.jar,
- lib/org.springframework.expression-3.2.2.RELEASE.jar,
- lib/org.springframework.jdbc-3.2.2.RELEASE.jar,
- lib/org.springframework.orm-3.2.2.RELEASE.jar,
- lib/org.springframework.oxm-3.2.2.RELEASE.jar,
- lib/org.springframework.test-3.2.2.RELEASE.jar,
- lib/org.springframework.transaction-3.2.2.RELEASE.jar,
- lib/org.springframework.web-3.2.2.RELEASE.jar,
- lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,
lib/osgi-3.6.0.jar,
- lib/p6spy-1.3.jar,
+ lib/p6spy-2.1.4.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-2.0.5.jar,
- lib/postgresql-9.1-901.jdbc4.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.2.jar,
- lib/slf4j-log4j12-1.7.2.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-3.2.2.RELEASE.jar,
- lib/spring-beans-3.2.2.RELEASE.jar,
- lib/spring-context-3.2.2.RELEASE.jar,
- lib/spring-context-support-3.2.2.RELEASE.jar,
- lib/spring-core-3.2.2.RELEASE.jar,
- lib/spring-expression-3.2.2.RELEASE.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-security-config-3.1.3.RELEASE.jar,
- lib/spring-security-core-3.1.3.RELEASE.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,
+ lib/unitils-dbunit-3.4.2.jar,
+ lib/unitils-easymock-3.4.2.jar,
+ lib/unitils-inject-3.4.2.jar,
+ 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.0.0.GA.jar,
- lib/wsdl4j-1.6.2.jar,
- lib/xalan-2.6.0.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/xmlParserAPIs-2.6.2.jar,
lib/xmlpull-1.1.3.1.jar,
- lib/xmlunit-1.4.jar,
- lib/xom-1.0.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/xstream-1.4.4.jar,
- lib/yjp-controller-api-redist-9.0.8.jar,
- lib/google-api-translate-java-0.92.jar,
- lib/odfdom-0.8.jar,
- lib/h2mig_pagestore_addon.jar,
- lib/spring-security-remoting-3.1.3.RELEASE.jar,
- lib/jena-core-2.11.2.jar,
- lib/jena-iri-1.0.2.jar,
- lib/poi-3.10-FINAL.jar,
- lib/poi-ooxml-3.10-FINAL.jar,
- lib/xmlbeans-2.3.0.jar,
- lib/poi-ooxml-schemas-3.10-FINAL.jar,
- lib/swagger-annotations-1.3.5.jar,
- lib/apache-log4j-extras-1.2.17.jar,
- lib/cdmlib-commons-3.12.4.jar,
- lib/cdmlib-ext-3.12.4.jar,
- lib/cdmlib-io-3.12.4.jar,
- lib/cdmlib-model-3.12.4.jar,
- lib/cdmlib-persistence-3.12.4.jar,
- lib/cdmlib-print-3.12.4.jar,
- lib/cdmlib-remote-3.12.4.jar,
- lib/cdmlib-services-3.12.4.jar
+ lib/xsom-20140925.jar,
+ lib/xstream-1.4.8.jar,
+ lib/yjp-controller-api-redist-9.0.8.jar
Import-Package: eu.etaxonomy.cdm.api.application
-bin.includes = META-INF/,\\r
- .,\\r
- lib/activation-1.1.1.jar,\\r
- lib/antlr-2.7.7.jar,\\r
- lib/aopalliance-1.0.jar,\\r
- lib/aspectjrt-1.7.1.jar,\\r
- lib/aspectjweaver-1.7.1.jar,\\r
- lib/avro-1.6.3.jar,\\r
- lib/batik-anim-1.7.jar,\\r
- lib/batik-awt-util-1.7.jar,\\r
- lib/batik-bridge-1.7.jar,\\r
- lib/batik-css-1.7.jar,\\r
- lib/batik-dom-1.7.jar,\\r
- lib/batik-ext-1.7.jar,\\r
- lib/batik-extension-1.7.jar,\\r
- lib/batik-gvt-1.7.jar,\\r
- lib/batik-js-1.7.jar,\\r
- lib/batik-parser-1.7.jar,\\r
- lib/batik-script-1.7.jar,\\r
- lib/batik-svg-dom-1.7.jar,\\r
- lib/batik-svggen-1.7.jar,\\r
- lib/batik-transcoder-1.7.jar,\\r
- lib/batik-util-1.7.jar,\\r
- lib/batik-xml-1.7.jar,\\r
- lib/c3p0-0.9.2.jar,\\r
- lib/cglib-nodep-2.2.2.jar,\\r
- lib/com.springsource.org.aopalliance-1.0.0.jar,\\r
- lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\\r
- lib/commons-beanutils-1.8.3.jar,\\r
- lib/commons-codec-20041127.091804.jar,\\r
- lib/commons-collections-3.2.1.jar,\\r
- lib/commons-dbcp-1.4.jar,\\r
- lib/commons-io-2.4.jar,\\r
- lib/commons-lang-2.6.jar,\\r
- lib/commons-logging-1.1.2.jar,\\r
- lib/commons-pool-1.5.4.jar,\\r
- lib/concurrent-1.3.4.jar,\\r
- lib/dbunit-2.4.9.jar,\\r
- lib/dom4j-1.6.1.jar,\\r
- lib/doxia-core-1.3.jar,\\r
- lib/doxia-logging-api-1.3.jar,\\r
- lib/doxia-module-apt-1.3.jar,\\r
- lib/doxia-module-xhtml-1.3.jar,\\r
- lib/doxia-sink-api-1.3.jar,\\r
- lib/dozer-5.3.0.jar,\\r
- lib/easymock-3.1.jar,\\r
- lib/easymockclassextension-2.3.jar,\\r
- lib/ehcache-core-2.6.9.jar,\\r
- lib/ezmorph-1.0.6.jar,\\r
- lib/fop-1.1.jar,\\r
- lib/guava-r05.jar,\\r
- lib/h2-1.3.170.jar,\\r
- lib/hamcrest-core-1.3.jar,\\r
- lib/hibernate-c3p0-4.1.10.Final.jar,\\r
- lib/hibernate-cglib-repack-2.1_3.jar,\\r
- lib/hibernate-commons-annotations-4.0.1.Final.jar,\\r
- lib/hibernate-core-4.1.10.Final.jar,\\r
- lib/hibernate-ehcache-4.1.10.Final.jar,\\r
- lib/hibernate-entitymanager-4.1.10.Final.jar,\\r
- lib/hibernate-envers-4.1.10.Final.jar,\\r
- lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,\\r
- lib/hibernate-search-4.2.0.Final.jar,\\r
- lib/hibernate-search-analyzers-4.2.0.Final.jar,\\r
- lib/hibernate-search-engine-4.2.0.Final.jar,\\r
- lib/hibernate-search-orm-4.2.0.Final.jar,\\r
- lib/hibernate-validator-4.3.1.Final.jar,\\r
- lib/hsqldb-1.8.0.10.jar,\\r
- lib/httpclient-4.2.3.jar,\\r
- lib/httpcore-4.2.4.jar,\\r
- lib/icu4j-2.6.1.jar,\\r
- lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,\\r
- lib/identificationKeyAPI-1.0-SNAPSHOT.jar,\\r
- lib/itextpdf-5.4.0.jar,\\r
- lib/jackson-core-asl-1.8.8.jar,\\r
- lib/jackson-mapper-asl-1.8.8.jar,\\r
- lib/jakarta-regexp-1.4.jar,\\r
- lib/javassist-3.17.1-GA.jar,\\r
- lib/jaxb-api-2.2.7.jar,\\r
- lib/jaxb-impl-2.2-EA.jar,\\r
- lib/jaxb-xjc-2.2-EA.jar,\\r
- lib/jaxb1-impl-2.2-EA.jar,\\r
- lib/jaxen-1.1.4.jar,\\r
- lib/jboss-logging-3.1.3.GA.jar,\\r
- lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,\\r
- lib/jdbc4-2.0.jar,\\r
- lib/jdom-1.1.3.jar,\\r
- lib/joda-time-2.1.jar,\\r
- lib/json-lib-2.4-jdk15.jar,\\r
- lib/jsr250-api-1.0.jar,\\r
- lib/jtds-1.3.0.jar,\\r
- lib/junit-4.11.jar,\\r
- lib/junit-benchmarks-0.5.0.jar,\\r
- lib/log4j-1.2.17.jar,\\r
- lib/lsid-client-1.1.2.jar,\\r
- lib/lsid-server-1.1.2.jar,\\r
- lib/lucene-analyzers-3.6.2.jar,\\r
- lib/lucene-core-3.6.2.jar,\\r
- lib/lucene-facet-3.6.2.jar,\\r
- lib/lucene-grouping-3.6.2.jar,\\r
- lib/lucene-highlighter-3.6.2.jar,\\r
- lib/lucene-kuromoji-3.6.2.jar,\\r
- lib/lucene-memory-3.6.2.jar,\\r
- lib/lucene-misc-3.6.2.jar,\\r
- lib/lucene-phonetic-3.6.2.jar,\\r
- lib/lucene-queries-3.6.2.jar,\\r
- lib/lucene-smartcn-3.6.2.jar,\\r
- lib/lucene-spatial-3.6.2.jar,\\r
- lib/lucene-spellchecker-3.6.2.jar,\\r
- lib/lucene-stempel-3.6.2.jar,\\r
- lib/mchange-commons-java-0.2.3.3.jar,\\r
- lib/mysql-connector-java-5.1.24.jar,\\r
- lib/objenesis-1.2.jar,\\r
- lib/odfdom-java-0.8.7.jar,\\r
- lib/ognl-2.6.9.jar,\\r
- lib/opencsv-2.3.jar,\\r
- lib/org.eclipse.equinox.common-3.6.0.v20110523.jar,\\r
- lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar,\\r
- lib/org.osgi.core-1.0.0.jar,\\r
- lib/org.springframework.aop-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.aspects-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.beans-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.context-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.core-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.expression-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.jdbc-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.orm-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.oxm-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.test-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.transaction-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.web-3.2.2.RELEASE.jar,\\r
- lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,\\r
- lib/osgi-3.6.0.jar,\\r
- lib/p6spy-1.3.jar,\\r
- lib/paranamer-2.3.jar,\\r
- lib/plexus-classworlds-1.2-alpha-9.jar,\\r
- lib/plexus-container-default-1.0-alpha-30.jar,\\r
- lib/plexus-utils-2.0.5.jar,\\r
- lib/postgresql-9.1-901.jdbc4.jar,\\r
- lib/sanselan-0.97-incubator.jar,\\r
- lib/servlet-api-2.5.jar,\\r
- lib/slf4j-api-1.7.2.jar,\\r
- lib/slf4j-log4j12-1.7.2.jar,\\r
- lib/snappy-java-1.0.4.1.jar,\\r
- lib/solr-analysis-extras-3.6.2.jar,\\r
- lib/solr-core-3.6.2.jar,\\r
- lib/solr-solrj-3.6.2.jar,\\r
- lib/spring-aop-3.2.2.RELEASE.jar,\\r
- lib/spring-beans-3.2.2.RELEASE.jar,\\r
- lib/spring-context-3.2.2.RELEASE.jar,\\r
- lib/spring-context-support-3.2.2.RELEASE.jar,\\r
- lib/spring-core-3.2.2.RELEASE.jar,\\r
- lib/spring-expression-3.2.2.RELEASE.jar,\\r
- lib/spring-modules-cache-0.7.jar,\\r
- lib/spring-security-config-3.1.3.RELEASE.jar,\\r
- lib/spring-security-core-3.1.3.RELEASE.jar,\\r
- lib/stax-1.2.0.jar,\\r
- lib/stax-api-1.0.1.jar,\\r
- lib/usertype.jodatime-2.0.1.jar,\\r
- lib/usertype.spi-2.0.1.jar,\\r
- lib/validation-api-1.0.0.GA.jar,\\r
- lib/wsdl4j-1.6.2.jar,\\r
- lib/xalan-2.6.0.jar,\\r
- lib/xercesImpl-2.11.0.jar,\\r
- lib/xml-apis-1.0.b2.jar,\\r
- lib/xml-apis-ext-1.3.04.jar,\\r
- lib/xml-resolver-1.2.jar,\\r
- lib/xmlgraphics-commons-1.5.jar,\\r
- lib/xmlParserAPIs-2.6.2.jar,\\r
- lib/xmlpull-1.1.3.1.jar,\\r
- lib/xmlunit-1.4.jar,\\r
- lib/xom-1.0.jar,\\r
- lib/xpp3_min-1.1.4c.jar,\\r
- lib/xpp3-1.1.4c.jar,\\r
- lib/xstream-1.4.4.jar,\\r
- lib/yjp-controller-api-redist-9.0.8.jar,\\r
- lib/google-api-translate-java-0.92.jar,\\r
- lib/odfdom-0.8.jar,\\r
- lib/h2mig_pagestore_addon.jar,\\r
- lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
- lib/spring-security-remoting-3.1.3.RELEASE.jar,\\r
- lib/jena-core-2.11.2.jar,\\r
- lib/jena-iri-1.0.2.jar,\\r
- lib/poi-3.10-FINAL.jar,\\r
- lib/poi-ooxml-3.10-FINAL.jar,\\r
- lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
- lib/xmlbeans-2.3.0.jar,\\r
- lib/swagger-annotations-1.3.5.jar,\\r
- lib/apache-log4j-extras-1.2.17.jar,\\r
- resources/cdm.map.ser,\\r
- lib/cdmlib-commons-3.12.4.jar,\\r
- lib/cdmlib-ext-3.12.4.jar,\\r
- lib/cdmlib-io-3.12.4.jar,\\r
- lib/cdmlib-model-3.12.4.jar,\\r
- lib/cdmlib-persistence-3.12.4.jar,\\r
- lib/cdmlib-print-3.12.4.jar,\\r
- lib/cdmlib-remote-3.12.4.jar,\\r
- lib/cdmlib-services-3.12.4.jar\r
-\r
-jars.compile.order = .\r
-output.. = bin/\r
-source.. = src/main/java/,\\r
- src/main/resources/\r
-src.includes = src/\r
-\r
+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-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-ext-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-io-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-model-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-persistence-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-print-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-remote-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-services-3.13.0-SNAPSHOT.jar,\
+ lib/cdmlib-test-3.13.0-SNAPSHOT.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/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,\
+ lib/commons-codec-1.10.jar,\
+ lib/commons-collections-3.2.2.jar,\
+ lib/commons-csv-1.0.jar,\
+ lib/commons-dbcp-1.4.jar,\
+ lib/commons-io-2.4.jar,\
+ lib/commons-lang-2.6.jar,\
+ 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,\
+ lib/hibernate-c3p0-5.0.7.Final.jar,\
+ lib/hibernate-cglib-repack-2.1_3.jar,\
+ lib/hibernate-commons-annotations-5.0.1.Final.jar,\
+ lib/hibernate-core-5.0.7.Final.jar,\
+ lib/hibernate-ehcache-5.0.7.Final.jar,\
+ lib/hibernate-entitymanager-5.0.7.Final.jar,\
+ lib/hibernate-envers-5.0.7.Final.jar,\
+ lib/hibernate-jpa-2.1-api-1.0.0.Final.jar,\
+ lib/hibernate-search-4.2.0.Final.jar,\
+ lib/hibernate-search-analyzers-4.2.0.Final.jar,\
+ lib/hibernate-search-engine-5.5.2.Final.jar,\
+ lib/hibernate-search-orm-5.5.2.Final.jar,\
+ lib/hibernate-validator-5.2.2.Final.jar,\
+ lib/hibernate-validator-cdi-5.2.2.Final.jar,\
+ lib/hsqldb-2.3.3.jar,\
+ lib/httpclient-4.5.1.jar,\
+ lib/httpclient-cache-4.2.6.jar,\
+ lib/httpcore-4.4.4.jar,\
+ 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/jackson-databind-2.6.5.jar,\
+ lib/jackson-mapper-asl-1.8.8.jar,\
+ lib/jakarta-regexp-1.4.jar,\
+ lib/jandex-2.0.0.Final.jar,\
+ lib/javassist-3.20.0-GA.jar,\
+ lib/javax.el-2.2.6.jar,\
+ lib/javax.el-api-2.2.5.jar,\
+ lib/javax.servlet-api-3.1.0.jar,\
+ lib/jaxb-api-2.2.12.jar,\
+ lib/jaxb-core-2.2.11.jar,\
+ lib/jaxb-jxc-2.2.11.jar,\
+ lib/jaxb-runtime-2.2.11.jar,\
+ lib/jaxb-xjc-2.2.11.jar,\
+ 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/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,\
+ lib/objenesis-1.2.jar,\
+ 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/p6spy-2.1.4.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,\
+ lib/unitils-dbunit-3.4.2.jar,\
+ lib/unitils-easymock-3.4.2.jar,\
+ lib/unitils-inject-3.4.2.jar,\
+ 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
+
+jars.compile.order = .
+output.. = bin/
+source.. = src/main/java/,\
+ src/main/resources/
+src.includes = src/
+
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ version="2.0">
+
+ <description>JSTL 1.1 XML library</description>
+ <display-name>JSTL XML</display-name>
+ <tlib-version>1.1</tlib-version>
+ <short-name>x</short-name>
+ <uri>http://java.sun.com/jsp/jstl/xml</uri>
+
+ <validator>
+ <description>
+ Provides validation features for JSTL XML tags.
+ </description>
+ <validator-class>
+ org.apache.taglibs.standard.tlv.JstlXmlTLV
+ </validator-class>
+ </validator>
+
+ <tag>
+ <description>
+ Simple conditional tag that establishes a context for
+ mutually exclusive conditional operations, marked by
+ <when> and <otherwise>
+ </description>
+ <name>choose</name>
+ <tag-class>org.apache.taglibs.standard.tag.common.core.ChooseTag</tag-class>
+ <body-content>JSP</body-content>
+ </tag>
+
+ <tag>
+ <description>
+ Like <%= ... >, but for XPath expressions.
+ </description>
+ <name>out</name>
+ <tag-class>org.apache.taglibs.standard.tag.rt.xml.ExprTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description>
+XPath expression to be evaluated.
+ </description>
+ <name>select</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Determines whether characters <,>,&,'," in the
+resulting string should be converted to their
+corresponding character entity codes. Default
+value is true.
+ </description>
+ <name>escapeXml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ XML conditional tag, which evalutes its body if the
+ supplied XPath expression evalutes to 'true' as a boolean
+ </description>
+ <name>if</name>
+ <tag-class>org.apache.taglibs.standard.tag.common.xml.IfTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description>
+The test condition that tells whether or not the
+body content should be processed.
+ </description>
+ <name>select</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Name of the exported scoped variable for the
+resulting value of the test condition. The type
+of the scoped variable is Boolean.
+ </description>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Scope for var.
+ </description>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ XML iteration tag.
+ </description>
+ <name>forEach</name>
+ <tag-class>org.apache.taglibs.standard.tag.common.xml.ForEachTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description>
+Name of the exported scoped variable for the
+current item of the iteration. This scoped variable
+has nested visibility. Its type depends on the
+result of the XPath expression in the select
+attribute.
+ </description>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+XPath expression to be evaluated.
+ </description>
+ <name>select</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Iteration begins at the item located at the
+specified index. First item of the collection has
+index 0.
+ </description>
+ <name>begin</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>int</type>
+ </attribute>
+ <attribute>
+ <description>
+Iteration ends at the item located at the specified
+index (inclusive).
+ </description>
+ <name>end</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>int</type>
+ </attribute>
+ <attribute>
+ <description>
+Iteration will only process every step items of
+the collection, starting with the first one.
+ </description>
+ <name>step</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <type>int</type>
+ </attribute>
+ <attribute>
+ <description>
+Name of the exported scoped variable for the
+status of the iteration. Object exported is of type
+javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility.
+ </description>
+ <name>varStatus</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ Subtag of <choose> that follows <when> tags
+ and runs only if all of the prior conditions evaluated to
+ 'false'
+ </description>
+ <name>otherwise</name>
+ <tag-class>org.apache.taglibs.standard.tag.common.core.OtherwiseTag</tag-class>
+ <body-content>JSP</body-content>
+ </tag>
+
+ <tag>
+ <description>
+ Adds a parameter to a containing 'transform' tag's Transformer
+ </description>
+ <name>param</name>
+ <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParamTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description>
+Name of the transformation parameter.
+ </description>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Value of the parameter.
+ </description>
+ <name>value</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ Parses XML content from 'source' attribute or 'body'
+ </description>
+ <name>parse</name>
+ <tag-class>org.apache.taglibs.standard.tag.rt.xml.ParseTag</tag-class>
+ <tei-class>org.apache.taglibs.standard.tei.XmlParseTEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description>
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is implementation
+dependent.
+ </description>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Name of the exported scoped variable for
+the parsed XML document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+ </description>
+ <name>varDom</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Scope for var.
+ </description>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Scope for varDom.
+ </description>
+ <name>scopeDom</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Deprecated. Use attribute 'doc' instead.
+ </description>
+ <name>xml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Source XML document to be parsed.
+ </description>
+ <name>doc</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+The system identifier (URI) for parsing the
+XML document.
+ </description>
+ <name>systemId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Filter to be applied to the source
+document.
+ </description>
+ <name>filter</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ Saves the result of an XPath expression evaluation in a 'scope'
+ </description>
+ <name>set</name>
+ <tag-class>org.apache.taglibs.standard.tag.common.xml.SetTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <description>
+Name of the exported scoped variable to hold
+the value specified in the action. The type of the
+scoped variable is whatever type the select
+expression evaluates to.
+ </description>
+ <name>var</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+XPath expression to be evaluated.
+ </description>
+ <name>select</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Scope for var.
+ </description>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ Conducts a transformation given a source XML document
+ and an XSLT stylesheet
+ </description>
+ <name>transform</name>
+ <tag-class>org.apache.taglibs.standard.tag.rt.xml.TransformTag</tag-class>
+ <tei-class>org.apache.taglibs.standard.tei.XmlTransformTEI</tei-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description>
+Name of the exported
+scoped variable for the
+transformed XML
+document. The type of the
+scoped variable is
+org.w3c.dom.Document.
+ </description>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Scope for var.
+ </description>
+ <name>scope</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Result
+Object that captures or
+processes the transformation
+result.
+ </description>
+ <name>result</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Deprecated. Use attribute
+'doc' instead.
+ </description>
+ <name>xml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Source XML document to be
+transformed. (If exported by
+<x:set>, it must correspond
+to a well-formed XML
+document, not a partial
+document.)
+ </description>
+ <name>doc</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+Deprecated. Use attribute
+'docSystemId' instead.
+ </description>
+ <name>xmlSystemId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+The system identifier (URI)
+for parsing the XML
+document.
+ </description>
+ <name>docSystemId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+javax.xml.transform.Source
+Transformation stylesheet as
+a String, Reader, or
+Source object.
+ </description>
+ <name>xslt</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <description>
+The system identifier (URI)
+for parsing the XSLT
+stylesheet.
+ </description>
+ <name>xsltSystemId</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <description>
+ Subtag of <choose> that includes its body if its
+ expression evalutes to 'true'
+ </description>
+ <name>when</name>
+ <tag-class>org.apache.taglibs.standard.tag.common.xml.WhenTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <description>
+The test condition that tells whether or
+not the body content should be
+processed
+ </description>
+ <name>select</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+</taglib>
<parent>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>taxeditor-parent</artifactId>\r
- <version>3.12.4</version>\r
+ <version>3.13.0-SNAPSHOT</version>\r
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
cdmlib-remote-webapp\r
</excludeArtifactIds>\r
<includeArtifactIds>\r
- cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote\r
+ cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdmlib-test\r
</includeArtifactIds>\r
<outputDirectory>${basedir}/lib</outputDirectory>\r
<overWriteReleases>true</overWriteReleases>\r
</id>\r
<url>http://repository.springsource.com/maven/bundles/external\r
</url>\r
+ </repository>\r
+ <repository>\r
+ <id>repository.springsource.release</id>\r
+ <name>SpringSource GA Repository</name>\r
+ <url>http://repo.springsource.org/release</url>\r
</repository>\r
</repositories>\r
<dependencies>\r
<artifactId>cdmlib-ext</artifactId>\r
<version>${cdmlib.version}</version>\r
</dependency>\r
+ <dependency>\r
+ <groupId>eu.etaxonomy</groupId>\r
+ <artifactId>cdmlib-test</artifactId>\r
+ <version>${cdmlib.version}</version>\r
+ </dependency>\r
\r
<!-- <dependency> -->\r
<!-- <groupId>org.eclipse.jetty</groupId> -->\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.context</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
- </dependency>\r
- <dependency>\r
- <groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.context.support</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
+ <artifactId>spring-context</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.aspects</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
+ <artifactId>spring-context-support</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.test</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
+ <artifactId>spring-aspects</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.beans</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
+ <artifactId>spring-test</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.transaction</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
+ <artifactId>spring-beans</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.web</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
+ <artifactId>spring-tx</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
</dependency>\r
<dependency>\r
- <groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.core</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
- </dependency>\r
+ <groupId>org.springframework</groupId>\r
+ <artifactId>spring-web</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
+ </dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.aop</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
+ <artifactId>spring-core</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.expression</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
+ <artifactId>spring-aop</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
</dependency>\r
<dependency>\r
- <groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.orm</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
- </dependency>\r
+ <groupId>org.springframework</groupId>\r
+ <artifactId>spring-expression</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.springframework</groupId>\r
+ <artifactId>spring-orm</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
+ </dependency>\r
<dependency>\r
- <groupId>org.springframework</groupId>\r
- <artifactId>org.springframework.jdbc</artifactId>\r
- <version>3.2.2.RELEASE</version>\r
- </dependency>\r
+ <groupId>org.springframework</groupId>\r
+ <artifactId>spring-jdbc</artifactId>\r
+ <version>4.2.4.RELEASE</version>\r
+ </dependency>\r
<dependency>\r
<groupId>org.springframework.security</groupId>\r
<artifactId>spring-security-core</artifactId>\r
- <version>3.1.3.RELEASE</version>\r
+ <version>4.0.3.RELEASE</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework.security</groupId>\r
<artifactId>spring-security-config</artifactId>\r
- <version>3.1.3.RELEASE</version>\r
+ <version>4.0.3.RELEASE</version>\r
</dependency>\r
<dependency>\r
<groupId>org.springframework.security</groupId>\r
<artifactId>spring-security-remoting</artifactId>\r
- <version>3.1.3.RELEASE</version>\r
+ <version>4.0.3.RELEASE</version>\r
</dependency>\r
<dependency>\r
<groupId>org.jboss.logging</groupId>\r
import org.springframework.beans.BeansException;\r
import org.springframework.context.ApplicationContext;\r
import org.springframework.context.ApplicationContextAware;\r
-import org.springframework.remoting.httpinvoker.CommonsHttpInvokerRequestExecutor;\r
+import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor;\r
import org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean;\r
import org.springframework.security.access.AccessDecisionVoter;\r
import org.springframework.security.authentication.AuthenticationProvider;\r
this.remoteSource = remoteSource;\r
}\r
\r
- private Object getService(Class<?> clazz, String serviceSuffix, CommonsHttpInvokerRequestExecutor executor) {\r
+ private Object getService(Class<?> clazz, String serviceSuffix, HttpComponentsHttpInvokerRequestExecutor executor) {\r
if(serviceMap.containsKey(clazz)) {\r
return serviceMap.get(clazz);\r
}\r
public static Object getService(Class<?> clazz,\r
String serviceSuffix,\r
ICdmRemoteSource remoteSource,\r
- CommonsHttpInvokerRequestExecutor executor) {\r
+ HttpComponentsHttpInvokerRequestExecutor executor) {\r
\r
String baseUrl;\r
if(remoteSource.getContextPath() == null || remoteSource.getContextPath().equals("")) {\r
\r
\r
public static IUserService getUserService(ICdmRemoteSource remoteSource) {\r
- return (IUserService) getService(IUserService.class, "/remoting-public/user.service", remoteSource, new CommonsHttpInvokerRequestExecutor());\r
+ return (IUserService) getService(IUserService.class, "/remoting-public/user.service", remoteSource, new HttpComponentsHttpInvokerRequestExecutor());\r
}\r
\r
@Override\r
public IMetadataService getMetadataService() {\r
- return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", new CommonsHttpInvokerRequestExecutor());\r
+ return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", new HttpComponentsHttpInvokerRequestExecutor());\r
}\r
\r
public static IMetadataService getMetadataService(ICdmRemoteSource remoteSource) {\r
- return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", remoteSource, new CommonsHttpInvokerRequestExecutor());\r
+ return (IMetadataService) getService(IMetadataService.class, "/remoting-public/metadata.service", remoteSource, new HttpComponentsHttpInvokerRequestExecutor());\r
}\r
\r
@Override\r
if(cdmPermissionEvaluator != null) {\r
return cdmPermissionEvaluator;\r
}\r
- List<AccessDecisionVoter> decisionVoters = new ArrayList<AccessDecisionVoter>();\r
+ List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<AccessDecisionVoter<? extends Object>>();\r
decisionVoters.add(new GrantAlwaysVoter());\r
decisionVoters.add(new TaxonNodeVoter());\r
decisionVoters.add(new TaxonBaseVoter());\r
/**
* Class which uses CDM services to cache cdm entities
*
- * FIXME: Currently only handles terms entities. It would be
+ * FIXME: Currently only handles term entities. It would be
* interesting to have a generic method which finds the
* correct service to load / cache the entity.
*
return load(term);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.model.ICdmCacher#isCachable(eu.etaxonomy.cdm.model.common.CdmBase)
- */
@Override
public boolean isCachable(CdmBase cdmEntity) {
// if(cdmEntity != null && cdmEntity instanceof DefinedTermBase) {
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
-import org.hibernate.property.Getter;
+import org.hibernate.metadata.ClassMetadata;
+import org.hibernate.property.access.spi.Getter;
import org.osgi.framework.Bundle;
+import org.hibernate.boot.Metadata;
+
public class CdmModelCacher {
public Map<String, CdmModelFieldPropertyFromClass> generateModelClassMap() {
-
- Configuration configuration = buildConfiguration(HB_CONFIG_FILE_PATH);
- Iterator<PersistentClass> classMappingIterator = configuration.getClassMappings();
-
- Map<String, CdmModelFieldPropertyFromClass> modelClassMap = new HashMap<String, CdmModelFieldPropertyFromClass>();
-
- while(classMappingIterator.hasNext()) {
- PersistentClass persistentClass = classMappingIterator.next();
- Class mappedClass = persistentClass.getMappedClass();
- String mappedClassName = mappedClass.getName();
-
- CdmModelFieldPropertyFromClass cmgmfc = new CdmModelFieldPropertyFromClass(mappedClassName);
- System.out.println("Adding class : " + mappedClassName + " to cache");
- addGetters(persistentClass, cmgmfc);
- modelClassMap.put(mappedClassName, cmgmfc);
- }
+
+ // A SessionFactory is set up once for an application!
+ final StandardServiceRegistry registry = new StandardServiceRegistryBuilder()
+ .configure(HB_CONFIG_FILE_PATH) // configures settings from hibernate.cfg.xml
+ .build();
+ SessionFactory sessionFactory = null;
+ Map<String, CdmModelFieldPropertyFromClass> modelClassMap = new HashMap<String, CdmModelFieldPropertyFromClass>();
+ try {
+ sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory();
+ Configuration configuration = buildConfiguration(HB_CONFIG_FILE_PATH);
+ Map<String, ClassMetadata> classMetaDataMap = sessionFactory.getAllClassMetadata();
+ Metadata metadata = new MetadataSources( registry ).getMetadataBuilder().applyImplicitNamingStrategy( ImplicitNamingStrategyJpaCompliantImpl.INSTANCE ).build();
+
+
+ for(ClassMetadata classMetaData :classMetaDataMap.values()) {
+ Class mappedClass = classMetaData.getMappedClass();
+
+ String mappedClassName = mappedClass.getName();
+
+ PersistentClass persistentClass =metadata.getEntityBinding(mappedClassName);
+ CdmModelFieldPropertyFromClass cmgmfc = new CdmModelFieldPropertyFromClass(mappedClassName);
+ System.out.println("Adding class : " + mappedClassName + " to cache");
+ addGetters(persistentClass, cmgmfc);
+ modelClassMap.put(mappedClassName, cmgmfc);
+ }
+ }
+ catch (Exception e) {
+ // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory
+ // so destroy it manually.
+ StandardServiceRegistryBuilder.destroy( registry );
+ }
+
+
return modelClassMap;
}
*/
package eu.etaxonomy.taxeditor.remoting.source;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.net.Socket;
import java.util.ArrayList;
import org.json.JSONException;
import org.json.JSONObject;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
+import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.config.CdmSourceException;
import eu.etaxonomy.cdm.database.CdmPersistentDataSource;
import eu.etaxonomy.cdm.database.ICdmDataSource;
public final static int NULL_PORT = -1;
public final static String NULL_PORT_STRING = "N/A";
+ private static final String CDM_REMOTE_SERVERS_CONFIG_FILE = "cdm_remote_servers.json";
+
private final String name;
private final String server;
private int port;
private final List<CdmInstanceInfo> instances;
- private static List<CdmServerInfo> cdmServerInfoList;
-
private String cdmlibServicesVersion = "";
private String cdmlibServicesLastModified = "";
private boolean ignoreCdmLibVersion = false;
- public CdmServerInfo(String name, String server, int port, String prefix, boolean ignoreCdmLibVersion) {
- this.name = name;
- this.server = server;
- this.port = port;
- this.prefix = prefix;
- this.ignoreCdmLibVersion = ignoreCdmLibVersion;
+ public CdmServerInfo(CdmServerInfoConfig parameterObject) {
+ this.name = parameterObject.getName();
+ this.server = parameterObject.getServer();
+ this.port = parameterObject.getPort();
+ this.prefix = parameterObject.getPrefix();
+ this.ignoreCdmLibVersion = parameterObject.isIgnoreCdmLibVersion();
instances = new ArrayList<CdmInstanceInfo>();
-
}
public static List<CdmServerInfo> getCdmServers() {
- if(cdmServerInfoList == null) {
- cdmServerInfoList = new ArrayList<CdmServerInfo>();
- cdmServerInfoList.add(new CdmServerInfo(NAME_PRODUCTION, SERVER_PRODUCTION, 80, "", false));
- //cdmServerInfoList.add(new CdmServerInfo(NAME_INTEGRATION, SERVER_INTEGRATION, 80, CDMSERVER_PREFIX));
- cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_1, SERVER_DEMO_1, 80, CDMSERVER_PREFIX, false));
- cdmServerInfoList.add(new CdmServerInfo(NAME_DEMO_2, SERVER_DEMO_2, 80, CDMSERVER_PREFIX, false));
- //cdmServerInfoList.add(new CdmServerInfo(NAME_TEST, SERVER_TEST, 80, CDMSERVER_PREFIX, false));
- cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, false));
- cdmServerInfoList.add(new CdmServerInfo(NAME_LOCALHOST_MGD, SERVER_LOCALHOST, NULL_PORT, CDMSERVER_PREFIX, false));
+ List<CdmServerInfoConfig> configList = loadFromConfigFile(new File(CdmUtils.perUserCdmFolder, CDM_REMOTE_SERVERS_CONFIG_FILE));
+ List<CdmServerInfo> serverInfoList = new ArrayList<CdmServerInfo>(configList.size());
+ for(CdmServerInfoConfig config : configList) {
+ serverInfoList.add(new CdmServerInfo(config));
}
- return cdmServerInfoList;
+ // The local host managed server must not be in the config file
+ CdmServerInfoConfig localHostManagedConfig = new CdmServerInfoConfig(NAME_LOCALHOST_MGD, SERVER_LOCALHOST, NULL_PORT, CDMSERVER_PREFIX, false);
+ serverInfoList.add(new CdmServerInfo(localHostManagedConfig));
+ return serverInfoList;
+ }
+
+
+ /**
+ * @param file
+ * @throws IOException
+ * @throws FileNotFoundException
+ * @throws JsonMappingException
+ * @throws JsonParseException
+ */
+ private static List<CdmServerInfoConfig> loadFromConfigFile(File file) {
+
+ List<CdmServerInfoConfig> serverList = null;
+
+ ObjectMapper mapper = new ObjectMapper();
+
+ if(!file.exists()) {
+ logger.info("The remote server config file '" + file.getAbsolutePath() +
+ "' does not yet exist, it will be created based on the defaults.");
+ try {
+ serverList = createDefaultServerConfigList();
+ mapper.writerWithDefaultPrettyPrinter().writeValue(new FileOutputStream(file), serverList);
+
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ try {
+ serverList = mapper.readValue(new FileInputStream(file), new TypeReference<List<CdmServerInfoConfig>>(){});
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ return serverList;
+
+
+ }
+
+
+ /**
+ *
+ */
+ private static List<CdmServerInfoConfig> createDefaultServerConfigList() {
+
+ List<CdmServerInfoConfig> serverInfoList = new ArrayList<CdmServerInfoConfig>();
+ // serverInfoList.add(new CdmServerInfoConfig(NAME_PRODUCTION, SERVER_PRODUCTION, 80, ""));
+ //serverInfoList.add(new CdmServerInfoConfig(NAME_INTEGRATION, SERVER_INTEGRATION, 80, CDMSERVER_PREFIX));
+ serverInfoList.add(new CdmServerInfoConfig(NAME_DEMO_1, SERVER_DEMO_1, 80, CDMSERVER_PREFIX, false));
+ // serverInfoList.add(new CdmServerInfoConfig(NAME_DEMO_2, SERVER_DEMO_2, 80, CDMSERVER_PREFIX));
+ serverInfoList.add(new CdmServerInfoConfig(NAME_TEST, SERVER_TEST, 80, CDMSERVER_PREFIX, false));
+ serverInfoList.add(new CdmServerInfoConfig(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, true));
+ return serverInfoList;
}
public String getName() {
CdmInstanceInfo devInstance = null;
if(value != null && !value.isEmpty()) {
int devPort = Integer.valueOf(value);
- CdmServerInfo devCii = new CdmServerInfo(NAME_LOCALHOST_DEV, SERVER_LOCALHOST_DEV, devPort, "", false);
+ CdmServerInfo devCii = new CdmServerInfo(new CdmServerInfoConfig(NAME_LOCALHOST_DEV, SERVER_LOCALHOST_DEV, devPort, "", false));
try {
devInstance = devCii.addInstance(NAME_INSTANCE_LOCALHOST_DEV, BASEPATH_LOCALHOST_DEV);
available = devCii.pingInstance(devInstance, devPort);
--- /dev/null
+// $Id$
+/**
+* Copyright (C) 2016 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.remoting.source;
+
+/**
+ * @author a.kohlbecker
+ * @date Feb 10, 2016
+ */
+public class CdmServerInfoConfig {
+ /**
+ *
+ */
+ private String name;
+ /**
+ *
+ */
+ private String server;
+ /**
+ *
+ */
+ private int port;
+ /**
+ *
+ */
+ private String prefix;
+ /**
+ *
+ */
+ private boolean ignoreCdmLibVersion;
+
+ /**
+ *
+ */
+ public CdmServerInfoConfig(String name, String server, int port, String prefix, boolean ignoreCdmLibVersion) {
+ this.name = name;
+ this.server = server;
+ this.port = port;
+ this.prefix = prefix;
+ this.ignoreCdmLibVersion = ignoreCdmLibVersion;
+ }
+
+ public CdmServerInfoConfig() {
+
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the server
+ */
+ public String getServer() {
+ return server;
+ }
+
+ /**
+ * @param server the server to set
+ */
+ public void setServer(String server) {
+ this.server = server;
+ }
+
+ /**
+ * @return the port
+ */
+ public int getPort() {
+ return port;
+ }
+
+ /**
+ * @param port the port to set
+ */
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ /**
+ * @return the prefix
+ */
+ public String getPrefix() {
+ return prefix;
+ }
+
+ /**
+ * @param prefix the prefix to set
+ */
+ public void setPrefix(String prefix) {
+ this.prefix = prefix;
+ }
+
+ /**
+ * @return the ignoreCdmLibVersion
+ */
+ public boolean isIgnoreCdmLibVersion() {
+ return ignoreCdmLibVersion;
+ }
+
+ /**
+ * @param ignoreCdmLibVersion the ignoreCdmLibVersion to set
+ */
+ public void setIgnoreCdmLibVersion(boolean ignoreCdmLibVersion) {
+ this.ignoreCdmLibVersion = ignoreCdmLibVersion;
+ }
+}
\ No newline at end of file
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.springframework.remoting.httpinvoker.CommonsHttpInvokerRequestExecutor;
+import org.apache.http.client.methods.HttpPost;
+import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor;
import org.springframework.remoting.httpinvoker.HttpInvokerClientConfiguration;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContext;
* @date 27 Jan 2015
*
*/
-public class CdmAuthenticatedHttpInvokerRequestExecutor extends CommonsHttpInvokerRequestExecutor {
+public class CdmAuthenticatedHttpInvokerRequestExecutor extends HttpComponentsHttpInvokerRequestExecutor {
@Override
- protected PostMethod createPostMethod(HttpInvokerClientConfiguration config) throws IOException {
- PostMethod postMethod = super.createPostMethod(config);
+ protected HttpPost createHttpPost(HttpInvokerClientConfiguration config) throws IOException {
+ HttpPost postMethod = super.createHttpPost(config);
SecurityContext securityContext = CdmApplicationState.getCurrentSecurityContext();
if(securityContext != null) {
if ((auth != null) && (auth.getName() != null) &&
(auth.getCredentials() != null)) {
String base64 = auth.getName() + ":" + auth.getCredentials().toString();
- postMethod.setRequestHeader("Authorization", "Basic " +
+ postMethod.setHeader("Authorization", "Basic " +
new String(Base64.encodeBase64(base64.getBytes())));
}
}
/**
* Base class implementing {@link org.hibernate.collection.spi.PersistentCollection}
*
+ * This a extended copy of the original class from hibernate. It has been extended to
+ * allow making remote service calls to spring httpinvoker services (see section at the bottom
+ * of this class).
+ *
+ *
* @author Gavin King
+ * @author Cherian Mathew
*/
public abstract class AbstractPersistentCollection implements Serializable, PersistentCollection {
private static final Logger log = Logger.getLogger( AbstractPersistentCollection.class );
- private static final long serialVersionUID = -7238232378593030571L;
+ /**
+ * <b>IMPORTANT:</b><br>
+ * This serialVersionUID must be kept in sync with the serialVersionUID which is generated
+ * on the fly for serialized AbstractPersistentCollection objects coming from the httpInvoker
+ * service.
+ * This is most probably necessary after updating hibernate to a newer version. In any case
+ * it the need for updating this <code>serialVersionUID</code> becomes obvious when the attempt
+ * to connect to the server side fails with an <code>InvalidClassException</code>:
+ *
+ * <pre>
+ * java.io.InvalidClassException: org.hibernate.collection.internal.AbstractPersistentCollection;
+ * local class incompatible:
+ * stream classdesc serialVersionUID = 2742261122392386159,
+ * local class serialVersionUID = -7238232378593030571
+ * </pre>
+ * The correct <code>serialVersionUID</code> is the <code>stream classdesc serialVersionUID</code>
+ * from the error message.
+ */
+ private static final long serialVersionUID = 2742261122392386159L;
private transient SessionImplementor session;
private boolean initialized;
if ( isTempSession ) {
// TODO: On the next major release, add an
// 'isJTA' or 'getTransactionFactory' method to Session.
- isJTA = session.getTransactionCoordinator()
+ /*isJTA = session.getTransactionCoordinator()
.getTransactionContext().getTransactionEnvironment()
.getTransactionFactory()
- .compatibleWithJtaSynchronization();
-
+ .compatibleWithJtaSynchronization();*/
+ isJTA = session.getTransactionCoordinator().getTransactionCoordinatorBuilder().isJta();
if ( !isJTA ) {
// Explicitly handle the transactions only if we're not in
// a JTA environment. A lazy loading temporary session can
// TODO: On the next major release, add an
// 'isJTA' or 'getTransactionFactory' method to Session.
- boolean isJTA = session.getTransactionCoordinator()
+ /*boolean isJTA = session.getTransactionCoordinator()
.getTransactionContext().getTransactionEnvironment()
.getTransactionFactory()
.compatibleWithJtaSynchronization();
+ */
+ boolean isJTA = session.getTransactionCoordinator().getTransactionCoordinatorBuilder().isJta();
if ( !isJTA ) {
// Explicitly handle the transactions only if we're not in
Bundle-ManifestVersion: 2
Bundle-Name: Editor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: OSGI-INF/l10n/plugin
command.tooltip = Show Only Individuals Associations\r
command.label.55 = Open Associated Specimens\r
command.name.41 = Show Only Individual Associations\r
-command.name.42 = Open Taxon Editor\r
+command.name.42 = Open Taxon Editor for taxon\r
command.name.43 = Create Field Unit\r
command.name.44 = Deep Delete\r
command.name.46 = Move Synonym (Homotypical Group) to another Accepted Taxon\r
</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.view.CdmViewerContextMenu"
+ id="eu.etaxonomy.taxeditor.editor.derivativeEditor.CdmViewerContextMenu">
+ </dynamic>
+ <dynamic
+ class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
+ id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
+ </dynamic>
+ <command
+ commandId="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
+ label="Link with taxon selection"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ <not>
+ <reference
+ definitionId="isDerivativeEditorLinkedToTaxonSelection">
+ </reference>
+ </not>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
+ label="Unlink from taxon selection"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ <reference
+ definitionId="isDerivativeEditorLinkedToTaxonSelection">
+ </reference>
+ </visibleWhen>
+ </command>
+ <separator
+ name="eu.etaxonomy.taxeditor.editor.separator3"
+ visible="true">
+ </separator>
+ <command
+ commandId="eu.etaxonomy.taxeditor.editor.derivative.reuseSingleRead"
+ id="eu.etaxonomy.taxeditor.editor.derivative.reuseSingleReadMenuItem"
+ label="Reuse single read here"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ <reference
+ definitionId="isSingleReadReusableHere">
+ </reference>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="eu.etaxonomy.taxeditor.editor.derivative.copySingleReadToClipBoard"
+ label="Reuse for other sequence"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ <reference
+ definitionId="isSingleRead">
+ </reference>
+ </visibleWhen>
+ </command>
+ <command
+ commandId="eu.etaxonomy.taxeditor.editor.derivative.removeSingleReadFromSequence"
+ label="Remove from this sequence"
+ style="push">
+ <visibleWhen
+ checkEnabled="true">
+ <reference
+ definitionId="isSingleReadReused">
+ </reference>
+ </visibleWhen>
+ </command>
+ <separator
+ name="eu.etaxonomy.taxeditor.editor.separator7"
+ visible="true">
+ </separator>
<command
- commandId="eu.etaxonomy.taxeditor.editor.derivate.delete"
+ commandId="org.eclipse.ui.edit.delete"
label="%command.label.52"
style="push">
</command>
label="%command.label.54"
style="push">
</command>
- <dynamic
- class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
- id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
- </dynamic>
</menuContribution>
<menuContribution
locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
</handler>
<handler
class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
- commandId="eu.etaxonomy.taxeditor.editor.view.derivate.command.delete">
+ commandId="org.eclipse.ui.edit.delete">
<activeWhen>
<with
variable="activePartId">
</reference>
</activeWhen>
</handler>
+ <handler
+ class="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsView"
+ commandId="eu.etaxonomy.taxeditor.openReferencingObjectsView">
+ <activeWhen>
+ <with
+ variable="activePartId">
+ <equals
+ value="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+ </equals>
+ </with>
+ </activeWhen>
+ </handler>
</extension>
<extension
name="%extension.name"
name="%command.name.41">
</command>
<command
- defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenTaxonEditorHandler"
- id="eu.etaxonomy.taxeditor.editor.openTaxonEditor"
+ defaultHandler="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonHandler"
+ id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon"
name="%command.name.42">
<commandParameter
- id="eu.etaxonomy.taxeditor.editor.taxonParameter"
+ id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon.uuid"
name="%commandParameter.name"
optional="false"
- typeId="eu.etaxonomy.taxeditor.editor.taxonParameterType">
+ typeId="eu.etaxonomy.taxeditor.uuidParameterType">
+ </commandParameter>
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonNodeHandler"
+ id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode"
+ name="Open Taxon Editor for taxonnode">
+ <commandParameter
+ id="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode.uuid"
+ name="taxon node uuid"
+ optional="true"
+ typeId="eu.etaxonomy.taxeditor.uuidParameterType">
</commandParameter>
</command>
- <commandParameterType
- converter="eu.etaxonomy.taxeditor.editor.handler.TaxonParameterConverter"
- id="eu.etaxonomy.taxeditor.editor.taxonParameterType"
- type="eu.etaxonomy.cdm.model.taxon.TaxonBase">
- </commandParameterType>
<command
defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
id="eu.etaxonomy.taxeditor.editor.openSpecimenEditor"
name="Open Derivative Editor">
- <commandParameter
- id="eu.etaxonomy.taxeditor.specimenUuidParameter"
- name="Specimen UUID parameter"
- optional="true"
- typeId="eu.etaxonomy.taxeditor.specimenUuidParameterType">
- </commandParameter>
</command>
<command
defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.ListenToSelectionChangeHandler"
id="eu.etaxonomy.taxeditor.editor.derivative.listenToSelectionChange"
name="Link with taxon selection">
</command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.SingleReadHandler"
+ id="eu.etaxonomy.taxeditor.editor.derivative.copySingleReadToClipBoard"
+ name="Copy SingleRead to clipboard">
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.SingleReadHandler"
+ id="eu.etaxonomy.taxeditor.editor.derivative.reuseSingleRead"
+ name="Reuse SingleRead">
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.SingleReadHandler"
+ id="eu.etaxonomy.taxeditor.editor.derivative.removeSingleReadFromSequence"
+ name="Remove SingleRead from sequence">
+ </command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.ToggleLinkWithTaxonSelectionHandler"
+ id="eu.etaxonomy.taxeditor.editor.derivative.toggleLinkWithTaxonSelection"
+ name="Toggle link with taxon selection">
+ </command>
</extension>
- <extension
- point="org.eclipse.ui.commands">
- <commandParameterType
- converter="eu.etaxonomy.taxeditor.handler.UuidParameterConverter"
- id="eu.etaxonomy.taxeditor.specimenUuidParameterType"
- type="java.util.UUID">
- </commandParameterType>
- </extension>
<extension
point="org.eclipse.core.expressions.definitions">
<definition
</test>
</with>
</definition>
+ <definition
+ id="isSingleReadReusableHere">
+ <with
+ variable="selection">
+ <test
+ property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSingleReadReusableHere">
+ </test>
+ </with>
+ </definition>
+ <definition
+ id="isSingleReadReused">
+ <with
+ variable="selection">
+ <test
+ property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSingleReadReused">
+ </test>
+ </with>
+ </definition>
+ <definition
+ id="isDerivativeEditorLinkedToTaxonSelection">
+ <with
+ variable="activeEditor">
+ <test
+ property="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester.isLinkedWithTaxonSelection">
+ </test>
+ </with>
+ </definition>
</extension>
<extension
point="org.eclipse.core.expressions.propertyTesters">
class="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
id="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
namespace="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
- properties="isSequence,isSingleRead"
+ properties="isSequence,isSingleRead,isSingleReadReusableHere,isSingleReadReused"
type="org.eclipse.jface.viewers.IStructuredSelection">
</propertyTester>
+ <propertyTester
+ class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester"
+ id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester"
+ namespace="eu.etaxonomy.taxeditor.editor.view.derivate.DerivativeEditorPropertyTester"
+ properties="isLinkedWithTaxonSelection"
+ type="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+ </propertyTester>
</extension>
<extension
point="org.eclipse.ui.bindings">
</extension-->
<extension
point="eu.etaxonomy.taxeditor.store.cdmViewer">
- <cdmViewer
- class="eu.etaxonomy.taxeditor.editor.EditorCdmViewer">
- </cdmViewer>
+ <viewCommandMapping
+ commandId="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode"
+ selection="eu.etaxonomy.cdm.model.taxon.TaxonNode"
+ viewerName="Taxon Editor">
+ </viewCommandMapping>
+ <viewCommandMapping
+ commandId="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon"
+ selection="eu.etaxonomy.cdm.model.taxon.TaxonBase"
+ viewerName="TaxonEditor">
+ </viewCommandMapping>
</extension>
</plugin>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+++ /dev/null
-// $Id$
-/**
-* Copyright (C) 2015 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.editor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.eclipse.ui.PartInitException;
-
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.view.ICdmViewer;
-
-/**
- * @author pplitzner
- * @date Feb 23, 2015
- *
- */
-public class EditorCdmViewer implements ICdmViewer {
-
- private final Logger logger = Logger.getLogger(EditorCdmViewer.class);
-
- @Override
- public void show(Object input, Class<?> viewerClass) {
- try {
- if(viewerClass.equals(MultiPageTaxonEditor.class)){
- if(input instanceof TaxonBase){
- TaxonEditorInput editorInput = TaxonEditorInput.NewInstanceFromTaxonBase(((TaxonBase<?>) input).getUuid());
- EditorUtil.open(editorInput);
- }
- }
- else if(viewerClass.equals(DerivateView.class)){
- if(input instanceof SpecimenOrObservationBase){
- }
- }
- } catch (PartInitException e) {
- String errorMessage = "Could not open editor";
- logger.error(errorMessage, e);
- MessagingUtils.error(EditorCdmViewer.class, errorMessage, e);
- }
- }
-
- @Override
- public Map<Class<?>, String> getViewerClasses(Object input) {
- Map<Class<?>, String> viewerNameMap = new HashMap<Class<?>, String>();
- if(input instanceof TaxonBase){
- viewerNameMap.put(MultiPageTaxonEditor.class, "Taxon Editor");
- }
- return viewerNameMap;
- }
-
-}
+++ /dev/null
-package eu.etaxonomy.taxeditor.editor.handler;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.ParameterType;
-import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.ui.PartInitException;
-
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-
-
-public class OpenTaxonEditorHandler extends AbstractHandler {
-
- @Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
- Object object = event.getObjectParameterForExecution("eu.etaxonomy.taxeditor.editor.taxonParameter");
-
- try {
- ParameterType parameterType = event.getCommand().getParameterType("eu.etaxonomy.taxeditor.editor.taxonParameter");
- if(parameterType.isCompatible(object)){
- EditorUtil.openTaxonEditor(object);
- }
- } catch (NotDefinedException e) {
- MessagingUtils.error(this.getClass(), "Parameter type not defined", e);
- } catch (PartInitException e) {
- MessagingUtils.error(OpenTaxonEditorHandler.class, "Error opening the editor", e);
- }
- return null;
- }
-
-}
import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeNode;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import eu.etaxonomy.cdm.model.molecular.Sequence;
import eu.etaxonomy.cdm.model.molecular.SingleRead;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
public class SpecimenPropertyTester extends PropertyTester {
private static final String SEQUENCE = "isSequence";
private static final String SINGLE_READ = "isSingleRead";
+ private static final String IS_SINGLEREAD_REUSABLE_HERE = "isSingleReadReusableHere";
+ private static final String IS_SINGLEREAD_REUSED = "isSingleReadReused";
public SpecimenPropertyTester() {}
else if (SINGLE_READ.equals(property)) {
return isSingleReadAlignment(treeNodeOfSelection.getValue());
}
+ else if (IS_SINGLEREAD_REUSABLE_HERE.equals(property)) {
+ return isSingleReadReusableHere(treeNodeOfSelection.getValue());
+ }
+ else if (IS_SINGLEREAD_REUSED.equals(property)) {
+ return isSingleReadReused(treeNodeOfSelection.getValue());
+ }
}
}
return false;
}
- private boolean isSequence(Object object) {
+ private boolean isSingleReadReused(Object value) {
+ final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ final IEditorPart activeEditor = window.getActivePage().getActiveEditor();
+ if(value instanceof SingleRead){
+ if(activeEditor instanceof DerivateView
+ && ((DerivateView) activeEditor).getMultiLinkSingleReads().contains(value)){
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean isSingleReadReusableHere(Object value) {
+ TreeNode clipboardNode = EditorUtil.getTreeNodeOfSelection(LocalSelectionTransfer.getTransfer().getSelection());
+ if(value instanceof Sequence && clipboardNode!=null && clipboardNode.getValue() instanceof SingleRead
+ && !((Sequence) value).getSingleReads().contains(clipboardNode.getValue())){
+ return true;
+ }
+ return false;
+ }
+
+ private boolean isSequence(Object object) {
return (object instanceof Sequence);
}
+++ /dev/null
-package eu.etaxonomy.taxeditor.editor.handler;
-
-import java.util.UUID;
-
-import org.eclipse.core.commands.AbstractParameterValueConverter;
-import org.eclipse.core.commands.ParameterValueConversionException;
-
-import eu.etaxonomy.cdm.api.service.ITaxonService;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-public class TaxonParameterConverter extends AbstractParameterValueConverter {
-
- public TaxonParameterConverter() {
- }
-
- @Override
- public Object convertToObject(String parameterValue) throws ParameterValueConversionException {
- return CdmStore.getService(ITaxonService.class).load(UUID.fromString(parameterValue));
- }
-
- @Override
- public String convertToString(Object parameterValue) throws ParameterValueConversionException {
- if(parameterValue instanceof TaxonBase<?>){
- return ((TaxonBase<?>) parameterValue).getUuid().toString();
- }
- return null;
- }
-
-}
--- /dev/null
+package eu.etaxonomy.taxeditor.editor.handler.defaultHandler;
+import java.util.UUID;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.ui.PartInitException;
+
+import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenHandlerBase;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+
+public class DefaultOpenTaxonEditorForTaxonHandler extends DefaultOpenHandlerBase<TaxonBase> {
+
+ @Override
+ protected TaxonBase getEntity(UUID uuid) {
+ return CdmStore.getService(ITaxonService.class).load(uuid);
+ }
+
+ @Override
+ protected void open(ExecutionEvent event, TaxonBase entity) {
+ try {
+ EditorUtil.openTaxonBase(entity.getUuid());
+ } catch (PartInitException e) {
+ MessagingUtils.error(DefaultOpenTaxonEditorForTaxonHandler.class, "Could not open taxon editor for taxon/synonym "+entity, e);
+ }
+ }
+
+}
--- /dev/null
+package eu.etaxonomy.taxeditor.editor.handler.defaultHandler;
+import java.util.UUID;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.ui.PartInitException;
+
+import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
+import eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenHandlerBase;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+
+public class DefaultOpenTaxonEditorForTaxonNodeHandler extends DefaultOpenHandlerBase<TaxonNode> {
+
+ @Override
+ protected TaxonNode getEntity(UUID uuid) {
+ return CdmStore.getService(ITaxonNodeService.class).load(uuid);
+ }
+
+ @Override
+ protected void open(ExecutionEvent event, TaxonNode entity) {
+ TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(entity.getTaxon().getUuid());
+ try {
+ EditorUtil.open(input);
+ } catch (PartInitException e) {
+ MessagingUtils.error(DefaultOpenTaxonEditorForTaxonNodeHandler.class, "Could not open taxon editor for taxon "+input.getTaxon(), e);
+ }
+ }
+
+}
import java.util.UUID;
import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.hibernate.LockOptions;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
import java.util.UUID;
import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.hibernate.LockOptions;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
import java.util.UUID;
import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.hibernate.LockOptions;
import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
//create context menu
MenuManager menuManager = new MenuManager();
+ menuManager.setRemoveAllWhenShown(true);
getSite().registerContextMenu(menuManager, viewer);
Control control = viewer.getControl();
Menu menu = menuManager.createContextMenu(control);
//init tree
updateRootEntities();
+ //reset status bar
+ getEditorSite().getActionBars().getStatusLineManager().setMessage("");
//add drag'n'drop support
Transfer[] transfers = new Transfer[] {LocalSelectionTransfer.getTransfer(),};
conversation.bind();
}
/*
- * If the active session is not the session of the Derivate Editor then we will
- * save it, bind temporarily to our session and rebind to the original session.
- * This happens e.g. if a selection change happens in the taxon editor and
- * "Link with editor" is enabled. The selection change event and thus the
- * loading in updateRootEntities() happens in the session of the taxon
- * editor.
+ * If the active session is not the session of the Derivative Editor
+ * then we will save the active session for later, bind temporarily
+ * to our session and rebind to the original session when we are
+ * done. This happens e.g. if a selection change happens in the
+ * taxon editor and "Link with editor" is enabled. The selection
+ * change event and thus the loading in updateRootEntities() happens
+ * in the session of the taxon editor.
*/
ICdmEntitySession previousCdmEntitySession = CdmStore.getCurrentSessionManager().getActiveSession();
if(cdmEntitySession != null) {
rootElements.add(specimen);
}
}
- labelProvider.initCache(rootElements);
+ labelProvider.updateLabelCache(rootElements);
viewer.setInput(rootElements);
getEditorSite().getActionBars().getStatusLineManager().setMessage(rootElements.size() +" derivative hierarchies found");
+ //set selection to derivatives if the filter criteria
+ //taxon assignment or or derivative type are set
+ if(derivates!=null && !derivateSearchCompositeController.isDefaultSearch()){
+ List<TreeNode> nodesToSelect = new ArrayList<TreeNode>();
+ for (SpecimenOrObservationBase specimenOrObservationBase : derivates) {
+ nodesToSelect.add(new TreeNode(specimenOrObservationBase));
+ }
+ viewer.setSelection(new StructuredSelection(nodesToSelect));
+ }
+ else{
+ viewer.setSelection(null);
+ }
+
+ }
+
+ public void updateLabelCache(){
+ labelProvider.updateLabelCache(rootElements);
}
@Override
@Override
public void contextStop(IMemento memento, IProgressMonitor monitor) {
derivateSearchCompositeController.setEnabled(false);
- viewer.getTree().setEnabled(false);
- viewer.setInput(null);
+ if(!viewer.getTree().isDisposed()) {
+ viewer.getTree().setEnabled(false);
+ viewer.setInput(null);
+ }
}
/**
--- /dev/null
+package eu.etaxonomy.taxeditor.editor.view.derivate;
+
+import org.eclipse.core.expressions.PropertyTester;
+
+public class DerivativeEditorPropertyTester extends PropertyTester {
+
+ public DerivativeEditorPropertyTester() {
+ // TODO Auto-generated constructor stub
+ }
+
+ @Override
+ public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+ DerivateView derivateView = (DerivateView)receiver;
+ if(property.equals("isLinkedWithTaxonSelection")){
+ return derivateView.isListenToSelectionChange();
+ }
+ return false;
+ }
+
+}
createMenuItem(addMenu, TISSUE_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.TissueSample, DerivationEventType.PREPARATION());
createMenuItem(addMenu, DNA_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample, DerivationEventType.DNA_EXTRACTION());
createMenuItem(addMenu, MEDIA_SPECIMEN, selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media, DerivationEventType.ACCESSIONING());
+ return;
}
//context menu for Specimen
else if(selectedTreeNode.getValue() instanceof DerivedUnit && ((DerivedUnit)selectedTreeNode.getValue()).getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){
createMenuItem(addMenu, TISSUE_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.TissueSample, DerivationEventType.PREPARATION());
createMenuItem(addMenu, DNA_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample, DerivationEventType.DNA_EXTRACTION());
createMenuItem(addMenu, MEDIA_SPECIMEN, selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media, DerivationEventType.ACCESSIONING());
+ return;
}
//context menu for TissueSample
else if(selectedTreeNode.getValue() instanceof DnaSample && ((DnaSample)selectedTreeNode.getValue()).getRecordBasis()==SpecimenOrObservationType.TissueSample){
createMenuItem(addMenu, DNA_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample, DerivationEventType.DNA_EXTRACTION());
createMenuItem(addMenu, MEDIA_SPECIMEN, selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media, DerivationEventType.ACCESSIONING());
+ return;
}
//context menu for DnaSample
else if(selectedTreeNode.getValue() instanceof DnaSample && ((DnaSample)selectedTreeNode.getValue()).getRecordBasis()==SpecimenOrObservationType.DnaSample){
createMenuItem(addMenu, CONSENSUS_SEQUENCE, selectedTreeNode, Sequence.class, null, null);
createMenuItem(addMenu, MEDIA_SPECIMEN, selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media, DerivationEventType.ACCESSIONING());
+ return;
}
//context menu for Sequence
else if(selectedTreeNode.getValue() instanceof Sequence){
createMenuItem(addMenu, SINGLE_READ, selectedTreeNode, SingleRead.class, null, null);
- }
- //default
- else{
- MenuItem menuItem = new MenuItem(addMenu, SWT.NONE);
- menuItem.setText(Messages.CreateDerivateContextMenu_NO_CHILD_DERIVATE);
- menuItem.setEnabled(false);
+ return;
}
}
+ MenuItem menuItem = new MenuItem(addMenu, SWT.NONE);
+ menuItem.setText(Messages.CreateDerivateContextMenu_NO_CHILD_DERIVATE);
+ menuItem.setEnabled(false);
}
package eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu;
import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.Separator;
import org.eclipse.ui.actions.CompoundContributionItem;
public class DerivateViewContextMenu extends CompoundContributionItem {
@Override
protected IContributionItem[] getContributionItems() {
IContributionItem[] contributionItems = new IContributionItem[] {
- new CreateFieldUnitContextMenu(),
new CreateDerivateContextMenu(),
- new ListenToSelectionChangeContextMenu(),
- new SingleReadSequenceContextMenu(),
+ new CreateFieldUnitContextMenu(),
+ new Separator(),
+// new ListenToSelectionChangeContextMenu(),
};
return contributionItems;
}
+++ /dev/null
-package eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu;
-
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.TreeNode;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.CompoundContributionItem;
-
-import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
-import eu.etaxonomy.cdm.model.molecular.Sequence;
-import eu.etaxonomy.cdm.model.molecular.SingleRead;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.Messages;
-import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-/**
- * Context menu for the SingleReads in the derivate hierarchy.
- *
- */
-public class SingleReadSequenceContextMenu extends CompoundContributionItem {
-
- private enum CommandType{
- COPY_TO_CLIPBOARD,
- REMOVE_FROM_SEQUENCE,
- ADD_TO_SEQUENCE
- }
-
- @Override
- protected IContributionItem[] getContributionItems() {
- IContributionItem[] contributionItems = new IContributionItem[] {
- new ContributionItem() {
- @Override
- public void fill(Menu menu, int index) {
- final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- final IEditorPart activeEditor = window.getActivePage().getActiveEditor();
- final ISelection selection = window.getActivePage().getSelection();
- TreeNode selectedTreeNode = EditorUtil.getTreeNodeOfSelection(selection);
- TreeNode clipboardNode = EditorUtil.getTreeNodeOfSelection(LocalSelectionTransfer.getTransfer().getSelection());
- if(selectedTreeNode!=null){
- //context menu for Sequence
- if(selectedTreeNode.getValue() instanceof Sequence
- && clipboardNode!=null && clipboardNode.getValue() instanceof SingleRead){
- MenuItem item = new MenuItem(menu, SWT.NONE);
- item.setText(Messages.SingleReadSequenceContextMenu_REUSE_SINGLE_READ_HERE);
- item.addSelectionListener(new WidgetSelectionListener(CommandType.ADD_TO_SEQUENCE));
- }
- else if(selectedTreeNode.getValue() instanceof SingleRead){
- MenuItem item = new MenuItem(menu, SWT.NONE);
- item.setText(Messages.SingleReadSequenceContextMenu_REUSE_FOR_SEQUENCE);
- item.addSelectionListener(new WidgetSelectionListener(CommandType.COPY_TO_CLIPBOARD));
- if(activeEditor instanceof DerivateView
- && ((DerivateView) activeEditor).getMultiLinkSingleReads().contains(selectedTreeNode.getValue())){
- MenuItem unlinkItem = new MenuItem(menu, SWT.NONE);
- unlinkItem.setText(Messages.SingleReadSequenceContextMenu_REMOVE_FROM_SEQUENCE);
- unlinkItem.addSelectionListener(new WidgetSelectionListener(CommandType.REMOVE_FROM_SEQUENCE));
- }
- }
- }
- }
- }
- };
- return contributionItems;
- }
-
- private class WidgetSelectionListener extends SelectionAdapter{
- private final CommandType commandType;
-
- /**
- * @param selectedTreeNode
- * @param clipboardNode
- * @param commandType
- */
- public WidgetSelectionListener(CommandType commandType) {
- this.commandType = commandType;
- }
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- ISelection clipBoardSelection = LocalSelectionTransfer.getTransfer().getSelection();
- final ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getSelection();
- TreeNode clipBoardTreeNode = EditorUtil.getTreeNodeOfSelection(clipBoardSelection);
- TreeNode selectedTreeNode = EditorUtil.getTreeNodeOfSelection(selection);
- switch (commandType) {
- case REMOVE_FROM_SEQUENCE:
- if(activeEditor.isDirty()){
- MessagingUtils.warningDialog(DerivateView.VIEW_HAS_UNSAVED_CHANGES, this, DerivateView.YOU_NEED_TO_SAVE_BEFORE_PERFORMING_THIS_ACTION);
- return;
- }
- if(selectedTreeNode!=null && selectedTreeNode.getParent()!=null &&
- selectedTreeNode.getValue() instanceof SingleRead && selectedTreeNode.getParent().getValue() instanceof Sequence) {
- Sequence sequence = (Sequence) selectedTreeNode.getParent().getValue();
- sequence.removeSingleRead((SingleRead) selectedTreeNode.getValue());
- CdmStore.getService(ISequenceService.class).saveOrUpdate(sequence);
- if(activeEditor instanceof DerivateView) {
- DerivateView derivateView = (DerivateView)activeEditor;
- derivateView.getConversationHolder().commit();
- derivateView.refreshTree();
- }
- }
-
- break;
- case ADD_TO_SEQUENCE:
- if(activeEditor.isDirty()){
- MessagingUtils.warningDialog(DerivateView.VIEW_HAS_UNSAVED_CHANGES, this, DerivateView.YOU_NEED_TO_SAVE_BEFORE_PERFORMING_THIS_ACTION);
- return;
- }
- if(clipBoardTreeNode!=null && clipBoardTreeNode.getValue() instanceof SingleRead
- && selectedTreeNode!=null && selectedTreeNode.getValue() instanceof Sequence){
- SingleRead singleRead = (SingleRead)clipBoardTreeNode.getValue();
- Sequence sequence = (Sequence)selectedTreeNode.getValue();
- sequence.addSingleRead(singleRead);
- CdmStore.getService(ISequenceService.class).merge(sequence);
- if(activeEditor instanceof DerivateView) {
- DerivateView derivateView = (DerivateView)activeEditor;
- derivateView.getConversationHolder().commit();
- derivateView.refreshTree();
- LocalSelectionTransfer.getTransfer().setSelection(null);
- }
- }
- break;
- case COPY_TO_CLIPBOARD:
- LocalSelectionTransfer.getTransfer().setSelection(selection);
- break;
- }
- }
- }
-}
--- /dev/null
+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.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.TreeNode;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+
+import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
+import eu.etaxonomy.cdm.model.molecular.Sequence;
+import eu.etaxonomy.cdm.model.molecular.SingleRead;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+public class SingleReadHandler extends AbstractHandler {
+
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ ISelection clipBoardSelection = LocalSelectionTransfer.getTransfer().getSelection();
+ final ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getSelection();
+ TreeNode clipBoardTreeNode = EditorUtil.getTreeNodeOfSelection(clipBoardSelection);
+ TreeNode selectedTreeNode = EditorUtil.getTreeNodeOfSelection(selection);
+ if(activeEditor instanceof DerivateView) {
+ DerivateView derivateView = (DerivateView)activeEditor;
+ if(event.getCommand().getId().equals("eu.etaxonomy.taxeditor.editor.derivative.copySingleReadToClipBoard")){
+ LocalSelectionTransfer.getTransfer().setSelection(selection);
+ }
+ else if(event.getCommand().getId().equals("eu.etaxonomy.taxeditor.editor.derivative.reuseSingleRead")){
+ if(activeEditor.isDirty()){
+ MessagingUtils.warningDialog(DerivateView.VIEW_HAS_UNSAVED_CHANGES, this, DerivateView.YOU_NEED_TO_SAVE_BEFORE_PERFORMING_THIS_ACTION);
+ return null;
+ }
+ if(clipBoardTreeNode!=null && clipBoardTreeNode.getValue() instanceof SingleRead
+ && selectedTreeNode!=null && selectedTreeNode.getValue() instanceof Sequence){
+ SingleRead singleRead = (SingleRead)clipBoardTreeNode.getValue();
+ Sequence sequence = (Sequence)selectedTreeNode.getValue();
+ sequence.addSingleRead(singleRead);
+ if(CdmStore.getCurrentSessionManager().isRemoting()){
+ CdmStore.getService(ISequenceService.class).merge(sequence);
+ }
+ else{
+ CdmStore.getService(ISequenceService.class).saveOrUpdate(sequence);
+ }
+ if(activeEditor instanceof DerivateView) {
+ derivateView.getConversationHolder().commit();
+ derivateView.refreshTree();
+ LocalSelectionTransfer.getTransfer().setSelection(null);
+ }
+ }
+ }
+ else if(event.getCommand().getId().equals("eu.etaxonomy.taxeditor.editor.derivative.removeSingleReadFromSequence")){
+ if(activeEditor.isDirty()){
+ MessagingUtils.warningDialog(DerivateView.VIEW_HAS_UNSAVED_CHANGES, this, DerivateView.YOU_NEED_TO_SAVE_BEFORE_PERFORMING_THIS_ACTION);
+ return null;
+ }
+ if(selectedTreeNode!=null && selectedTreeNode.getParent()!=null &&
+ selectedTreeNode.getValue() instanceof SingleRead && selectedTreeNode.getParent().getValue() instanceof Sequence) {
+ Sequence sequence = (Sequence) selectedTreeNode.getParent().getValue();
+ sequence.removeSingleRead((SingleRead) selectedTreeNode.getValue());
+ if(CdmStore.getCurrentSessionManager().isRemoting()){
+ CdmStore.getService(ISequenceService.class).merge(sequence);
+ }
+ else{
+ CdmStore.getService(ISequenceService.class).saveOrUpdate(sequence);
+ }
+ if(activeEditor instanceof DerivateView) {
+ derivateView.getConversationHolder().commit();
+ derivateView.refreshTree();
+ }
+ }
+ }
+ derivateView.updateLabelCache();
+ derivateView.refreshTree();
+ }
+ return null;
+ }
+
+}
--- /dev/null
+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.ui.handlers.HandlerUtil;
+
+import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
+
+public class ToggleLinkWithTaxonSelectionHandler extends AbstractHandler {
+
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ DerivateView derivateView = (DerivateView) HandlerUtil.getActiveEditor(event);
+ derivateView.toggleListenToSelectionChange();
+ return null;
+ }
+
+}
*/
package eu.etaxonomy.taxeditor.editor.view.derivate.searchFilter;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Widget;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.service.IOccurrenceService;
import eu.etaxonomy.cdm.api.service.config.FindOccurrencesConfigurator;
+import eu.etaxonomy.cdm.api.service.config.FindOccurrencesConfigurator.AssignmentStatus;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
-import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.SearchManager;
import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory;
import eu.etaxonomy.taxeditor.ui.mvc.combo.EnumTermComboController;
if(selectedTaxon!=null){
config.setSpecimenType(null);
}
+ switch (derivateSearchComposite.getComboTaxonAssignment().getSelectionIndex()) {
+ case DerivateSearchComposite.ALL_SPECIMENS:
+ config.setAssignmentStatus(AssignmentStatus.ALL_SPECIMENS);
+ break;
+ case DerivateSearchComposite.ASSIGNED_SPECIMENS:
+ config.setAssignmentStatus(AssignmentStatus.ASSIGNED_SPECIMENS);
+ break;
+ case DerivateSearchComposite.UNASSIGNED_SPECIMENS:
+ config.setAssignmentStatus(AssignmentStatus.UNASSIGNED_SPECIMENS);
+ break;
+ default:
+ break;
+ }
SearchManager searchManager = new SearchManager();
List<SpecimenOrObservationBase> occurrences = searchManager.findOccurrences(config, true);
-
- //filter out specimens of wrong type (only if an associated taxon was selected)
- if(selectedTaxon!=null && !specimenType.equals(SpecimenOrObservationType.Unknown)){
- List<SpecimenOrObservationBase> specimensOfCorrectType = new ArrayList<SpecimenOrObservationBase>();
- for(SpecimenOrObservationBase<?> occurrence:occurrences){
- if(occurrence.getRecordBasis().equals(specimenType)
- || occurrence.getRecordBasis().isKindOf(specimenType)){
- specimensOfCorrectType.add(occurrence);
- }
- }
- occurrences = specimensOfCorrectType;
- }
-
- //filter out (un-)assigned specimens
- if(selectedTaxon==null){
- int selectionIndex = derivateSearchComposite.getComboTaxonAssignment().getSelectionIndex();
- List<SpecimenOrObservationBase<?>> specimenWithAssociations = new ArrayList<SpecimenOrObservationBase<?>>();
- if(selectionIndex!=DerivateSearchComposite.ALL_SPECIMENS){
- for (SpecimenOrObservationBase specimenOrObservationBase : occurrences) {
- Collection<TaxonBase<?>> associatedTaxa = CdmStore.getService(IOccurrenceService.class).listAssociatedTaxa(specimenOrObservationBase, null, null, null, null);
- if(!associatedTaxa.isEmpty()){
- specimenWithAssociations.add(specimenOrObservationBase);
- specimenWithAssociations.addAll(CdmStore.getService(IOccurrenceService.class).getFieldUnits(specimenOrObservationBase.getUuid()));
- }
- }
- }
- if(selectionIndex==DerivateSearchComposite.UNASSIGNED_SPECIMENS){
- occurrences.removeAll(specimenWithAssociations);
- }
- else if(selectionIndex==DerivateSearchComposite.ASSIGNED_SPECIMENS){
- occurrences = new ArrayList<SpecimenOrObservationBase>(specimenWithAssociations);
- }
- }
derivativeEditor.updateRootEntities(occurrences);
}
derivateSearchComposite.setLayoutData(layoutData);
}
+ /**
+ * Checks whether or not the search criteria are set to their default value.<br>
+ * This does not consider the title search field.
+ * @return <code>true</code> if search criteria are set to default.
+ */
+ public boolean isDefaultSearch(){
+ boolean isDefault = true;
+ isDefault &= comboSpecimenTypeController.getSelection()==SpecimenOrObservationType.Unknown;
+ isDefault &= derivateSearchComposite.getComboTaxonAssignment().getSelectionIndex()==DerivateSearchComposite.ALL_SPECIMENS;
+ isDefault &= selectedTaxon==null;
+ return isDefault;
+ }
/**
* Resets all input fields
*/
<feature
id="eu.etaxonomy.taxeditor.feature.jre.linux64"
label="Taxonomic Editor JRE Linux64"
- version="3.12.4"
+ version="3.13.0.qualifier"
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature.jre.linux64</artifactId>
<feature
id="eu.etaxonomy.taxeditor.feature.platform"
label="Taxeditor Dependencies"
- version="3.12.4"
+ version="3.13.0.qualifier"
os="linux,macosx,win32"
ws="cocoa,gtk,win32"
arch="x86,x86_64">
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
<feature
id="eu.etaxonomy.taxeditor.feature"
label="Taxonomic Editor"
- version="3.12.4"
+ version="3.13.0.qualifier"
provider-name="EDIT"
plugin="eu.etaxonomy.taxeditor.application"
os="linux,macosx,win32"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
Bundle-ManifestVersion: 2
Bundle-Name: Help
Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
Bundle-Vendor: EDIT
Require-Bundle: org.eclipse.ui,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Bundle-ClassPath: .,
lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,
lib/bioinfweb-commons-core-2-SNAPSHOT.jar,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<build>
Bundle-ManifestVersion: 2
Bundle-Name: Molecular Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
</menu>
</menuContribution>
<menuContribution
- locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView?before=eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
+ locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView?before=eu.etaxonomy.taxeditor.editor.derivative.reuseSingleReadMenuItem">
+ <separator
+ name="eu.etaxonomy.taxeditor.molecular.separator5"
+ visible="true">
+ </separator>
<command
commandId="eu.etaxonomy.taxeditor.molecular.editSequence"
label="Edit Sequence"
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Navigation Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.cdm,
eu.etaxonomy.taxeditor.navigation,
name="taxeditor-navigation.separator1"
visible="true">
</separator>
- <command
- commandId="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"
- label="%command.label.5"
- style="push">
- <visibleWhen
- checkEnabled="true">
- <or>
- <reference
- definitionId="isTaxonNode">
- </reference>
- <reference
- definitionId="isTaxonomicTree">
- </reference>
- </or>
- </visibleWhen>
- </command>
- <command
- commandId="eu.etaxonomy.taxeditor.store.open"
- label="Edit"
- style="push">
- <visibleWhen
- checkEnabled="true">
- <with
- variable="selection">
- <reference
- definitionId="isClassification">
- </reference>
- </with>
- </visibleWhen>
- </command>
+ <dynamic
+ class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
+ id="eu.etaxonomy.taxeditor.navigation.cdmViewerContextMenu">
+ </dynamic>
<command
commandId="eu.etaxonomy.taxeditor.navigator.command.update.changeAcceptedToSynonym"
label="%command.label.6"
</extension>
<extension
point="org.eclipse.ui.commands">
- <command
- defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.EditHandler"
- id="eu.etaxonomy.taxeditor.navigation.command.update.editSelection"
- name="%command.name.1">
- </command>
<command
defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.MoveTaxonHandler"
id="eu.etaxonomy.taxeditor.navigation.command.update.moveTaxon"
</test>
</definition>
</extension>
- <extension
- point="eu.etaxonomy.taxeditor.store.cdmViewer">
- <cdmViewer
- class="eu.etaxonomy.taxeditor.navigation.NavigationCdmViewer">
- </cdmViewer>
- </extension>
</plugin>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+++ /dev/null
-package eu.etaxonomy.taxeditor.navigation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.PlatformUI;
-
-import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
-import eu.etaxonomy.taxeditor.view.ICdmViewer;
-
-public class NavigationCdmViewer implements ICdmViewer {
-
-
- @SuppressWarnings("unused")
- private final Logger logger = Logger.getLogger(NavigationCdmViewer.class);
-
- @Override
- public void show(Object input, Class<?> viewerClass) {
- if(viewerClass.equals(NewClassificationWizard.class)){
- if(input instanceof Classification){
- Classification classification = (Classification)input;
- NewClassificationWizard classificationWizard = new NewClassificationWizard();
- classificationWizard.init(null, null);
- classificationWizard.setEntity(classification);
- WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), classificationWizard);
- dialog.open();
- }
- }
- }
-
- @Override
- public Map<Class<?>, String> getViewerClasses(Object input) {
- Map<Class<?>, String> viewerNameMap = new HashMap<Class<?>, String>();
- if(input instanceof Classification){
- viewerNameMap.put(NewClassificationWizard.class, "Classification Wizard");
- }
- return viewerNameMap;
- }
-
-}
import java.util.Set;
import java.util.UUID;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.NotEnabledException;
-import org.eclipse.core.commands.NotHandledException;
-import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.core.commands.operations.IUndoContext;
import org.eclipse.core.commands.operations.UndoContext;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.ui.IEditorReference;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.handlers.IHandlerService;
import org.eclipse.ui.navigator.CommonViewer;
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
public class NavigationUtil extends AbstractUtility{
private static IUndoContext defaultUndoContext;
- /**
- * <p>executeEditHandler</p>
- */
- public static void executeEditHandler(){
-
- String commandId = "eu.etaxonomy.taxeditor.navigation.command.update.editSelection";
-
- IHandlerService handlerService = (IHandlerService) AbstractUtility.getService(IHandlerService.class);
- try {
- handlerService.executeCommand(commandId, null);
- } catch (ExecutionException e) {
- MessagingUtils.error(NavigationUtil.class, e);
- } catch (NotDefinedException e) {
- MessagingUtils.error(NavigationUtil.class, e);
- } catch (NotEnabledException e) {
- MessagingUtils.error(NavigationUtil.class, e);
- } catch (NotHandledException e) {
- MessagingUtils.error(NavigationUtil.class, e);
- }
- }
-
/**
* <p>openEditor</p>
*
}
}
- public static void openEditor(Object selectedObject){
- if (selectedObject instanceof UuidAndTitleCache){
- Class type = ((UuidAndTitleCache) selectedObject).getType();
- if(type == Taxon.class || type == Synonym.class){
- try {
- EditorUtil.openTaxonBase(((UuidAndTitleCache) selectedObject).getUuid());
- } catch (PartInitException e) {
- MessagingUtils.error(NavigationUtil.class, "Error opening the editor", e);
- }
- }
- }else if(selectedObject instanceof ICdmBase){
- openEditor((ICdmBase) selectedObject);
- }else{
- MessagingUtils.error(NavigationUtil.class, new IllegalArgumentException("Selected object is not supported: " + selectedObject));
- }
- }
-
/**
* <p>openEmpty</p>
*
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IViewSite;
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.LoginManager;
+import eu.etaxonomy.taxeditor.view.CdmViewerChooser;
/**
* Taxonomic tree implementation using Common Navigator Framework.
/** {@inheritDoc} */
@Override
- protected void handleDoubleClick(DoubleClickEvent anEvent) {
- NavigationUtil.executeEditHandler();
+ protected void handleDoubleClick(DoubleClickEvent event) {
+ if(event.getSelection() instanceof IStructuredSelection){
+ Object selectedObject = ((IStructuredSelection) event.getSelection()).getFirstElement();
+ CdmViewerChooser chooser = new CdmViewerChooser(getSite().getShell());
+ chooser.chooseViewer(selectedObject);
+ }
// If the double click is passed up to the super-class it will
// expand/collapse trees.
// We do not want that
+++ /dev/null
-package eu.etaxonomy.taxeditor.navigation.navigator.handler;
-// $Id$
-/**
-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-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.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
-import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
-
-/**
- * <p>EditHandler class.</p>
- *
- * @author n.hoffmann
- * @created May 12, 2010
- * @version 1.0
- */
-public class EditHandler extends AbstractHandler implements IHandler{
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- */
- /** {@inheritDoc} */
- @Override
- public Object execute(ExecutionEvent event) throws ExecutionException {
-
- ISelection selection = HandlerUtil.getCurrentSelection(event);
-
- if(selection instanceof IStructuredSelection){
- final IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-
- if(structuredSelection.size() == 1 && structuredSelection.getFirstElement() instanceof Classification){
- Classification classification = (Classification) structuredSelection.getFirstElement();
-
- NewClassificationWizard classificationWizard = new NewClassificationWizard();
- classificationWizard.init(null, null);
- classificationWizard.setEntity(classification);
- WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), classificationWizard);
- dialog.open();
-
- }
- else{
-
- Job job = new Job("Opening editor") {
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- for(final Object selectedObject : structuredSelection.toArray()){
-
- Display.getDefault().asyncExec(new Runnable(){
-
- @Override
- public void run() {
- NavigationUtil.openEditor(selectedObject);
- }
-
- });
- }
- return Status.OK_STATUS;
- }
- };
-
- job.schedule();
- }
- }
-
- return null;
- }
-}
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
+import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
+import eu.etaxonomy.cdm.model.taxon.Synonym;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
import eu.etaxonomy.cdm.persistence.query.MatchMode;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
import eu.etaxonomy.taxeditor.model.IContextListener;
-import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
import eu.etaxonomy.taxeditor.navigation.search.SearchBar.SearchOption;
import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.view.CdmViewerChooser;
/**
* <p>SearchResultView class.</p>
resultViewer.addDoubleClickListener(new IDoubleClickListener() {
@Override
public void doubleClick(DoubleClickEvent event) {
- NavigationUtil.executeEditHandler();
+ if(event.getSelection() instanceof IStructuredSelection){
+ Object selectedObject = ((IStructuredSelection) event.getSelection()).getFirstElement();
+ if (selectedObject instanceof UuidAndTitleCache){
+ Class type = ((UuidAndTitleCache) selectedObject).getType();
+ if(type == Taxon.class || type == Synonym.class){
+ TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).load(((UuidAndTitleCache) selectedObject).getUuid());
+ CdmViewerChooser chooser = new CdmViewerChooser(getSite().getShell());
+ chooser.chooseViewer(taxonBase);
+ }
+ }
+ }
}
});
Bundle-ManifestVersion: 2
Bundle-Name: Printpublisher Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Require-Bundle: org.eclipse.osgi,
org.eclipse.ui,
eu.etaxonomy.taxeditor.cdmlib,
<parent>
<artifactId>taxeditor-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: DataStore Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.cdm,
eu.etaxonomy.taxeditor.editor.definedterm.input,
eu.etaxonomy.taxeditor.featuretree,
eu.etaxonomy.taxeditor.handler,
+ eu.etaxonomy.taxeditor.handler.defaultHandler,
eu.etaxonomy.taxeditor.io,
eu.etaxonomy.taxeditor.io.wizard,
eu.etaxonomy.taxeditor.labels,
extension.name.0 = Popup Menu Commands\r
command.name.8 = Clone Datasource\r
command.name.9 = Open Feature Tree Editor Wizard\r
-command.name.10 = Open Password Wizzard\r
+command.name.10 = Open Password Wizard\r
command.name.11 = Open Distribution Editor Wizard\r
command.name.12 = Connect\r
wizard.name.18 = CSV\r
activity.name.2 = UserManagement\r
activity.description.3 = ROLE_PROJECT_MANAGER dependent ui contributions\r
activity.name.3 = ProjectManagement\r
-extension-point.name = Cdm Viewer\r
Bundle-Vendor = EDIT\r
Bundle-Name = DataStore Bundle\r
command.name.13 = delete\r
command.name.14 = delete\r
page.name.32 = Taxon Navigator\r
page.name.33 = Sort of Taxonnodes\r
-command.name.15 = Open
\ No newline at end of file
+command.name.15 = Open\r
+view.name.SESSIONS = Sessions\r
+command.label.SESSION = Sessions\r
+command.label.CONNECT = Connect\r
+command.label.RE_CONNECT = Re-Connect\r
+command.name.CONNECT = Connect\r
+command.name.RE_CONNECT = Re-Connect\r
+command.name.OPEN_CLASSIFICATION_WIZARD = Open Classification Wizard
\ No newline at end of file
page.name.32 = Taxon Navigator
page.name.33 = Sortierung im TaxonNavigator
command.label.clone = Klonen
-command.label.openInSpecimenEditor = \u00d6ffnen im Specimen-Editor
\ No newline at end of file
+command.label.openInSpecimenEditor = \u00d6ffnen im Specimen-Editor
+page.name.31 = Taxon-Node-Reihenfolge
+extension.name.0 = Popup Menu Befehle
+command.name.8 = Datenquelle klonen
+command.name.9 = \u00d6ffne Feature Tree-Wizard
+command.name.10 = \u00d6ffne Passwort-Wizard
+command.name.11 = \u00d6ffne Verbreitungs-Wizard
+command.name.12 = Verbinden
+wizard.name.18 = CSV
+wizard.name.19 = CSV_NAME
+wizard.name.20 = CSV_PRINT
+command.name.13 = L\u00f6schen
+command.name.14 = L\u00f6schen
+page.name.32 = Taxon Navigator
+page.name.33 = Reihenfolge der Taxon-Nodes
+command.name.15 = \u00d6ffnen
+view.name.SESSIONS = Sessions
+command.label.SESSION = Sessions
+command.label.CONNECT = Verbinden
+command.label.RE_CONNECT = Aktualisiere Verbundung
+command.name.CONNECT = Verbinden
+command.name.RE_CONNECT = Aktualisiere Verbundung
+command.name.OPEN_CLASSIFICATION_WIZARD = \u00d6ffne Klassifikations-Wizard
\ No newline at end of file
LoginDialog_REALLY_CANCEL=Do you really want to cancel?\r
LoginDialog_USER_LOGIN=User Login\r
LoginDialog_USER_NAME=Username\r
+\r
+CdmViewerContextMenu_OPEN=Open (%s)\r
+CdmViewerContextMenu_OPEN_IN=Open in...\r
LoginDialog_REALLY_CANCEL=Wollen Sie wirklich abbrechen?
LoginDialog_USER_LOGIN=Benutzer Login
LoginDialog_USER_NAME=Benutzername
+
+CdmViewerContextMenu_OPEN=\u00d6ffnen (%s)
+CdmViewerContextMenu_OPEN_IN=\u00d6ffne mit...
+
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.2"?>
<plugin>
- <extension-point id="eu.etaxonomy.taxeditor.store.cdmViewer" name="%extension-point.name" schema="schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd"/>
+ <extension-point id="eu.etaxonomy.taxeditor.store.cdmViewer" name="Cdm Viewer" schema="schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd"/>
<extension
point="org.eclipse.ui.preferencePages">
<page
allowMultiple="false"
class="eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart"
id="eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart"
- name="Sessions"
+ name="%view.name.SESSIONS"
restorable="false">
</view>
</extension>
</command>
<command
commandId="org.eclipse.ui.views.showView"
- label="Sessions"
+ label="%command.label.SESSION"
style="push">
<parameter
name="org.eclipse.ui.views.showView.viewId"
locationURI="menu:org.eclipse.ui.main.menu.file?after=eu.etaxonomy.taxeditor.application.filemenu.io">
<command
commandId="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow"
- label="Connect"
+ label="%command.label.CONNECT"
style="push">
</command>
<command
</command>
<command
commandId="eu.etaxonomy.taxeditor.store.operations.reconnect"
- label="Re-Connect"
+ label="%command.label.RE_CONNECT"
style="push">
<visibleWhen
checkEnabled="true">
</command>
<command
id="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow"
- name="Connect">
+ name="%command.name.CONNECT">
</command>
<command
defaultHandler="eu.etaxonomy.taxeditor.handler.ReconnectHandler"
id="eu.etaxonomy.taxeditor.store.operations.reconnect"
- name="Re-Connect">
+ name="%command.name.RE_CONNECT">
</command>
<command
defaultHandler="eu.etaxonomy.taxeditor.editor.definedterm.handler.OpenDefinedTermEditorHandler"
id="eu.etaxonomy.taxeditor.store.open"
name="%command.name.15">
</command>
+ <command
+ defaultHandler="eu.etaxonomy.taxeditor.handler.defaultHandler.DefaultOpenClassificationWizardHandler"
+ id="eu.etaxonomy.taxeditor.command.openClassificationWizard"
+ name="%command.name.OPEN_CLASSIFICATION_WIZARD">
+ <commandParameter
+ id="eu.etaxonomy.taxeditor.command.openClassificationWizard.uuid"
+ name="Classification Uuid"
+ optional="true"
+ typeId="eu.etaxonomy.taxeditor.uuidParameterType">
+ </commandParameter>
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <commandParameterType
+ converter="eu.etaxonomy.taxeditor.handler.UuidsParameterTypeConverter"
+ id="eu.etaxonomy.taxeditor.uuidParameterType"
+ type="java.util.UUID">
+ </commandParameterType>
</extension>
<extension
point="org.eclipse.ui.importWizards">
</variable>
</sourceProvider>
</extension>
+<extension
+ point="eu.etaxonomy.taxeditor.store.cdmViewer">
+ <viewCommandMapping
+ commandId="eu.etaxonomy.taxeditor.command.openClassificationWizard"
+ selection="eu.etaxonomy.cdm.model.taxon.Classification"
+ viewerName="Classification Wizard">
+ </viewCommandMapping>
+</extension>
</plugin>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</annotation>
<complexType>
<sequence>
- <element ref="cdmViewer" minOccurs="1" maxOccurs="unbounded"/>
+ <element ref="viewCommandMapping" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
</complexType>
</element>
- <element name="cdmViewer">
+ <element name="viewCommandMapping">
<annotation>
<documentation>
- A Cdm Viewer knows what viewer or editor can show which input.
+ Maps a viewing class, like editors or views, to a command which opens it.
</documentation>
</annotation>
<complexType>
- <sequence>
- </sequence>
- <attribute name="class" type="string" use="required">
+ <attribute name="commandId" type="string" use="required">
<annotation>
<documentation>
- The class of the viewer.
+ The command which opens the viewer to show the selected object
</documentation>
<appInfo>
- <meta.attribute kind="java" basedOn=":eu.etaxonomy.taxeditor.view.ICdmViewer"/>
+ <meta.attribute kind="identifier" basedOn="org.eclipse.ui.commands/command/@id"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ <attribute name="viewerName" type="string">
+ <annotation>
+ <documentation>
+ The name of the viewer which shows the selected element
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="selection" type="string" use="required">
+ <annotation>
+ <documentation>
+ The class of the selected element
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java"/>
</appInfo>
</annotation>
</attribute>
public static String CdmDataSourceViewPart_7;
public static String CdmDataSourceViewPart_8;
public static String CdmDataSourceViewPart_9;
+ public static String CdmViewerContextMenu_OPEN;
+ public static String CdmViewerContextMenu_OPEN_IN;
public static String ChangeConnectionHandler_ALREADY_CONNECTING;
public static String ChangeConnectionHandler_CONFIRM_DATASOURCE;
public static String ChangeConnectionHandler_CURRENTLY_CONNECTING_ALREADY;
import org.eclipse.core.commands.AbstractParameterValueConverter;
import org.eclipse.core.commands.ParameterValueConversionException;
-public class UuidParameterConverter extends AbstractParameterValueConverter {
+/**
+ * Converts {@link UUID}s to a string representation
+ * and vica versa.
+ *
+ * @author pplitzner
+ * @date Sep 15, 2015
+ *
+ */
+public class UuidsParameterTypeConverter extends AbstractParameterValueConverter {
- public UuidParameterConverter() {
- // TODO Auto-generated constructor stub
+ public UuidsParameterTypeConverter() {
}
@Override
return parameterValue.toString();
}
-}
+}
\ No newline at end of file
--- /dev/null
+package eu.etaxonomy.taxeditor.handler.defaultHandler;
+
+import java.util.UUID;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.ui.PlatformUI;
+
+import eu.etaxonomy.cdm.api.service.IClassificationService;
+import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+public class DefaultOpenClassificationWizardHandler extends DefaultOpenHandlerBase<Classification> {
+
+ @Override
+ protected Classification getEntity(UUID uuid) {
+ return CdmStore.getService(IClassificationService.class).load(uuid);
+ }
+
+ @Override
+ protected void open(ExecutionEvent event, Classification entity) {
+ NewClassificationWizard classificationWizard = new NewClassificationWizard();
+ classificationWizard.init(null, null);
+ classificationWizard.setEntity(entity);
+ WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), classificationWizard);
+ dialog.open();
+ }
+
+
+}
\ No newline at end of file
--- /dev/null
+package eu.etaxonomy.taxeditor.handler.defaultHandler;
+
+import java.util.UUID;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.ParameterType;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+
+public abstract class DefaultOpenHandlerBase <T> extends AbstractHandler {
+
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ String commandId = event.getCommand().getId();
+ String uuidParameterId = commandId+".uuid";
+ //check if uuid parameter is set
+ if(event.getParameter(uuidParameterId)!=null){
+ Object object = event.getObjectParameterForExecution(uuidParameterId);
+ ParameterType parameterType;
+ try {
+ parameterType = event.getCommand().getParameterType(uuidParameterId);
+ if(parameterType.isCompatible(object)){
+ T entity = getEntity((UUID) object);
+ open(event, entity);
+ }
+ } catch (NotDefinedException e) {
+ MessagingUtils.error(DefaultOpenHandlerBase.class, "Error while opening classification!", e);
+ }
+ }
+ //if not try current selection
+ else{
+ ISelection selection = HandlerUtil.getCurrentSelection(event);
+ if(selection instanceof IStructuredSelection){
+ open(event, (T) ((IStructuredSelection) selection).getFirstElement());
+ }
+ }
+ return null;
+ }
+
+
+ protected abstract T getEntity(UUID uuid);
+
+ protected abstract void open(ExecutionEvent event, T entity);
+
+}
\ No newline at end of file
--- /dev/null
+package eu.etaxonomy.taxeditor.handler.defaultHandler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
+
+public class OpenReferencingObjectsView extends AbstractHandler {
+
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ return AbstractUtility.showView("eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects");
+ }
+
+}
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Display;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.SecurityExceptionUtils;
+import eu.etaxonomy.cdm.test.integration.SecurityExceptionUtils;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
Reference sec = taxon.getSec();
taxon.setSec(null);
try{
+<<<<<<< HEAD
+ UpdateResult result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, parent.getReference(), parent.getMicroReference());
+
+=======
UUID parentNodeUuid;
if(parent instanceof Classification){
parentNodeUuid = ((Classification) parent).getRootNode().getUuid();
}
UpdateResult result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parentNodeUuid, taxon, parent.getReference(), parent.getMicroReference());
+>>>>>>> hotfix/3.12.4
//TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());
/* if(CdmStore.getCurrentSessionManager().isRemoting()) {
generatedTaxonNodeUuid = result.getCdmEntity().getUuid();
TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid);
taxonNode.getTaxon().setSec(sec);
+<<<<<<< HEAD
+ CdmStore.getService(ITaxonNodeService.class).merge(taxonNode);
+=======
CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true);
+>>>>>>> hotfix/3.12.4
Set<CdmBase> affectedObjects = new HashSet<CdmBase>();
if (result.getUpdatedObjects().iterator().hasNext()){
TaxonNode parentNode = (TaxonNode)result.getUpdatedObjects().iterator().next();
affectedObjects.add(parentNode);
}
}
+<<<<<<< HEAD
+
+
+=======
+>>>>>>> hotfix/3.12.4
+
if(CdmStore.getCurrentSessionManager().isRemoting()) {
CdmApplicationState.getCurrentDataChangeService()
.fireChangeEvent(new CdmChangeEvent(Action.Create, affectedObjects, NewTaxonNodeWizard.class), true);
--- /dev/null
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.newWizard;
+
+import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.taxon.TaxonWizardPage;
+
+/**
+ *
+ * @author pplitzner
+ * @date Jan 18, 2016
+ *
+ */
+public class NewTaxonWizard extends AbstractNewEntityWizard<Taxon> {
+
+ private TaxonWizardPage taxonWizardPage;
+
+ /** {@inheritDoc} */
+ @Override
+ public void addPages() {
+ addPage(new NonViralNameWizardPage(formFactory, getConversationHolder(), (NonViralName) getEntity().getName()));
+ taxonWizardPage = new TaxonWizardPage(formFactory, getConversationHolder(), getEntity());
+ addPage(taxonWizardPage);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected Taxon createNewEntity() {
+ return Taxon.NewInstance(NonViralName.NewInstance(null), null);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected void saveEntity() {
+ CdmStore.getService(ITaxonService.class).save(getEntity());
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void setEntity(Taxon entity) {
+ super.setEntity(entity);
+ }
+
+ @Override
+ protected String getEntityName() {
+ return "Taxon";
+ }
+}
private boolean checkLargeResult(int count) {
- if(count > MAX_RESULTS_BEFORE_WARNING){
+ return checkLargeResult(count, MAX_RESULTS_BEFORE_WARNING);
+ }
+
+ private boolean checkLargeResult(int count, int maxBeforWarning) {
+ if(count > maxBeforWarning){
return MessageDialog.openConfirm(Display.getDefault().getActiveShell(), "Large result expected",
String.format("The current search will return %s objects. This will " +
"take a long time and/or might render the editor unusable. Please consider refining your search.", count));
@Override
public void widgetSelected(SelectionEvent e) {
- AbstractNewEntityWizard wizard = getNewEntityWizard(e.text);
-
- wizard.init(null, null);
- if(wizard.getEntity() != null) {
- WizardDialog dialog = new WizardDialog(getShell(), wizard);
- int status = dialog.open();
-
- if (status == IStatus.OK) {
-
- T entity = (T) wizard.getEntity();
- model.add(new UuidAndTitleCache<T>(entity.getUuid(),
- entity.getId(),
- getTitle(entity)));
- refresh();
- setPattern(entity);
- getConversationHolder().bind();
- }
- //FIXME : Need to make sure this is a stable fix (ticket 3822)
- getConversationHolder().commit();
- }
+ AbstractNewEntityWizard wizard = getNewEntityWizard(e.text);
+ if(wizard!=null){
+ wizard.init(null, null);
+ if(wizard.getEntity() != null) {
+ WizardDialog dialog = new WizardDialog(getShell(), wizard);
+ int status = dialog.open();
+
+ if (status == IStatus.OK) {
+
+ T entity = (T) wizard.getEntity();
+ model.add(new UuidAndTitleCache<T>(entity.getUuid(),
+ entity.getId(),
+ getTitle(entity)));
+ refresh();
+ setPattern(entity);
+ getConversationHolder().bind();
+ }
+ //FIXME : Need to make sure this is a stable fix (ticket 3822)
+ getConversationHolder().commit();
+ }
+ }
}
};
}
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- * <p>FilteredNameSelectionDialog class.</p>
- *
* @author n.hoffmann
* @created 04.06.2009
* @version 1.0
*/
public class NameSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonNameBase> {
- /**
- * Creates a filtered selection dialog to select a name.
- *
- * @param shell
- * The shell for displaying this widget
- * @param name
- * A name that should be selected when the dialog opens
- * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
- * @return a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
- */
public static TaxonNameBase select(Shell shell, ConversationHolder conversation, TaxonNameBase name) {
NameSelectionDialog dialog = new NameSelectionDialog(shell, conversation,
"Choose a name", false, name);
return getSelectionFromDialog(dialog);
}
- /**
- * <p>Constructor for FilteredNameSelectionDialog.</p>
- *
- * @param shell a {@link org.eclipse.swt.widgets.Shell} object.
- * @param title a {@link java.lang.String} object.
- * @param name a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
- * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
- * @param multi a boolean.
- */
protected NameSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonNameBase name) {
super(shell, conversation, title, multi, NameSelectionDialog.class.getCanonicalName(), name);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)
- */
/** {@inheritDoc} */
@Override
protected TaxonNameBase getPersistentObject(UUID cdmUuid) {
return CdmStore.getService(INameService.class).load(cdmUuid);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#initModel()
- */
/** {@inheritDoc} */
@Override
protected void initModel() {
-// $Id$\r
-/**\r
- * Copyright (C) 2007 EDIT\r
- * European Distributed Institute of Taxonomy\r
- * http://www.e-taxonomy.eu\r
- *\r
- * The contents of this file are subject to the Mozilla Public License Version 1.1\r
- * See LICENSE.TXT at the top of this package for the full license terms.\r
- */\r
-\r
-package eu.etaxonomy.taxeditor.ui.dialog.selection;\r
-\r
-import java.util.UUID;\r
-\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Shell;\r
-\r
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
-import eu.etaxonomy.cdm.api.service.ITaxonService;\r
-import eu.etaxonomy.cdm.model.taxon.Synonym;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
-import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;\r
-import eu.etaxonomy.taxeditor.store.CdmStore;\r
-\r
-/**\r
- * <p>FilteredTaxonBaseSelectionDialog class.</p>\r
- *\r
- * @author n.hoffmann\r
- * @created Sep 21, 2009\r
- * @version 1.0\r
- */\r
-public class TaxonBaseSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonBase> {\r
-\r
-\r
- /**\r
- * <p>select</p>\r
- *\r
- * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
- * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
- * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
- */\r
- public static TaxonBase selectTaxonBase(Shell shell, ConversationHolder conversation) {\r
- AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, conversation,\r
- "Choose a taxon", false, null, null);\r
- return getSelectionFromDialog(dialog);\r
- }\r
-\r
- /**\r
- * <p>select</p>\r
- *\r
- * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
- * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
- * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
- */\r
- public static Taxon selectTaxon(Shell shell, ConversationHolder conversation, Taxon taxonToBeFiltered) {\r
-\r
-\r
- AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, conversation,\r
- "Choose a taxon", false, null, taxonToBeFiltered);\r
- return (Taxon) getSelectionFromDialog(dialog);\r
- }\r
-\r
- /**\r
- * <p>select</p>\r
- *\r
- * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
- * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
- * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
- */\r
- public static Synonym selectSynonym(Shell shell, ConversationHolder conversation) {\r
- AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, conversation,\r
- "Choose a taxon", false, null, null);\r
- return (Synonym) getSelectionFromDialog(dialog);\r
- }\r
-\r
- private final Class<? extends TaxonBase> clazz;\r
-\r
- /**\r
- * <p>Constructor for FilteredTaxonBaseSelectionDialog.</p>\r
- *\r
- * @param shell a {@link org.eclipse.swt.widgets.Shell} object.\r
- * @param title a {@link java.lang.String} object.\r
- * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.\r
- * @param multi a boolean.\r
- * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.\r
- */\r
- protected TaxonBaseSelectionDialog(Class<? extends TaxonBase> clazz, Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) {\r
- super(shell, conversation, title, multi, ReferenceSelectionDialog.class.getCanonicalName(), taxon);\r
- this.cdmBaseToBeFiltered = taxonToBeFiltered;\r
- this.clazz = clazz;\r
- initModel();\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createExtendedContentArea(org.eclipse.swt.widgets.Composite)\r
- */\r
- /** {@inheritDoc} */\r
- @Override\r
- protected Control createExtendedContentArea(Composite parent) {\r
- return null;\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)\r
- */\r
- /** {@inheritDoc} */\r
- @Override\r
- protected TaxonBase getPersistentObject(UUID uuid) {\r
- return CdmStore.getService(ITaxonService.class).load(uuid);\r
- }\r
-\r
- /* (non-Javadoc)\r
- * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#initModel()\r
- */\r
- /** {@inheritDoc} */\r
- @Override\r
- protected void initModel() {\r
- if(clazz == TaxonBase.class){\r
- model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCache();\r
- }\r
- else if(clazz == Taxon.class){\r
-\r
- model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheTaxon();\r
-\r
- }\r
- else if(clazz == Synonym.class){\r
- model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheSynonym();\r
- }\r
- }\r
-\r
- /** {@inheritDoc} */\r
- @Override\r
- protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {\r
- return null;\r
- }\r
-\r
- /** {@inheritDoc} */\r
- @Override\r
- protected String getNewWizardLinkText() {\r
- return null;\r
- }\r
-}\r
+// $Id$
+/**
+ * Copyright (C) 2007 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
+
+package eu.etaxonomy.taxeditor.ui.dialog.selection;
+
+import java.util.UUID;
+
+import org.eclipse.swt.widgets.Shell;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.model.taxon.Synonym;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewTaxonWizard;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+/**
+ * @author n.hoffmann
+ * @created Sep 21, 2009
+ * @version 1.0
+ */
+public class TaxonBaseSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonBase> {
+
+
+ public static TaxonBase selectTaxonBase(Shell shell, ConversationHolder conversation) {
+ AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(TaxonBase.class, shell, conversation,
+ "Choose a taxon/synonym", false, null, null);
+ return getSelectionFromDialog(dialog);
+ }
+
+ public static Taxon selectTaxon(Shell shell, ConversationHolder conversation, Taxon taxonToBeFiltered) {
+
+
+ AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Taxon.class, shell, conversation,
+ "Choose a taxon", false, null, taxonToBeFiltered);
+ return (Taxon) getSelectionFromDialog(dialog);
+ }
+
+ public static Synonym selectSynonym(Shell shell, ConversationHolder conversation) {
+ AbstractFilteredCdmResourceSelectionDialog<TaxonBase> dialog = new TaxonBaseSelectionDialog(Synonym.class, shell, conversation,
+ "Choose a synonym", false, null, null);
+ return (Synonym) getSelectionFromDialog(dialog);
+ }
+
+ private final Class<? extends TaxonBase> clazz;
+
+ protected TaxonBaseSelectionDialog(Class<? extends TaxonBase> clazz, Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonBase taxon, TaxonBase taxonToBeFiltered) {
+ super(shell, conversation, title, multi, TaxonBaseSelectionDialog.class.getCanonicalName(), taxon);
+ this.cdmBaseToBeFiltered = taxonToBeFiltered;
+ this.clazz = clazz;
+ initModel();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected TaxonBase getPersistentObject(UUID uuid) {
+ return CdmStore.getService(ITaxonService.class).load(uuid);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected void initModel() {
+ if(clazz == TaxonBase.class){
+ model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCache();
+ }
+ else if(clazz == Taxon.class){
+ model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheTaxon();
+ }
+ else if(clazz == Synonym.class){
+ model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheSynonym();
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
+ return new NewTaxonWizard();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected String getNewWizardLinkText() {
+ return String.format("Create a new <a>%1s</a>", "Taxon ");
+ }
+}
// $Id$
/**
* 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.
*/
* <p>
* Abstract AbstractCdmEntityWizardPage class.
* </p>
- *
+ *
* @author n.hoffmann
* @created Jun 1, 2010
* @version 1.0
* <p>
* Constructor for AbstractCdmEntityWizardPage.
* </p>
- *
+ *
* @param formFactory
* a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
* object.
/*
* (non-Javadoc)
- *
+ *
* @see
* org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets
* .Composite)
* <p>
* Getter for the field <code>entity</code>.
* </p>
- *
+ *
* @return a T object.
*/
public T getEntity() {
/**
* Creates the detail element for this wizard page
- *
+ *
* @param rootElement
* a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
* object.
if (event.getSource() == getDetailElement()) {
checkComplete();
}
+ else if(event.getSource() instanceof AbstractCdmDetailElement){
+ //check if parent element is set as detail element
+ ICdmFormElement formElement = (ICdmFormElement) event.getSource();
+ while(formElement.getParentElement()!=null){
+ if(formElement.getParentElement() == getDetailElement()){
+ checkComplete();
+ return;
+ }
+ formElement = formElement.getParentElement();
+ }
+ }
}
/**
* <p>
* getConversationHolder
* </p>
- *
+ *
* @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
* object.
*/
* <p>
* Getter for the field <code>detailElement</code>.
* </p>
- *
+ *
* @return a
* {@link eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement}
* object.
TableWrapLayout layout = LayoutConstants.LAYOUT();
layout.bottomMargin = 10;
layout.rightMargin = 5;
+ layout.horizontalSpacing = 5;
client.setLayout(layout);
import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenCurrentDeterminationDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenDetailElement;
import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenDeterminationDetailElement;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenDeterminationDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenDeterminationHistoryDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenGeneralDetailElement;
import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenGeneralDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenSourceCollectionDetailSection;
return section;
}
- public PreservedSpecimenDeterminationDetailSection createPreservedSpecimenDeterminationDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){
- PreservedSpecimenDeterminationDetailSection section = new PreservedSpecimenDeterminationDetailSection(this, conversation, parentElement, selectionProvider, style);
- addAndAdaptSection(parentElement, section);
- return section;
- }
-
public TaxonRelationshipDetailSection createTaxonRelationshipDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){
TaxonRelationshipDetailSection section = new TaxonRelationshipDetailSection(this, conversation, parentElement, selectionProvider, style);
addAndAdaptSection(parentElement, section);
return element;
}
- public PreservedSpecimenDeterminationDetailElement createPreservedSpecimenDeterminationDetailElement(ICdmFormElement parentElement) {
- PreservedSpecimenDeterminationDetailElement element = new PreservedSpecimenDeterminationDetailElement(this, parentElement);
- addAndAdaptElement(parentElement, element);
- return element;
- }
-
public DeterminationDetailElement createDeterminationDetailElement(ICdmFormElement parentElement) {
DeterminationDetailElement element = new DeterminationDetailElement(this, parentElement);
addAndAdaptElement(parentElement, element);
return section;
}
- public PreservedSpecimenDeterminationHistoryDetailSection createPreservedSpecimenDeterminationHistoryDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){
- PreservedSpecimenDeterminationHistoryDetailSection section = new PreservedSpecimenDeterminationHistoryDetailSection(this, conversation, parentElement, style);
- addAndAdaptSection(parentElement, section);
- return section;
- }
-
public SpecimenCollectionDetailSection createSpecimenCollectionDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){
SpecimenCollectionDetailSection section = new SpecimenCollectionDetailSection(this, conversation, parentElement, style);
addAndAdaptSection(parentElement, section);
+++ /dev/null
-// $Id$
-/**
-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
-package eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit;
-
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
-import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
-
-/**
- * @author n.hoffmann
- * @created May 11, 2011
- * @version 1.0
- */
-public class PreservedSpecimenDeterminationDetailElement extends AbstractCdmDetailElement<DerivedUnit> {
-
- private PreservedSpecimenCurrentDeterminationDetailSection section_currentDetermination;
-
- private PreservedSpecimenDeterminationHistoryDetailSection section_determinationHistory;
-
- /**
- * @param formFactory
- * @param formElement
- */
- public PreservedSpecimenDeterminationDetailElement(CdmFormFactory formFactory,
- ICdmFormElement formElement) {
- super(formFactory, formElement);
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#createControls(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement, java.lang.Object, int)
- */
- @Override
- protected void createControls(ICdmFormElement formElement,
- DerivedUnit entity, int style) {
-
- section_currentDetermination = formFactory.createPreservedSpecimenCurrentDeterminationDetailSection(getConversationHolder(), formElement, ExpandableComposite.EXPANDED);
- section_currentDetermination.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
- section_currentDetermination.setEntity(entity);
-
- section_determinationHistory = formFactory.createPreservedSpecimenDeterminationHistoryDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE);
- section_determinationHistory.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
- section_determinationHistory.setEntity(entity);
-
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)
- */
- @Override
- public void handleEvent(Object eventSource) {
- if(eventSource == section_currentDetermination){
- section_determinationHistory.refresh();
- }
- }
-
-}
+++ /dev/null
-// $Id$
-/**
-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
-package eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
-
-/**
- * @author n.hoffmann
- * @created May 11, 2011
- * @version 1.0
- */
-public class PreservedSpecimenDeterminationDetailSection extends AbstractCdmDetailSection<DerivedUnit> {
-
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param selectionProvider
- * @param style
- */
- public PreservedSpecimenDeterminationDetailSection(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement,
- ISelectionProvider selectionProvider, int style) {
- super(formFactory, conversation, parentElement, selectionProvider, style);
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#getHeading()
- */
- @Override
- public String getHeading() {
- return "Determinations";
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
- @Override
- protected AbstractCdmDetailElement<DerivedUnit> createCdmDetailElement(AbstractCdmDetailSection<DerivedUnit> parentElement, int style) {
- return formFactory.createPreservedSpecimenDeterminationDetailElement(parentElement);
- }
-
-}
+++ /dev/null
-// $Id$
-/**
-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
-package eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
-import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-
-/**
- * @author n.hoffmann
- * @created May 11, 2011
- * @version 1.0
- */
-public class PreservedSpecimenDeterminationHistoryDetailSection extends
-PreservedSpecimenAbstractDeterminationEventDetailSection {
-
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param style
- */
- public PreservedSpecimenDeterminationHistoryDetailSection(CdmFormFactory formFactory,
- ConversationHolder conversation, ICdmFormElement parentElement,
- int style) {
- super(formFactory, conversation, parentElement, "Determination History", style);
- }
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#getCollection(java.lang.Object)
- */
- @Override
- public Collection<DeterminationEvent> getCollection(DerivedUnit entity) {
- if(entity!=null){
- Set<DeterminationEvent> events = entity.getDeterminations();
- Set<DeterminationEvent> result = new HashSet<DeterminationEvent>();
- for (DeterminationEvent event : events){
- if (event.getPreferredFlag() != true){
- result.add(event);
- }
- }
- return result;
- }
- return null;
- }
-
- @Override
- public void refresh() {
- internalUpdateSection(false);
- }
-
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#getTooltipString()
- */
- /** {@inheritDoc} */
- @Override
- protected String getTooltipString() {
- return "Add a determination event to the history";
- }
-
-}
--- /dev/null
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.ui.section.taxon;
+
+import org.eclipse.swt.SWT;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+
+/**
+ *
+ * @author pplitzner
+ * @date Jan 18, 2016
+ *
+ */
+public class TaxonWizardPage extends AbstractCdmEntityWizardPage<TaxonBase> {
+
+ public TaxonWizardPage(CdmFormFactory formFactory, ConversationHolder conversation,
+ TaxonBase entity) {
+ super(formFactory, conversation, entity);
+ setTitle("Taxon");
+ }
+
+
+ /** {@inheritDoc} */
+ @Override
+ public AbstractCdmDetailElement<TaxonBase> createElement(ICdmFormElement rootElement) {
+ TaxonBaseDetailElement taxonBaseDetailElement = formFactory.createTaxonBaseDetailElement(rootElement, SWT.NULL);
+ taxonBaseDetailElement.setEntity(entity);
+ return taxonBaseDetailElement;
+ }
+
+ @Override
+ public boolean isPageComplete() {
+ return true;
+ }
+}
+++ /dev/null
-// $Id$
-/**
-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
-package eu.etaxonomy.taxeditor.view;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.part.ViewPart;
-
-import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
-
-/**
- * <p>Abstract AbstractSplitableViewPart class.</p>
- *
- * @author n.hoffmann
- * @created Feb 12, 2010
- * @version 1.0
- */
-public abstract class AbstractSplitableViewPart extends ViewPart implements ISelectionListener{
-
- static final int VIEW_ORIENTATION_VERTICAL = 0;
- static final int VIEW_ORIENTATION_HORIZONTAL = 1;
- static final int VIEW_ORIENTATION_SINGLE = 2;
- static final int VIEW_ORIENTATION_AUTOMATIC = 3;
-
- private static final int PAGE_EMPTY = 0;
- private static final int PAGE_VIEWER = 1;
-
- private final IDialogSettings dialogSettings;
-
- private SashForm detailSplitter;
-
- private Composite parent;
-
- private PageBook pagebook;
-
- private int orientation;
-
- private int currentOrientation;
-//
- private boolean showViewer2;
-
- private Viewer viewer1;
-
- private Viewer viewer2;
-
- private Label emptySelectionLabel;
-
- private ISelectionService selectionService;
-
-
- /**
- * <p>Constructor for AbstractSplitableViewPart.</p>
- */
- public AbstractSplitableViewPart() {
- super();
-
- dialogSettings = TaxeditorStorePlugin.getDefault().getDialogSettings();
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
- */
- /** {@inheritDoc} */
- @Override
- public void createPartControl(Composite parent) {
- selectionService = getSite().getWorkbenchWindow().getSelectionService();
- selectionService.addSelectionListener(this);
- selectionService.addPostSelectionListener(this);
-
-
- this.parent = parent;
- addResizeListener(parent);
- pagebook = new PageBook(parent, SWT.NULL);
-
- // Page 1: Viewers
- createDetailSplitter(pagebook);
- viewer1 = createViewer1(detailSplitter);
- viewer2 = createViewer2(detailSplitter);
-
- // Page 2: Nothing selected
- emptySelectionLabel = new Label(pagebook, SWT.TOP + SWT.LEFT + SWT.WRAP);
- emptySelectionLabel.setText("Current selection does not support this view"); //
-
- showPage(PAGE_EMPTY);
-
- initOrientation();
-
- // FIXME since this class is not used at the moment we will not have to fix this soon
- // it might also become irrelevant in future uses
- // set the selection if there is an open editor
-// if(EditorUtil.getActiveMultiPageTaxonEditor() != null){
-// selectionChanged(EditorUtil.getActiveMultiPageTaxonEditor(), EditorUtil.getCurrentSelection());
-// }
- }
-
- private void initOrientation() {
-
- try {
- orientation = dialogSettings.getInt(getDialogstoreVieworientationKey());
-
- if ((orientation < 0) || (orientation > 3)) {
- orientation = VIEW_ORIENTATION_AUTOMATIC;
- }
- } catch (NumberFormatException e) {
- orientation = VIEW_ORIENTATION_AUTOMATIC;
- }
-
- // force the update
- currentOrientation = -1;
- setOrientation(orientation);
- }
-
- /**
- * <p>getDialogstoreVieworientationKey</p>
- *
- * @return a {@link java.lang.String} object.
- */
- protected abstract String getDialogstoreVieworientationKey();
-
- /**
- * <p>showEmptyPage</p>
- */
- public void showEmptyPage(){
- showPage(PAGE_EMPTY);
- }
-
- /**
- * <p>showViewer</p>
- */
- public void showViewer(){
- showPage(PAGE_VIEWER);
- }
-
- private void showPage(int page) {
- if (page == PAGE_EMPTY) {
- pagebook.showPage(emptySelectionLabel);
- } else {
- pagebook.showPage(detailSplitter);
- }
- }
-
- private void addResizeListener(Composite parent) {
- parent.addControlListener(new ControlListener() {
- public void controlMoved(ControlEvent e) {
- }
- public void controlResized(ControlEvent e) {
- computeOrientation();
- }
- });
- }
-
- void computeOrientation() {
- saveSplitterRatio();
- dialogSettings.put(getDialogstoreVieworientationKey(), orientation);
- if (orientation != VIEW_ORIENTATION_AUTOMATIC) {
- setOrientation(orientation);
- }
- else {
- if (orientation == VIEW_ORIENTATION_SINGLE)
- return;
- Point size= parent.getSize();
- if (size.x != 0 && size.y != 0) {
- if (size.x > size.y)
- setOrientation(VIEW_ORIENTATION_HORIZONTAL);
- else
- setOrientation(VIEW_ORIENTATION_VERTICAL);
- }
- }
- }
-
- private void saveSplitterRatio() {
- if (detailSplitter != null && ! detailSplitter.isDisposed()) {
- int[] weigths = detailSplitter.getWeights();
- int ratio = (weigths[0] * 1000) / (weigths[0] + weigths[1]);
- String key= getDialogStoreRatioKey() + currentOrientation;
- dialogSettings.put(key, ratio);
- }
- }
-
- /**
- * <p>getDialogStoreRatioKey</p>
- *
- * @return a {@link java.lang.String} object.
- */
- protected abstract String getDialogStoreRatioKey();
-
- void setOrientation(int orientation) {
- if (currentOrientation != orientation) {
- if ((getViewer1() != null)
- && !getViewer1().getControl().isDisposed()
- && (detailSplitter != null)
- && !detailSplitter.isDisposed()) {
-
- if (orientation == VIEW_ORIENTATION_SINGLE) {
- setShowViewer2(false);
- } else {
- if (currentOrientation == VIEW_ORIENTATION_SINGLE) {
- setShowViewer2(true);
- }
- boolean horizontal = orientation == VIEW_ORIENTATION_HORIZONTAL;
- detailSplitter.setOrientation(horizontal ? SWT.HORIZONTAL
- : SWT.VERTICAL);
- }
-
- detailSplitter.layout();
- }
-
- updateCheckedState();
-
- currentOrientation = orientation;
-
- restoreSplitterRatio();
- }
- }
-
- /**
- * @param show
- */
- private void setShowViewer2(boolean show) {
- showViewer2 = show;
- showOrHideViewer2();
- }
-
- /**
- *
- */
- private void showOrHideViewer2() {
- if (showViewer2) {
- detailSplitter.setMaximizedControl(null);
- } else {
- detailSplitter.setMaximizedControl(getViewer1().getControl());
- }
- }
-
- private void restoreSplitterRatio() {
- String ratio= dialogSettings.get(getDialogStoreRatioKey() + currentOrientation);
- if (ratio == null)
- return;
- int intRatio= Integer.parseInt(ratio);
- detailSplitter.setWeights(new int[] {intRatio, 1000 - intRatio});
- }
-
- private void updateCheckedState() {
-// for (int i= 0; i < fToggleOrientationActions.length; i++) {
-// fToggleOrientationActions[i].setChecked(fOrientation == fToggleOrientationActions[i].getOrientation());
-// }
- }
-
- /**
- * <p>createViewer1</p>
- *
- * @param parent a {@link org.eclipse.swt.widgets.Composite} object.
- * @return a {@link org.eclipse.jface.viewers.Viewer} object.
- */
- protected abstract Viewer createViewer1(Composite parent);
-
-
- /**
- * <p>createViewer2</p>
- *
- * @param parent a {@link org.eclipse.swt.widgets.Composite} object.
- * @return a {@link org.eclipse.jface.viewers.Viewer} object.
- */
- protected abstract Viewer createViewer2(Composite parent);
-
-
- /**
- * @param pagebook2
- */
- private void createDetailSplitter(Composite parent) {
- detailSplitter = new SashForm(parent, SWT.HORIZONTAL);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.part.WorkbenchPart#dispose()
- */
- /** {@inheritDoc} */
- @Override
- public void dispose() {
- selectionService.removeSelectionListener(this);
- selectionService.removePostSelectionListener(this);
- super.dispose();
- }
-
- /**
- * <p>Getter for the field <code>viewer1</code>.</p>
- *
- * @return a {@link org.eclipse.jface.viewers.Viewer} object.
- */
- protected Viewer getViewer1() {
- return viewer1;
- }
-
- /**
- * <p>Getter for the field <code>viewer2</code>.</p>
- *
- * @return a {@link org.eclipse.jface.viewers.Viewer} object.
- */
- protected Viewer getViewer2() {
- return viewer2;
- }
-}
*/
package eu.etaxonomy.taxeditor.view;
+import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
+import java.util.UUID;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.IHandlerService;
+
+import eu.etaxonomy.cdm.model.common.ICdmBase;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
/**
* This class opens a popup dialog and provides the possibility to choose from a
*/
public class CdmViewerChooser extends PopupDialog implements ISelectionChangedListener, ILabelProvider{
+ private Map<Command, String> nameViewerMap;
private Object input;
- private Map<Entry<Class<?>, String>, ICdmViewer> nameViewerMap;
public CdmViewerChooser(Shell parentShell) {
this(parentShell, SWT.RESIZE | SWT.ON_TOP, true, false, false, false, false, "Open in ...",
*/
public void chooseViewer(Object input){
this.input = input;
- this.nameViewerMap = CdmViewerUtil.getNameViewerMap(input);
+ this.nameViewerMap = CdmViewerUtil.getAvailableViewers(input);
//if only one editor is available then open it
if(nameViewerMap.size()==1){
- Entry<Class<?>, String> next = nameViewerMap.keySet().iterator().next();
- ICdmViewer cdmViewer = nameViewerMap.get(next);
- cdmViewer.show(input, next.getKey());
+ Command command = nameViewerMap.keySet().iterator().next();
+ executeCommand(command.getId(), input);
}
else{
if(nameViewerMap.isEmpty()){
}
}
+ private void executeCommand(String commandId, Object input) {
+ ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
+ //get the command from plugin.xml
+ Command command = commandService.getCommand(commandId);
+
+ //set uuid parameter
+ if(input instanceof ICdmBase){
+ Map<String, UUID> params = new HashMap<String, UUID>();
+ params.put(commandId+".uuid", ((ICdmBase) input).getUuid());
+
+ //build the parameterized command
+ ParameterizedCommand pc = ParameterizedCommand.generateCommand(command, params);
+
+ if(command.isEnabled()) {
+ IHandlerService handlerService = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
+ try {
+ handlerService.executeCommand(pc, null);
+ } catch (NotDefinedException nde) {
+ throw new RuntimeException("Could not find open command: " + commandId);
+ } catch (Exception exception) {
+ MessagingUtils.error(getClass(), "An exception occured while trying execute "+commandId, exception);
+ }
+ }
+ }
+ }
+
@Override
protected Control createDialogArea(Composite parent) {
TableViewer viewer = new TableViewer(new Table(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION));
ISelection selection = event.getSelection();
if(selection instanceof IStructuredSelection){
Object firstElement = ((IStructuredSelection) selection).getFirstElement();
- if(nameViewerMap.containsKey(firstElement)){
- Entry<Class<?>, String> entry = (Entry<Class<?>, String>)firstElement;
- ICdmViewer cdmViewer = nameViewerMap.get(entry);
- cdmViewer.show(input, entry.getKey());
+ if(firstElement instanceof String && nameViewerMap.containsKey(firstElement)){
+ executeCommand((String) firstElement, this.input);
this.close();
}
}
@Override
public String getText(Object element) {
- String text = null;
- if(nameViewerMap.containsKey(element)){
- Entry<Class<?>, String> entry = (Entry<Class<?>, String>) element;
- text = entry.getValue();
- }
- return text;
+ return nameViewerMap.get(element);
}
@Override
package eu.etaxonomy.taxeditor.view;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.UUID;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ParameterizedCommand;
+import org.eclipse.core.commands.common.NotDefinedException;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.CompoundContributionItem;
+import org.eclipse.ui.handlers.IHandlerService;
+
+import eu.etaxonomy.cdm.model.common.ICdmBase;
+import eu.etaxonomy.taxeditor.Messages;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
/**
* Generic context menu for opening elements in the taxeditor.
new ContributionItem() {
@Override
public void fill(Menu menu, int index) {
- MenuItem addItem = new MenuItem(menu, SWT.CASCADE);
- addItem.setText("Open in...");
- Menu addMenu = new Menu(menu);
- addItem.setMenu(addMenu);
final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
final ISelection selection = window.getActivePage().getSelection();
if(selection instanceof IStructuredSelection){
Object firstElement = ((IStructuredSelection) selection).getFirstElement();
- Map<Entry<Class<?>, String>, ICdmViewer> nameViewerMap = CdmViewerUtil.getNameViewerMap(firstElement);
- for(Entry<Entry<Class<?>, String>, ICdmViewer> entry:nameViewerMap.entrySet()){
- Entry<Class<?>, String> viewerClass = entry.getKey();
- MenuItem menuItem = new MenuItem(addMenu, SWT.NONE);
- menuItem.setText(viewerClass.getValue());
- menuItem.addSelectionListener(new OpenInViewerListener(entry.getValue(), firstElement, viewerClass.getKey()));
+ Map<Command, String> enabledCommands = CdmViewerUtil.getAvailableViewers(firstElement);
+
+ //check if only one or multiple viewers/commands are available
+ if(enabledCommands.size()==1){
+ Entry<Command, String> entry = enabledCommands.entrySet().iterator().next();
+ final Command command = entry.getKey();
+ String viewerName = entry.getValue();
+
+ MenuItem addItem = new MenuItem(menu, SWT.CASCADE);
+ addItem.setText(String.format(Messages.CdmViewerContextMenu_OPEN, viewerName));
+ addItem.addSelectionListener(new CommandInvoker(command, firstElement)) ;
+ }
+ else if(enabledCommands.size()>1){
+ MenuItem addItem = new MenuItem(menu, SWT.CASCADE);
+ addItem.setText(Messages.CdmViewerContextMenu_OPEN_IN);
+ Menu addMenu = new Menu(menu);
+ addItem.setMenu(addMenu);
+ for(Entry<Command, String> entry:enabledCommands.entrySet()){
+ final Command command = entry.getKey();
+ String viewerName = entry.getValue();
+
+ MenuItem menuItem = new MenuItem(addMenu, SWT.NONE);
+ menuItem.setText(viewerName);
+ menuItem.addSelectionListener(new CommandInvoker(command, firstElement)) ;
+ }
}
}
}
+
}
};
return contributionItems;
}
- private class OpenInViewerListener extends SelectionAdapter {
-
- private final ICdmViewer cdmViewer;
- private final Object input;
- private final Class<?> viewerClass;
+ private final class CommandInvoker extends SelectionAdapter {
+ private final Command command;
+ private final Object selectedObject;
- public OpenInViewerListener(ICdmViewer cdmViewer, Object input, Class<?> viewerClass) {
- super();
- this.cdmViewer = cdmViewer;
- this.input = input;
- this.viewerClass = viewerClass;
+ private CommandInvoker(Command command, Object selectedObject) {
+ this.command = command;
+ this.selectedObject = selectedObject;
}
@Override
public void widgetSelected(SelectionEvent e) {
- cdmViewer.show(input, viewerClass);
+ IHandlerService handlerService = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
+ Map<String, UUID> params = new HashMap<String, UUID>();
+ if(selectedObject instanceof ICdmBase){
+ params.put(command.getId()+".uuid", ((ICdmBase) selectedObject).getUuid()); //$NON-NLS-1$
+ }
+ ParameterizedCommand parameterizedCommand = ParameterizedCommand.generateCommand(command, params);
+ try {
+ if(parameterizedCommand!=null){
+ handlerService.executeCommand(parameterizedCommand, null);
+ }
+ else{
+ handlerService.executeCommand(command.getId(), null);
+ }
+ } catch (NotDefinedException nde) {
+ throw new RuntimeException("Could not find open command: " + command.getId()); //$NON-NLS-1$
+ } catch (Exception exception) {
+ MessagingUtils.error(getClass(), "An exception occured while trying execute "+command.getId(), exception); //$NON-NLS-1$
+ }
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getSelection();
}
-
}
}
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
-import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.commands.Command;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
/**
+ * Scans eu.etaxonomy.taxeditor.store.cdmViewer extension point.
* @author pplitzner
* @date Jul 7, 2015
*
*/
public class CdmViewerUtil {
- public static Map<Entry<Class<?>, String>, ICdmViewer> getNameViewerMap(Object input){
- Map<Entry<Class<?>, String>, ICdmViewer> nameViewerMap = new HashMap<Entry<Class<?>, String>, ICdmViewer>();
-
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] extensions = reg
- .getConfigurationElementsFor("eu.etaxonomy.taxeditor.store.cdmViewer");
- for (IConfigurationElement configElement : extensions) {
- try {
- Object object = configElement.createExecutableExtension("class");
- if(object instanceof ICdmViewer){
- ICdmViewer cdmViewer = (ICdmViewer)object;
- Map<Class<?>, String> viewerClasses = cdmViewer.getViewerClasses(input);
- for (Entry<Class<?>, String> entry : viewerClasses.entrySet()) {
- nameViewerMap.put(entry, cdmViewer);
+ /**
+ * Returns a map of available commands to open the given input.
+ * Keys are the command IDs and values are their string representations.
+ *
+ * @param input
+ * the object which should be handled by the available commands
+ * @return a key-value map of available commands and their string
+ * representation
+ */
+ public static Map<Command, String> getAvailableViewers(Object input){
+ Map<Command, String> commandViewerNameMap = new HashMap<Command, String>();
+
+ if(input!=null){
+ IExtensionRegistry reg = Platform.getExtensionRegistry();
+ IConfigurationElement[] extensions = reg
+ .getConfigurationElementsFor("eu.etaxonomy.taxeditor.store.cdmViewer"); //$NON-NLS-1$
+ for (IConfigurationElement configElement : extensions) {
+ if(configElement.getName().equals("viewCommandMapping")){ //$NON-NLS-1$
+ try {
+ String commandId = configElement.getAttribute("commandId"); //$NON-NLS-1$
+ String viewerName = configElement.getAttribute("viewerName"); //$NON-NLS-1$
+ Class<?> selectionClass = Class.forName(configElement.getAttribute("selection")); //$NON-NLS-1$
+ if(selectionClass.isAssignableFrom(input.getClass())){
+ ICommandService commandService = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
+ Command command = commandService.getCommand(commandId);
+ //TODO: maybe pass the command directly instead of just the command id
+ if(command.isEnabled()){
+ commandViewerNameMap.put(command, viewerName);
+ }
+ }
+ } catch (ClassNotFoundException e) {
+ MessagingUtils.error(CdmViewerChooser.class, "Could not initalize selection class element of cdmViewer extension", e); //$NON-NLS-1$
}
}
- else{
- MessagingUtils.error(CdmViewerChooser.class, new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, "Could not load cdmViewer extension"));
- }
- } catch (CoreException e) {
- MessagingUtils.error(CdmViewerChooser.class, "Could not load cdmViewer extension", e);
}
}
- return nameViewerMap;
+ return commandViewerNameMap;
}
}
+++ /dev/null
-// $Id$
-/**
-* Copyright (C) 2015 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.view;
-
-import java.util.Map;
-
-
-/**
- * Implementors of this interface provide a mapping of input elements to views
- * or editors which can display information or provide editing functionality for
- * the input elements.
- *
- * @author pplitzner
- * @date Feb 23, 2015
- *
- */
-public interface ICdmViewer {
-
- /**
- * For the given input a map is returned specifying the available viewer
- * classes as keys and their string representation as values
- *
- * @param input
- * the input for which the viewer classes should be returned
- * @return a map holding the viewer classes as keys and their string
- * representations as values
- */
- public Map<Class<?>, String> getViewerClasses(Object input);
-
- /**
- * Opens the viewer defined by the given viewerClass for the given input.
- * @param input the input for which a viewer should be opened
- * @param viewerClass the qualified class name of the viewer
- */
- public void show(Object input, Class<?> viewerClass);
-
-}
return multiLinkSingleReads;
}
- public void initCache(Collection<SpecimenOrObservationBase<?>> rootElements) {
+ public void updateLabelCache(Collection<SpecimenOrObservationBase<?>> rootElements) {
DerivateLabelProvider.multiLinkSingleReads = new HashSet<SingleRead>();
DerivateLabelProvider.typeDesignations = new HashMap<DerivedUnit, Collection<SpecimenTypeDesignation>>();
for(Entry<SingleRead, Collection<Sequence>> entry:CdmStore.getService(ISequenceService.class).getSingleReadSequencesMap().entrySet()){
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.test
Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-Bundle-Version: 3.12.0.qualifier
+Bundle-Version: 3.13.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-Vendor: EDIT
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
org.hamcrest,
org.eclipse.swtbot.eclipse.core,
org.eclipse.swtbot.eclipse.finder,
- eu.etaxonomy.taxeditor.webapp;bundle-version="3.12.0"
+ eu.etaxonomy.taxeditor.webapp;bundle-version="3.13.0"
Eclipse-RegisterBuddy: org.apache.log4j, org.eclipse.swtbot.swt.finder
Bundle-ClassPath: .,
lib/byte-buddy-0.5.1.jar,
-<?xml version="1.0" encoding="UTF-8"?>\r
-<project>\r
-\r
- <parent>\r
- <groupId>eu.etaxonomy</groupId>\r
- <artifactId>taxeditor-parent</artifactId>\r
- <version>3.12.0-SNAPSHOT</version>\r
- </parent>\r
- <modelVersion>4.0.0</modelVersion>\r
- <artifactId>eu.etaxonomy.taxeditor.test</artifactId>\r
- <packaging>eclipse-test-plugin</packaging>\r
- <name>UI Test Bundle</name>\r
- <description>Holds all Tests for the Taxonomic Editor</description>\r
- <build>\r
- <plugins>\r
- <plugin>\r
- <groupId>org.eclipse.tycho</groupId>\r
- <artifactId>target-platform-configuration</artifactId>\r
- <version>${tycho.version}</version>\r
- <configuration>\r
- <filters>\r
- <!-- Work around for https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045 -->\r
- <!-- taken from https://wiki.eclipse.org/index.php?title=Tycho/Target_Platform#Filtering -->\r
- <filter>\r
- <type>p2-installable-unit</type>\r
- <id>org.eclipse.equinox.servletbridge.extensionbundle</id>\r
- <removeAll />\r
- </filter>\r
- </filters>\r
- </configuration>\r
- </plugin>\r
- <plugin>\r
- <groupId>org.eclipse.tycho</groupId>\r
- <artifactId>tycho-surefire-plugin</artifactId>\r
- <version>${tycho.version}</version>\r
- <configuration>\r
- <!-- currently we run only the non-ui unit tests so we don't the \r
- harness -->\r
- <!-- <useUIHarness>true</useUIHarness> -->\r
- <dependencies>\r
- <!-- This will pull the feature and its dependent plugins into \r
- the classpath for the tests. Note that this requires ALL taxeditor projects \r
- to be installed. -->\r
- <dependency>\r
- <type>eclipse-feature</type>\r
- <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>\r
- <!-- This is the minimum required version -->\r
- <version>1.0.0</version>\r
- </dependency>\r
- </dependencies>\r
- </configuration>\r
- </plugin>\r
- <plugin>\r
- <groupId>org.eclipse.jetty</groupId>\r
- <artifactId>jetty-maven-plugin</artifactId>\r
- <version>9.2.9.v20150224</version>\r
- <configuration>\r
- <jvmArgs>-Xmx512m -XX:MaxPermSize=512m</jvmArgs>\r
- <systemProperties>\r
- <systemProperty>\r
- <name>spring.profiles.active</name>\r
- <value>remoting</value>\r
- </systemProperty>\r
- <systemProperty>\r
- <name>cdm.beanDefinitionFile</name>\r
- <value>${basedir}/src/test/resources/datasources.xml</value>\r
- </systemProperty>\r
- <systemProperty>\r
- <name>cdm.datasource</name>\r
- <value>cdmTest</value>\r
- </systemProperty>\r
- </systemProperties>\r
- <stopPort>9191</stopPort>\r
- <stopKey>jetty-cdm-server</stopKey>\r
- <stopWait>10</stopWait>\r
- <httpConnector>\r
- <port>9090</port>\r
- </httpConnector>\r
- <war>${project.parent.basedir}/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war</war>\r
- <daemon>true</daemon>\r
- </configuration>\r
- <executions>\r
- <execution>\r
- <id>start-jetty</id>\r
- <phase>pre-integration-test</phase>\r
- <goals>\r
- <goal>deploy-war</goal>\r
- </goals>\r
- <configuration>\r
- <scanIntervalSeconds>0</scanIntervalSeconds>\r
- </configuration>\r
- </execution>\r
- <execution>\r
- <id>stop-jetty</id>\r
- <phase>post-integration-test</phase>\r
- <goals>\r
- <goal>stop</goal>\r
- </goals>\r
- </execution>\r
- </executions>\r
- </plugin>\r
- </plugins>\r
- </build>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+
+ <parent>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>taxeditor-parent</artifactId>
+ <version>3.13.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
+ <name>UI Test Bundle</name>
+ <description>Holds all Tests for the Taxonomic Editor</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <filters>
+ <!-- Work around for https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045 -->
+ <!-- taken from https://wiki.eclipse.org/index.php?title=Tycho/Target_Platform#Filtering -->
+ <filter>
+ <type>p2-installable-unit</type>
+ <id>org.eclipse.equinox.servletbridge.extensionbundle</id>
+ <removeAll />
+ </filter>
+ </filters>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <!-- currently we run only the non-ui unit tests so we don't the
+ harness -->
+ <!-- <useUIHarness>true</useUIHarness> -->
+ <dependencies>
+ <!-- This will pull the feature and its dependent plugins into
+ the classpath for the tests. Note that this requires ALL taxeditor projects
+ to be installed. -->
+ <dependency>
+ <type>eclipse-feature</type>
+ <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
+ <!-- This is the minimum required version -->
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.2.9.v20150224</version>
+ <configuration>
+ <jvmArgs>-Xmx512m -XX:MaxPermSize=512m</jvmArgs>
+ <systemProperties>
+ <force>true</force>
+ <systemProperty>
+ <!--
+ The lucene index should be placed into the target folder,
+ so user.home needs to be set to this folder.
+ user.home needs to be overriden since it already
+ exists, thus the force option is turned on above
+ -->
+ <name>user.home</name>
+ <value>${basedir}/target/</value>
+ </systemProperty>
+ <systemProperty>
+ <name>spring.profiles.active</name>
+ <value>remoting</value>
+ </systemProperty>
+ <systemProperty>
+ <name>cdm.beanDefinitionFile</name>
+ <value>${basedir}/src/test/resources/datasources.xml</value>
+ </systemProperty>
+ <systemProperty>
+ <name>cdm.datasource</name>
+ <value>cdmTest</value>
+ </systemProperty>
+ </systemProperties>
+ <stopPort>9191</stopPort>
+ <stopKey>jetty-cdm-server</stopKey>
+ <stopWait>10</stopWait>
+ <httpConnector>
+ <port>9090</port>
+ </httpConnector>
+ <war>${project.parent.basedir}/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war</war>
+ <daemon>true</daemon>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-jetty</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-war</goal>
+ </goals>
+ <configuration>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-jetty</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
package eu.etaxonomy.taxeditor.session;
+import java.util.Iterator;
import java.util.List;
import java.util.UUID;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
+import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.LanguageString;
+import eu.etaxonomy.cdm.model.description.KeyStatement;
import eu.etaxonomy.cdm.model.description.PolytomousKey;
+import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
+import eu.etaxonomy.cdm.persistence.dao.description.IPolytomousKeyNodeDao;
+import eu.etaxonomy.cdm.persistence.dto.MergeResult;
import eu.etaxonomy.taxeditor.httpinvoker.RemotingSessionAwareTest;
//FIXME:Remoting fix data issue : User#30
@DataSet
public class CdmEntitySessionManagerTest extends RemotingSessionAwareTest {
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(CdmEntitySessionManagerTest.class);
IPolytomousKeyService polytomousKeyService = getRemoteApplicationController().getPolytomousKeyService();
+ IPolytomousKeyNodeService polytomousKeyNodeService = getRemoteApplicationController().getPolytomousKeyNodeService();
private final UUID polytomousKeyUuid = UUID.fromString("0d53ba20-7de4-4baa-bd8a-401048447d66");
private final Language english = Language.getLanguageFromUuid(Language.uuidEnglish);
String upStatement = "Updated Statement";
pKey.setTitleCache(upTitleCache, true);
- pKey.getRoot().getChildAt(0).getStatement().getLabel(english).setText(upStatement);
- polytomousKeyService.merge(pKey);
+ PolytomousKeyNode node = pKey.getRoot().getChildAt(0);
+ node.getStatement().getLabel(english).setText(upStatement);
+ polytomousKeyService.merge(pKey, true);
pKey = CdmBase.deproxy(polytomousKeyService.find(polytomousKeyUuid),PolytomousKey.class);
Assert.assertEquals(pKey.getTitleCache(), upTitleCache);
- Assert.assertEquals(pKey.getRoot().getChildAt(0).getStatement().getLabel(english).getText(), upStatement);
+ node = pKey.getRoot().getChildAt(0);
+ KeyStatement statement = node.getStatement();
+ LanguageString label = statement.getLabel(english);
+ Assert.assertEquals(label.getText(), upStatement);
}
@Test
String upStatement = "Updated Statement";
pKeys.get(0).setTitleCache(upTitleCache, true);
polytomousKeyService.merge(pKeys.get(0));
- pKeys.get(1).getRoot().getChildAt(0).getStatement().getLabel(english).setText(upStatement);
- polytomousKeyService.merge(pKeys.get(1));
-
-
+ PolytomousKey key = pKeys.get(1);
+ PolytomousKeyNode root = key.getRoot();
+ root = HibernateProxyHelper.deproxy(root, PolytomousKeyNode.class);
+ PolytomousKeyNode node = root.getChildAt(0);
+ List<PolytomousKeyNode> nodes = root.getChildren();
+ node.getStatement().getLabel(english).setText(upStatement);
+
+ MergeResult<PolytomousKey> result = polytomousKeyService.merge(key, true);
+ key = result.getMergedEntity();
pKeys = polytomousKeyService.list(PolytomousKey.class, null, null, null, null);
Assert.assertEquals(pKeys.get(0).getTitleCache(), upTitleCache);
- Assert.assertEquals(pKeys.get(1).getRoot().getChildAt(0).getStatement().getLabel(english).getText(), upStatement);
+ key = pKeys.get(1);
+ root = key.getRoot();
+ nodes = root.getChildren();
+ Iterator<PolytomousKeyNode> it = nodes.iterator();
+ if (it.hasNext()){
+ node = it.next();
+ } else {
+ Assert.fail();
+ }
+ Assert.assertEquals(node.getStatement().getLabel(english).getText(), upStatement);
}
import eu.etaxonomy.taxeditor.remoting.server.CDMServerException;
import eu.etaxonomy.taxeditor.remoting.source.CdmServerInfo;
import eu.etaxonomy.taxeditor.remoting.source.CdmServerInfo.CdmInstanceInfo;
+import eu.etaxonomy.taxeditor.remoting.source.CdmServerInfoConfig;
/**
* @author cmathew
@Ignore // this should be targetting integration or production
@Test
public void pingInstancesTest() {
- CdmServerInfo csii = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080, "cdmserver/", false);
+ CdmServerInfo csii = new CdmServerInfo(new CdmServerInfoConfig("edit-test", "test.e-taxonomy.eu", 8080, "cdmserver/", false));
try {
csii.refreshInstances();
List<CdmInstanceInfo> instances = csii.getInstances();
@Test
public void refreshWrongInstancesTest() {
- CdmServerInfo wrongCsii = new CdmServerInfo("local", "local", 8080, "noserver", false);
+ CdmServerInfo wrongCsii = new CdmServerInfo(new CdmServerInfoConfig("local", "local", 8080, "noserver", false));
try {
wrongCsii.refreshInstances();
List<CdmInstanceInfo> instances = wrongCsii.getInstances();
@Ignore // this should be targetting integration or production
@Test
public void refreshInstancesTest() throws CDMServerException {
- CdmServerInfo cdmServerInfo = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080, "cdmserver/", false);
+ CdmServerInfo cdmServerInfo = new CdmServerInfo(new CdmServerInfoConfig("edit-test", "test.e-taxonomy.eu", 8080, "cdmserver/", false));
cdmServerInfo.refreshInstances();
List<CdmInstanceInfo> instances = cdmServerInfo.getInstances();
Assert.assertTrue(instances != null && !instances.isEmpty());
Bundle-ManifestVersion: 2
Bundle-Name: Webapp
Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 3.12.4
+Bundle-Version: 3.13.0.qualifier
Require-Bundle: org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>
<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.12.4">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.13.0.qualifier">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<text>
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.12.4" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="3.13.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</prerequisites>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>3.12.4</version>
+ <version>3.13.0-SNAPSHOT</version>
<name>EDIT Taxonomic Editor</name>
<description>The Taxonomic Editor for EDIT's platform for
cybertaxonomy
<properties>
<java.codelevel>1.6</java.codelevel>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cdmlib.version>3.12.4</cdmlib.version>
+ <cdmlib.version>3.13.0-SNAPSHOT</cdmlib.version>
<!-- TODO can we use project.version ????? -->
<tycho.version>0.22.0</tycho.version>
- <taxeditor.version>3.12.4</taxeditor.version>
+ <taxeditor.version>3.13.0-SNAPSHOT</taxeditor.version>
<update.dir>snapshot</update.dir>
<unitils.version>3.4.2</unitils.version>
</properties>
BGBM BDI Projects / taxeditor.git / commitdiff