- added icons for derivate views

 - enhanced DerivateViewEditorInput handling

diff --git a/.gitattributes b/.gitattributes
index 9230825b9b657a6fcb34d6439d0bd9997fe12a80..11368e746cd546168a769d19ee6283ef9e4184a9 100644 (file)
--- 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 (file)
index 6588e07..0000000
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 (file)
index 0000000..35b8a1a
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 ad4eea38ee6650429b6c41a097930fb3ff210597..ff3de6627b6965c9472a256f2b5cdfd8b6a02f32 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/plugin.xml
+++ b/eu.etaxonomy.taxeditor.application/plugin.xml
@@ -38,7 +38,7 @@
       </perspective>\r
       <perspective\r
             class="eu.etaxonomy.taxeditor.perspective.DerivatePerspective"\r
-            icon="icons/specimen_derivate-16x16-32.gif"\r
+            icon="icons/specimen_derivate-16x16-32.png"\r
             id="eu.etaxonomy.taxeditor.application.perspective.derivates"\r
             name="Derivates">\r
       </perspective>\r

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 83f1f6619edec7d0ec6d59173774ce0e0b745557..768481d3b984b87fa3f6e57d6fa7b12861cf1c90 100644 (file)
--- 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<FieldUnit> 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 (file)
index 0000000..85c30a8
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 a02e50e30d43e339e60e2871afa5cead2c00859b..5883a846f92d3c5dea103ddb19b333fbbf304de5 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -61,6 +61,7 @@
       <editor
             class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
             default="false"
+            icon="icons/derivate_view-16x16-32.png"
             id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
             name="Derivate View">
       </editor>

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 6c64cb95abb3fcb5f5f3c7de3d005c3fbe61812b..22faa208a06733faa99f7be025b10996e7bbbfe6 100644 (file)
--- 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 c322cfcd09e9d4a771407d06d870f01584f413e9..118c671b8791ce9801f93612cb4869e3ea4a560a 100644 (file)
--- 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 bee0847cd56eaaefea0b08d133f697e140ed80f9..207471637f280111ca4ea8a27a721393658f9655 100644 (file)
--- 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<DerivationEvent>)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 ba4c5a84caad65d7af922f0a49128c5a252da51b..806d730b61f9de980cf001007464936b0a08eb0b 100644 (file)
--- 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 4e534e30a92c6ee21df869e2846593e6efe8e13f..bed369ad394f34c34fda4a049260540aaa1d16c1 100644 (file)
--- 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.<br>
+ * 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<FieldUnit> 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 (file)
index ee8009a..0000000
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 (file)
index 0000000..d8f62c3
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 (file)
index a186f00..0000000
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 (file)
index 0000000..f80d8dc
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 (file)
index 2c2aaf3..0000000
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 (file)
index 0000000..956897e
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 (file)
index 6588e07..0000000
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 (file)
index 0000000..35b8a1a
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 (file)
index 031621f..0000000
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 (file)
index 0000000..557e2e6
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 (file)
index e9a3d6a..0000000
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 (file)
index 0000000..fa4e5f6
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 f70e96d34b4e0e022d00f806fa9c7d8fcb686bba..28f8b2242698aafd68f9b8091056b77c3ed1d5d3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -229,6 +229,7 @@
   </view>
   <view
         class="eu.etaxonomy.taxeditor.ui.campanula.derivatesearch.DerivateSearchView"
+        icon="icons/derivate_search_view-16x16-32.png"
         id="eu.etaxonomy.taxeditor.ui.campanula.derivatesearch.DerivateSearchView"
         name="Derivate Search"
         restorable="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 690be9b319745646a5707b844dd454485a8db46a..a5d2a388d3ee224a59c687c5a48127b582b6a800 100644 (file)
--- 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,