- added derivate icons

 - adapted transient interface

diff --git a/.gitattributes b/.gitattributes
index 4772386687705c3c2d15c5319bad41aeb8f908ba..c167ad99b4a8fe557b069727d6cdd28f6237c40c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -946,6 +946,7 @@ 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-16x16-32.gif -text
 eu.etaxonomy.taxeditor.store/icons/autonym_no_bg.gif -text
 eu.etaxonomy.taxeditor.store/icons/back.gif -text
 eu.etaxonomy.taxeditor.store/icons/basionym.gif -text
@@ -1047,6 +1048,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/step_done.gif -text
 eu.etaxonomy.taxeditor.store/icons/swap.gif -text
 eu.etaxonomy.taxeditor.store/icons/swap2.gif -text

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientDescriptionService.java
index b896316cca1e2971ea8eafacaf82214b53b41fd3..2837c7ccf6cc264fb6767069e779bb613ab0c06b 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientDescriptionService.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientDescriptionService.java
@@ -1042,18 +1042,6 @@ public class TransientDescriptionService implements IDescriptionService {
         return defaultDescriptionService.pageDescriptionElementsForTaxon(taxon, features, type, pageSize, pageNumber, propertyPaths);
     }
 
-    /**
-     * @param taxonDescriptions
-     * @param levels
-     * @param propertyPaths
-     * @return
-     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#getOrderedDistributions(java.util.Set, java.util.Set, java.util.List)
-     */
-    @Override
-    public DistributionTree getOrderedDistributions(Set<TaxonDescription> taxonDescriptions, Set<NamedAreaLevel> levels, List<String> propertyPaths) {
-        return defaultDescriptionService.getOrderedDistributions(taxonDescriptions, levels, propertyPaths);
-    }
-
     /**
      * @param featureTree
      * @param description
@@ -1098,5 +1086,14 @@ public class TransientDescriptionService implements IDescriptionService {
         return defaultDescriptionService.pageNamedAreasInUse(pageSize, pageNumber, propertyPaths);
     }
 
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#getOrderedDistributions(java.util.Set, boolean, boolean, java.util.Set, java.util.List)
+     */
+    @Override
+    public DistributionTree getOrderedDistributions(Set<TaxonDescription> taxonDescriptions, boolean subAreaPreference, boolean statusOrderPreference, Set<NamedAreaLevel> omitLevels, List<String> propertyPaths) {
+        // TODO Auto-generated method stub
+        return defaultDescriptionService.getOrderedDistributions(taxonDescriptions, subAreaPreference, statusOrderPreference, omitLevels, propertyPaths);
+    }
+
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/icons/artwork-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/artwork-16x16-32.gif
new file mode 100644 (file)
index 0000000..ee8009a
Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/artwork-16x16-32.gif differ

diff --git a/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif
index 8adc848bdd945b4ce8a4ea6b31c95126dcb37b2b..2c2aaf357421b88a1cf7365cfa399eb29b21ce5d 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif and b/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif 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
new file mode 100644 (file)
index 0000000..cbd8e23
Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif 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
new file mode 100644 (file)
index 0000000..a695f43
Binary files /dev/null and b/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif differ

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..89f5aefe6aa2c120d16c95e781a64ce92f91ae42 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
@@ -323,9 +323,9 @@ public class ImageResources {
                registerImage(registry, FIELD_UNIT,
                        "fieldunit-16x16-32.gif");
                registerImage(registry, SPECIMEN_DERIVATE,
-                       "tissue_sample-16x16-32.gif");
+                       "specimen_derivate-16x16-32.gif");
                registerImage(registry, ARTWORK_DERIVATE,
-                       "artowork_derivate-16x16-32.gif");
+                       "artwork_derivate-16x16-32.gif");
                registerImage(registry, SPECIMEN_SCAN_DERIVATE,
                        "specimen_scan_derivate-16x16-32.gif");
                registerImage(registry, LIVING_PLANT_FOTO_DERIVATE,