From feb7a53497312add062f4360210334bf9e890acd Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Thu, 11 Dec 2014 12:06:19 +0000 Subject: [PATCH] - temporarily commented compile errors --- .../AmplificationCloningDetailElement.java | 50 +++++++++---------- ...cationGelPhotoCollectionDetailSection.java | 20 ++++---- .../dna/SingleReadGeneralDetailElement.java | 4 +- .../derivateSearch/DerivateLabelProvider.java | 6 +-- 4 files changed, 39 insertions(+), 41 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java index 941e5dbf4..da80ca604 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java @@ -11,9 +11,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna; import eu.etaxonomy.cdm.model.agent.AgentBase; import eu.etaxonomy.cdm.model.common.DefinedTerm; -import eu.etaxonomy.cdm.model.common.TermType; import eu.etaxonomy.cdm.model.molecular.Amplification; -import eu.etaxonomy.cdm.model.molecular.Cloning; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; @@ -51,11 +49,11 @@ public class AmplificationCloningDetailElement extends AbstractCdmDetailElement */ @Override protected void createControls(ICdmFormElement formElement, Amplification entity, int style) { - Cloning cloning = entity.getCloning(); - textCloningStrain = formFactory.createTextWithLabelElement(formElement, "Cloning Strain", cloning==null?"":cloning.getStrain(), style); - date = formFactory.createTimePeriodElement(formElement, "Cloning Date", cloning==null?null:cloning.getTimeperiod(), style); - selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Cloning Staff", cloning==null?null:cloning.getActor(), EntitySelectionElement.ALL, style); - comboCloningMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style); +// Cloning cloning = entity.getCloning(); +// textCloningStrain = formFactory.createTextWithLabelElement(formElement, "Cloning Strain", cloning==null?"":cloning.getStrain(), style); +// date = formFactory.createTimePeriodElement(formElement, "Cloning Date", cloning==null?null:cloning.getTimeperiod(), style); +// selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Cloning Staff", cloning==null?null:cloning.getActor(), EntitySelectionElement.ALL, style); +// comboCloningMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style); } /* @@ -67,25 +65,25 @@ public class AmplificationCloningDetailElement extends AbstractCdmDetailElement */ @Override public void handleEvent(Object eventSource) { - if(eventSource==textCloningStrain || eventSource==date|| eventSource==selectionCloningStaff || eventSource==comboCloningMaterialOrMethod){ - Cloning cloning = getEntity().getCloning(); - if(cloning==null){ - cloning = Cloning.NewInstance(); - getEntity().setCloning(cloning); - } - if(eventSource==textCloningStrain){ - cloning.setStrain(textCloningStrain.getText()); - } - else if(eventSource==date){ - cloning.setTimeperiod(date.getTimePeriod()); - } - else if(eventSource==selectionCloningStaff){ - cloning.setActor(selectionCloningStaff.getSelection()); - } - else if(eventSource==comboCloningMaterialOrMethod){ - cloning.setDefinedMaterialOrMethod(comboCloningMaterialOrMethod.getSelection()); - } - } +// if(eventSource==textCloningStrain || eventSource==date|| eventSource==selectionCloningStaff || eventSource==comboCloningMaterialOrMethod){ +// Cloning cloning = getEntity().getCloning(); +// if(cloning==null){ +// cloning = Cloning.NewInstance(); +// getEntity().setCloning(cloning); +// } +// if(eventSource==textCloningStrain){ +// cloning.setStrain(textCloningStrain.getText()); +// } +// else if(eventSource==date){ +// cloning.setTimeperiod(date.getTimePeriod()); +// } +// else if(eventSource==selectionCloningStaff){ +// cloning.setActor(selectionCloningStaff.getSelection()); +// } +// else if(eventSource==comboCloningMaterialOrMethod){ +// cloning.setDefinedMaterialOrMethod(comboCloningMaterialOrMethod.getSelection()); +// } +// } } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java index ee60c70c9..e982e7ff2 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java @@ -45,9 +45,9 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity */ @Override public Collection getCollection(Amplification entity) { - if(entity.getGelPhoto()!=null){ - return Collections.singleton(entity.getGelPhoto()); - } +// if(entity.getGelPhoto()!=null){ +// return Collections.singleton(entity.getGelPhoto()); +// } return Collections.EMPTY_LIST; } @@ -56,9 +56,9 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity */ @Override public Media createNewElement() { - if(getEntity().getGelPhoto()==null){ - return Media.NewInstance(); - } +// if(getEntity().getGelPhoto()==null){ +// return Media.NewInstance(); +// } return null; } @@ -67,9 +67,9 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity */ @Override public void addElement(Media element) { - if(getEntity().getGelPhoto()==null){ - getEntity().setGelPhoto(element); - } +// if(getEntity().getGelPhoto()==null){ +// getEntity().setGelPhoto(element); +// } } @@ -78,7 +78,7 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity */ @Override public void removeElement(Media element) { - getEntity().setGelPhoto(null); +// getEntity().setGelPhoto(null); } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java index 4c85ed548..0c2f933e8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java @@ -47,7 +47,7 @@ public class SingleReadGeneralDetailElement extends AbstractCdmDetailElement