From 597771652d2b95e6bc5971bb0ecb8583666d9afc Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Tue, 4 Nov 2014 13:56:39 +0000 Subject: [PATCH] - used more pepresentative DerivationEventTypes when creating derivates via DerivatView --- .../CreateDerivateContextMenu.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java index 9c65824d4..a98bbb423 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java @@ -55,32 +55,32 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { if(selectedTreeNode!=null){ //context menu for FieldUnit if(selectedTreeNode.getValue() instanceof FieldUnit){ - createMenuItem(addMenu, "Specimen", selectedTreeNode, DerivedUnit.class, SpecimenOrObservationType.PreservedSpecimen); + createMenuItem(addMenu, "Specimen", selectedTreeNode, DerivedUnit.class, SpecimenOrObservationType.PreservedSpecimen, DerivationEventType.GATHERING_IN_SITU()); new MenuItem(addMenu, SWT.SEPARATOR); - createMenuItem(addMenu, "Tissue Sample", selectedTreeNode, DnaSample.class, SpecimenOrObservationType.TissueSample); - createMenuItem(addMenu, "DNA Sample", selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample); - createMenuItem(addMenu, "Media Specimen", selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media); + createMenuItem(addMenu, "Tissue Sample", selectedTreeNode, DnaSample.class, SpecimenOrObservationType.TissueSample, DerivationEventType.PREPARATION()); + createMenuItem(addMenu, "DNA Sample", selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample, DerivationEventType.DNA_EXTRACTION()); + createMenuItem(addMenu, "Media Specimen", selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media, DerivationEventType.ACCESSIONING()); } //context menu for Specimen else if(selectedTreeNode.getValue() instanceof DerivedUnit && ((DerivedUnit)selectedTreeNode.getValue()).getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){ - createMenuItem(addMenu, "Tissue Sample", selectedTreeNode, DnaSample.class, SpecimenOrObservationType.TissueSample); - createMenuItem(addMenu, "DNA Sample", selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample); - createMenuItem(addMenu, "Media Specimen", selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media); + createMenuItem(addMenu, "Tissue Sample", selectedTreeNode, DnaSample.class, SpecimenOrObservationType.TissueSample, DerivationEventType.PREPARATION()); + createMenuItem(addMenu, "DNA Sample", selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample, DerivationEventType.DNA_EXTRACTION()); + createMenuItem(addMenu, "Media Specimen", selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media, DerivationEventType.ACCESSIONING()); } //context menu for TissueSample else if(selectedTreeNode.getValue() instanceof DnaSample && ((DnaSample)selectedTreeNode.getValue()).getRecordBasis()==SpecimenOrObservationType.TissueSample){ - createMenuItem(addMenu, "DnaSample", selectedTreeNode, DnaSample.class, null); - createMenuItem(addMenu, "Media Specimen", selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media); + createMenuItem(addMenu, "DnaSample", selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample, DerivationEventType.DNA_EXTRACTION()); + createMenuItem(addMenu, "Media Specimen", selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media, DerivationEventType.ACCESSIONING()); } //context menu for DnaSample else if(selectedTreeNode.getValue() instanceof DnaSample && ((DnaSample)selectedTreeNode.getValue()).getRecordBasis()==SpecimenOrObservationType.DnaSample){ - createMenuItem(addMenu, "Consensus Sequence", selectedTreeNode, Sequence.class, null); - createMenuItem(addMenu, "Media Specimen", selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media); + createMenuItem(addMenu, "Consensus Sequence", selectedTreeNode, Sequence.class, null, null); + createMenuItem(addMenu, "Media Specimen", selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.Media, DerivationEventType.ACCESSIONING()); } //context menu for Sequence else if(selectedTreeNode.getValue() instanceof Sequence){ - createMenuItem(addMenu, "Single Read", selectedTreeNode, SingleRead.class, null); + createMenuItem(addMenu, "Single Read", selectedTreeNode, SingleRead.class, null, null); } //default else{ @@ -97,10 +97,10 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { return contributionItems; } - private void createMenuItem(Menu menu, String menuLabel, TreeNode selectedNode, Class childClass, SpecimenOrObservationType specimenType) { + private void createMenuItem(Menu menu, String menuLabel, TreeNode selectedNode, Class childClass, SpecimenOrObservationType specimenType, DerivationEventType derivationEventType) { MenuItem menuItem = new MenuItem(menu, SWT.NONE); menuItem.setText(menuLabel); - menuItem.addSelectionListener(new WidgetSelectionListener(selectedNode, childClass, specimenType)); + menuItem.addSelectionListener(new WidgetSelectionListener(selectedNode, childClass, specimenType, derivationEventType)); } private class WidgetSelectionListener extends SelectionAdapter{ @@ -109,15 +109,17 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { //TODO: we need a common interface for the generic like e.g. "IDerivateHierarchyNode" private final Class childClass; private final SpecimenOrObservationType specimenType; + private final DerivationEventType derivationEventType; /** * @param selectedNode * @param specimenType */ - public WidgetSelectionListener(TreeNode selectedNode, Class childClass, SpecimenOrObservationType specimenType) { + public WidgetSelectionListener(TreeNode selectedNode, Class childClass, SpecimenOrObservationType specimenType, DerivationEventType derivationEventType) { this.selectedNode = selectedNode; this.childClass = childClass; this.specimenType = specimenType; + this.derivationEventType = derivationEventType; } /* (non-Javadoc) @@ -130,8 +132,7 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { if(selectedDerivate instanceof DnaSample && ((DnaSample) selectedDerivate).getRecordBasis()==SpecimenOrObservationType.DnaSample){ DnaSample dnaSample = (DnaSample)selectedDerivate; if(childClass.equals(Sequence.class)){ - Sequence newInstance = Sequence.NewInstance(""); - dnaSample.addSequence(newInstance);//why does this not have DnaSample as constructor parameter? + Sequence newInstance = Sequence.NewInstance(dnaSample, "", 0); createdElement = newInstance; } } @@ -160,7 +161,7 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { else{ derivedUnit = DerivedUnit.NewInstance(specimenType); } - specimenOrObservationBase.addDerivationEvent(DerivationEvent.NewSimpleInstance(specimenOrObservationBase, derivedUnit, DerivationEventType.GATHERING_IN_SITU())); + specimenOrObservationBase.addDerivationEvent(DerivationEvent.NewSimpleInstance(specimenOrObservationBase, derivedUnit, derivationEventType)); derivedUnit.setCacheStrategy(new DerivedUnitFacadeCacheStrategy()); derivedUnit.getTitleCache(); //update title cache createdElement = derivedUnit; -- 2.34.1