From: Patric Plitzner Date: Tue, 10 Dec 2013 15:06:02 +0000 (+0000) Subject: - added icons for derivate views X-Git-Tag: 3.6.0~841^2~35 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d00b84de7be837711590fe7e7491f98651b9226b - added icons for derivate views - enhanced DerivateViewEditorInput handling --- diff --git a/.gitattributes b/.gitattributes index 9230825b9..11368e746 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,7 +10,7 @@ eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif -text eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif -text eu.etaxonomy.taxeditor.application/icons/256color_48x48.ico -text eu.etaxonomy.taxeditor.application/icons/edit_16x16.gif -text -eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.gif -text +eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png -text eu.etaxonomy.taxeditor.application/p2.inf -text eu.etaxonomy.taxeditor.application/plugin.properties -text eu.etaxonomy.taxeditor.application/plugin.xml -text @@ -335,6 +335,7 @@ eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF -text eu.etaxonomy.taxeditor.editor/build.properties -text eu.etaxonomy.taxeditor.editor/icons/address-book-new.png -text eu.etaxonomy.taxeditor.editor/icons/camera-photo.png -text +eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png -text eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text eu.etaxonomy.taxeditor.editor/icons/leaf_detail.png -text @@ -948,7 +949,6 @@ eu.etaxonomy.taxeditor.store/icons/add_no_bg2.gif -text eu.etaxonomy.taxeditor.store/icons/alt_window_16.gif -text eu.etaxonomy.taxeditor.store/icons/alt_window_32.gif -text eu.etaxonomy.taxeditor.store/icons/applications-office.png -text -eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.gif -text eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/autonym_no_bg.gif -text eu.etaxonomy.taxeditor.store/icons/back.gif -text @@ -973,7 +973,8 @@ eu.etaxonomy.taxeditor.store/icons/db.gif -text eu.etaxonomy.taxeditor.store/icons/debug.gif -text eu.etaxonomy.taxeditor.store/icons/delete.gif -text eu.etaxonomy.taxeditor.store/icons/delete_edit.gif -text -eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif -text +eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png -text +eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/eclipse.gif -text eu.etaxonomy.taxeditor.store/icons/edit_16x16.gif -text eu.etaxonomy.taxeditor.store/icons/edit_16x16.ico -text @@ -981,7 +982,7 @@ eu.etaxonomy.taxeditor.store/icons/edit_256color.ICO -text eu.etaxonomy.taxeditor.store/icons/error_co.gif -text eu.etaxonomy.taxeditor.store/icons/expandAll.jpg -text eu.etaxonomy.taxeditor.store/icons/export.gif -text -eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif -text +eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/file_obj.gif -text eu.etaxonomy.taxeditor.store/icons/filter.gif -text eu.etaxonomy.taxeditor.store/icons/flat.gif -text @@ -1051,8 +1052,8 @@ eu.etaxonomy.taxeditor.store/icons/search_src.gif -text eu.etaxonomy.taxeditor.store/icons/settings.gif -text eu.etaxonomy.taxeditor.store/icons/smartmode_co.gif -text eu.etaxonomy.taxeditor.store/icons/sort.gif -text -eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif -text -eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif -text +eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png -text +eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/step_done.gif -text eu.etaxonomy.taxeditor.store/icons/swap.gif -text eu.etaxonomy.taxeditor.store/icons/swap2.gif -text @@ -1066,7 +1067,7 @@ eu.etaxonomy.taxeditor.store/icons/th_vertical.gif -text eu.etaxonomy.taxeditor.store/icons/thin_close_view.gif -text eu.etaxonomy.taxeditor.store/icons/thin_max_view.gif -text eu.etaxonomy.taxeditor.store/icons/thin_restore_view.GIF -text -eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif -text +eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.png -text eu.etaxonomy.taxeditor.store/icons/trash.gif -text eu.etaxonomy.taxeditor.store/icons/tree_icon_small.jpg -text eu.etaxonomy.taxeditor.store/icons/undo.gif -text diff --git a/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.gif deleted file mode 100644 index 6588e07da..000000000 Binary files a/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.gif and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png new file mode 100644 index 000000000..35b8a1a9b Binary files /dev/null and b/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png differ diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml index ad4eea38e..ff3de6627 100644 --- a/eu.etaxonomy.taxeditor.application/plugin.xml +++ b/eu.etaxonomy.taxeditor.application/plugin.xml @@ -38,7 +38,7 @@ diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java index 83f1f6619..768481d3b 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java @@ -857,4 +857,12 @@ public class TransientOccurenceService implements IOccurrenceService { return units; } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getFieldUnits(eu.etaxonomy.cdm.model.occurrence.DerivedUnit) + */ + @Override + public Collection getFieldUnits(DerivedUnit derivedUnit) { + return defaultService.getFieldUnits(derivedUnit); + } + } diff --git a/eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png b/eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png new file mode 100644 index 000000000..85c30a804 Binary files /dev/null and b/eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png differ diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml index a02e50e30..5883a846f 100644 --- a/eu.etaxonomy.taxeditor.editor/plugin.xml +++ b/eu.etaxonomy.taxeditor.editor/plugin.xml @@ -61,6 +61,7 @@ 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 6c64cb95a..22faa208a 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,7 @@ import org.eclipse.ui.IEditorReference; import org.eclipse.ui.PartInitException; import org.eclipse.ui.handlers.HandlerUtil; +import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.FieldUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; @@ -353,7 +354,7 @@ public class EditorUtil extends AbstractUtility { if(specimen.isInstanceOf(FieldUnit.class)){ return (FieldUnit) specimen; } - else if(specimen.isInstanceOf(DerivedUnit.class) && ((DerivedUnit) specimen).getOriginals()!=null){ + else if(specimen instanceof DerivedUnit && ((DerivedUnit) specimen).getOriginals()!=null){ for(SpecimenOrObservationBase original:((DerivedUnit) specimen).getOriginals()){ if(original.isInstanceOf(FieldUnit.class)){ return (FieldUnit) original; 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 c322cfcd0..118c671b8 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 @@ -8,7 +8,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.PartInitException; import org.eclipse.ui.handlers.HandlerUtil; -import eu.etaxonomy.cdm.model.occurrence.FieldUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput; @@ -25,12 +24,8 @@ public class OpenDerivateViewHandler extends AbstractHandler { if(currentSelection instanceof IStructuredSelection){ Object selectedElement = ((IStructuredSelection) currentSelection).getFirstElement(); if(selectedElement instanceof SpecimenOrObservationBase){ - FieldUnit fieldUnit = EditorUtil.getFieldUnit((SpecimenOrObservationBase) selectedElement); - if(fieldUnit==null){ - AbstractUtility.errorDialog("Failed to open Editor", OpenDerivateViewHandler.class, "Could not open DerivateView. The derivate hierarchy is corrupted!"); - return null; - } - DerivateViewEditorInput input = new DerivateViewEditorInput(fieldUnit); + + DerivateViewEditorInput input = new DerivateViewEditorInput((SpecimenOrObservationBase) selectedElement); try { EditorUtil.open(input); } catch (PartInitException e) { 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 bee0847cd..207471637 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 @@ -28,20 +28,20 @@ public class DerivateContentProvider implements ITreeContentProvider { @Override public Object[] getElements(Object inputElement) { - FieldUnit fieldUnit = null; + SpecimenOrObservationBase specimen = null; if(inputElement instanceof DerivateViewEditorInput){ - fieldUnit = ((DerivateViewEditorInput) inputElement).getFieldUnit(); + inputElement = ((DerivateViewEditorInput) inputElement).getDerivate(); } + // return the parent FieldUnit if element is a DerivedUnit - else if(inputElement instanceof DerivedUnit){ - fieldUnit = EditorUtil.getFieldUnit((DerivedUnit)inputElement); + if(inputElement instanceof DerivedUnit){ + specimen = EditorUtil.getFieldUnit((DerivedUnit)inputElement); } else if(inputElement instanceof FieldUnit){ - fieldUnit = (FieldUnit) inputElement; -// fieldUnit.getTitleCache(); + specimen = (FieldUnit) inputElement; } - if(fieldUnit!=null){ - return Collections.singleton(fieldUnit).toArray(); + if(specimen!=null){ + return Collections.singleton(specimen).toArray(); } else { return Collections.EMPTY_LIST.toArray(); @@ -51,8 +51,9 @@ public class DerivateContentProvider implements ITreeContentProvider { @Override public Object[] getChildren(Object parentElement) { if(parentElement instanceof DerivateViewEditorInput){ - parentElement = ((DerivateViewEditorInput) parentElement).getFieldUnit(); + parentElement = ((DerivateViewEditorInput) parentElement).getDerivate(); } + if(parentElement instanceof SpecimenOrObservationBase){ return getDerivates((SpecimenOrObservationBase) parentElement).toArray(); } @@ -62,9 +63,13 @@ public class DerivateContentProvider implements ITreeContentProvider { @Override public Object getParent(Object element) { if(element instanceof DerivateViewEditorInput){ - element = ((DerivateViewEditorInput) element).getFieldUnit(); + element = ((DerivateViewEditorInput) element).getDerivate(); } - if(element instanceof DerivedUnit){ + + if(element instanceof FieldUnit){ + return element; + } + else if(element instanceof DerivedUnit){ DerivedUnit derivedUnit = (DerivedUnit)element; return derivedUnit.getOriginalUnit(); } @@ -74,8 +79,9 @@ public class DerivateContentProvider implements ITreeContentProvider { @Override public boolean hasChildren(Object element) { if(element instanceof DerivateViewEditorInput){ - element = ((DerivateViewEditorInput) element).getFieldUnit(); + element = ((DerivateViewEditorInput) element).getDerivate(); } + if(element instanceof SpecimenOrObservationBase){ SpecimenOrObservationBase specimenOrObservation = (SpecimenOrObservationBase)element; for(DerivationEvent event:(Set)specimenOrObservation.getDerivationEvents()){ 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 ba4c5a84c..806d730b6 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 @@ -19,6 +19,7 @@ import org.eclipse.ui.part.EditorPart; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.model.occurrence.FieldUnit; +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; @@ -67,9 +68,10 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa IEditorInput editorInput = getEditorInput(); viewer.setInput(editorInput); if(editorInput instanceof DerivateViewEditorInput){ + SpecimenOrObservationBase specimen = ((DerivateViewEditorInput) editorInput).getDerivate(); FieldUnit fieldUnit = ((DerivateViewEditorInput) editorInput).getFieldUnit(); setPartName(fieldUnit.toString()); - viewer.setSelection(new StructuredSelection(fieldUnit)); + viewer.setSelection(new StructuredSelection(specimen)); } } 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 4e534e30a..bed369ad3 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,25 +9,59 @@ */ package eu.etaxonomy.taxeditor.editor.view.derivate; +import java.util.Collection; + import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; +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.model.AbstractUtility; +import eu.etaxonomy.taxeditor.store.CdmStore; /** + * Editor input for the {@link DerivateView} which holds the currently selected derivate for which + * the derivate hierarchy should be shown in the DerivateView.
+ * It also holds a {@link FieldUnit} which is the root of the hierarchy. (both may be the same object) * @author pplitzner * @date 25.11.2013 * */ public class DerivateViewEditorInput implements IEditorInput { - private final FieldUnit fieldUnit; + /** + * The selected derivate + */ + private final SpecimenOrObservationBase derivate; + /** + * The root of the hierarchy (may be the same object as the derivate) + */ + private FieldUnit fieldUnit; - public DerivateViewEditorInput(FieldUnit fieldUnit) { - //TODO: add current selection to constructor to highlight it in DerivateView + /** + * Creates an editor input for the {@link DerivateView} with the currently selected derivate and the + * corresponding {@link FieldUnit} (both may be the same object). + * @param derivate the derivate for which the derivate hierarchy should be shown + * @param fieldUnit the root of the hierarchy + */ + public DerivateViewEditorInput(SpecimenOrObservationBase derivate) { super(); - this.fieldUnit = fieldUnit; + this.derivate = derivate; + if(derivate instanceof FieldUnit){ + this.fieldUnit = (FieldUnit) derivate; + } + else if(derivate instanceof DerivedUnit){ + Collection fieldUnits = CdmStore.getCurrentApplicationConfiguration().getOccurrenceService().getFieldUnits((DerivedUnit) derivate); + if(!fieldUnits.isEmpty()){ + // TODO think about handling multiple parent FieldUnits + this.fieldUnit = fieldUnits.iterator().next(); + } + } + if(fieldUnit==null){ + AbstractUtility.errorDialog("Failed initializing editor", DerivateViewEditorInput.class, "No FieldUnit found!"); + } } /* (non-Javadoc) @@ -61,7 +95,7 @@ public class DerivateViewEditorInput implements IEditorInput { */ @Override public String getName() { - return fieldUnit.toString(); + return derivate.toString(); } /* (non-Javadoc) @@ -77,7 +111,15 @@ public class DerivateViewEditorInput implements IEditorInput { */ @Override public String getToolTipText() { - return fieldUnit.toString(); + return derivate.toString(); + } + + + /** + * @return the specimen + */ + public SpecimenOrObservationBase getDerivate() { + return derivate; } /** diff --git a/eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.gif deleted file mode 100644 index ee8009a33..000000000 Binary files a/eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.gif and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png new file mode 100644 index 000000000..d8f62c3c2 Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png differ diff --git a/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif deleted file mode 100644 index a186f0018..000000000 Binary files a/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png new file mode 100644 index 000000000..f80d8dc57 Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png differ diff --git a/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif deleted file mode 100644 index 2c2aaf357..000000000 Binary files a/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.png new file mode 100644 index 000000000..956897e99 Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.png differ diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif deleted file mode 100644 index 6588e07da..000000000 Binary files a/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png new file mode 100644 index 000000000..35b8a1a9b Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png differ diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif deleted file mode 100644 index 031621fb9..000000000 Binary files a/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png new file mode 100644 index 000000000..557e2e68e Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png differ diff --git a/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif deleted file mode 100644 index e9a3d6ac4..000000000 Binary files a/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif and /dev/null differ diff --git a/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.png new file mode 100644 index 000000000..fa4e5f647 Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.png differ diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml index f70e96d34..28f8b2242 100644 --- a/eu.etaxonomy.taxeditor.store/plugin.xml +++ b/eu.etaxonomy.taxeditor.store/plugin.xml @@ -229,6 +229,7 @@ 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 690be9b31..a5d2a388d 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 @@ -319,19 +319,19 @@ public class ImageResources { registerImage(registry, LOCK_OPEN_ICON, "lock_open.png"); registerImage(registry, DNA_SAMPLE_DERIVATE, - "dna_derivate-16x16-32.gif"); + "dna_derivate-16x16-32.png"); registerImage(registry, FIELD_UNIT, - "fieldunit-16x16-32.gif"); + "fieldunit-16x16-32.png"); registerImage(registry, SPECIMEN_DERIVATE, - "specimen_derivate-16x16-32.gif"); + "specimen_derivate-16x16-32.png"); registerImage(registry, ARTWORK_DERIVATE, "artwork_derivate-16x16-32.png"); registerImage(registry, SPECIMEN_SCAN_DERIVATE, - "specimen_scan_derivate-16x16-32.gif"); + "specimen_scan_derivate-16x16-32.png"); registerImage(registry, LIVING_PLANT_PHOTO_DERIVATE, - "specimen_scan_derivate-16x16-32.gif"); + "specimen_scan_derivate-16x16-32.png"); registerImage(registry, TISSUE_SAMPLE_DERIVATE, - "tissue_sample-16x16-32.gif"); + "tissue_sample-16x16-32.png"); } private void registerImage(ImageRegistry registry, String key,