From: n.hoffmann Date: Fri, 11 Feb 2011 17:27:30 +0000 (+0000) Subject: Implemented correct handling of images for specimen. Still needs fine tuning. X-Git-Tag: rcp.ss-first-working-version~198 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/3f2e3f8a94d602abbace52ba197d64059243efd6 Implemented correct handling of images for specimen. Still needs fine tuning. --- diff --git a/.gitattributes b/.gitattributes index 97598e100..6066b49dd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -89,8 +89,10 @@ taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/Del taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java -text +taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddDerivedUnitMediaHandler.java -text -taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitMediaOperation.java -text +taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddFieldObjectMediaHandler.java -text +taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/MergeGroupHandler.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/OpenBulkEditorHandler.java -text taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/RemoveMergeCandidateHandler.java -text diff --git a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java index 8f3e62cd9..bc5e0a668 100644 --- a/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java +++ b/taxeditor-application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java @@ -45,5 +45,4 @@ public class Taxonomic extends Default { createAdditionalFolder(layout, layout.getEditorArea()); } - } diff --git a/taxeditor-bulkeditor/plugin.xml b/taxeditor-bulkeditor/plugin.xml index 905baaa9a..807fedb28 100644 --- a/taxeditor-bulkeditor/plugin.xml +++ b/taxeditor-bulkeditor/plugin.xml @@ -342,12 +342,11 @@ commandId="eu.etaxonomy.taxeditor.bulkeditor.command.derivedunit.addDerivedUnitMedia" label="Add Derived Unit Media" style="push"> - - - - + + @@ -358,6 +357,11 @@ id="eu.etaxonomy.taxeditor.bulkeditor.command.derivedunit.addDerivedUnitMedia" name="Add Derived Unit Media"> + + @@ -368,9 +372,6 @@ properties="isDerivedUnitEditor" type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor"> - - diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java new file mode 100644 index 000000000..fe74a3d13 --- /dev/null +++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java @@ -0,0 +1,77 @@ +// $Id$ +/** +* Copyright (C) 2007 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.bulkeditor.derivedunit.handler; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.commands.common.NotDefinedException; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.handlers.HandlerUtil; + +import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; +import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; +import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; +import eu.etaxonomy.taxeditor.bulkeditor.derivedunit.operation.AddDerivedUnitFacadeMediaOperation; +import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput; +import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; +import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; + +/** + * @author n.hoffmann + * @created Feb 11, 2011 + * @version 1.0 + */ +public abstract class AbstractAddDerivedUnitFacadeMediaHandler extends AbstractHandler { + + /* (non-Javadoc) + * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) + */ + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + IWorkbenchPart part = HandlerUtil.getActivePart(event); + IPostOperationEnabled postOperationEnabled = (part instanceof IPostOperationEnabled) ? (IPostOperationEnabled) part : null; + + + IEditorPart editor = HandlerUtil.getActiveEditor(event); + IEditorInput input = editor.getEditorInput(); + + + if(input instanceof OccurrenceEditorInput){ + BulkEditor bulkEditor = (BulkEditor) editor; + ISelection selection = bulkEditor.getSelectionProvider().getSelection(); + + if(selection instanceof IStructuredSelection){ + Object element = ((IStructuredSelection) selection).getFirstElement(); + if(element instanceof DerivedUnitBase){ + + try{ + AbstractPostOperation operation = new AddDerivedUnitFacadeMediaOperation(event.getCommand().getName(), BulkEditorUtil.getUndoContext(), (DerivedUnitBase) element, getMode(), postOperationEnabled); + BulkEditorUtil.executeOperation(operation); + } catch (NotDefinedException e) { + BulkEditorUtil.warn(getClass(), "Command name not set."); + } + } + } + } + return null; + } + + /** + * @return + */ + protected abstract int getMode(); + +} diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddDerivedUnitMediaHandler.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddDerivedUnitMediaHandler.java index 9b02d73e3..21fa66c85 100644 --- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddDerivedUnitMediaHandler.java +++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddDerivedUnitMediaHandler.java @@ -10,67 +10,23 @@ package eu.etaxonomy.taxeditor.bulkeditor.derivedunit.handler; -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.common.NotDefinedException; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.handlers.HandlerUtil; +import eu.etaxonomy.taxeditor.bulkeditor.derivedunit.operation.AddDerivedUnitFacadeMediaOperation; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; -import eu.etaxonomy.cdm.model.description.Feature; -import eu.etaxonomy.cdm.model.description.SpecimenDescription; -import eu.etaxonomy.cdm.model.description.TextData; -import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; -import eu.etaxonomy.taxeditor.bulkeditor.derivedunit.operation.AddDerivedUnitMediaOperation; -import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput; -import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; -import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; /** * @author n.hoffmann * @created Feb 7, 2011 * @version 1.0 */ -public class AddDerivedUnitMediaHandler extends AbstractHandler { +public class AddDerivedUnitMediaHandler extends AbstractAddDerivedUnitFacadeMediaHandler { /* (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) + * @see eu.etaxonomy.taxeditor.bulkeditor.derivedunit.handler.AbstractAddDerivedUnitFacadeMediaHandler#getMode() */ @Override - public Object execute(ExecutionEvent event) throws ExecutionException { - IWorkbenchPart part = HandlerUtil.getActivePart(event); - IPostOperationEnabled postOperationEnabled = (part instanceof IPostOperationEnabled) ? (IPostOperationEnabled) part : null; - - - IEditorPart editor = HandlerUtil.getActiveEditor(event); - IEditorInput input = editor.getEditorInput(); - - if(input instanceof OccurrenceEditorInput){ - BulkEditor bulkEditor = (BulkEditor) editor; - ISelection selection = bulkEditor.getSelectionProvider().getSelection(); - - if(selection instanceof IStructuredSelection){ - Object element = ((IStructuredSelection) selection).getFirstElement(); - if(element instanceof DerivedUnitBase){ - - try{ - AbstractPostOperation operation = new AddDerivedUnitMediaOperation(event.getCommand().getName(), BulkEditorUtil.getUndoContext(), (DerivedUnitBase) element, postOperationEnabled); - BulkEditorUtil.executeOperation(operation); - } catch (NotDefinedException e) { - BulkEditorUtil.warn(getClass(), "Command name not set."); - } - } - } - } - return null; + protected int getMode() { + return AddDerivedUnitFacadeMediaOperation.DERIVED_UNIT_MEDIA; } + } diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddFieldObjectMediaHandler.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddFieldObjectMediaHandler.java new file mode 100644 index 000000000..2d19d111b --- /dev/null +++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddFieldObjectMediaHandler.java @@ -0,0 +1,31 @@ +// $Id$ +/** +* Copyright (C) 2007 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.bulkeditor.derivedunit.handler; + +import eu.etaxonomy.taxeditor.bulkeditor.derivedunit.operation.AddDerivedUnitFacadeMediaOperation; + +/** + * @author n.hoffmann + * @created Feb 11, 2011 + * @version 1.0 + */ +public class AddFieldObjectMediaHandler extends + AbstractAddDerivedUnitFacadeMediaHandler { + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.bulkeditor.derivedunit.handler.AbstractAddDerivedUnitFacadeMediaHandler#getMode() + */ + @Override + protected int getMode() { + return AddDerivedUnitFacadeMediaOperation.FIELD_OBJECT_MEDIA; + } + +} diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitMediaOperation.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java similarity index 73% rename from taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitMediaOperation.java rename to taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java index 9369b16f6..179f2a5f5 100644 --- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitMediaOperation.java +++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java @@ -18,10 +18,8 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; -import eu.etaxonomy.cdm.model.description.Feature; +import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.description.SpecimenDescription; -import eu.etaxonomy.cdm.model.description.TextData; -import eu.etaxonomy.cdm.model.media.Media; import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; @@ -29,47 +27,42 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; /** * @author n.hoffmann - * @created Feb 7, 2011 + * @created Feb 11, 2011 * @version 1.0 */ -public class AddDerivedUnitMediaOperation extends AbstractPostOperation { +public class AddDerivedUnitFacadeMediaOperation extends + AbstractPostOperation { + public static final int DERIVED_UNIT_MEDIA = 0; + public static final int FIELD_OBJECT_MEDIA = 1; + private DerivedUnitBase derivedUnit; - + private int mode; + /** * @param label * @param undoContext * @param postOperationEnabled */ - public AddDerivedUnitMediaOperation(String label, IUndoContext undoContext, DerivedUnitBase derivedUnit, - IPostOperationEnabled postOperationEnabled) { + public AddDerivedUnitFacadeMediaOperation(String label, IUndoContext undoContext, DerivedUnitBase derivedUnit, + int mode, IPostOperationEnabled postOperationEnabled) { super(label, undoContext, postOperationEnabled); this.derivedUnit = derivedUnit; - + this.mode = mode; } - + /* (non-Javadoc) * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) */ @Override public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - DerivedUnitFacade facade; try { facade = DerivedUnitFacade.NewInstance(derivedUnit); - SpecimenDescription imageGallery = facade.getDerivedUnitImageGallery(true); - - TextData element = TextData.NewInstance(Feature.IMAGE()); - - Media media = Media.NewInstance(); - - element.addMedia(media); - - imageGallery.addElement(element); - + createImageGallery(facade); } catch (DerivedUnitFacadeNotSupportedException e) { BulkEditorUtil.error(getClass(), e); } @@ -77,6 +70,24 @@ public class AddDerivedUnitMediaOperation extends AbstractPostOperation { return postExecute(derivedUnit); } + + + /** + * @param facade + * @return + */ + protected void createImageGallery(DerivedUnitFacade facade){ + if(mode == DERIVED_UNIT_MEDIA){ + facade.getDerivedUnitImageGallery(true); + } + else if(mode == FIELD_OBJECT_MEDIA){ + facade.getFieldObjectImageGallery(true); + } + else{ + throw new IllegalArgumentException("Mode not supported: " + mode); + } + } + /* (non-Javadoc) * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable) */ diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewer.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewer.java index bab79edf5..ac64b51cf 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewer.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/detail/DetailsViewer.java @@ -88,6 +88,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { DESCRIPTION, DESCRIPTION_ELEMENT, EMPTY, + IMAGE_GALLERY, MEDIA, TEAM_OR_PERSON_BASE, DERIVED_UNIT, @@ -189,9 +190,16 @@ public class DetailsViewer extends AbstractCdmDataViewer { currentViewPart = VIEW_PART.TEAM_OR_PERSON_BASE; } }else if(getInput() instanceof DescriptionBase){ - if(currentViewPart != VIEW_PART.DESCRIPTION){ - createDescriptionSection(rootElement); - currentViewPart = VIEW_PART.DESCRIPTION; + if(((DescriptionBase) getInput()).isImageGallery()){ + if(currentViewPart != VIEW_PART.IMAGE_GALLERY){ + createImageGallerySection(rootElement); + currentViewPart = VIEW_PART.IMAGE_GALLERY; + } + }else{ + if(currentViewPart != VIEW_PART.DESCRIPTION){ + createDescriptionSection(rootElement); + currentViewPart = VIEW_PART.DESCRIPTION; + } } }else if(getInput() instanceof DescriptionElementBase){ if(currentViewPart != VIEW_PART.DESCRIPTION_ELEMENT){ @@ -231,6 +239,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { layout(); } + /* (non-Javadoc) * @see org.eclipse.jface.viewers.Viewer#getSelection() */ @@ -448,6 +457,18 @@ public class DetailsViewer extends AbstractCdmDataViewer { } + /** + * @param rootElement + */ + private void createImageGallerySection(RootElement parent) { + destroySections(); + DescriptionDetailSection descriptionDetailSection = (DescriptionDetailSection) + formFactory.createCdmDetailSection(DetailType.DESCRIPTION, getConversationHolder(), parent, this, Section.TWISTIE | Section.EXPANDED); + + addPart(descriptionDetailSection); + } + + private void createMediaElementSection(RootElement parent) { destroySections(); MediaDetailsSection mediaDetailSection = (MediaDetailsSection) diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/CreateMediaHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/CreateMediaHandler.java index 269b475f0..a03c9a363 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/CreateMediaHandler.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/CreateMediaHandler.java @@ -10,16 +10,13 @@ import org.eclipse.core.commands.common.NotDefinedException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.TreePath; import org.eclipse.jface.viewers.TreeSelection; -import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.model.description.DescriptionBase; -import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; -import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.view.media.operation.AddMediaToImageGalleryOperation; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -41,38 +38,39 @@ public class CreateMediaHandler extends AbstractHandler { IPostOperationEnabled postOperationEnabled = (part instanceof IPostOperationEnabled) ? (IPostOperationEnabled) part : null; + DescriptionBase description = null; + IEditorPart editor = HandlerUtil.getActiveEditor(event); if (editor instanceof FormEditor) { editor = ((FormEditor) editor).getActiveEditor(); } - IEditorInput input = editor.getEditorInput(); - if (input instanceof TaxonEditorInput) { - Taxon taxon = ((TaxonEditorInput) input).getTaxon(); + + ISelection selection = HandlerUtil.getCurrentSelection(event); + if (selection instanceof TreeSelection) { + TreePath[] paths = ((TreeSelection) selection).getPaths(); - ISelection selection = HandlerUtil.getCurrentSelection(event); - if (selection instanceof TreeSelection) { - TreePath[] paths = ((TreeSelection) selection).getPaths(); - - int count = paths[0].getSegmentCount(); - DescriptionBase description = null; - for (int i = 0; i < count; i++ ) { - if (paths[0].getSegment(i) instanceof DescriptionBase) { - description = (DescriptionBase) paths[0].getSegment(i); - break; - } - } - - AbstractPostOperation operation = null; - try { - // TODO use undo context specific to editor - operation = new AddMediaToImageGalleryOperation(event.getCommand().getName(), - EditorUtil.getUndoContext(), taxon, description, postOperationEnabled); - EditorUtil.executeOperation(operation); - } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + int count = paths[0].getSegmentCount(); + + for (int i = 0; i < count; i++ ) { + if (paths[0].getSegment(i) instanceof DescriptionBase) { + description = (DescriptionBase) paths[0].getSegment(i); + break; } } } + + if(description != null){ + AbstractPostOperation operation = null; + try { + // TODO use undo context specific to editor + operation = new AddMediaToImageGalleryOperation(event.getCommand().getName(), + EditorUtil.getUndoContext(), description, postOperationEnabled); + EditorUtil.executeOperation(operation); + } catch (NotDefinedException e) { + EditorUtil.warn(getClass(), "Command name not set."); + } + } + return null; } diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/AddMediaToImageGalleryOperation.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/AddMediaToImageGalleryOperation.java index 8c11b5839..7fa478f01 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/AddMediaToImageGalleryOperation.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/AddMediaToImageGalleryOperation.java @@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.api.utility.ImagesUtility; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.media.Media; -import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; /** @@ -44,9 +43,8 @@ public class AddMediaToImageGalleryOperation extends AbstractPostOperation { * @param description a {@link eu.etaxonomy.cdm.model.description.DescriptionBase} object. */ public AddMediaToImageGalleryOperation(String label, - IUndoContext undoContext, Taxon taxon, - DescriptionBase description, IPostOperationEnabled postOperationEnabled) { - super(label, undoContext, taxon, postOperationEnabled); + IUndoContext undoContext, DescriptionBase description, IPostOperationEnabled postOperationEnabled) { + super(label, undoContext, postOperationEnabled); this.description = description; media = Media.NewInstance(); diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescribedSpecimenSection.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescribedSpecimenSection.java index 5617a1925..da88df0f5 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescribedSpecimenSection.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescribedSpecimenSection.java @@ -12,10 +12,7 @@ package eu.etaxonomy.taxeditor.section.description; import java.util.Collection; -import org.apache.log4j.Logger; - import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; @@ -32,10 +29,6 @@ import eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection; */ public class DescribedSpecimenSection extends AbstractEntityCollectionSection { - - private static final Logger logger = Logger - .getLogger(DescribedSpecimenSection.class); - /** *

Constructor for DescribedSpecimenSection.

* diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailElement.java index 9badd3be3..5cfabc1f4 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailElement.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/description/DescriptionDetailElement.java @@ -51,7 +51,7 @@ public class DescriptionDetailElement extends AbstractCdmDetailElement