merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / model / ImageResources.java

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 669ec2be07ad709b8833bbe8b05eb6ae6dd19d89..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
@@ -135,12 +135,12 @@ public class ImageResources {
        public static final String COLLAPSE_ALL = "collapse_all";
 
        public static final String TISSUE_SAMPLE_DERIVATE = "tissue_sample_derivate";
-       public static final String DNA_SAMPLE_DERIVATE = "dna_derivate";
+       public static final String DNA_SAMPLE_DERIVATE = "dna_sample_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_DERIVATE = "specimen_derivate";
+    public static final String ARTWORK_DERIVATE = "artwork_derivate";
     public static final String SPECIMEN_SCAN_DERIVATE = "specimen_scan_derivate";
-    public static final String LIVING_PLANT_FOTO_DERIVATE = "living_plant_photo_derivate";
+    public static final String LIVING_PLANT_PHOTO_DERIVATE = "living_plant_photo_derivate";
 
 
 
@@ -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,
-                       "tissue_sample-16x16-32.gif");
+                       "specimen_derivate-16x16-32.png");
                registerImage(registry, ARTWORK_DERIVATE,
-                       "artowork_derivate-16x16-32.gif");
+                       "artwork_derivate-16x16-32.png");
                registerImage(registry, SPECIMEN_SCAN_DERIVATE,
-                       "specimen_scan_derivate-16x16-32.gif");
-               registerImage(registry, LIVING_PLANT_FOTO_DERIVATE,
-                       "specimen_scan_derivate-16x16-32.gif");
+                       "specimen_scan_derivate-16x16-32.png");
+               registerImage(registry, LIVING_PLANT_PHOTO_DERIVATE,
+                       "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,