From e140c036e98d00a1151bfd1424596bb79e2d3563 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Mon, 9 Dec 2013 09:36:25 +0000 Subject: [PATCH] - Changed DerivateViewEditorInput to hold the FieldUnit itself - added icons to ImageResources --- .../taxeditor/editor/EditorUtil.java | 22 +++++++++- .../handler/OpenDerivateViewHandler.java | 8 ++-- .../derivate/CreateDerivateContextMenu.java | 43 ++----------------- .../derivate/DerivateContentProvider.java | 32 +++++++------- .../editor/view/derivate/DerivateView.java | 11 +---- .../derivate/DerivateViewEditorInput.java | 37 +++++++--------- .../taxeditor/model/ImageResources.java | 24 ++++++++--- .../derivatesearch/DerivateLabelProvider.java | 8 +++- .../derivatesearch/DerivateSearchView.java | 9 ++-- 9 files changed, 88 insertions(+), 106 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java index 135d2a7bf..e2a8ee77b 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java @@ -26,6 +26,9 @@ import org.eclipse.ui.IEditorReference; import org.eclipse.ui.PartInitException; import org.eclipse.ui.handlers.HandlerUtil; +import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; +import eu.etaxonomy.cdm.model.occurrence.FieldUnit; +import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditor; import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditorInput; import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin; @@ -298,7 +301,7 @@ public class EditorUtil extends AbstractUtility { return false; } - editor.doSave(EditorUtil.getMonitor()); + editor.doSave(AbstractUtility.getMonitor()); } return true; } @@ -342,4 +345,21 @@ public class EditorUtil extends AbstractUtility { CdmAuthorityEditorInput input = CdmAuthorityEditorInput.NewInstance(groupUuid); open(input); } + + public static FieldUnit getFieldUnit(SpecimenOrObservationBase specimen){ + if(specimen.isInstanceOf(FieldUnit.class)){ + return (FieldUnit) specimen; + } + else if(specimen.isInstanceOf(DerivedUnit.class)){ + for(SpecimenOrObservationBase original:((DerivedUnit) specimen).getOriginals()){ + if(original.isInstanceOf(FieldUnit.class)){ + return (FieldUnit) original; + } + else if(original.isInstanceOf(DerivedUnit.class)){ + return getFieldUnit(original); + } + } + } + return null; + } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java index 5c8977df5..b41c77554 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java @@ -5,10 +5,11 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.IEditorInput; import org.eclipse.ui.PartInitException; import org.eclipse.ui.handlers.HandlerUtil; -import eu.etaxonomy.cdm.model.common.ICdmBase; +import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput; import eu.etaxonomy.taxeditor.model.AbstractUtility; @@ -23,8 +24,8 @@ public class OpenDerivateViewHandler extends AbstractHandler { ISelection currentSelection = HandlerUtil.getCurrentSelection(event); if(currentSelection instanceof IStructuredSelection){ Object selectedElement = ((IStructuredSelection) currentSelection).getFirstElement(); - if(selectedElement instanceof ICdmBase){ - DerivateViewEditorInput input = new DerivateViewEditorInput(((ICdmBase) selectedElement).getUuid()); + if(selectedElement instanceof SpecimenOrObservationBase){ + DerivateViewEditorInput input = new DerivateViewEditorInput(EditorUtil.getFieldUnit((SpecimenOrObservationBase) selectedElement)); try { EditorUtil.open(input); } catch (PartInitException e) { @@ -33,7 +34,6 @@ public class OpenDerivateViewHandler extends AbstractHandler { } } return null; - } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/CreateDerivateContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/CreateDerivateContextMenu.java index abdf7ce95..d00c93575 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/CreateDerivateContextMenu.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/CreateDerivateContextMenu.java @@ -13,7 +13,6 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.CompoundContributionItem; -import org.eclipse.ui.handlers.IHandlerService; import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy; import eu.etaxonomy.cdm.model.occurrence.DerivationEvent; @@ -30,8 +29,6 @@ import eu.etaxonomy.taxeditor.model.AbstractUtility; */ public class CreateDerivateContextMenu extends CompoundContributionItem { - private final IHandlerService handlerService = (IHandlerService) AbstractUtility.getService(IHandlerService.class); - /* (non-Javadoc) * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems() */ @@ -52,36 +49,6 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { FieldUnit fieldUnit = (FieldUnit) selectedElement; createSpecimen.addSelectionListener(new WidgetSelectionListener(fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen))); -// @Override -// public void widgetSelected(SelectionEvent e) { -// ICdmApplicationConfiguration currentApplicationConfiguration = CdmStore.getCurrentApplicationConfiguration(); -//// TransactionStatus transaction = currentApplicationConfiguration.startTransaction(); -// IOccurrenceService occurrenceService = currentApplicationConfiguration.getOccurrenceService(); -// FieldUnit fieldUnit = (FieldUnit)selectedElement; -// UUID uuid = fieldUnit.getUuid(); -// fieldUnit = (FieldUnit) occurrenceService.load(uuid); -//// fieldUnit = (FieldUnit)HibernateProxyHelper.deproxy(fieldUnit); -// -// DerivedUnit specimen = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen); -// fieldUnit.addDerivationEvent(DerivationEvent.NewSimpleInstance(fieldUnit, specimen, DerivationEventType.GATHERING_IN_SITU())); -// specimen.setCacheStrategy(new DerivedUnitFacadeCacheStrategy()); -// specimen.getTitleCache(); //update title cache -// IWorkbenchPart activePart = AbstractUtility.getActivePart(); -//// occurrenceService.saveOrUpdate(fieldUnit); -//// occurrenceService.saveOrUpdate(specimen); -//// currentApplicationConfiguration.commitTransaction(transaction); -// if(activePart instanceof DerivateView){ -// DerivateView derivateView = (DerivateView)activePart; -// derivateView.viewer.refresh(); -// } -// } -// -// @Override -// public void widgetDefaultSelected(SelectionEvent e) { -// // TODO Auto-generated method stub -// -// } -// }); MenuItem createLivingPlantPhoto = new MenuItem(menu, SWT.None); createLivingPlantPhoto.setText("Living Plant Photo"); createLivingPlantPhoto.addSelectionListener(new WidgetSelectionListener(fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage))); @@ -123,13 +90,13 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { private class WidgetSelectionListener implements SelectionListener{ - private final SpecimenOrObservationBase parent; + private final SpecimenOrObservationBase parent; private final DerivedUnit derivate; /** * @param parent */ - public WidgetSelectionListener(SpecimenOrObservationBase parent, DerivedUnit derivate) { + public WidgetSelectionListener(SpecimenOrObservationBase parent, DerivedUnit derivate) { this.parent = parent; this.derivate = derivate; } @@ -139,17 +106,13 @@ public class CreateDerivateContextMenu extends CompoundContributionItem { */ @Override public void widgetSelected(SelectionEvent e) { -// ICdmApplicationConfiguration currentApplicationConfiguration = CdmStore.getCurrentApplicationConfiguration(); -// IOccurrenceService occurrenceService = currentApplicationConfiguration.getOccurrenceService(); -// UUID uuid = parent.getUuid(); -// fieldUnit = (FieldUnit) occurrenceService.load(uuid); - parent.addDerivationEvent(DerivationEvent.NewSimpleInstance(parent, derivate, DerivationEventType.GATHERING_IN_SITU())); derivate.setCacheStrategy(new DerivedUnitFacadeCacheStrategy()); derivate.getTitleCache(); //update title cache IWorkbenchPart activePart = AbstractUtility.getActivePart(); if(activePart instanceof DerivateView){ DerivateView derivateView = (DerivateView)activePart; + derivateView.changed(derivate); derivateView.viewer.refresh(); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java index ba12717ff..bee0847cd 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java @@ -12,6 +12,7 @@ import eu.etaxonomy.cdm.model.occurrence.DerivationEvent; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.FieldUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; +import eu.etaxonomy.taxeditor.editor.EditorUtil; public class DerivateContentProvider implements ITreeContentProvider { @@ -27,33 +28,30 @@ public class DerivateContentProvider implements ITreeContentProvider { @Override public Object[] getElements(Object inputElement) { + FieldUnit fieldUnit = null; if(inputElement instanceof DerivateViewEditorInput){ - inputElement = ((DerivateViewEditorInput) inputElement).getDerivate(); + fieldUnit = ((DerivateViewEditorInput) inputElement).getFieldUnit(); } // return the parent FieldUnit if element is a DerivedUnit - if(inputElement instanceof DerivedUnit){ - DerivedUnit derivedUnit = (DerivedUnit)inputElement; - for(SpecimenOrObservationBase original:derivedUnit.getOriginals()){ - if(original instanceof FieldUnit){ - return Collections.singletonList(original).toArray(); - } - else{ - return getElements(original); - } - } + else if(inputElement instanceof DerivedUnit){ + fieldUnit = EditorUtil.getFieldUnit((DerivedUnit)inputElement); } else if(inputElement instanceof FieldUnit){ - FieldUnit fieldUnit = (FieldUnit) inputElement; - fieldUnit.getTitleCache(); + fieldUnit = (FieldUnit) inputElement; +// fieldUnit.getTitleCache(); + } + if(fieldUnit!=null){ return Collections.singleton(fieldUnit).toArray(); } - return Collections.EMPTY_LIST.toArray(); + else { + return Collections.EMPTY_LIST.toArray(); + } } @Override public Object[] getChildren(Object parentElement) { if(parentElement instanceof DerivateViewEditorInput){ - parentElement = ((DerivateViewEditorInput) parentElement).getDerivate(); + parentElement = ((DerivateViewEditorInput) parentElement).getFieldUnit(); } if(parentElement instanceof SpecimenOrObservationBase){ return getDerivates((SpecimenOrObservationBase) parentElement).toArray(); @@ -64,7 +62,7 @@ public class DerivateContentProvider implements ITreeContentProvider { @Override public Object getParent(Object element) { if(element instanceof DerivateViewEditorInput){ - element = ((DerivateViewEditorInput) element).getDerivate(); + element = ((DerivateViewEditorInput) element).getFieldUnit(); } if(element instanceof DerivedUnit){ DerivedUnit derivedUnit = (DerivedUnit)element; @@ -76,7 +74,7 @@ public class DerivateContentProvider implements ITreeContentProvider { @Override public boolean hasChildren(Object element) { if(element instanceof DerivateViewEditorInput){ - element = ((DerivateViewEditorInput) element).getDerivate(); + element = ((DerivateViewEditorInput) element).getFieldUnit(); } if(element instanceof SpecimenOrObservationBase){ SpecimenOrObservationBase specimenOrObservation = (SpecimenOrObservationBase)element; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java index 6007a7d56..383f47d31 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java @@ -17,8 +17,6 @@ import org.eclipse.ui.part.EditorPart; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy; -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider; import eu.etaxonomy.taxeditor.model.IPartContentHasDetails; @@ -40,7 +38,7 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa protected TreeViewer viewer; - private SpecimenOrObservationBase derivate; +// private SpecimenOrObservationBase derivate; private boolean isDirty; @@ -66,7 +64,6 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa control.setMenu(menu); - viewer.setInput(getEditorInput()); } @@ -117,12 +114,6 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa conversation = CdmStore.createConversation(); setSite(site); setInput(input); - if(input instanceof DerivateViewEditorInput){ - derivate = ((DerivateViewEditorInput) input).getDerivate(); - } - else{ - throw new PartInitException("Invalid Input: Must be DerivateViewEditorInput"); - } } /* (non-Javadoc) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java index 08960026e..089502a5f 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java @@ -9,16 +9,11 @@ */ package eu.etaxonomy.taxeditor.editor.view.derivate; -import java.util.UUID; - import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy; -import eu.etaxonomy.cdm.api.service.IOccurrenceService; -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; -import eu.etaxonomy.taxeditor.store.CdmStore; +import eu.etaxonomy.cdm.model.occurrence.FieldUnit; /** * @author pplitzner @@ -27,14 +22,11 @@ import eu.etaxonomy.taxeditor.store.CdmStore; */ public class DerivateViewEditorInput implements IEditorInput { - private final UUID uuid; + private final FieldUnit fieldUnit; - /** - * @param uuid - */ - public DerivateViewEditorInput(UUID uuid) { + public DerivateViewEditorInput(FieldUnit fieldUnit) { super(); - this.uuid = uuid; + this.fieldUnit = fieldUnit; } /* (non-Javadoc) @@ -68,7 +60,7 @@ public class DerivateViewEditorInput implements IEditorInput { */ @Override public String getName() { - return uuid.toString(); + return fieldUnit.toString(); } /* (non-Javadoc) @@ -84,15 +76,16 @@ public class DerivateViewEditorInput implements IEditorInput { */ @Override public String getToolTipText() { - return uuid.toString(); + return fieldUnit.toString(); } - public SpecimenOrObservationBase getDerivate(){ - IOccurrenceService service = CdmStore.getService(IOccurrenceService.class); - return service.find(uuid); + /** + * @return the fieldUnit + */ + public FieldUnit getFieldUnit() { + return fieldUnit; } - /* (non-Javadoc) * @see java.lang.Object#hashCode() */ @@ -100,7 +93,7 @@ public class DerivateViewEditorInput implements IEditorInput { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((uuid == null) ? 0 : uuid.hashCode()); + result = prime * result + ((fieldUnit == null) ? 0 : fieldUnit.hashCode()); return result; } @@ -119,11 +112,11 @@ public class DerivateViewEditorInput implements IEditorInput { return false; } DerivateViewEditorInput other = (DerivateViewEditorInput) obj; - if (uuid == null) { - if (other.uuid != null) { + if (fieldUnit == null) { + if (other.fieldUnit != null) { return false; } - } else if (!uuid.equals(other.uuid)) { + } else if (!fieldUnit.equals(other.fieldUnit)) { return false; } return true; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java index 5c8e549d8..669ec2be0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java @@ -21,7 +21,6 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; /** @@ -135,10 +134,13 @@ public class ImageResources { /** Constant COLLAPSE_ALL="collapse_all" */ public static final String COLLAPSE_ALL = "collapse_all"; - public static final String TISSUE_SAMPLE_DERIVATE = "derivate_view_icon"; - - public static final String DNA_DERIVATE = "dna_derivate"; + public static final String TISSUE_SAMPLE_DERIVATE = "tissue_sample_derivate"; + public static final String DNA_SAMPLE_DERIVATE = "dna_derivate"; public static final String FIELD_UNIT = "field_unit"; + public static final String SPECIMEN_DERIVATE = "specimen_scan_derivate"; + public static final String ARTWORK_DERIVATE = "artwor_derivate"; + public static final String SPECIMEN_SCAN_DERIVATE = "specimen_scan_derivate"; + public static final String LIVING_PLANT_FOTO_DERIVATE = "living_plant_photo_derivate"; @@ -191,7 +193,7 @@ public class ImageResources { } catch (MalformedURLException e) { // should never happen } catch (Exception e) { - StoreUtil.error(ImageResources.class, e); + AbstractUtility.error(ImageResources.class, e); } // logger.warn(ImageDescriptor.getMissingImageDescriptor().getClass()); @@ -316,12 +318,20 @@ public class ImageResources { "lock.png"); registerImage(registry, LOCK_OPEN_ICON, "lock_open.png"); - registerImage(registry, DNA_DERIVATE, + registerImage(registry, DNA_SAMPLE_DERIVATE, "dna_derivate-16x16-32.gif"); registerImage(registry, FIELD_UNIT, "fieldunit-16x16-32.gif"); + registerImage(registry, SPECIMEN_DERIVATE, + "tissue_sample-16x16-32.gif"); + registerImage(registry, ARTWORK_DERIVATE, + "artowork_derivate-16x16-32.gif"); + registerImage(registry, SPECIMEN_SCAN_DERIVATE, + "specimen_scan_derivate-16x16-32.gif"); + registerImage(registry, LIVING_PLANT_FOTO_DERIVATE, + "specimen_scan_derivate-16x16-32.gif"); registerImage(registry, TISSUE_SAMPLE_DERIVATE, - "tissue_sample_derivate-16x16-32.gif"); + "tissue_sample-16x16-32.gif"); } private void registerImage(ImageRegistry registry, String key, diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java index 3c0f2af05..aade6834b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateLabelProvider.java @@ -54,11 +54,17 @@ public class DerivateLabelProvider extends ColumnLabelProvider { return ImageResources.getImage(ImageResources.FIELD_UNIT); } else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.DnaSample){ - return ImageResources.getImage(ImageResources.DNA_DERIVATE); + return ImageResources.getImage(ImageResources.DNA_SAMPLE_DERIVATE); } else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){ return ImageResources.getImage(ImageResources.TISSUE_SAMPLE_DERIVATE); } + else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){ + return ImageResources.getImage(ImageResources.SPECIMEN_DERIVATE); + } + else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.StillImage){ + return ImageResources.getImage(ImageResources.ARTWORK_DERIVATE); + } } return super.getImage(element); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java index d0a185a29..ce631623a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/campanula/derivatesearch/DerivateSearchView.java @@ -19,6 +19,9 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; * the results in a list. The results can be selected and opened in an editor. */ public class DerivateSearchView extends ViewPart { + + private DerivateSearchCompositeController derivateSearchCompositeController; + public DerivateSearchView() { } @@ -27,7 +30,7 @@ public class DerivateSearchView extends ViewPart { */ @Override public void createPartControl(Composite parent) { - DerivateSearchCompositeController derivateSearchCompositeController = new DerivateSearchCompositeController(parent); + derivateSearchCompositeController = new DerivateSearchCompositeController(parent); getSite().setSelectionProvider(derivateSearchCompositeController.getDerivateSearchComposite().getResultViewer()); } @@ -36,8 +39,6 @@ public class DerivateSearchView extends ViewPart { */ @Override public void setFocus() { - // TODO Auto-generated method stub - + derivateSearchCompositeController.getDerivateSearchComposite().setFocus(); } - } -- 2.34.1