From: Patric Plitzner Date: Mon, 24 Nov 2014 10:16:04 +0000 (+0000) Subject: - removed unused code X-Git-Tag: 3.6.0~353 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/902350add0b69903c4087d1ff50f9e8d2a16701c - removed unused code --- diff --git a/.gitattributes b/.gitattributes index 280eb1c92..4b54556ca 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1665,12 +1665,8 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadPherogramCollectionDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/LivingPlantPhotoGeneralDetailElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/LivingPlantPhotoGeneralDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/SpecimenScanGeneralDetailElement.java -text -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/SpecimenScanGeneralDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailElement.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/NomenclaturalReferenceDetailSection.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/reference/ReferenceDetailElement.java -text diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java index 03f76ed7c..9e450f39b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java @@ -261,12 +261,8 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SingleReadGeneralDetailS import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SingleReadPherogramCollectionDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.TissueSampleGeneralDetailElement; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.TissueSampleGeneralDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.media.LivingPlantPhotoGeneralDetailElement; -import eu.etaxonomy.taxeditor.ui.section.occurrence.media.LivingPlantPhotoGeneralDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.media.MediaSpecimenGeneralDetailElement; import eu.etaxonomy.taxeditor.ui.section.occurrence.media.MediaSpecimenGeneralDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.media.SpecimenScanGeneralDetailElement; -import eu.etaxonomy.taxeditor.ui.section.occurrence.media.SpecimenScanGeneralDetailSection; import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalReferenceDetailElement; import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalReferenceDetailSection; import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceDetailElement; @@ -1777,18 +1773,6 @@ public class CdmFormFactory extends FormToolkit { return section; } - public SpecimenScanGeneralDetailSection createSpecimenScanGeneralDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ - SpecimenScanGeneralDetailSection section = new SpecimenScanGeneralDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdaptSection(parentElement, section); - return section; - } - - public LivingPlantPhotoGeneralDetailSection createLivingPlantPhotoGeneralDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ - LivingPlantPhotoGeneralDetailSection section = new LivingPlantPhotoGeneralDetailSection(this, conversation, parentElement, selectionProvider, style); - addAndAdaptSection(parentElement, section); - return section; - } - public MediaSpecimenGeneralDetailSection createMediaSpecimenGeneralDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style){ MediaSpecimenGeneralDetailSection section = new MediaSpecimenGeneralDetailSection(this, conversation, parentElement, selectionProvider, style); addAndAdaptSection(parentElement, section); @@ -2127,18 +2111,6 @@ public class CdmFormFactory extends FormToolkit { return element; } - public SpecimenScanGeneralDetailElement createSpecimenScanGeneralDetailElement(ICdmFormElement parentElement){ - SpecimenScanGeneralDetailElement element = new SpecimenScanGeneralDetailElement(this, parentElement); - addAndAdaptElement(parentElement, element); - return element; - } - - public LivingPlantPhotoGeneralDetailElement createLivingPlantPhotoGeneralDetailElement(ICdmFormElement parentElement){ - LivingPlantPhotoGeneralDetailElement element = new LivingPlantPhotoGeneralDetailElement(this, parentElement); - addAndAdaptElement(parentElement, element); - return element; - } - public MediaSpecimenGeneralDetailElement createMediaSpecimenGeneralDetailElement(ICdmFormElement parentElement){ MediaSpecimenGeneralDetailElement element = new MediaSpecimenGeneralDetailElement(this, parentElement); addAndAdaptElement(parentElement, element); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java index 97207a2ba..e67aaaf80 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java @@ -40,8 +40,6 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement { - private TextWithLabelElement textOriginalLabelData; - private TextWithLabelElement text_derivedUnitDefinitions; private TextWithLabelElement text_barcode; @@ -84,9 +82,6 @@ public class DerivedUnitBaseDetailElement extends // "Specimen Definition", // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()), // style); - //FIXME map original label data to corresponding model field - //commented because we do not use this yet in the trunk -// 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); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/LivingPlantPhotoGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/LivingPlantPhotoGeneralDetailElement.java deleted file mode 100644 index 523f297fc..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/LivingPlantPhotoGeneralDetailElement.java +++ /dev/null @@ -1,55 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 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.media; - -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author pplitzner - * @date 16.12.2013 - * - */ -public class LivingPlantPhotoGeneralDetailElement extends AbstractCdmDetailElement { - - /** - * @param formFactory - * @param formElement - */ - public LivingPlantPhotoGeneralDetailElement(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, DerivedUnitFacade entity, int style) { - - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java - * .lang.Object) - */ - @Override - public void handleEvent(Object eventSource) { - } - -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/LivingPlantPhotoGeneralDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/LivingPlantPhotoGeneralDetailSection.java deleted file mode 100644 index b1b8974c0..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/LivingPlantPhotoGeneralDetailSection.java +++ /dev/null @@ -1,57 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 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.media; - -import org.eclipse.jface.viewers.ISelectionProvider; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; - -/** - * @author pplitzner - * @date 12.12.2013 - * - */ -public class LivingPlantPhotoGeneralDetailSection extends AbstractCdmDetailSection { - - /** - * @param formFactory - * @param conversation - * @param parentElement - * @param selectionProvider - * @param style - */ - public LivingPlantPhotoGeneralDetailSection(CdmFormFactory formFactory, - ConversationHolder conversation, ICdmFormElement parentElement, - ISelectionProvider selectionProvider, int style) { - super(formFactory, conversation, parentElement, selectionProvider, style); - } - - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading() - */ - @Override - public String getHeading() { - return "General"; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) - */ - @Override - protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { - return formFactory.createLivingPlantPhotoGeneralDetailElement(parentElement); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/SpecimenScanGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/SpecimenScanGeneralDetailElement.java deleted file mode 100644 index fada3bb28..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/SpecimenScanGeneralDetailElement.java +++ /dev/null @@ -1,55 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 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.media; - -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; - -/** - * @author pplitzner - * @date 16.12.2013 - * - */ -public class SpecimenScanGeneralDetailElement extends AbstractCdmDetailElement { - - /** - * @param formFactory - * @param formElement - */ - public SpecimenScanGeneralDetailElement(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, DerivedUnitFacade entity, int style) { - - } - - /* - * (non-Javadoc) - * - * @see - * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java - * .lang.Object) - */ - @Override - public void handleEvent(Object eventSource) { - } - -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/SpecimenScanGeneralDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/SpecimenScanGeneralDetailSection.java deleted file mode 100644 index 497d96a1e..000000000 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/SpecimenScanGeneralDetailSection.java +++ /dev/null @@ -1,57 +0,0 @@ -// $Id$ -/** -* Copyright (C) 2013 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.media; - -import org.eclipse.jface.viewers.ISelectionProvider; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; -import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; -import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection; - -/** - * @author pplitzner - * @date 12.12.2013 - * - */ -public class SpecimenScanGeneralDetailSection extends AbstractCdmDetailSection { - - /** - * @param formFactory - * @param conversation - * @param parentElement - * @param selectionProvider - * @param style - */ - public SpecimenScanGeneralDetailSection(CdmFormFactory formFactory, - ConversationHolder conversation, ICdmFormElement parentElement, - ISelectionProvider selectionProvider, int style) { - super(formFactory, conversation, parentElement, selectionProvider, style); - } - - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading() - */ - @Override - public String getHeading() { - return "General"; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int) - */ - @Override - protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { - return formFactory.createSpecimenScanGeneralDetailElement(parentElement); - } -} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java index c536146bc..a03175185 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java @@ -92,9 +92,6 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitGeneralDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.OriginalLabelDataSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenDeterminationDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.derivedUnit.PreservedSpecimenGeneralDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationCloningDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationGelPhotoCollectionDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationGeneralDetailSection; @@ -108,9 +105,7 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SequenceReferenceCollect import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SingleReadGeneralDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SingleReadPherogramCollectionDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.TissueSampleGeneralDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.media.LivingPlantPhotoGeneralDetailSection; import eu.etaxonomy.taxeditor.ui.section.occurrence.media.MediaSpecimenGeneralDetailSection; -import eu.etaxonomy.taxeditor.ui.section.occurrence.media.SpecimenScanGeneralDetailSection; import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalReferenceDetailSection; import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceDetailSection; import eu.etaxonomy.taxeditor.ui.section.supplemental.RightsSection; @@ -297,15 +292,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { //in future using only one class with different SpecimenOrObservationTypes is desired // createTissueSampleSection(rootElement); } - else if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.StillImage){ - createSpecimenScanSection(rootElement); - } - else if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.StillImage){ - createLivingPlantPhotoSection(rootElement); - } - else if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.StillImage){ - createMediaSpecimenSection(rootElement); - } else{ createDerivedUnitBaseElementSection(rootElement); } @@ -736,24 +722,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { } } - private void createPreservedSpecimenSpecimenSection(RootElement parent) { - destroySections(); - - PreservedSpecimenGeneralDetailSection section = formFactory.createPreservedSpecimenGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - PreservedSpecimenDetailSection derivedUnitBaseDetailSection = formFactory.createPreservedSpecimenDetailsSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); - - formFactory.createHorizontalSeparator(parent, SWT.BORDER); - - PreservedSpecimenDeterminationDetailSection determinationDetailSection = formFactory.createPreservedSpecimenDeterminationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE); - - addPart(section); - addPart(derivedUnitBaseDetailSection); - addPart(determinationDetailSection); - } - private void createTissueSampleSection(RootElement parent) { destroySections(); @@ -840,20 +808,6 @@ public class DetailsViewer extends AbstractCdmDataViewer { addPart(pherogramSection); } - private void createSpecimenScanSection(RootElement parent) { - destroySections(); - SpecimenScanGeneralDetailSection section = formFactory.createSpecimenScanGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - - addPart(section); - } - - private void createLivingPlantPhotoSection(RootElement parent) { - destroySections(); - LivingPlantPhotoGeneralDetailSection section = formFactory.createLivingPlantPhotoGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - - addPart(section); - } - private void createMediaSpecimenSection(RootElement parent) { destroySections();