name="%perspective.name.3">
</perspective>
<perspective
- class="eu.etaxonomy.taxeditor.perspective.WorkingSetPerspective"
- id="eu.etaxonomy.taxeditor.perspective.WorkingSetPerspective"
- name="Working Set">
+ class="eu.etaxonomy.taxeditor.perspective.DescriptiveDataSetPerspective"
+ id="eu.etaxonomy.taxeditor.perspective.DescriptiveDataSetPerspective"
+ name="Descriptive Data Set">
</perspective>
</extension>
/**
* @author n.hoffmann
* @created Jan 17, 2011
- * @version 1.0
*/
-public class WorkingSetPerspective extends Default {
+public class DescriptiveDataSetPerspective extends Default {
@Override
public void createInitialLayout(IPageLayout layout) {
navigationFolder.addView(NAVIGATOR);
navigationFolder.addPlaceholder(SEARCH_RESULTS);
- layout.addView("eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetNavigator", IPageLayout.TOP, 0.5f, SearchBar.NAVIGATION_STACK_ID);
+ layout.addView("eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNavigator", IPageLayout.TOP, 0.5f, SearchBar.NAVIGATION_STACK_ID);
- layout.addPlaceholder("eu.etaxonomy.taxeditor.editor.view.workingSet.WorkingSetEditor", IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());
- layout.addPlaceholder("eu.etaxonomy.taxeditor.editor.workingSet.matrix.CharacterMatrix", IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());
+ layout.addPlaceholder("eu.etaxonomy.taxeditor.editor.view.descriptiveDataSet.DescriptiveDataSetEditor", IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());
+ layout.addPlaceholder("eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrix", IPageLayout.BOTTOM, 0.25f, layout.getEditorArea());
layout.addView(DETAILS_VIEW, IPageLayout.RIGHT, 0.7f, layout.getEditorArea());
import eu.etaxonomy.cdm.api.service.ITestService;\r
import eu.etaxonomy.cdm.api.service.IUserService;\r
import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;\r
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;\r
import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService;\r
import eu.etaxonomy.cdm.api.service.molecular.IPrimerService;\r
import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;\r
}\r
\r
@Override\r
- public IWorkingSetService getWorkingSetService(){\r
- return (IWorkingSetService) getService(IWorkingSetService.class, "/remoting/workingset.service", new CdmServiceRequestExecutor());\r
+ public IDescriptiveDataSetService getDescriptiveDataSetService(){\r
+ return (IDescriptiveDataSetService) getService(IDescriptiveDataSetService.class, "/remoting/descriptivedataset.service", new CdmServiceRequestExecutor());\r
}\r
\r
/**\r
</property>\r
</bean>\r
\r
- <bean id="workingSetService" lazy-init="true"\r
+ <bean id="descriptiveDataSetService" lazy-init="true"\r
class="org.springframework.remoting.httpinvoker.HttpInvokerProxyFactoryBean">\r
<property name="serviceUrl">\r
- <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/workingset.service\r
+ <value>http://${remoteServer}:${remotePort}/${remoteContext}/remoting/descriptivedataset.service\r
</value>\r
</property>\r
<property name="serviceInterface">\r
- <value>eu.etaxonomy.cdm.api.service.IWorkingSetService</value>\r
+ <value>eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService</value>\r
</property>\r
<property name="httpInvokerRequestExecutor">\r
<bean class="eu.etaxonomy.taxeditor.service.CdmServiceRequestExecutor">\r
<mapping class="eu.etaxonomy.cdm.model.description.TaxonNameDescription"/>
<mapping class="eu.etaxonomy.cdm.model.description.TextData"/>
<mapping class="eu.etaxonomy.cdm.model.description.TextFormat"/>
- <mapping class="eu.etaxonomy.cdm.model.description.WorkingSet"/>
+ <mapping class="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"/>
<!-- Location Package -->
<mapping class="eu.etaxonomy.cdm.model.location.NamedArea"/>
<mapping class="eu.etaxonomy.cdm.model.location.NamedAreaLevel"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_wg0-oDulEeeOtqC_3qh40A" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.commandlabel54" label="%command.label.54" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/deep-delete-16x16-32.png" command="_fKT-wDulEeeOtqC_3qh40A"/>
</menus>
</elements>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_R7vxEECaEeeL5JDzMOYK6g" elementId="eu.etaxonomy.taxeditor.editor.workingSet.CharacterEditor" label="Character Editor" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.character.CharacterEditor">
+ <elements xsi:type="basic:PartDescriptor" xmi:id="_R7vxEECaEeeL5JDzMOYK6g" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.CharacterEditor" label="Character Editor" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.character.CharacterEditor">
<tags>nonRestore</tags>
<menus xsi:type="menu:PopupMenu" xmi:id="_cHWz8GhvEee3K4uKJljEYg" elementId="eu.etaxonomy.taxeditor.editor.popupmenu.characterEditor">
<children xsi:type="menu:HandledMenuItem" xmi:id="_eDZC0GhvEee3K4uKJljEYg" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.removecharacter" label="Remove Character" command="_oBEz8GhvEee3K4uKJljEYg"/>
</menus>
</elements>
<elements xsi:type="basic:PartDescriptor" xmi:id="_ARZyMKz2EeeBIsZyvYlAaA" elementId="eu.etaxonomy.taxeditor.editor.group.authority.e4.CdmAuthorityEditorE4" label="%editor.name.4" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.group.authority.e4.CdmAuthorityEditorE4"/>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_Fa8l4M7XEeex0rHJ7p8Zdw" elementId="eu.etaxonomy.taxeditor.editor.view.workingSet.WorkingSetEditor" label="Working Set Editor" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/ws_icon.gif" tooltip="Working Set Editor" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetEditor"/>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_rpaDsNK2EeeWSJT7vW9jsw" elementId="eu.etaxonomy.taxeditor.editor.workingSet.matrix.CharacterMatrixPart" label="Character Matrix" tooltip="Character Matrix" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.matrix.CharacterMatrixPart">
+ <elements xsi:type="basic:PartDescriptor" xmi:id="_Fa8l4M7XEeex0rHJ7p8Zdw" elementId="eu.etaxonomy.taxeditor.editor.view.descriptiveDataSet.DescriptiveDataSetEditor" label="Descriptive Data Set Editor" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/ws_icon.gif" tooltip="Descriptive Data Set Editor" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetEditor"/>
+ <elements xsi:type="basic:PartDescriptor" xmi:id="_rpaDsNK2EeeWSJT7vW9jsw" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrixPart" label="Character Matrix" tooltip="Character Matrix" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrixPart">
<handlers xmi:id="_d_HUYOPBEeeIH8IplZ0cuA" elementId="eu.etaxonomy.taxeditor.editor.handler.2" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.view.charactermatrix.handler.ExportCharacterMatrixHandler" command="_YeWagOPBEeeIH8IplZ0cuA"/>
<menus xmi:id="_PLw00OPBEeeIH8IplZ0cuA" elementId="eu.etaxonomy.taxeditor.editor.menu.characterMatrix" label="Character Matrix">
<children xsi:type="menu:HandledMenuItem" xmi:id="_TGK04OPBEeeIH8IplZ0cuA" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.characterMatrix.export" label="Export" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_YeWagOPBEeeIH8IplZ0cuA"/>
</menus>
</elements>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_XcQMEN8mEee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetNavigator" label="Working Set Navigator" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetNavigator">
- <handlers xmi:id="_JvYVgNXoEeeLtdyzt6BEAA" elementId="eu.etaxonomy.taxeditor.editor.workingSet.handler.OpenCharacterMatrixHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.handler.OpenCharacterMatrixHandler" command="_FnWwMNXoEeeLtdyzt6BEAA"/>
- <handlers xmi:id="_SQL_wN86Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.workingSet.handler.OpenWorkingSetEditorHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.handler.OpenWorkingSetEditorHandler" command="_xdCSwN85Eee9zP45RW4C3A"/>
- <handlers xmi:id="_mjo-gOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.workingSet.handler.CreateWorkingSetHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.handler.CreateWorkingSetHandler" command="_XO7eUOSjEee9gvnH2Eirpw"/>
- <handlers xmi:id="_yQHcoOS3EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.workingSet.handler.deleteWorkingSet" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.handler.DeleteWorkingSetHandler" command="_uPmNgOS3EeeKONG__xkGZg"/>
- <handlers xmi:id="_-g9koPycEeeOqKfc2I-67A" elementId="eu.etaxonomy.taxeditor.editor.workingSet.handler.RefreshWorkingSetNavigatorHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.workingSet.handler.RefreshWorkingSetNavigatorHandler" command="_4k-uYPycEeeOqKfc2I-67A"/>
- <menus xsi:type="menu:PopupMenu" xmi:id="__S3vQN87Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.popupmenu.workingSetNavigator">
- <children xsi:type="menu:DynamicMenuContribution" xmi:id="_BRxE4N88Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.workingSetNavigator.dynamicmenucontribution.cdmViewer" label="Open in..." contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.CdmViewerContextMenuE4"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_UUfGcOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.newworkingset" label="New Working Set" tooltip="New Working Set" command="_XO7eUOSjEee9gvnH2Eirpw"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_JSt1kOS4EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.deleteWorkingSet" label="Delete Working Set" tooltip="Delete Working Set" command="_uPmNgOS3EeeKONG__xkGZg"/>
+ <elements xsi:type="basic:PartDescriptor" xmi:id="_XcQMEN8mEee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNavigator" label="Descriptive Data Set Navigator" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNavigator">
+ <handlers xmi:id="_JvYVgNXoEeeLtdyzt6BEAA" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.OpenCharacterMatrixHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.OpenCharacterMatrixHandler" command="_FnWwMNXoEeeLtdyzt6BEAA"/>
+ <handlers xmi:id="_SQL_wN86Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.OpenDescriptiveDataSetEditorHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.OpenDescriptiveDataSetEditorHandler" command="_xdCSwN85Eee9zP45RW4C3A"/>
+ <handlers xmi:id="_mjo-gOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.CreateDescriptiveDataSetHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.CreateDescriptiveDataSetHandler" command="_XO7eUOSjEee9gvnH2Eirpw"/>
+ <handlers xmi:id="_yQHcoOS3EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.deleteDescriptiveDataSet" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.DeleteDescriptiveDataSetHandler" command="_uPmNgOS3EeeKONG__xkGZg"/>
+ <handlers xmi:id="_-g9koPycEeeOqKfc2I-67A" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.RefreshDescriptiveDataSetNavigatorHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.RefreshDescriptiveDataSetNavigatorHandler" command="_4k-uYPycEeeOqKfc2I-67A"/>
+ <menus xsi:type="menu:PopupMenu" xmi:id="__S3vQN87Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.popupmenu.descriptiveDataSetNavigator">
+ <children xsi:type="menu:DynamicMenuContribution" xmi:id="_BRxE4N88Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSetNavigator.dynamicmenucontribution.cdmViewer" label="Open in..." contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.CdmViewerContextMenuE4"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_UUfGcOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.newdescriptivedataset" label="New Descriptive Data Set" tooltip="New Descriptive Data Set" command="_XO7eUOSjEee9gvnH2Eirpw"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_JSt1kOS4EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.deleteDescriptiveDataSet" label="Delete Descriptive Data Set" tooltip="Delete Descriptive Data Set" command="_uPmNgOS3EeeKONG__xkGZg"/>
</menus>
<toolbar xmi:id="_gz3CkPycEeeOqKfc2I-67A" elementId="eu.etaxonomy.taxeditor.editor.toolbar.2">
<children xsi:type="menu:HandledToolItem" xmi:id="_hnZYUPycEeeOqKfc2I-67A" elementId="eu.etaxonomy.taxeditor.editor.handledtoolitem.0" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/refresh.gif" tooltip="Refresh" command="_4k-uYPycEeeOqKfc2I-67A"/>
<elements xsi:type="commands:Command" xmi:id="_1CaG8K21EeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.editor.command.new.name" commandName="%command.name.24"/>
<elements xsi:type="commands:Command" xmi:id="_2vSfgK21EeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.editor.command.new.team" commandName="%command.name.25"/>
<elements xsi:type="commands:Command" xmi:id="_4nv18K21EeeykrJkROy5EA" elementId="eu.etaxonomy.taxeditor.editor.command.new.person" commandName="%command.name.26"/>
- <elements xsi:type="commands:Command" xmi:id="_FnWwMNXoEeeLtdyzt6BEAA" elementId="eu.etaxonomy.taxeditor.editor.command.workingSet.openCharacterMatrix" commandName="Open Character Matrix"/>
- <elements xsi:type="commands:Command" xmi:id="_xdCSwN85Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.command.workingSet.openWorkingSetEditor" commandName="Open Working Set Editor"/>
+ <elements xsi:type="commands:Command" xmi:id="_FnWwMNXoEeeLtdyzt6BEAA" elementId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openCharacterMatrix" commandName="Open Character Matrix"/>
+ <elements xsi:type="commands:Command" xmi:id="_xdCSwN85Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor" commandName="Open Descriptive Data Set Editor"/>
<elements xsi:type="commands:Command" xmi:id="_YeWagOPBEeeIH8IplZ0cuA" elementId="eu.etaxonomy.taxeditor.editor.command.characterMatrix.export" commandName="Export Character Matrix"/>
- <elements xsi:type="commands:Command" xmi:id="_XO7eUOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.command.createWorkingSet" commandName="New Working Set"/>
- <elements xsi:type="commands:Command" xmi:id="_uPmNgOS3EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.command.deleteWorkingSet" commandName="Delete Working Set"/>
+ <elements xsi:type="commands:Command" xmi:id="_XO7eUOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.command.createDescriptiveDataSet" commandName="New Descriptive Data Set"/>
+ <elements xsi:type="commands:Command" xmi:id="_uPmNgOS3EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.command.deleteDescriptiveDataSet" commandName="Delete Descriptive Data Set"/>
<elements xsi:type="commands:Command" xmi:id="_4k-uYPycEeeOqKfc2I-67A" elementId="eu.etaxonomy.taxeditor.editor.command.refresh" commandName="Refresh"/>
<elements xsi:type="commands:Command" xmi:id="_eTTa4C0vEeiiqYcnQ2drEA" elementId="eu.etaxonomy.taxeditor.openSpecimenEditorForGatheringEvent" commandName="Open specimen tree editor for gathering event"/>
<elements xsi:type="commands:Command" xmi:id="_z5Zb4E3kEeivZbtHG8C6kA" elementId="eu.etaxonomy.taxeditor.editor.openSpecimenEditorForTaxonNode" commandName="%command.name.OPEN_DERIVATIVE_EDITOR"/>
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_COD1EIZHEee-VvuRyq44pQ" coreExpressionId="isCdmStoreConnected"/>
<parameters xmi:id="_XBhycYGxEeehlNPrK_b5JA" elementId="eu.etaxonomy.taxeditor.editor.showView.parameter.factualview" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4"/>
</elements>
- <elements xsi:type="menu:HandledMenuItem" xmi:id="_QvOWgM7XEeex0rHJ7p8Zdw" elementId="eu.etaxonomy.taxeditor.editor.showViewMenu.workingSetNavigator" label="Working Set Navigator" tooltip="Working Set Navigator" command="_WPjpoDSnEeek0dKsFNy--Q">
+ <elements xsi:type="menu:HandledMenuItem" xmi:id="_QvOWgM7XEeex0rHJ7p8Zdw" elementId="eu.etaxonomy.taxeditor.editor.showViewMenu.descriptiveDataSetNavigator" label="Descriptive Data Set Navigator" tooltip="Descriptive Data Set Navigator" command="_WPjpoDSnEeek0dKsFNy--Q">
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_ph1OQN5eEeeLp7mUPmwRWA" coreExpressionId="isCdmStoreConnectedAndShowExperimental"/>
- <parameters xmi:id="_APYkQN5fEeeLp7mUPmwRWA" elementId="eu.etaxonomy.taxeditor.editor.showView.parameter.workingSetEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetNavigator"/>
+ <parameters xmi:id="_APYkQN5fEeeLp7mUPmwRWA" elementId="eu.etaxonomy.taxeditor.editor.showView.parameter.descriptiveDataSetEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNavigator"/>
</elements>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_P9N9YJMkEeeR4YRjNqCKeA" featurename="handlers" parentElementId="xpath:/">
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_v3iTkMRpEeednrXvH5DIOw" featurename="children" parentElementId="eu.etaxonomy.taxeditor.store.menu.termeditor" positionInList="after:eu.etaxonomy.taxeditor.store.menuseparator.6">
<elements xsi:type="menu:HandledMenuItem" xmi:id="_tvph4EalEeeXMc6kSYO7Xg" elementId="eu.etaxonomy.taxeditor.editor.showViewMenu.characterEditor" label="Character Editor" tooltip="Character Editor" command="_WPjpoDSnEeek0dKsFNy--Q">
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_G0z2MKNxEeebGZ23ERGMGw" coreExpressionId="isCdmStoreConnectedAndShowExperimental"/>
- <parameters xmi:id="_wJkmoEalEeeXMc6kSYO7Xg" elementId="eu.etaxonomy.taxeditor.editor.showView.parameter.charactereditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.editor.workingSet.CharacterEditor"/>
+ <parameters xmi:id="_wJkmoEalEeeXMc6kSYO7Xg" elementId="eu.etaxonomy.taxeditor.editor.showView.parameter.charactereditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.CharacterEditor"/>
</elements>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_dXKrQE3HEeiplYSgvvNXRQ" featurename="children" parentElementId="eu.etaxonomy.navigation.menu.new" positionInList="last">
viewerName="Specimen Editor (tree)">
</viewCommandMapping>
<viewCommandMapping
- commandId="eu.etaxonomy.taxeditor.editor.command.workingSet.openWorkingSetEditor"
- selection="eu.etaxonomy.cdm.model.description.WorkingSet"
- viewerName="Working Set Editor">
+ commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor"
+ selection="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"
+ viewerName="Descriptive Data Set Editor">
</viewCommandMapping>
<viewCommandMapping
- commandId="eu.etaxonomy.taxeditor.editor.command.workingSet.openCharacterMatrix"
- selection="eu.etaxonomy.cdm.model.description.WorkingSet"
+ commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openCharacterMatrix"
+ selection="eu.etaxonomy.cdm.model.description.DescriptiveDataSet"
viewerName="Character Matrix">
</viewCommandMapping>
<viewCommandMapping
- commandId="eu.etaxonomy.taxeditor.editor.command.workingSet.openWorkingSetEditor"
+ commandId="eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor"
selection="eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache"
- viewerName="Working Set Editor">
+ viewerName="Descriptive Data Set Editor">
</viewCommandMapping>
<viewCommandMapping
commandId="eu.etaxonomy.taxeditor.openSpecimenEditorForGatheringEvent"
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_ADD_DERIVATE_ADD_SPECIMEN = "eu.etaxonomy.taxeditor.editor.command.add_derivate.add_specimen";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_ADD_DERIVATE_ADD_TISSUE_SAMPLE = "eu.etaxonomy.taxeditor.editor.command.add_derivate.add_tissue_sample";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_CHARACTERMATRIX_EXPORT = "eu.etaxonomy.taxeditor.editor.command.characterMatrix.export";
- public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_CREATEWORKINGSET = "eu.etaxonomy.taxeditor.editor.command.createWorkingSet";
- public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_DELETEWORKINGSET = "eu.etaxonomy.taxeditor.editor.command.deleteWorkingSet";
+ public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_CREATEDESCRIPTIVEDATASET = "eu.etaxonomy.taxeditor.editor.command.createDescriptiveDataSet";
+ public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_DELETEDESCRIPTIVEDATASET = "eu.etaxonomy.taxeditor.editor.command.deleteDescriptiveDataSet";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_NEW_DATASOURCE = "eu.etaxonomy.taxeditor.editor.command.new.datasource";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_NEW_NAME = "eu.etaxonomy.taxeditor.editor.command.new.name";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_NEW_PERSON = "eu.etaxonomy.taxeditor.editor.command.new.person";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_POLYTOMOUSKEYLIST_OPENGRAPH = "eu.etaxonomy.taxeditor.editor.command.polytomouskeylist.openGraph";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_REFRESH = "eu.etaxonomy.taxeditor.editor.command.refresh";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_SPECIMENEDITOR_CREATE_FIELD_UNIT = "eu.etaxonomy.taxeditor.editor.command.specimeneditor.create_field_unit";
- public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_WORKINGSET_OPENCHARACTERMATRIX = "eu.etaxonomy.taxeditor.editor.command.workingSet.openCharacterMatrix";
- public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_WORKINGSET_OPENWORKINGSETEDITOR = "eu.etaxonomy.taxeditor.editor.command.workingSet.openWorkingSetEditor";
+ public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_DESCRIPTIVEDATASET_OPENCHARACTERMATRIX = "eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openCharacterMatrix";
+ public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_COMMAND_DESCRIPTIVEDATASET_OPENDESCRIPTIVEDATASETEDITOR = "eu.etaxonomy.taxeditor.editor.command.descriptiveDataSet.openDescriptiveDataSetEditor";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_DERIVATE_DEEPDELETE = "eu.etaxonomy.taxeditor.editor.derivate.deepDelete";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_DERIVATE_DELETE = "eu.etaxonomy.taxeditor.editor.derivate.delete";
public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_EDITOR_DERIVATIVE_COPYSINGLEREADTOCLIPBOARD = "eu.etaxonomy.taxeditor.editor.derivative.copySingleReadToClipBoard";
public static final String DYNAMICMENUCONTRIBUTION_EU_ETAXONOMY_TAXEDITOR_EDITOR_FACTUAL_DYNAMICMENUCONTRIBUTION_CDMVIEWER = "eu.etaxonomy.taxeditor.editor.factual.dynamicmenucontribution.cdmViewer";
public static final String DYNAMICMENUCONTRIBUTION_EU_ETAXONOMY_TAXEDITOR_EDITOR_SPECIMENEDITOR_DYNAMICMENUCONTRIBUTION_CDMVIEWER = "eu.etaxonomy.taxeditor.editor.specimeneditor.dynamicmenucontribution.cdmViewer";
public static final String DYNAMICMENUCONTRIBUTION_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DESCRIPTIVE_E4_HANDLER_DYNAMICFEATUREMENUE4 = "eu.etaxonomy.taxeditor.editor.view.descriptive.e4.handler.DynamicFeatureMenuE4";
- public static final String DYNAMICMENUCONTRIBUTION_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSETNAVIGATOR_DYNAMICMENUCONTRIBUTION_CDMVIEWER = "eu.etaxonomy.taxeditor.editor.workingSetNavigator.dynamicmenucontribution.cdmViewer";
+ public static final String DYNAMICMENUCONTRIBUTION_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASETNAVIGATOR_DYNAMICMENUCONTRIBUTION_CDMVIEWER = "eu.etaxonomy.taxeditor.editor.descriptiveDataSetNavigator.dynamicmenucontribution.cdmViewer";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_FACTUALDATA_DELETE = "eu.etaxonomy.taxeditor.editor.factualData.delete";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_FACTUALDATA_MOVEDESCRIPTIONELEMENT = "eu.etaxonomy.taxeditor.editor.factualData.moveDescriptionElement";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_FACTUALDATA_MOVEDESCRIPTIONTOTAXON = "eu.etaxonomy.taxeditor.editor.factualData.moveDescriptionToTaxon";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_CREATEFIELDUNIT = "eu.etaxonomy.taxeditor.editor.handledmenuitem.createfieldunit";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_CREATE_FIELD_UNIT_FOR_TAXON = "eu.etaxonomy.taxeditor.editor.handledmenuitem.create_field_unit_for_taxon";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_DELETEMEDIA = "eu.etaxonomy.taxeditor.editor.handledmenuitem.deleteMedia";
- public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_DELETEWORKINGSET = "eu.etaxonomy.taxeditor.editor.handledmenuitem.deleteWorkingSet";
+ public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_DELETEDESCRIPTIVEDATASET = "eu.etaxonomy.taxeditor.editor.handledmenuitem.deleteDescriptiveDataSet";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_DNASAMPLE = "eu.etaxonomy.taxeditor.editor.handledmenuitem.dnasample";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_EXISTINGMEDIA = "eu.etaxonomy.taxeditor.editor.handledmenuitem.existingmedia";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_FACTUALDATA_ADDDESCRIPTION = "eu.etaxonomy.taxeditor.editor.handledmenuitem.factualData.addDescription";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_MOVEIMAGEUP = "eu.etaxonomy.taxeditor.editor.handledmenuitem.moveImageUp";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_NEWIMAGE = "eu.etaxonomy.taxeditor.editor.handledmenuitem.newImage";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_NEWIMAGEGALLERY = "eu.etaxonomy.taxeditor.editor.handledmenuitem.newImageGallery";
- public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_NEWWORKINGSET = "eu.etaxonomy.taxeditor.editor.handledmenuitem.newworkingset";
+ public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_NEWDESCRIPTIVEDATASET = "eu.etaxonomy.taxeditor.editor.handledmenuitem.newdescriptiveDataSet";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_OPENGRAPH = "eu.etaxonomy.taxeditor.editor.handledmenuitem.opengraph";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_POLYTOMOUSKEYLIST_DELETE = "eu.etaxonomy.taxeditor.editor.handledmenuitem.polytomouskeylist.delete";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_HANDLEDMENUITEM_POLYTOMOUSKEYLIST_NEWALTERNATIVE = "eu.etaxonomy.taxeditor.editor.handledmenuitem.polytomouskeylist.newAlternative";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEWMENU_CONCEPTGRAPH = "eu.etaxonomy.taxeditor.editor.showViewMenu.conceptGraph";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEWMENU_FACTUALDATA = "eu.etaxonomy.taxeditor.editor.showViewMenu.factualData";
public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEWMENU_MEDIAVIEW = "eu.etaxonomy.taxeditor.editor.showViewMenu.mediaView";
- public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEWMENU_WORKINGSETNAVIGATOR = "eu.etaxonomy.taxeditor.editor.showViewMenu.workingSetNavigator";
+ public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEWMENU_DESCRIPTIVEDATASETNAVIGATOR = "eu.etaxonomy.taxeditor.editor.showViewMenu.descriptiveDataSetNavigator";
public static final String HANDLEDTOOLITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_FACTUAL_HANDLEDTOOLITEM_COLLAPSE = "eu.etaxonomy.taxeditor.editor.factual.handledtoolitem.collapse";
public static final String HANDLEDTOOLITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_FACTUAL_HANDLEDTOOLITEM_EXPAND = "eu.etaxonomy.taxeditor.editor.factual.handledtoolitem.expand";
public static final String HANDLEDTOOLITEM_EU_ETAXONOMY_TAXEDITOR_EDITOR_FACTUAL_HANDLEDTOOLITEM_USES_EXPAND = "eu.etaxonomy.taxeditor.editor.factual.handledtoolitem.uses.expand";
public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_USES_E4_HANDLER_CREATEUSEHANDLERE4 = "eu.etaxonomy.taxeditor.editor.view.uses.e4.handler.CreateUseHandlerE4";
public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_USES_E4_HANDLER_CREATEUSERECORDHANDLERE4 = "eu.etaxonomy.taxeditor.editor.view.uses.e4.handler.CreateUseRecordHandlerE4";
public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_USES_E4_HANDLER_CREATEUSESUMMARYHANDLERE4 = "eu.etaxonomy.taxeditor.editor.view.uses.e4.handler.CreateUseSummaryHandlerE4";
- public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_HANDLER_CREATEWORKINGSETHANDLER = "eu.etaxonomy.taxeditor.editor.workingSet.handler.CreateWorkingSetHandler";
- public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_HANDLER_DELETEWORKINGSET = "eu.etaxonomy.taxeditor.editor.workingSet.handler.deleteWorkingSet";
- public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_HANDLER_OPENCHARACTERMATRIXHANDLER = "eu.etaxonomy.taxeditor.editor.workingSet.handler.OpenCharacterMatrixHandler";
- public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_HANDLER_OPENWORKINGSETEDITORHANDLER = "eu.etaxonomy.taxeditor.editor.workingSet.handler.OpenWorkingSetEditorHandler";
- public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_HANDLER_REFRESHWORKINGSETNAVIGATORHANDLER = "eu.etaxonomy.taxeditor.editor.workingSet.handler.RefreshWorkingSetNavigatorHandler";
+ public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_HANDLER_CREATEDESCRIPTIVEDATASETHANDLER = "eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.CreateDescriptiveDataSetHandler";
+ public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_HANDLER_DELETEDESCRIPTIVEDATASET = "eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.deleteDescriptiveDataSet";
+ public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_HANDLER_OPENCHARACTERMATRIXHANDLER = "eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.OpenCharacterMatrixHandler";
+ public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_HANDLER_OPENDESCRIPTIVEDATASETEDITORHANDLER = "eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.OpenDescriptiveDataSetEditorHandler";
+ public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_HANDLER_REFRESHDESCRIPTIVEDATASETNAVIGATORHANDLER = "eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.RefreshDescriptiveDataSetNavigatorHandler";
public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_VIEW_DATASOURCE_E4_HANDLER_CREATEDATASOURCEHANDLERE4_NEWMENU = "eu.etaxonomy.taxeditor.view.datasource.e4.handler.CreateDataSourceHandlerE4.newMenu";
public static final String MENUSEPARATOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_MENUSEPARATOR_0 = "eu.etaxonomy.taxeditor.editor.menuseparator.0";
public static final String MENUSEPARATOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_MENUSEPARATOR_1 = "eu.etaxonomy.taxeditor.editor.menuseparator.1";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEW_PARAMETER_CONCEPTVIEW = "eu.etaxonomy.taxeditor.editor.showView.parameter.conceptview";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEW_PARAMETER_FACTUALVIEW = "eu.etaxonomy.taxeditor.editor.showView.parameter.factualview";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEW_PARAMETER_MEDIAVIEW = "eu.etaxonomy.taxeditor.editor.showView.parameter.mediaview";
- public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEW_PARAMETER_WORKINGSETEDITOR = "eu.etaxonomy.taxeditor.editor.showView.parameter.workingSetEditor";
+ public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_EDITOR_SHOWVIEW_PARAMETER_DESCRIPTIVEDATASETEDITOR = "eu.etaxonomy.taxeditor.editor.showView.parameter.descriptiveDataSetEditor";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_DETAILSVIEW_NAMEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.detailsView.nameEditor";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_GROUP_AUTHORITY_E4_CDMAUTHORITYEDITORE4 = "eu.etaxonomy.taxeditor.editor.group.authority.e4.CdmAuthorityEditorE4";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_KEY_POLYTOMOUS_E4_POLYTOMOUSKEYGRAPHEDITORE4 = "eu.etaxonomy.taxeditor.editor.key.polytomous.e4.PolytomousKeyGraphEditorE4";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DESCRIPTIVE_E4_FACTUALDATAPARTE4 = "eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_MEDIA_E4_MEDIAVIEWPARTE4 = "eu.etaxonomy.taxeditor.editor.view.media.e4.MediaViewPartE4";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_USES = "eu.etaxonomy.taxeditor.editor.view.uses";
- public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_WORKINGSET_WORKINGSETEDITOR = "eu.etaxonomy.taxeditor.editor.view.workingSet.WorkingSetEditor";
- public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_CHARACTEREDITOR = "eu.etaxonomy.taxeditor.editor.workingSet.CharacterEditor";
- public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_MATRIX_CHARACTERMATRIXPART = "eu.etaxonomy.taxeditor.editor.workingSet.matrix.CharacterMatrixPart";
- public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_WORKINGSETNAVIGATOR = "eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetNavigator";
+ public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETEDITOR = "eu.etaxonomy.taxeditor.editor.view.descriptiveDataSet.DescriptiveDataSetEditor";
+ public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_CHARACTEREDITOR = "eu.etaxonomy.taxeditor.editor.descriptiveDataSet.CharacterEditor";
+ public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_MATRIX_CHARACTERMATRIXPART = "eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrixPart";
+ public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETNAVIGATOR = "eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNavigator";
public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_EDITOR_POPUPMENU_CHARACTEREDITOR = "eu.etaxonomy.taxeditor.editor.popupmenu.characterEditor";
public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_EDITOR_POPUPMENU_CONCEPTVIEW = "eu.etaxonomy.taxeditor.editor.popupmenu.conceptview";
public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_EDITOR_POPUPMENU_FACTUALDATAVIEW = "eu.etaxonomy.taxeditor.editor.popupmenu.factualDataView";
public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_EDITOR_POPUPMENU_POLYTOMOUSKEYLISTEDITOR = "eu.etaxonomy.taxeditor.editor.popupmenu.polytomouskeylisteditor";
public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_EDITOR_POPUPMENU_SPECIMENEDITOR = "eu.etaxonomy.taxeditor.editor.popupmenu.specimeneditor";
public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_EDITOR_POPUPMENU_USESVIEW = "eu.etaxonomy.taxeditor.editor.popupmenu.usesView";
- public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_EDITOR_POPUPMENU_WORKINGSETNAVIGATOR = "eu.etaxonomy.taxeditor.editor.popupmenu.workingSetNavigator";
+ public static final String POPUPMENU_EU_ETAXONOMY_TAXEDITOR_EDITOR_POPUPMENU_DESCRIPTIVEDATASETNAVIGATOR = "eu.etaxonomy.taxeditor.editor.popupmenu.descriptiveDataSetNavigator";
public static final String TOOLBAR_EU_ETAXONOMY_TAXEDITOR_EDITOR_TOOLBAR_0 = "eu.etaxonomy.taxeditor.editor.toolbar.0";
public static final String TOOLBAR_EU_ETAXONOMY_TAXEDITOR_EDITOR_TOOLBAR_1 = "eu.etaxonomy.taxeditor.editor.toolbar.1";
public static final String TOOLBAR_EU_ETAXONOMY_TAXEDITOR_EDITOR_TOOLBAR_2 = "eu.etaxonomy.taxeditor.editor.toolbar.2";
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetEditor;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrixPart;
import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4;
import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditorInput;
import eu.etaxonomy.taxeditor.editor.group.authority.e4.CdmAuthorityEditorE4;
import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput;
-import eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetEditor;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.CharacterMatrixPart;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.workbench.WorkbenchUtility;
private static final String NAME_EDITOR_ID = "eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4";
private static boolean isSaving = false;
- public static void openWorkingSetEditor(UUID workingSetUuid, EModelService modelService, EPartService partService, MApplication application){
- String partId = AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_WORKINGSET_WORKINGSETEDITOR;
+ public static void openDescriptiveDataSetEditor(UUID descriptiveDataSetUuid, EModelService modelService, EPartService partService, MApplication application){
+ String partId = AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETEDITOR;
MPart part = showPart(partId, modelService, partService, application);
- WorkingSetEditor editor = (WorkingSetEditor) part.getObject();
- editor.init(workingSetUuid);
+ DescriptiveDataSetEditor editor = (DescriptiveDataSetEditor) part.getObject();
+ editor.init(descriptiveDataSetUuid);
}
- public static void openCharacterMatrix(UUID workingSetUuid, EModelService modelService, EPartService partService, MApplication application){
- String partId = AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_MATRIX_CHARACTERMATRIXPART;
+ public static void openCharacterMatrix(UUID descriptiveDataSetUuid, EModelService modelService, EPartService partService, MApplication application){
+ String partId = AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_MATRIX_CHARACTERMATRIXPART;
MPart part = showPart(partId, modelService, partService, application);
CharacterMatrixPart editor = (CharacterMatrixPart) part.getObject();
- editor.init(workingSetUuid, true);
+ editor.init(descriptiveDataSetUuid, true);
}
public static void openSpecimenEditor(DerivateViewEditorInput input, EModelService modelService, EPartService partService, MApplication application){
* 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.workingSet;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
* @since Nov 21, 2017
*
*/
-public class WorkingSetComposite extends Composite {
- private Text txtWorkingSet;
+public class DescriptiveDataSetComposite extends Composite {
+ private Text txtDescriptiveDataSet;
private TermUuidComboViewer comboRankMin;
private TermUuidComboViewer comboRankMax;
private FeatureTreeEditorComposite featureTreeEditorComposite;
private Button btnChooseArea;
private Button btnRemoveArea;
- public WorkingSetComposite(Composite parent, int style) {
+ public DescriptiveDataSetComposite(Composite parent, int style) {
super(parent, style);
setLayout(new GridLayout(3, false));
Label lblNewLabel = new Label(this, SWT.NONE);
lblNewLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
- lblNewLabel.setText(Messages.WorkingSetComposite_LABEL);
+ lblNewLabel.setText(Messages.DescriptiveDataSetComposite_LABEL);
- txtWorkingSet = new Text(this, SWT.BORDER);
- txtWorkingSet.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+ txtDescriptiveDataSet = new Text(this, SWT.BORDER);
+ txtDescriptiveDataSet.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
Label lblNewLabel_1 = new Label(this, SWT.NONE);
- lblNewLabel_1.setText(Messages.WorkingSetComposite_TAXON_FILTER);
+ lblNewLabel_1.setText(Messages.DescriptiveDataSetComposite_TAXON_FILTER);
Label lblNewLabel_2 = new Label(this, SWT.NONE);
lblNewLabel_2.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
- lblNewLabel_2.setText(Messages.WorkingSetComposite_RANK_MIN);
+ lblNewLabel_2.setText(Messages.DescriptiveDataSetComposite_RANK_MIN);
comboRankMin = new TermUuidComboViewer(this, SWT.NONE);
comboRankMin.setInput(TermType.Rank);
Label lblNewLabel_3 = new Label(this, SWT.NONE);
lblNewLabel_3.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
- lblNewLabel_3.setText(Messages.WorkingSetComposite_RANK_MAX);
+ lblNewLabel_3.setText(Messages.DescriptiveDataSetComposite_RANK_MAX);
comboRankMax = new TermUuidComboViewer(this, SWT.NONE);
comboRankMax.setInput(TermType.Rank);
Label lblNewLabel_4 = new Label(this, SWT.NONE);
lblNewLabel_4.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
- lblNewLabel_4.setText(Messages.WorkingSetComposite_AREA);
+ lblNewLabel_4.setText(Messages.DescriptiveDataSetComposite_AREA);
Composite composite = new Composite(this, SWT.NONE);
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
textAreaText = new Text(composite, SWT.BORDER);
textAreaText.setEditable(false);
- textAreaText.setText(Messages.WorkingSetComposite_CHOOSE);
+ textAreaText.setText(Messages.DescriptiveDataSetComposite_CHOOSE);
textAreaText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
btnChooseArea = new Button(composite, SWT.NONE);
// Disable the check that prevents subclassing of SWT components
}
public Text getTxt_label() {
- return txtWorkingSet;
+ return txtDescriptiveDataSet;
}
public TermUuidComboViewer getRankMin() {
* 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.workingSet;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet;
import java.util.ArrayList;
import java.util.Collection;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
import eu.etaxonomy.cdm.api.service.ITermService;
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
import eu.etaxonomy.cdm.model.description.FeatureTree;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.cdm.model.location.NamedArea;
import eu.etaxonomy.cdm.model.name.Rank;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
/**
- * Editor for configuring WorkingSets
+ * Editor for configuring DescriptiveDataSets
* @author pplitzner
* @since Nov 21, 2017
*
*/
-public class WorkingSetEditor implements IE4SavablePart, IConversationEnabled, ICdmEntitySessionEnabled,
+public class DescriptiveDataSetEditor implements IE4SavablePart, IConversationEnabled, ICdmEntitySessionEnabled,
IPartContentHasDetails, IDirtyMarkable {
- private WorkingSetComposite composite;
+ private DescriptiveDataSetComposite composite;
private ConversationHolder conversation;
private ICdmEntitySession cdmEntitySession;
- private WorkingSet workingSet;
+ private DescriptiveDataSet descriptiveDataSet;
private final int dndOperations = DND.DROP_MOVE;
CdmFormFactory cdmFormFactory = new CdmFormFactory(Display.getCurrent());
ContextInjectionFactory.inject(cdmFormFactory, context);
- composite = new WorkingSetComposite(parent, SWT.NONE);
+ composite = new DescriptiveDataSetComposite(parent, SWT.NONE);
labelModifyListener = new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
- workingSet.setLabel(composite.getTxt_label().getText());
+ descriptiveDataSet.setLabel(composite.getTxt_label().getText());
dirty.setDirty(true);
}
};
if(e.character==SWT.DEL){
IStructuredSelection selection = (IStructuredSelection) composite.getTaxonNodeTree().getSelection();
if(selection.toList().stream().anyMatch(object->!(object instanceof TaxonNode))){
- MessagingUtils.warningDialog(Messages.WorkingSetEditor_DELETE_FAIL_TITLE, this.getClass(), Messages.WorkingSetEditor_DELETE_FAIL_MESSAGE);
+ MessagingUtils.warningDialog(Messages.DescriptiveDataSetEditor_DELETE_FAIL_TITLE, this.getClass(), Messages.DescriptiveDataSetEditor_DELETE_FAIL_MESSAGE);
return;
}
Iterator<Object> iterator = selection.iterator();
}
- public void init(UUID workingSetUuid) {
- this.workingSet = cdmEntitySession.remoteLoad(CdmStore.getService(IWorkingSetService.class), workingSetUuid);
- if(workingSet.getLabel()!=null){
- composite.getTxt_label().setText(workingSet.getLabel());
+ public void init(UUID descriptiveDataSetUuid) {
+ this.descriptiveDataSet = cdmEntitySession.remoteLoad(CdmStore.getService(IDescriptiveDataSetService.class), descriptiveDataSetUuid);
+ if(descriptiveDataSet.getLabel()!=null){
+ composite.getTxt_label().setText(descriptiveDataSet.getLabel());
}
- if(workingSet.getDescriptiveSystem()!=null){
- composite.setCharacters(workingSet.getDescriptiveSystem());
+ if(descriptiveDataSet.getDescriptiveSystem()!=null){
+ composite.setCharacters(descriptiveDataSet.getDescriptiveSystem());
}
- Rank maxRank = workingSet.getMaxRank();
+ Rank maxRank = descriptiveDataSet.getMaxRank();
if(maxRank!=null){
composite.setRankMax(maxRank);
}
- Rank minRank = workingSet.getMinRank();
+ Rank minRank = descriptiveDataSet.getMinRank();
if(minRank!=null){
composite.setRankMin(minRank);
}
- Set<NamedArea> geoFilter = workingSet.getGeoFilter();
+ Set<NamedArea> geoFilter = descriptiveDataSet.getGeoFilter();
if(geoFilter!=null && !geoFilter.isEmpty()){
composite.setArea(geoFilter.iterator().next());
}
- Set<TaxonNode> taxonSubtreeFilter = workingSet.getTaxonSubtreeFilter();
+ Set<TaxonNode> taxonSubtreeFilter = descriptiveDataSet.getTaxonSubtreeFilter();
if(taxonSubtreeFilter!=null){
composite.getTaxonNodeTree().setInput(taxonSubtreeFilter);
}
public void addTaxonNode(TaxonNodeDto taxonNodeDto){
TaxonNode taxonNode = cdmEntitySession.remoteLoad(CdmStore.getService(ITaxonNodeService.class), taxonNodeDto.getUuid());
//check if node belongs to same classification
- Set<TaxonNode> taxonSubtreeFilter = workingSet.getTaxonSubtreeFilter();
+ Set<TaxonNode> taxonSubtreeFilter = descriptiveDataSet.getTaxonSubtreeFilter();
if(taxonSubtreeFilter!=null && !taxonSubtreeFilter.isEmpty()){
if(!taxonSubtreeFilter.iterator().next().getClassification().equals(taxonNode.getClassification())){
MessagingUtils.warningDialog(Messages.TaxonNodeDropAdapter_CLASSIFICATIONS_NO_MATCH, this.getClass(),
Viewer taxonTreeViewer = getTaxonTreeViewer();
Collection<TaxonNode> input = (Collection<TaxonNode>) taxonTreeViewer.getInput();
input.remove(taxonNode);
- workingSet.removeTaxonSubtree(taxonNode);
+ descriptiveDataSet.removeTaxonSubtree(taxonNode);
taxonTreeViewer.setInput(input);
dirty.setDirty(true);
}
}
Object input = composite.getTaxonNodeTree().getInput();
if(input!=null){
- workingSet.setTaxonSubtreeFilter(new HashSet<>());//clear existing filter
+ descriptiveDataSet.setTaxonSubtreeFilter(new HashSet<>());//clear existing filter
Collection<ITaxonTreeNode> taxonNodes = (Collection<ITaxonTreeNode>) input;
for (ITaxonTreeNode taxonTreeNode : taxonNodes) {
if(taxonTreeNode instanceof TaxonNode){
TaxonNode taxonNode = (TaxonNode)taxonTreeNode;
- workingSet.addTaxonSubtree(taxonNode);
+ descriptiveDataSet.addTaxonSubtree(taxonNode);
}
}
}
rankMin = (Rank) rankMinSelection;
}
- workingSet.setMaxRank(rankMax);
- workingSet.setMinRank(rankMin);
- workingSet.setDescriptiveSystem(characters);
- workingSet.setGeoFilter(areas);
+ descriptiveDataSet.setMaxRank(rankMax);
+ descriptiveDataSet.setMinRank(rankMin);
+ descriptiveDataSet.setDescriptiveSystem(characters);
+ descriptiveDataSet.setGeoFilter(areas);
conversation.commit();
- CdmStore.getService(IWorkingSetService.class).merge(workingSet, true);
+ CdmStore.getService(IDescriptiveDataSetService.class).merge(descriptiveDataSet, true);
dirty.setDirty(false);
}
return composite.getTaxonNodeTree();
}
- public WorkingSet getWorkingSet() {
- return workingSet;
+ public DescriptiveDataSet getDescriptiveDataSet() {
+ return descriptiveDataSet;
}
@Override
}
@Override
- public Collection<WorkingSet> getRootEntities() {
- return Collections.singleton(workingSet);
+ public Collection<DescriptiveDataSet> getRootEntities() {
+ return Collections.singleton(descriptiveDataSet);
}
@Override
* 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.workingSet;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet;
import java.util.Collection;
import java.util.List;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
* @date 12.12.2017
*
*/
-public class WorkingSetNavigator implements IConversationEnabled, ICdmEntitySessionEnabled, IContextListener{
+public class DescriptiveDataSetNavigator implements IConversationEnabled, ICdmEntitySessionEnabled, IContextListener{
private ListViewer viewer;
private ICdmEntitySession cdmEntitySession;
- private List<WorkingSet> workingSets;
+ private List<DescriptiveDataSet> descriptiveDataSets;
- public WorkingSetNavigator() {
+ public DescriptiveDataSetNavigator() {
CdmStore.getContextManager().addContextListener(this);
}
*/
@Override
public String getText(Object element) {
- if(element instanceof WorkingSet){
- return ((WorkingSet) element).getLabel();
+ if(element instanceof DescriptiveDataSet){
+ return ((DescriptiveDataSet) element).getLabel();
}
return super.getText(element);
}
public void doubleClick(DoubleClickEvent event) {
ISelection selection = event.getSelection();
if(selection instanceof IStructuredSelection){
- WorkingSet workingSetUuid = (WorkingSet) ((IStructuredSelection) selection).getFirstElement();
- EditorUtil.openWorkingSetEditor(workingSetUuid.getUuid(), modelService, partService, application);
+ DescriptiveDataSet descriptiveDataSetUuid = (DescriptiveDataSet) ((IStructuredSelection) selection).getFirstElement();
+ EditorUtil.openDescriptiveDataSetEditor(descriptiveDataSetUuid.getUuid(), modelService, partService, application);
}
}
});
viewer.addSelectionChangedListener(selectionChangedListener);
//create context menu
- menuService.registerContextMenu(viewer.getControl(), "eu.etaxonomy.taxeditor.editor.popupmenu.workingSetNavigator"); //$NON-NLS-1$
+ menuService.registerContextMenu(viewer.getControl(), "eu.etaxonomy.taxeditor.editor.popupmenu.descriptiveDataSetNavigator"); //$NON-NLS-1$
init();
}
conversation = CdmStore.createConversation();
}
cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true);
- workingSets = CdmStore.getService(IWorkingSetService.class).list(WorkingSet.class, null, null, null, null);
- viewer.setInput(workingSets);
+ descriptiveDataSets = CdmStore.getService(IDescriptiveDataSetService.class).list(DescriptiveDataSet.class, null, null, null, null);
+ viewer.setInput(descriptiveDataSets);
}
}
- public void addWorkingSet(WorkingSet workingSet){
- workingSets.add(workingSet);
+ public void addDescriptiveDataSet(DescriptiveDataSet descriptiveDataSetSet){
+ descriptiveDataSets.add(descriptiveDataSetSet);
refresh();
}
- public void removeWorkingSet(WorkingSet workingSet){
- workingSets.remove(workingSet);
+ public void removeDescriptiveDataSet(DescriptiveDataSet descriptiveDataSetSet){
+ descriptiveDataSets.remove(descriptiveDataSetSet);
refresh();
}
refresh(false);
}
- public void refresh(boolean reloadWorkingSets){
- if(reloadWorkingSets){
+ public void refresh(boolean reloadDescriptiveDataSets){
+ if(reloadDescriptiveDataSets){
cdmEntitySession.dispose();
cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true);
- IWorkingSetService service = CdmStore.getService(IWorkingSetService.class);
- workingSets = service.list(WorkingSet.class, null, null, null, null);
+ IDescriptiveDataSetService service = CdmStore.getService(IDescriptiveDataSetService.class);
+ descriptiveDataSets = service.list(DescriptiveDataSet.class, null, null, null, null);
}
- viewer.setInput(workingSets);
+ viewer.setInput(descriptiveDataSets);
viewer.refresh();
}
* 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.workingSet;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.ISelection;
*/
public class TaxonNodeDropAdapter extends ViewerDropAdapter {
- private WorkingSetEditor workingSetEditor;
+ private DescriptiveDataSetEditor descriptiveDataSetEditor;
- public TaxonNodeDropAdapter(WorkingSetEditor workingSetEditor) {
- super(workingSetEditor.getTaxonTreeViewer());
- this.workingSetEditor = workingSetEditor;
+ public TaxonNodeDropAdapter(DescriptiveDataSetEditor descriptiveDataSetEditor) {
+ super(descriptiveDataSetEditor.getTaxonTreeViewer());
+ this.descriptiveDataSetEditor = descriptiveDataSetEditor;
}
/**
@Override
public boolean performDrop(Object data) {
TaxonNodeDto taxonNodeDto = (TaxonNodeDto) ((ITreeSelection) data).getFirstElement();
- workingSetEditor.addTaxonNode(taxonNodeDto);
- workingSetEditor.setFocus();
+ descriptiveDataSetEditor.addTaxonNode(taxonNodeDto);
+ descriptiveDataSetEditor.setFocus();
return true;
}
* 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.workingSet.character;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.character;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
* 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.workingSet.character;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.character;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerDropAdapter;
* 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.workingSet.character;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.character;
import java.util.ArrayList;
import java.util.Arrays;
--- /dev/null
+
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler;
+
+import javax.inject.Named;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.services.IServiceConstants;
+
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNavigator;
+import eu.etaxonomy.taxeditor.editor.l10n.Messages;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+public class CreateDescriptiveDataSetHandler {
+
+ @Execute
+ public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart) {
+ DescriptiveDataSetNavigator navigator = (DescriptiveDataSetNavigator) activePart.getObject();
+ DescriptiveDataSet descriptiveDataSet = DescriptiveDataSet.NewInstance();
+ descriptiveDataSet.setLabel(Messages.CreateDescriptiveDataSetHandler_NEW_DESCRIPTIVE_DATA_SET);
+ CdmStore.getService(IDescriptiveDataSetService.class).merge(descriptiveDataSet, true);
+ navigator.getConversationHolder().commit();
+ navigator.addDescriptiveDataSet(descriptiveDataSet);
+ }
+
+}
\ No newline at end of file
--- /dev/null
+
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler;
+
+import javax.inject.Named;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.services.IServiceConstants;
+
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNavigator;
+import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+public class DeleteDescriptiveDataSetHandler {
+
+ @Execute
+ public void execute(@Named(IServiceConstants.ACTIVE_SELECTION)Object selection,
+ @Named(IServiceConstants.ACTIVE_PART)MPart activePart) {
+ boolean confirm = MessagingUtils.confirmDialog("Confirm delete", "Do you really want to delete the descriptive data set?");
+ if(confirm && selection instanceof DescriptiveDataSet){
+ Object object = activePart.getObject();
+ if(object instanceof DescriptiveDataSetNavigator){
+ IDescriptiveDataSetService descriptiveDataSetService = CdmStore.getService(IDescriptiveDataSetService.class);
+ descriptiveDataSetService.delete(((DescriptiveDataSet) selection).getUuid());
+ DescriptiveDataSetNavigator navigator = (DescriptiveDataSetNavigator) object;
+ navigator.removeDescriptiveDataSet((DescriptiveDataSet) selection);
+ navigator.getConversationHolder().commit();
+ }
+ else{
+ MessagingUtils.errorDialog("Deletion failed", DeleteDescriptiveDataSetHandler.class, "Deletion failed. Please try again", TaxeditorEditorPlugin.PLUGIN_ID, null, false);
+ }
+ }
+ }
+
+}
\ No newline at end of file
-package eu.etaxonomy.taxeditor.editor.workingSet.handler;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler;
import java.util.UUID;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.taxeditor.editor.AppModelId;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenHandlerBaseE4;
import eu.etaxonomy.taxeditor.store.CdmStore;
-public class OpenCharacterMatrixHandler extends DefaultOpenHandlerBaseE4<WorkingSet>{
+public class OpenCharacterMatrixHandler extends DefaultOpenHandlerBaseE4<DescriptiveDataSet>{
/**
* {@inheritDoc}
*/
@Override
- protected WorkingSet getEntity(UUID uuid) {
- return CdmStore.getService(IWorkingSetService.class).load(uuid);
+ protected DescriptiveDataSet getEntity(UUID uuid) {
+ return CdmStore.getService(IDescriptiveDataSetService.class).load(uuid);
}
@Override
- protected void open(WorkingSet entity, Shell shell, EPartService partService) {
+ protected void open(DescriptiveDataSet entity, Shell shell, EPartService partService) {
EditorUtil.openCharacterMatrix(entity.getUuid(), modelService, partService, application);
}
* {@inheritDoc}
*/
@Override
- protected boolean canExecute(WorkingSet entity) {
+ protected boolean canExecute(DescriptiveDataSet entity) {
return true;
}
@Override
protected String getPartId() {
- return AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_WORKINGSET_MATRIX_CHARACTERMATRIXPART;
+ return AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DESCRIPTIVEDATASET_MATRIX_CHARACTERMATRIXPART;
}
}
\ No newline at end of file
--- /dev/null
+
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler;
+
+import java.util.UUID;
+
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.swt.widgets.Shell;
+
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
+import eu.etaxonomy.taxeditor.editor.AppModelId;
+import eu.etaxonomy.taxeditor.editor.EditorUtil;
+import eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenHandlerBaseE4;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+public class OpenDescriptiveDataSetEditorHandler extends DefaultOpenHandlerBaseE4<DescriptiveDataSet>{
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected DescriptiveDataSet getEntity(UUID uuid) {
+ return CdmStore.getService(IDescriptiveDataSetService.class).load(uuid);
+ }
+
+ @Override
+ protected void open(DescriptiveDataSet entity, Shell shell, EPartService partService) {
+ EditorUtil.openDescriptiveDataSetEditor(entity.getUuid(), modelService, partService, application);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected boolean canExecute(DescriptiveDataSet entity) {
+ return true;
+ }
+
+ @Override
+ protected String getPartId() {
+ return AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DESCRIPTIVEDATASET_DESCRIPTIVEDATASETEDITOR;
+ }
+
+}
\ No newline at end of file
--- /dev/null
+
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler;
+
+import javax.inject.Named;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.services.IServiceConstants;
+
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetNavigator;
+
+public class RefreshDescriptiveDataSetNavigatorHandler {
+
+ @Execute
+ public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart) {
+ if(activePart.getObject() instanceof DescriptiveDataSetNavigator){
+ ((DescriptiveDataSetNavigator) activePart.getObject()).refresh(true);
+ }
+ }
+
+}
\ No newline at end of file
* 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.workingSet.matrix;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix;
import java.util.HashSet;
import java.util.Set;
* 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.workingSet.matrix;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix;
import java.io.File;
import java.io.FileInputStream;
import eu.etaxonomy.cdm.api.service.IDescriptionService;
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
import eu.etaxonomy.cdm.api.service.IProgressMonitorService;
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
import eu.etaxonomy.cdm.model.description.CategoricalData;
import eu.etaxonomy.cdm.model.description.QuantitativeData;
import eu.etaxonomy.cdm.model.description.SpecimenDescription;
import eu.etaxonomy.cdm.model.description.State;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.persistence.dto.SpecimenNodeWrapper;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.categorical.CategoricalDataCellEditor;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.categorical.CategoricalDataDisplayConverter;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.quantitative.QuantitativeDataCellEditor;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.quantitative.QuantitativeDataDisplayConverter;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.supplementalInfo.SupplementalInfoDisplayConverter;
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.categorical.CategoricalDataCellEditor;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.categorical.CategoricalDataDisplayConverter;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.quantitative.QuantitativeDataCellEditor;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.quantitative.QuantitativeDataDisplayConverter;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.supplementalInfo.SupplementalInfoDisplayConverter;
import eu.etaxonomy.taxeditor.model.ColorResources;
import eu.etaxonomy.taxeditor.model.DescriptionHelper;
import eu.etaxonomy.taxeditor.model.ImageResources;
private static final String IDENTIFIER_COLUMN = "identifier_column"; //$NON-NLS-1$
private static final String COUNTRY_COLUMN = "country_column"; //$NON-NLS-1$
- private WorkingSet workingSet;
+ private DescriptiveDataSet descriptiveDataSet;
private NatTable natTable;
Collection<SpecimenNodeWrapper> wrappers = dialog.getSpecimen();
for (SpecimenNodeWrapper wrapper : wrappers) {
SpecimenOrObservationBase specimen = CdmStore.getService(IOccurrenceService.class).load(wrapper.getUuidAndTitleCache().getUuid());
- SpecimenDescription description = getDescriptionForWorkingSet(specimen);
+ SpecimenDescription description = getDescriptionForDescriptiveDataSet(specimen);
//description elements
Map<Feature, DescriptionElementBase> featureToElementMap = new HashMap<>();
Set<DescriptionElementBase> elements = description.getElements();
Feature feature = descriptionElementBase.getFeature();
featureToElementMap.put(feature, descriptionElementBase);
}
- RowWrapperDTO rowWrapper = CdmStore.getService(IWorkingSetService.class).createRowWrapper(description, workingSet);
+ RowWrapperDTO rowWrapper = CdmStore.getService(IDescriptiveDataSetService.class).createRowWrapper(description, descriptiveDataSet);
CharacterMatrix.this.descriptions.add(rowWrapper);
- workingSet.addDescription(description);
+ descriptiveDataSet.addDescription(description);
setDirty();
specimenCache.remove(wrapper);
}
}
toRemove.forEach(rowToRemove->{
CharacterMatrix.this.descriptions.remove(rowToRemove);
- workingSet.removeDescription(rowToRemove.getSpecimenDescription());
+ descriptiveDataSet.removeDescription(rowToRemove.getSpecimenDescription());
setDirty();
});
}
GridDataFactory.fillDefaults().grab(true, true).applyTo(natTable);
- wsLabel.setText(workingSet.getLabel());
+ wsLabel.setText(descriptiveDataSet.getLabel());
wsLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
wsLabel.getParent().layout();
return features;
}
- public void initWorkingSet(WorkingSet workingSet){
- this.workingSet = workingSet;
- //get features/columns stored in working set
- FeatureTree tree = workingSet.getDescriptiveSystem();
+ public void initDescriptiveDataSet(DescriptiveDataSet descriptiveDataSet){
+ this.descriptiveDataSet = descriptiveDataSet;
+ //get features/columns stored in descriptive data set
+ FeatureTree tree = descriptiveDataSet.getDescriptiveSystem();
features = initFeatureList(tree.getRoot());
//init state data for categorical features
// because the Comparator will be set by configuration
SortedList<Object> sortedList = new SortedList<>(descriptions, new MatrixRowComparator());
// wrap the SortedList with the TreeList
- TreeList<Object> treeList = new TreeList(sortedList, new DescriptionTreeFormat(workingSet), TreeList.NODES_START_EXPANDED);
+ TreeList<Object> treeList = new TreeList(sortedList, new DescriptionTreeFormat(descriptiveDataSet), TreeList.NODES_START_EXPANDED);
/**
* data provider
*/
}
}
- private SpecimenDescription getDescriptionForWorkingSet(SpecimenOrObservationBase specimen){
- Set<Feature> wsFeatures = workingSet.getDescriptiveSystem().getDistinctFeatures();
+ private SpecimenDescription getDescriptionForDescriptiveDataSet(SpecimenOrObservationBase specimen){
+ Set<Feature> wsFeatures = descriptiveDataSet.getDescriptiveSystem().getDistinctFeatures();
List<DescriptionElementBase> matchingDescriptionElements = new ArrayList<>();
for (SpecimenDescription specimenDescription : (Set<SpecimenDescription>) specimen.getDescriptions()) {
//Create new specimen description if no match was found
setDirty();
SpecimenDescription newDesription = SpecimenDescription.NewInstance(specimen);
- newDesription.setTitleCache(Messages.CharacterMatrix_WORKING_SET+workingSet.getLabel()+": "+newDesription.generateTitle(), true); //$NON-NLS-2$
+ newDesription.setTitleCache(Messages.CharacterMatrix_DESCRIPTIVE_DATA_SET+descriptiveDataSet.getLabel()+": "+newDesription.generateTitle(), true); //$NON-NLS-2$
//check for equals description element (same feature and same values)
Map<Feature, List<DescriptionElementBase>> featureToElementMap = new HashMap<>();
}
- public void loadDescriptions(WorkingSet workingSet) {
- UUID monitorUuid = CdmStore.getService(IWorkingSetService.class).monitGetRowWrapper(workingSet);
+ public void loadDescriptions(DescriptiveDataSet descriptiveDataSet) {
+ UUID monitorUuid = CdmStore.getService(IDescriptiveDataSetService.class).monitGetRowWrapper(descriptiveDataSet);
IProgressMonitorService progressMonitorService = CdmApplicationState.getCurrentAppConfig().getProgressMonitorService();
return descriptions;
}
- public WorkingSet getWorkingSet() {
- return workingSet;
+ public DescriptiveDataSet getDescriptiveDataSet() {
+ return descriptiveDataSet;
}
public Collection<SpecimenNodeWrapper> getSpecimenCache() {
* 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.workingSet.matrix;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix;
import java.io.File;
import java.io.FileOutputStream;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.api.service.IDescriptionService;
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
private static final String CHARACTER_MATRIX_STATE_PROPERTIES = "characterMatrixState.properties"; //$NON-NLS-1$
- private WorkingSet workingSet;
+ private DescriptiveDataSet descriptiveDataSet;
private ConversationHolder conversation;
matrix = new CharacterMatrix(parent, this);
}
- public void init(UUID workingSetUuid, boolean treeView) {
- this.workingSet = CdmStore.getService(IWorkingSetService.class).load(workingSetUuid, WS_PROPERTY_PATH);
- if(workingSet!=null){
- if(workingSet.getDescriptiveSystem()==null){
+ public void init(UUID descriptiveDataSetUuid, boolean treeView) {
+ this.descriptiveDataSet = CdmStore.getService(IDescriptiveDataSetService.class).load(descriptiveDataSetUuid, WS_PROPERTY_PATH);
+ if(descriptiveDataSet!=null){
+ if(descriptiveDataSet.getDescriptiveSystem()==null){
MessagingUtils.informationDialog(Messages.CharacterMatrixPart_COULD_NOT_OPEN, Messages.CharacterMatrixPart_COULD_NOT_OPEN_MESSAGE);
return;
}
- matrix.initWorkingSet(workingSet);
+ matrix.initDescriptiveDataSet(descriptiveDataSet);
matrix.createTable(treeView);
- thisPart.setLabel(workingSet.getLabel());
- matrix.loadDescriptions(workingSet);
+ thisPart.setLabel(descriptiveDataSet.getLabel());
+ matrix.loadDescriptions(descriptiveDataSet);
}
}
this.dirty.setDirty(true);
}
- public WorkingSet getWorkingSet() {
- return workingSet;
+ public DescriptiveDataSet getDescriptiveDataSet() {
+ return descriptiveDataSet;
}
private File getStatePropertiesFile() {
matrix.getDescriptions().stream()
.filter(o->o instanceof RowWrapperDTO)
.forEach(wrapper->save((RowWrapperDTO)wrapper));
- CdmStore.getService(IWorkingSetService.class).merge(workingSet, true);
+ CdmStore.getService(IDescriptiveDataSetService.class).merge(descriptiveDataSet, true);
conversation.commit();
dirty.setDirty(false);
}
}
@Override
- public Collection<WorkingSet> getRootEntities() {
- return Collections.singleton(this.workingSet);
+ public Collection<DescriptiveDataSet> getRootEntities() {
+ return Collections.singleton(this.descriptiveDataSet);
}
@Override
* 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.workingSet.matrix;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix;
import java.util.HashSet;
import java.util.Set;
* 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.workingSet.matrix;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix;
import java.util.Comparator;
import java.util.List;
import ca.odell.glazedlists.TreeList;
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.cdm.model.name.Rank;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
private Rank maxRank;
- public DescriptionTreeFormat(WorkingSet workingSet) {
- this.maxRank = workingSet.getMaxRank();
+ public DescriptionTreeFormat(DescriptiveDataSet descriptiveDataSet) {
+ this.maxRank = descriptiveDataSet.getMaxRank();
}
@Override
* 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.workingSet.matrix;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix;
import java.util.Comparator;
* 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.workingSet.matrix;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix;
import java.util.Set;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.description.QuantitativeData;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
}
- public static Classification getClassificationForWorkingSet(WorkingSet workingSet){
- Set<TaxonNode> taxonSubtreeFilter = workingSet.getTaxonSubtreeFilter();
+ public static Classification getClassificationForDescriptiveDataSet(DescriptiveDataSet descriptiveDataSet){
+ Set<TaxonNode> taxonSubtreeFilter = descriptiveDataSet.getTaxonSubtreeFilter();
if(taxonSubtreeFilter!=null && !taxonSubtreeFilter.isEmpty()){
return taxonSubtreeFilter.iterator().next().getClassification();
}
* 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.workingSet.matrix;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix;
import org.eclipse.nebula.widgets.nattable.data.IColumnPropertyAccessor;
* 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.workingSet.matrix;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix;
import java.util.ArrayList;
import java.util.Collection;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.Text;
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.persistence.dto.SpecimenNodeWrapper;
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
lblNewLabel.setText("Taxon");
comboTaxon = new TaxonNodeCombo(composite_1, SWT.NONE);
- comboTaxon.setInput(matrix.getWorkingSet().getTaxonSubtreeFilter());
+ comboTaxon.setInput(matrix.getDescriptiveDataSet().getTaxonSubtreeFilter());
comboTaxon.addSelectionChangedListener(e->applyFilter());
txtTextFilter = new Text(composite_1, SWT.BORDER);
}
private void loadSpecimens(){
- Collection<SpecimenNodeWrapper> specimenCache = CdmStore.getService(IWorkingSetService.class).loadSpecimens(matrix.getWorkingSet());
+ Collection<SpecimenNodeWrapper> specimenCache = CdmStore.getService(IDescriptiveDataSetService.class).loadSpecimens(matrix.getDescriptiveDataSet());
matrix.setSpecimenCache(specimenCache);
}
* 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.workingSet.matrix.categorical;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.categorical;
import java.util.List;
import eu.etaxonomy.cdm.api.service.dto.RowWrapperDTO;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.description.State;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.CharacterMatrix;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrix;
/**
* Cell editor for CategoricalData
* 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.workingSet.matrix.categorical;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.categorical;
import java.util.Collection;
* 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.workingSet.matrix.quantitative;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.quantitative;
import java.util.HashMap;
import java.util.Map;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.description.QuantitativeData;
import eu.etaxonomy.cdm.model.description.StatisticalMeasure;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.CharacterMatrix;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrix;
/**
* Cell editor for QuantitativeData
* 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.workingSet.matrix.quantitative;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.quantitative;
import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
import eu.etaxonomy.cdm.model.description.QuantitativeData;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.MatrixUtility;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.MatrixUtility;
/**
* Converts QuantitativeData of one cell of the character matrix to a String.
* 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.workingSet.matrix.supplementalInfo;
+package eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.supplementalInfo;
import org.eclipse.nebula.widgets.nattable.data.convert.DisplayConverter;
public static String CharacterMatrix_SHOW_HIERARCHY;
public static String CharacterMatrix_TAXON;
public static String CharacterMatrix_VIEW_CONFIG;
- public static String CharacterMatrix_WORKING_SET;
+ public static String CharacterMatrix_DESCRIPTIVE_DATA_SET;
public static String CharacterMatrixPart_COULD_NOT_OPEN;
public static String CharacterMatrixPart_COULD_NOT_OPEN_MESSAGE;
public static String ChecklistDropdownSelectionListener_ADD_DISTRIBUTION;
public static String ConceptGraphView_VIEWER_NAME;
public static String ConceptViewPart_VIEWER_NAME;
public static String CreateFieldUnitContextMenu_CREATE_FIELD_UNIT_FOR;
- public static String CreateWorkingSetHandler_NEW_WORKING_SET;
+ public static String CreateDescriptiveDataSetHandler_NEW_DESCRIPTIVE_DATA_SET;
public static String DefaultOpenSpecimenEditorForTypeSpecimenHandler_COULD_NOT_OPEN;
public static String DefaultOpenTaxonEditorForTaxonBaseHandler_COULD_NOT_OPEN;
public static String DefaultOpenTaxonEditorForTaxonNodeHandler_COULD_NOT_OPEN;
public static String DeleteDerivateHandler_LABEL;
public static String DeleteDerivateHandler_SUCCESSFULL_BUT_EXCEPTIONS;
public static String DynamicFeatureMenuE4_new;
- public static String WorkingSetComposite_AREA;
- public static String WorkingSetComposite_CHOOSE;
- public static String WorkingSetComposite_LABEL;
- public static String WorkingSetComposite_RANK_MAX;
- public static String WorkingSetComposite_RANK_MIN;
- public static String WorkingSetComposite_TAXON_FILTER;
- public static String WorkingSetEditor_DELETE_FAIL_MESSAGE;
- public static String WorkingSetEditor_DELETE_FAIL_TITLE;
+ public static String DescriptiveDataSetComposite_AREA;
+ public static String DescriptiveDataSetComposite_CHOOSE;
+ public static String DescriptiveDataSetComposite_LABEL;
+ public static String DescriptiveDataSetComposite_RANK_MAX;
+ public static String DescriptiveDataSetComposite_RANK_MIN;
+ public static String DescriptiveDataSetComposite_TAXON_FILTER;
+ public static String DescriptiveDataSetEditor_DELETE_FAIL_MESSAGE;
+ public static String DescriptiveDataSetEditor_DELETE_FAIL_TITLE;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
CreateFieldUnitContextMenu_CREATE_FIELD_UNIT_FOR=Create new field unit for %s
-CreateWorkingSetHandler_NEW_WORKING_SET=New working set
+CreateDescriptiveDataSetHandler_NEW_DESCRIPTIVE_DATA=New descriptive data set
SingleReadSequenceContextMenu_REMOVE_FROM_SEQUENCE=Remove from this Sequence
SingleReadSequenceContextMenu_REUSE_FOR_SEQUENCE=Reuse for other Sequence
SingleReadSequenceContextMenu_REUSE_SINGLE_READ_HERE=Reuse SingleRead here
TaxonNameEditor_SAVING_NAMES=Saving names
TaxonNameEditor_THERE_SHOULD_ALWAYS_BE=There should always be a selected object.
TaxonNodeDropAdapter_CLASSIFICATIONS_NO_MATCH=Classifications do not match
-TaxonNodeDropAdapter_CLASSIFICATIONS_NO_MATCH_MESSAGE=The taxon node you are trying to add belongs to another classification than the node(s) belonging to the working set.
+TaxonNodeDropAdapter_CLASSIFICATIONS_NO_MATCH_MESSAGE=The taxon node you are trying to add belongs to another classification than the node(s) belonging to the descriptive data set.
ValidationDaemon_RUNNING_DAEMON=Running validation daemon
ValidationDaemon_VALIDATION_EXCEPTION=Validation module terminated unexpectedly:
ValidationDaemon_VALIDATION_STOPPED=Validation module stopped
CharacterMatrix_SHOW_HIERARCHY=Show taxon hierarchy
CharacterMatrix_TAXON=Unit
CharacterMatrix_VIEW_CONFIG=View configuration
-CharacterMatrix_WORKING_SET=WorkingSet
+CharacterMatrix_DESCRIPTIVE_DATA=DescriptiveDataSet
CharacterMatrixPart_COULD_NOT_OPEN=Editor could not be opened
-CharacterMatrixPart_COULD_NOT_OPEN_MESSAGE=The working set has no feature tree selected.
+CharacterMatrixPart_COULD_NOT_OPEN_MESSAGE=The descriptive data set has no feature tree selected.
SwapSynonymAndAcceptedOperation_NOT_IMPLEMENTED=Not yet implemented
SwapSynonymAndAcceptedOperation_SWAP_SYN_ACC_TAXON=Swap Synonym And Accepted Taxon Operation
ChecklistDropdownSelectionListener_ADD_DISTRIBUTION=Add Distribution
DerivateSearchComposite_YES=Yes
DerivateViewEditorInput_SPECIMEN_EDITOR=Specimen Editor (tree)
DynamicFeatureMenuE4_new=New
-WorkingSetComposite_AREA=Area
-WorkingSetComposite_CHOOSE=Choose...
-WorkingSetComposite_LABEL=Label
-WorkingSetComposite_RANK_MAX=Rank max
-WorkingSetComposite_RANK_MIN=Rank min
-WorkingSetComposite_TAXON_FILTER=Taxon filter
-WorkingSetEditor_DELETE_FAIL_MESSAGE=You can only select top level elements
-WorkingSetEditor_DELETE_FAIL_TITLE=Could not delete
+DescriptiveDataSetComposite_AREA=Area
+DescriptiveDataSetComposite_CHOOSE=Choose...
+DescriptiveDataSetComposite_LABEL=Label
+DescriptiveDataSetComposite_RANK_MAX=Rank max
+DescriptiveDataSetComposite_RANK_MIN=Rank min
+DescriptiveDataSetComposite_TAXON_FILTER=Taxon filter
+DescriptiveDataSetEditor_DELETE_FAIL_MESSAGE=You can only select top level elements
+DescriptiveDataSetEditor_DELETE_FAIL_TITLE=Could not delete
CreateFieldUnitContextMenu_CREATE_FIELD_UNIT_FOR=Erzeuge neue Field Unit für %s
-CreateWorkingSetHandler_NEW_WORKING_SET=Neues Workingset
+CreateDescriptiveDataSetHandler_NEW_DESCRIPTIVE_DATA=Neues Descriptive Data Set
SingleReadSequenceContextMenu_REMOVE_FROM_SEQUENCE=Von Sequenz entfernen
SingleReadSequenceContextMenu_REUSE_FOR_SEQUENCE=Für andere Sequenz verwenden
SingleReadSequenceContextMenu_REUSE_SINGLE_READ_HERE=SingleRead hier verwenden
TaxonNameEditor_SAVING_NAMES=Speichere Namen
TaxonNameEditor_THERE_SHOULD_ALWAYS_BE=Es muss immer ein Objekt ausgewählt sein.
TaxonNodeDropAdapter_CLASSIFICATIONS_NO_MATCH=Unterschiedliche Klassifikationen
-TaxonNodeDropAdapter_CLASSIFICATIONS_NO_MATCH_MESSAGE=Der Taxonknoten, der hinzugefügt werden soll, gehört zu einer anderen Klassifikation als die schon vorhandenen Taxonknoten im Workingset.
+TaxonNodeDropAdapter_CLASSIFICATIONS_NO_MATCH_MESSAGE=Der Taxonknoten, der hinzugefügt werden soll, gehört zu einer anderen Klassifikation als die schon vorhandenen Taxonknoten im Descriptive Data Set.
ValidationDaemon_RUNNING_DAEMON=Validation daemon läuft
ValidationDaemon_VALIDATION_EXCEPTION=Validation-Modul wurde unerwartet beendet:
ValidationDaemon_VALIDATION_STOPPED=Validation-Modul angehalten
CharacterMatrix_SHOW_HIERARCHY=Baumansicht
CharacterMatrix_TAXON=Unit
CharacterMatrix_VIEW_CONFIG=Ansicht konfigurieren
-CharacterMatrix_WORKING_SET=Workingset
+CharacterMatrix_DESCRIPTIVE_DATA=Dataset
CharacterMatrixPart_COULD_NOT_OPEN=Editor konnte nicht geöffnet werden
-CharacterMatrixPart_COULD_NOT_OPEN_MESSAGE=dAS Workingset hat keinen Merkmalsbaum ausgewählt.
+CharacterMatrixPart_COULD_NOT_OPEN_MESSAGE=dAS Dataset hat keinen Merkmalsbaum ausgewählt.
SwapSynonymAndAcceptedOperation_NOT_IMPLEMENTED=Noch nicht implementiert
SwapSynonymAndAcceptedOperation_SWAP_SYN_ACC_TAXON=Tausche Synonym und akzeptiertes Taxon
ChecklistDropdownSelectionListener_ADD_DISTRIBUTION=Verbreitung hinzufügen
DerivateSearchComposite_YES=Ja
DerivateViewEditorInput_SPECIMEN_EDITOR=Specimen-Editor (Baum)
DynamicFeatureMenuE4_new=Neu
-WorkingSetComposite_AREA=Gebiet
-WorkingSetComposite_CHOOSE=Gebiet wählen...
-WorkingSetComposite_LABEL=Label
-WorkingSetComposite_RANK_MAX=max. Rang
-WorkingSetComposite_RANK_MIN=min. Rang
-WorkingSetComposite_TAXON_FILTER=Taxonfilter
-WorkingSetEditor_DELETE_FAIL_MESSAGE=Es können nur Elemente auf erster Ebene ausgewählt werden
-WorkingSetEditor_DELETE_FAIL_TITLE=Löschen fehlgesschlagen
+DescriptiveDataSetComposite_AREA=Gebiet
+DescriptiveDataSetComposite_CHOOSE=Gebiet wählen...
+DescriptiveDataSetComposite_LABEL=Label
+DescriptiveDataSetComposite_RANK_MAX=max. Rang
+DescriptiveDataSetComposite_RANK_MIN=min. Rang
+DescriptiveDataSetComposite_TAXON_FILTER=Taxonfilter
+DescriptiveDataSetEditor_DELETE_FAIL_MESSAGE=Es können nur Elemente auf erster Ebene ausgewählt werden
+DescriptiveDataSetEditor_DELETE_FAIL_TITLE=Löschen fehlgesschlagen
import org.eclipse.nebula.widgets.nattable.export.command.ExportCommand;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.taxeditor.editor.workingSet.matrix.CharacterMatrixPart;
+import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrixPart;
public class ExportCharacterMatrixHandler {
+++ /dev/null
-
-package eu.etaxonomy.taxeditor.editor.workingSet.handler;
-
-import javax.inject.Named;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.services.IServiceConstants;
-
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
-import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetNavigator;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-public class CreateWorkingSetHandler {
-
- @Execute
- public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart) {
- WorkingSetNavigator navigator = (WorkingSetNavigator) activePart.getObject();
- WorkingSet workingSet = WorkingSet.NewInstance();
- workingSet.setLabel(Messages.CreateWorkingSetHandler_NEW_WORKING_SET);
- CdmStore.getService(IWorkingSetService.class).merge(workingSet, true);
- navigator.getConversationHolder().commit();
- navigator.addWorkingSet(workingSet);
- }
-
-}
\ No newline at end of file
+++ /dev/null
-
-package eu.etaxonomy.taxeditor.editor.workingSet.handler;
-
-import javax.inject.Named;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.services.IServiceConstants;
-
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
-import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
-import eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetNavigator;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-public class DeleteWorkingSetHandler {
-
- @Execute
- public void execute(@Named(IServiceConstants.ACTIVE_SELECTION)Object selection,
- @Named(IServiceConstants.ACTIVE_PART)MPart activePart) {
- boolean confirm = MessagingUtils.confirmDialog("Confirm delete", "Do you really want to delete the working set?");
- if(confirm && selection instanceof WorkingSet){
- Object object = activePart.getObject();
- if(object instanceof WorkingSetNavigator){
- IWorkingSetService workingSetService = CdmStore.getService(IWorkingSetService.class);
- workingSetService.delete(((WorkingSet) selection).getUuid());
- WorkingSetNavigator navigator = (WorkingSetNavigator) object;
- navigator.removeWorkingSet((WorkingSet) selection);
- navigator.getConversationHolder().commit();
- }
- else{
- MessagingUtils.errorDialog("Deletion failed", DeleteWorkingSetHandler.class, "Deletion failed. Please try again", TaxeditorEditorPlugin.PLUGIN_ID, null, false);
- }
- }
- }
-
-}
\ No newline at end of file
+++ /dev/null
-
-package eu.etaxonomy.taxeditor.editor.workingSet.handler;
-
-import java.util.UUID;
-
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.swt.widgets.Shell;
-
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
-import eu.etaxonomy.taxeditor.editor.AppModelId;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenHandlerBaseE4;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-public class OpenWorkingSetEditorHandler extends DefaultOpenHandlerBaseE4<WorkingSet>{
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected WorkingSet getEntity(UUID uuid) {
- return CdmStore.getService(IWorkingSetService.class).load(uuid);
- }
-
- @Override
- protected void open(WorkingSet entity, Shell shell, EPartService partService) {
- EditorUtil.openWorkingSetEditor(entity.getUuid(), modelService, partService, application);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean canExecute(WorkingSet entity) {
- return true;
- }
-
- @Override
- protected String getPartId() {
- return AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_WORKINGSET_WORKINGSETEDITOR;
- }
-
-}
\ No newline at end of file
+++ /dev/null
-
-package eu.etaxonomy.taxeditor.editor.workingSet.handler;
-
-import javax.inject.Named;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.services.IServiceConstants;
-
-import eu.etaxonomy.taxeditor.editor.workingSet.WorkingSetNavigator;
-
-public class RefreshWorkingSetNavigatorHandler {
-
- @Execute
- public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart) {
- if(activePart.getObject() instanceof WorkingSetNavigator){
- ((WorkingSetNavigator) activePart.getObject()).refresh(true);
- }
- }
-
-}
\ No newline at end of file
import org.eclipse.e4.ui.workbench.modeling.EModelService;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.progress.IProgressConstants;
+import eu.etaxonomy.cdm.api.application.CdmApplicationException;
+import eu.etaxonomy.cdm.api.application.CdmApplicationState;
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
import eu.etaxonomy.cdm.api.service.UpdateResult;
import eu.etaxonomy.cdm.api.service.config.SecundumForSubtreeConfigurator;
public class SetSecundumForSubtreeOperation extends UpdateSubtreeOperation implements IPostMoniteredOperationEnabled{
private final static String LABEL = Messages.SetSecundumForSubtreeOperation_CHANGE_SEC_OP;
- private static final Logger logger = Logger
- .getLogger(SetSecundumForSubtreeOperation.class);
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(SetSecundumForSubtreeOperation.class);
@Inject
UISynchronize sync;
*/
@Override
protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
- runMoniteredOperation();
- updateNameEditors();
-// Job job = createJob(monitor);
-// // configure the job
-// job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
-// job.setUser(true);
-// // schedule job
-// job.schedule();
-//
+// runMoniteredOperation();
+
+ Job job = createJob(monitor);
+ // configure the job
+ job.setProperty(IProgressConstants.KEEP_PROPERTY, true);
+ job.setUser(true);
+ // schedule job
+ job.schedule();
+
return updateResult;
public void runMoniteredOperation() {
ITaxonNodeService nodeService;
-// try {
-// nodeService = CdmApplicationState.getService(ITaxonNodeService.class);
+ try {
+ nodeService = CdmApplicationState.getService(ITaxonNodeService.class);
- final UUID uuid = longRunningTaskService.monitLongRunningTask((SecundumForSubtreeConfigurator)config);
+ final UUID uuid = nodeService.monitSetSecundum((SecundumForSubtreeConfigurator)config);
Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
null);
}
});
-// } catch (CdmApplicationException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// }
+ } catch (CdmApplicationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
import eu.etaxonomy.cdm.api.service.ITermService;
import eu.etaxonomy.cdm.api.service.IUserService;
import eu.etaxonomy.cdm.api.service.IVocabularyService;
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService;
import eu.etaxonomy.cdm.api.service.molecular.IPrimerService;
import eu.etaxonomy.cdm.cache.CdmRemoteCacheManager;
import eu.etaxonomy.cdm.model.description.FeatureTree;
import eu.etaxonomy.cdm.model.description.PolytomousKey;
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.media.Rights;
import eu.etaxonomy.cdm.model.molecular.Amplification;
else if (cdmBase instanceof Group) {
service = (IService<T>) getService(IGroupService.class);
}
- else if (cdmBase instanceof WorkingSet) {
- service = (IService<T>) getService(IWorkingSetService.class);
+ else if (cdmBase instanceof DescriptiveDataSet) {
+ service = (IService<T>) getService(IDescriptiveDataSetService.class);
}
else if (cdmBase instanceof TermVocabulary<?>) {
service = (IService<T>) getService(IVocabularyService.class);
/**
* Adds a filter to this content provider. For an example usage of such
* filters look at the project <code>org.eclipse.ui.ide</code>, class
- * <code>org.eclipse.ui.dialogs.FilteredResourcesSelectionDialog.CustomWorkingSetFilter</code>.
+ * <code>org.eclipse.ui.dialogs.FilteredResourcesSelectionDialog.CustomDescriptiveDataSetFilter</code>.
*
*
* @param filter
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Shell;
-import eu.etaxonomy.cdm.api.service.IWorkingSetService;
+import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.description.WorkingSet;
+import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
import eu.etaxonomy.taxeditor.store.CdmStore;
* @date 11.03.2014
*
*/
-public class WorkingSetSelectionDialog extends
-AbstractFilteredCdmResourceSelectionDialog<WorkingSet> {
+public class DescriptiveDataSetSelectionDialog extends
+AbstractFilteredCdmResourceSelectionDialog<DescriptiveDataSet> {
- public static WorkingSet select(Shell shell, WorkingSet workingSet){
- WorkingSetSelectionDialog dialog = new WorkingSetSelectionDialog(shell,
- "Choose working set", false, WorkingSetSelectionDialog.class.getCanonicalName(), workingSet);
+ public static DescriptiveDataSet select(Shell shell, DescriptiveDataSet descriptiveDataSet){
+ DescriptiveDataSetSelectionDialog dialog = new DescriptiveDataSetSelectionDialog(shell,
+ "Choose descriptive data set", false, DescriptiveDataSetSelectionDialog.class.getCanonicalName(), descriptiveDataSet);
return getSelectionFromDialog(dialog);
}
/**
* <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
*/
- protected WorkingSetSelectionDialog(Shell shell, String title,
- boolean multi, String settings, WorkingSet cdmObject) {
+ protected DescriptiveDataSetSelectionDialog(Shell shell, String title,
+ boolean multi, String settings, DescriptiveDataSet cdmObject) {
super(shell, title, multi, settings, cdmObject);
}
/** {@inheritDoc} */
@Override
- protected WorkingSet getPersistentObject(UUID uuid) {
- Object object = CdmStore.getService(IWorkingSetService.class).load(uuid);
+ protected DescriptiveDataSet getPersistentObject(UUID uuid) {
+ Object object = CdmStore.getService(IDescriptiveDataSetService.class).load(uuid);
- WorkingSet workingSet = (WorkingSet) HibernateProxyHelper.deproxy(object);
+ DescriptiveDataSet descriptiveDataSet = (DescriptiveDataSet) HibernateProxyHelper.deproxy(object);
- if(workingSet != null){
- return workingSet;
+ if(descriptiveDataSet != null){
+ return descriptiveDataSet;
}
- MessagingUtils.error(this.getClass(), "Selected element is not a working set", null);
+ MessagingUtils.error(this.getClass(), "Selected element is not a descriptive data set", null);
return null;
}
/** {@inheritDoc} */
@Override
protected void callService(String pattern) {
- model = CdmStore.getService(IWorkingSetService.class).getWorkingSetUuidAndTitleCache(limitOfInitialElements, pattern);
+ model = CdmStore.getService(IDescriptiveDataSetService.class).getDescriptiveDataSetUuidAndTitleCache(limitOfInitialElements, pattern);
}
@Override
- protected String getTitle(WorkingSet cdmObject) {
+ protected String getTitle(DescriptiveDataSet cdmObject) {
if(cdmObject!=null){
return cdmObject.getLabel();
}
if (source instanceof Button){
Button sourceButton = (Button) source;
}
- InputDialog dialog = new InputDialog(getShell(), "Working set label", "Enter label for working set", null, null);
+ InputDialog dialog = new InputDialog(getShell(), "Descriptive Data Set label", "Enter label for descriptive data set", null, null);
if (dialog.open() == Window.OK) {
// User clicked OK; update the label with the input
- WorkingSet workingSet = WorkingSet.NewInstance();
- CdmStore.getService(IWorkingSetService.class).merge(workingSet,true);
- workingSet.setLabel(dialog.getValue());
+ DescriptiveDataSet descriptiveDataSet = DescriptiveDataSet.NewInstance();
+ CdmStore.getService(IDescriptiveDataSetService.class).merge(descriptiveDataSet,true);
+ descriptiveDataSet.setLabel(dialog.getValue());
refresh();
- setPattern(workingSet);
+ setPattern(descriptiveDataSet);
}
}
};
/** {@inheritDoc} */
@Override
protected String[] getNewWizardText() {
- return new String[]{"Working set "};
+ return new String[]{"Descriptive Data Set "};
}
}
formElement, "Abbrev. Title", entity.getNomenclaturalTitle(),
SWT.NULL);
text_lastname = formFactory.createTextWithLabelElement(formElement,
- "Familiy Name", entity.getLastname(), SWT.NULL);
+ "Familiy Name", entity.getFamilyName(), SWT.NULL);
text_firstname = formFactory.createTextWithLabelElement(formElement,
- "Other/ Given Names", entity.getFirstname(), SWT.NULL);
+ "Other/ Given Names", entity.getGivenName(), SWT.NULL);
text_initials = formFactory.createTextWithLabelElement(formElement,
"Initials", entity.getInitials(), SWT.NULL);
text_prefix = formFactory.createTextWithLabelElement(formElement,
getEntity()
.setNomenclaturalTitle(text_nomenclaturalTitle.getText());
} else if (eventSource == text_firstname) {
- getEntity().setFirstname(text_firstname.getText());
+ getEntity().setGivenName(text_firstname.getText());
}else if (eventSource == text_initials) {
getEntity().setInitials(text_initials.getText());
}else if (eventSource == text_lastname) {
- getEntity().setLastname(text_lastname.getText());
+ getEntity().setFamilyName(text_lastname.getText());
} else if (eventSource == text_prefix) {
getEntity().setPrefix(text_prefix.getText());
} else if (eventSource == text_suffix) {
private TextWithLabelElement text_lifeForm;
- private NumberWithLabelElement number_individualCount;
+ private TextWithLabelElement number_individualCount;
// private TermComboElement<DefinedTerm> combo_kindOfUnit;
//
text_lifeForm = formFactory.createTextWithLabelElement(formElement, "Life Form", entity.getLifeform(PreferencesUtil.getGlobalLanguage()), style);
}
- number_individualCount = formFactory.createNumberTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
+ number_individualCount = formFactory.createTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
super.createControls(formElement, entity, style);
}
getEntity().setLifeform(text_lifeForm.getText());
}
else if(eventSource == number_individualCount){
- getEntity().setIndividualCount(number_individualCount.getInteger());
+ getEntity().setIndividualCount(number_individualCount.getText());
}
}
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.common.OriginalSourceType;
import eu.etaxonomy.cdm.model.common.TermVocabulary;
+import eu.etaxonomy.cdm.model.common.TimePeriod;
import eu.etaxonomy.cdm.model.common.VocabularyEnum;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.occurrence.Collection;
textTitleLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Motif", media.getTitle(), style);
selectionArtist = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
formElement, "Prepared by", media.getArtist(), EntitySelectionElement.ALL, style);
- DateTime mediaCreated = entity.getMediaSpecimen().getMediaCreated();
+ TimePeriod mediaCreated = entity.getMediaSpecimen().getMediaCreated();
date = formFactory.createDateElement(formElement, "Preparation Date", mediaCreated, style, true);
textMethodLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Method", media.getDescription(Language.getDefaultLanguage()), style);
public void updatePerson() {
// Test for #5138
Person person = (Person) CdmApplicationState.getCurrentAppConfig().getAgentService().load(personUuid);
- person.setFirstname("Me");
+ person.setGivenName("Me");
CdmApplicationState.getCurrentAppConfig().getAgentService().merge(person, true);
}
Person person = Person.NewInstance();
person = (Person) CdmApplicationState.getCurrentAppConfig().getAgentService().merge(person);
person = (Person) CdmApplicationState.getCurrentAppConfig().getAgentService().load(person.getUuid());
- person.setFirstname("Some");
+ person.setGivenName("Some");
CdmApplicationState.getCurrentAppConfig().getAgentService().merge(person, true);
}
<feature id="org.eclipse.oomph.setup.targlets"/>
<feature id="org.eclipse.oomph.setup.ui.ide"/>
<feature id="org.eclipse.oomph.setup.workbench"/>
-<feature id="org.eclipse.oomph.setup.workingsets"/>
+<feature id="org.eclipse.oomph.setup.descriptivedatasets"/>
<feature id="org.eclipse.pde"/>
<feature id="org.eclipse.pde.source"/>
<feature id="org.eclipse.platform"/>
<plugin id="org.eclipse.oomph.ui"/>
<plugin id="org.eclipse.oomph.util"/>
<plugin id="org.eclipse.oomph.util.pde"/>
-<plugin id="org.eclipse.oomph.workingsets"/>
-<plugin id="org.eclipse.oomph.workingsets.edit"/>
-<plugin id="org.eclipse.oomph.workingsets.editor"/>
+<plugin id="org.eclipse.oomph.descriptivedatasets"/>
+<plugin id="org.eclipse.oomph.descriptivedatasets.edit"/>
+<plugin id="org.eclipse.oomph.descriptivedatasets.editor"/>
<plugin id="org.eclipse.xpand"/>
<plugin id="org.eclipse.xpand.source"/>
<plugin id="org.eclipse.xtend"/>
BGBM BDI Projects / taxeditor.git / commitdiff