- added Amplification to DetailsView of SingleRead as an EntitySelectionElement
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TimeHelper.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationCloningWizardPage.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGeneralWizardPage.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationPrimerWizardPage.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewCollectionWizard.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ClassificationSelectionDialog.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectionSelectionDialog.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailSection.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoDetailElement.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailSection.java -text
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationPrimerDetailElement.java -text
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.DnaSample;
import eu.etaxonomy.cdm.model.molecular.Sequence;
import eu.etaxonomy.cdm.model.molecular.SingleRead;
else if(selectedTreeNode.getValue() instanceof Sequence){
createMenuItem(menu, "Single Read", selectedTreeNode, SingleRead.class, null);
}
- //context menu for SingleRead
- else if(selectedTreeNode.getValue() instanceof SingleRead && !(selectedTreeNode.getParent().getValue() instanceof Amplification)){
- createMenuItem(menu, "Amplification (will be a parent node)", selectedTreeNode, Amplification.class, null);
- }
+// //context menu for SingleRead
+// else if(selectedTreeNode.getValue() instanceof SingleRead && !(selectedTreeNode.getParent().getValue() instanceof Amplification)){
+// createMenuItem(menu, "Amplification (will be a parent node)", selectedTreeNode, Amplification.class, null);
+// }
//default
else{
MenuItem menuItem = new MenuItem(menu, SWT.NONE);
Object selectedDerivate = selectedNode.getValue();
if(selectedDerivate instanceof DnaSample){
DnaSample dnaSample = (DnaSample)selectedDerivate;
- if(childClass.equals(Amplification.class)){
- Amplification.NewInstance(dnaSample);
- }
- else if(childClass.equals(Sequence.class)){
+// if(childClass.equals(Amplification.class)){
+// Amplification.NewInstance(dnaSample);
+// }
+// else
+ if(childClass.equals(Sequence.class)){
dnaSample.addSequence(Sequence.NewInstance(""));//why does this not have DnaSample as constructor parameter?
}
}
- else if(selectedDerivate instanceof Amplification){
- ((Amplification) selectedDerivate).addSingleRead(SingleRead.NewInstance());
- }
+// else if(selectedDerivate instanceof Amplification){
+// ((Amplification) selectedDerivate).addSingleRead(SingleRead.NewInstance());
+// }
else if(selectedDerivate instanceof Sequence){
((Sequence) selectedDerivate).addSingleRead(SingleRead.NewInstance());
}
- else if(selectedDerivate instanceof SingleRead){
- TreeNode parentNode = selectedNode.getParent();
- while(parentNode!=null && !(parentNode.getValue() instanceof DnaSample)){
- parentNode = parentNode.getParent();
- }
- if(parentNode!=null && parentNode.getValue() instanceof DnaSample){
- DnaSample dnaSample = (DnaSample)parentNode.getValue();
- Amplification amplification = Amplification.NewInstance(dnaSample);
- dnaSample.addAmplification(amplification);
- amplification.addSingleRead((SingleRead) selectedDerivate);
- }
- }
+// else if(selectedDerivate instanceof SingleRead){
+// TreeNode parentNode = selectedNode.getParent();
+// while(parentNode!=null && !(parentNode.getValue() instanceof DnaSample)){
+// parentNode = parentNode.getParent();
+// }
+// if(parentNode!=null && parentNode.getValue() instanceof DnaSample){
+// DnaSample dnaSample = (DnaSample)parentNode.getValue();
+// Amplification amplification = Amplification.NewInstance(dnaSample);
+// dnaSample.addAmplification(amplification);
+// amplification.addSingleRead((SingleRead) selectedDerivate);
+// }
+// }
else if(selectedDerivate instanceof SpecimenOrObservationBase && DerivedUnit.class.isAssignableFrom(childClass)){
SpecimenOrObservationBase<?> specimenOrObservationBase = (SpecimenOrObservationBase<?>)selectedDerivate;
DerivedUnit derivedUnit;
import org.eclipse.jface.viewers.TreeNode;
import org.eclipse.jface.viewers.Viewer;
-import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.DnaSample;
import eu.etaxonomy.cdm.model.molecular.Sequence;
import eu.etaxonomy.cdm.model.molecular.SingleRead;
}
return children.toArray();
}
- else if(value instanceof Amplification){
- if(parentNode!=null && parentNode.getValue() instanceof Sequence){
- Set<SingleRead> amplificationSingleReads = ((Amplification) value).getSingleReads();
- Set<SingleRead> sequenceSingleReads = ((Sequence)parentNode.getValue()).getSingleReads();
- for(SingleRead amplificationSingleRead:amplificationSingleReads){
- if(sequenceSingleReads.contains(amplificationSingleRead)){
- TreeNode node = new TreeNode(amplificationSingleRead);
- node.setParent(currentnode);
- children.add(node);
- }
- }
- return children.toArray();
- }
- }
+// else if(value instanceof Amplification){
+// if(parentNode!=null && parentNode.getValue() instanceof Sequence){
+// Set<SingleRead> amplificationSingleReads = ((Amplification) value).getSingleReads();
+// Set<SingleRead> sequenceSingleReads = ((Sequence)parentNode.getValue()).getSingleReads();
+// for(SingleRead amplificationSingleRead:amplificationSingleReads){
+// if(sequenceSingleReads.contains(amplificationSingleRead)){
+// TreeNode node = new TreeNode(amplificationSingleRead);
+// node.setParent(currentnode);
+// children.add(node);
+// }
+// }
+// return children.toArray();
+// }
+// }
else if(value instanceof Sequence){
Set<SingleRead> singleReads = ((Sequence) value).getSingleReads();
for(SingleRead singleRead:singleReads){
- // if the single read has an amplification then show the amplification as the direct child
- // (and the single read as child of the amplification)
- if(singleRead.getAmplification()!=null){
- TreeNode node = new TreeNode(singleRead.getAmplification());
- node.setParent(currentnode);
- children.add(node);
- }
- else{
+// // if the single read has an amplification then show the amplification as the direct child
+// // (and the single read as child of the amplification)
+// if(singleRead.getAmplification()!=null){
+// TreeNode node = new TreeNode(singleRead.getAmplification());
+// node.setParent(currentnode);
+// children.add(node);
+// }
+// else{
TreeNode node = new TreeNode(singleRead);
node.setParent(currentnode);
children.add(node);
- }
+// }
}
return children.toArray();
}
if(element instanceof DnaSample){
DnaSample dnaSample = (DnaSample)element;
- if(!dnaSample.getSequences().isEmpty() || !dnaSample.getAmplifications().isEmpty()){
+ if(!dnaSample.getSequences().isEmpty()){// || !dnaSample.getAmplifications().isEmpty()){
return true;
}
}
- else if(element instanceof Amplification){
- Amplification amplification = (Amplification)element;
- return !amplification.getSingleReads().isEmpty();
- }
+// else if(element instanceof Amplification){
+// Amplification amplification = (Amplification)element;
+// return !amplification.getSingleReads().isEmpty();
+// }
else if(element instanceof Sequence){
return !((Sequence)element).getSingleReads().isEmpty();
}
--- /dev/null
+// $Id$
+/**
+ * Copyright (C) 2014 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
+package eu.etaxonomy.taxeditor.newWizard;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationCloningDetailElement;
+
+/**
+ * @author pplitzner
+ * @date 11.03.2014
+ *
+ */
+public class AmplificationCloningWizardPage extends AbstractCdmEntityWizardPage<Amplification> {
+
+ /**
+ * @param formFactory
+ * @param conversation
+ * @param entity
+ */
+ public AmplificationCloningWizardPage(CdmFormFactory formFactory,
+ ConversationHolder conversation, Amplification entity) {
+ super(formFactory, conversation, entity);
+ setTitle("Amplification Cloning Data");
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete()
+ */
+ @Override
+ protected void checkComplete() {
+ setPageComplete(true);
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement)
+ */
+ @Override
+ public AbstractCdmDetailElement<Amplification> createElement(ICdmFormElement rootElement) {
+ AmplificationCloningDetailElement detailElement = formFactory.createAmplificationCloningDetailElement(rootElement);
+ detailElement.setEntity(getEntity());
+ checkComplete();
+ return detailElement;
+ }
+
+}
--- /dev/null
+// $Id$
+/**
+ * Copyright (C) 2014 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
+package eu.etaxonomy.taxeditor.newWizard;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.cdm.model.molecular.Primer;
+import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationGeneralDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.PrimerGeneralDetailElement;
+
+/**
+ * @author pplitzner
+ * @date 11.03.2014
+ *
+ */
+public class AmplificationGeneralWizardPage extends AbstractCdmEntityWizardPage<Amplification> {
+
+ /**
+ * @param formFactory
+ * @param conversation
+ * @param entity
+ */
+ public AmplificationGeneralWizardPage(CdmFormFactory formFactory,
+ ConversationHolder conversation, Amplification entity) {
+ super(formFactory, conversation, entity);
+ setTitle("General Amplification Data");
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete()
+ */
+ @Override
+ protected void checkComplete() {
+ setPageComplete(true);
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement)
+ */
+ @Override
+ public AbstractCdmDetailElement<Amplification> createElement(ICdmFormElement rootElement) {
+ AmplificationGeneralDetailElement detailElement = formFactory.createAmplificationGeneralDetailElement(rootElement);
+ detailElement.setEntity(getEntity());
+ checkComplete();
+ return detailElement;
+ }
+
+}
--- /dev/null
+// $Id$
+/**
+ * Copyright (C) 2014 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
+package eu.etaxonomy.taxeditor.newWizard;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationPrimerDetailElement;
+
+/**
+ * @author pplitzner
+ * @date 11.03.2014
+ *
+ */
+public class AmplificationPrimerWizardPage extends AbstractCdmEntityWizardPage<Amplification> {
+
+ /**
+ * @param formFactory
+ * @param conversation
+ * @param entity
+ */
+ public AmplificationPrimerWizardPage(CdmFormFactory formFactory,
+ ConversationHolder conversation, Amplification entity) {
+ super(formFactory, conversation, entity);
+ setTitle("Amplification Primer Data");
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete()
+ */
+ @Override
+ protected void checkComplete() {
+ setPageComplete(true);
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement)
+ */
+ @Override
+ public AbstractCdmDetailElement<Amplification> createElement(ICdmFormElement rootElement) {
+ AmplificationPrimerDetailElement detailElement = formFactory.createAmplificationPrimerDetailElement(rootElement);
+ detailElement.setEntity(getEntity());
+ checkComplete();
+ return detailElement;
+ }
+
+}
--- /dev/null
+// $Id$
+/**
+* Copyright (C) 2014 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.taxeditor.newWizard;
+
+import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+/**
+ * @author pplitzner
+ * @date 11.03.2014
+ *
+ */
+public class NewAmplificationWizard extends AbstractNewEntityWizard<Amplification> {
+
+ private AmplificationGeneralWizardPage amplificationGeneralPage;
+ private AmplificationPrimerWizardPage amplificationPrimerPage;
+ private AmplificationCloningWizardPage amplificationCloningPage;
+
+ /** {@inheritDoc} */
+ @Override
+ public void addPages() {
+ amplificationGeneralPage = new AmplificationGeneralWizardPage(formFactory, getConversationHolder(), getEntity());
+ addPage(amplificationGeneralPage);
+ amplificationPrimerPage = new AmplificationPrimerWizardPage(formFactory, getConversationHolder(), getEntity());
+ addPage(amplificationPrimerPage);
+ amplificationCloningPage = new AmplificationCloningWizardPage(formFactory, getConversationHolder(), getEntity());
+ addPage(amplificationCloningPage);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected Amplification createNewEntity() {
+ return Amplification.NewInstance();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected void saveEntity() {
+ CdmStore.getService(IAmplificationService.class).saveOrUpdate(getEntity());
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void setEntity(Amplification entity) {
+ super.setEntity(entity);
+ amplificationGeneralPage.getDetailElement().setEntity(entity);
+ amplificationPrimerPage.getDetailElement().setEntity(entity);
+ amplificationCloningPage.getDetailElement().setEntity(entity);
+ }
+
+ @Override
+ protected String getEntityName() {
+ return "Amplification";
+ }
+}
--- /dev/null
+// $Id$
+/**
+ * Copyright (C) 2014 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
+package eu.etaxonomy.taxeditor.ui.dialog.selection;
+
+import java.util.UUID;
+
+import org.eclipse.swt.widgets.Shell;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewAmplificationWizard;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+/**
+ * @author pplitzner
+ * @date 11.03.2014
+ *
+ */
+public class AmplificationSelectionDialog extends
+AbstractFilteredCdmResourceSelectionDialog<Amplification> {
+
+ public static Amplification select(Shell shell, ConversationHolder conversation, Amplification amplification){
+ AmplificationSelectionDialog dialog = new AmplificationSelectionDialog(shell, conversation,
+ "Choose Unit", false, AmplificationSelectionDialog.class.getCanonicalName(), amplification);
+ return getSelectionFromDialog(dialog);
+ }
+
+ /**
+ * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
+ */
+ protected AmplificationSelectionDialog(Shell shell, ConversationHolder conversation, String title,
+ boolean multi, String settings, Amplification cdmObject) {
+ super(shell, conversation, title, multi, settings, cdmObject);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected Amplification getPersistentObject(UUID uuid) {
+ Object object = CdmStore.getService(IAmplificationService.class).load(uuid);
+
+ Amplification amplification = (Amplification) HibernateProxyHelper.deproxy(object);
+
+ if(amplification != null){
+ return amplification;
+ }
+ AbstractUtility.error(this.getClass(), "Selected unit is not an amplification", null);
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected void initModel() {
+ model = CdmStore.getService(IAmplificationService.class).getAmplificationUuidAndDescription();
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.ui.dialog.selection.AbstractFilteredCdmResourceSelectionDialog#getTitle(eu.etaxonomy.cdm.model.common.ICdmBase)
+ */
+ @Override
+ protected String getTitle(Amplification cdmObject) {
+ if(cdmObject!=null){
+ return cdmObject.getDescription();
+ }
+ return super.getTitle(cdmObject);
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
+ return new NewAmplificationWizard();
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ protected String getNewWizardLinkText() {
+ return String.format("Create a new <a>%1s</a>", "Amplification ");
+ }
+}
import eu.etaxonomy.cdm.model.description.PolytomousKey;
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Primer;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
import eu.etaxonomy.cdm.model.occurrence.Collection;
if(clazz.equals(Primer.class)){
return (T) PrimerSelectionDialog.select(shell, conversation, (Primer) curentSelection);
}
+ if(clazz.equals(Amplification.class)){
+ return (T) AmplificationSelectionDialog.select(shell, conversation, (Amplification) curentSelection);
+ }
return null;
}
public class DerivedUnitBaseDetailElement extends
AbstractCdmDetailElement<DerivedUnitFacade> {
+ private TextWithLabelElement textOriginalLabelData;
+
private TextWithLabelElement text_derivedUnitDefinitions;
private TextWithLabelElement text_barcode;
// "Specimen Definition",
// facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
// style);
+ //FIXME map original label data to corresponding model field
+ textOriginalLabelData = formFactory.createTextWithLabelElement(formElement, "Original Label Data", null, style);
text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
text_catalogNumber = formFactory.createTextWithLabelElement(formElement, "Catalog Number", entity.getCatalogNumber(), style);
--- /dev/null
+// $Id$
+/**
+* Copyright (C) 2014 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
+
+import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+
+/**
+ * @author pplitzner
+ * @date 15.01.2014
+ *
+ */
+public class AmplificationGelPhotoDetailElement extends AbstractCdmDetailElement<Amplification> {
+ private AmplificationGelPhotoCollectionDetailSection sectionGelPhoto;
+
+ /**
+ * @param formFactory
+ * @param formElement
+ */
+ public AmplificationGelPhotoDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
+ super(formFactory, formElement);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
+ * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
+ */
+ @Override
+ protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
+ sectionGelPhoto = formFactory.createAmplificationGelPhotoCollectionDetailSection(getConversationHolder(), formElement, style);
+ sectionGelPhoto.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+ sectionGelPhoto.setEntity(entity);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
+ * .lang.Object)
+ */
+ @Override
+ public void handleEvent(Object eventSource) {
+ handle
+ }
+
+}
*/
public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<Amplification> {
+ private TextWithLabelElement textDescription;
private TermComboElement<DefinedTerm> comboMarker;
private TimePeriodElement dateAmplification;
private EntitySelectionElement<AgentBase> selectionAmplificationStaff;
*/
@Override
protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
+ textDescription = formFactory.createTextWithLabelElement(formElement, "Description", entity.getDescription(), style);
comboMarker = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Marker", entity.getDnaMarker(), style);
// dateAmplification = formFactory.createTimePeriodElement(formElement, "Amplification Date", entity.getTimeperiod(), style);
// selectionAmplificationStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Amplification staff", entity.getActor(), EntitySelectionElement.ALL, style);
*/
@Override
public void handleEvent(Object eventSource) {
- if(eventSource==comboMarker){
+ if(eventSource==textDescription){
+ getEntity().setDescription(textDescription.getText());
+ }
+ else if(eventSource==comboMarker){
getEntity().setDnaMarker(comboMarker.getSelection());
}
else if(eventSource==dateAmplification){
*/
package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Primer;
import eu.etaxonomy.cdm.model.molecular.SingleRead;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
public class SingleReadGeneralDetailElement extends AbstractCdmDetailElement<SingleRead> {
private EntitySelectionElement<Primer> selectionPrimer;
+ private EntitySelectionElement<Amplification> selectionAmplification;
/**
* @param formFactory
@Override
protected void createControls(ICdmFormElement formElement, SingleRead entity, int style) {
selectionPrimer = formFactory.createSelectionElement(Primer.class, getConversationHolder(), formElement, "Primer", entity.getPrimer(), EntitySelectionElement.ALL, style);
+ selectionAmplification = formFactory.createSelectionElement(Amplification.class, getConversationHolder(), formElement, "Amplification", entity.getAmplification(), EntitySelectionElement.ALL, style);
}
/*
if(eventSource==selectionPrimer){
getEntity().setPrimer(selectionPrimer.getSelection());
}
+ else if(eventSource==selectionAmplification){
+ selectionAmplification.getSelection().addSingleRead(getEntity());
+ }
}
}
import eu.etaxonomy.cdm.model.agent.Team;
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Primer;
import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.occurrence.Collection;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.TextHelper;
+import eu.etaxonomy.taxeditor.newWizard.AmplificationCloningWizardPage;
+import eu.etaxonomy.taxeditor.newWizard.AmplificationGeneralWizardPage;
+import eu.etaxonomy.taxeditor.newWizard.AmplificationPrimerWizardPage;
import eu.etaxonomy.taxeditor.newWizard.PrimerWizardPage;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
addPage(new PrimerWizardPage(formFactory,
selectionElement.getConversationHolder(),
(Primer) entity));
+ } else if (entity instanceof Amplification) {
+ addPage(new AmplificationGeneralWizardPage(formFactory,
+ selectionElement.getConversationHolder(),
+ (Amplification) entity));
+ addPage(new AmplificationPrimerWizardPage(formFactory,
+ selectionElement.getConversationHolder(),
+ (Amplification) entity));
+ addPage(new AmplificationCloningWizardPage(formFactory,
+ selectionElement.getConversationHolder(),
+ (Amplification) entity));
+// addPage(new AmplificationGelPhotoWizardPage(formFactory,
+// selectionElement.getConversationHolder(),
+// (Amplification) entity));
} else {
AbstractUtility.warningDialog("Missing interface", this,
"No detail element for current selection");
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Primer;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
return ((User) entity).getUsername();
} else if (entity instanceof Primer){
return ((Primer) entity).getLabel();
+ } else if (entity instanceof Amplification){
+ return ((Amplification) entity).getDescription();
}
}
import org.eclipse.jface.viewers.TreeNode;
import org.eclipse.swt.graphics.Image;
-import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Sequence;
import eu.etaxonomy.cdm.model.molecular.SingleRead;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
else if(element instanceof Sequence){
return ImageResources.getImage(ImageResources.SEQUENCE_DERIVATE);
}
- else if(element instanceof Amplification){
- return ImageResources.getImage(ImageResources.AMPLIFICATION_DERIVATE);
- }
+// else if(element instanceof Amplification){
+// return ImageResources.getImage(ImageResources.AMPLIFICATION_DERIVATE);
+// }
else if(element instanceof SingleRead){
return ImageResources.getImage(ImageResources.SINGLE_READ_DERIVATE);
}
BGBM BDI Projects / taxeditor.git / commitdiff