- added specimen scan icon

 - save kindOfUnit

diff --git a/.gitattributes b/.gitattributes
index 0d04c6b375c592cacee3f89deca5b625661ac216..8156684fb1eb0521524c1d69f0e00681ec728a67 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1051,6 +1051,7 @@ eu.etaxonomy.taxeditor.store/icons/import_wiz.gif -text
 eu.etaxonomy.taxeditor.store/icons/large_image.gif -text
 eu.etaxonomy.taxeditor.store/icons/leaf_detail.png -text
 eu.etaxonomy.taxeditor.store/icons/linkto_help.gif -text
+eu.etaxonomy.taxeditor.store/icons/living_plant_photo_derivate-16x16-32.png -text
 eu.etaxonomy.taxeditor.store/icons/lock.png -text
 eu.etaxonomy.taxeditor.store/icons/lock_open.png -text
 eu.etaxonomy.taxeditor.store/icons/lockedstate.gif -text

diff --git a/eu.etaxonomy.taxeditor.store/icons/living_plant_photo_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/living_plant_photo_derivate-16x16-32.png
new file mode 100644 (file)
index 0000000..557e2e6
Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/living_plant_photo_derivate-16x16-32.png 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
index 557e2e68e5bf10fb84294e8c801bef2c81d1189b..715402d9d9289753d1713a8ec27766ce62843b47 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png and b/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png differ

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
index c73b7d16fdb9025596cbda1c52741faaa97bce07..3a31a39b6364fd7237712819288542dac036c738 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
@@ -119,7 +119,10 @@ public class MediaSpecimenGeneralDetailElement extends AbstractCdmDetailElement<
             media = Media.NewInstance();
             getEntity().setMediaSpecimen(media);
         }
-        if(eventSource==textTitleLanguageString){
+        if(eventSource==comboKindOfUnit){
+            getEntity().setKindOfUnit(comboKindOfUnit.getSelection());
+        }
+        else if(eventSource==textTitleLanguageString){
             media.putTitle(textTitleLanguageString.getLanguageString());
         }
         else if(eventSource==date.getController()){