From 3c7a8f3af5f1a7bc56043b05c1bb6d6455725a37 Mon Sep 17 00:00:00 2001
From: Patric Plitzner
Date: Mon, 9 Dec 2013 13:02:32 +0000
Subject: [PATCH 1/1] - added derivate icons - adapted transient interface
---
.gitattributes | 3 +++
.../TransientDescriptionService.java | 21 ++++++++----------
.../icons/artwork-16x16-32.gif | Bin 0 -> 1022 bytes
.../icons/fieldunit-16x16-32.gif | Bin 984 -> 977 bytes
.../icons/specimen_derivate-16x16-32.gif | Bin 0 -> 1095 bytes
.../icons/specimen_scan_derivate-16x16-32.gif | Bin 0 -> 1058 bytes
.../taxeditor/model/ImageResources.java | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
create mode 100644 eu.etaxonomy.taxeditor.store/icons/artwork-16x16-32.gif
create mode 100644 eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif
create mode 100644 eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif
diff --git a/.gitattributes b/.gitattributes
index 477238668..c167ad99b 100644
--- 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 b896316cc..2837c7ccf 100644
--- 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 taxonDescriptions, Set levels, List 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 taxonDescriptions, boolean subAreaPreference, boolean statusOrderPreference, Set omitLevels, List 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
index 0000000000000000000000000000000000000000..ee8009a332385796cdf6e198c72ae3aa207c18ec
GIT binary patch
literal 1022
zcmVj?v3QeM5Fx~PJrg098Q$~lfKgHxo_F_Xv7Z){+|H{#*e^z-_`S$wI+02wXizlAl$izY1*B7cyprA&V5|Y*F
z@an;nuh*gBSBp>DE+UVm7g*Spyuqo&zAk4taRHrb=u*FWM
zD0p~yd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%X
ziHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6okmj+>ew9x{`Kn)TIBB+@%V}_S53dB%Qaz#jn
sB2?VaNEijmo2NHW6qtj?#ZZDYIGpJGnV^#*IXspY2m}NQoB;spF
literal 0
HcmV?d00001
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
GIT binary patch
delta 298
zcmV+_0oDH42hj(RGJgdH1GKcWVPRkE>+6b&i9J0#)YQ};A02mhcK-hUo12$B$#>T~NZf$^of7;sGL_|W6kdO28^Pr%gD=R5hR#kg@d%wTF%*@M4Nk=6mBc!CG
zlarI><>h2#V_8{P2nYs)gMv{}PjGN(#bZ{`ig9`!;Fi2=XLW2PwEDY!nfCgaH8nJ32FRVgLXD
delta 305
zcmV-10nYx>2iOOYGJgUB0-KwgL_|d65Fnrc0t*ldOfV>+0fY)3Ay_Ctp`Zi+C=ozdU|~Up00Rvq_y_<&
z01gQ#SP*c)0RsvUAT$7=zyQt!7&m5E5OgSo0W$@(Od#-rg$ETt8n}=^K*k0z9T-6H
z-~xaM9RO_DaG?T(0VV?jG-$xVfd-EXFf6D`kU@lj9V!%{2sfdF0T>c=FwD5|z<>Zd
D!eV5N
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
index 0000000000000000000000000000000000000000..cbd8e23a58f443eb623a29e37ede24b8ebe73283
GIT binary patch
literal 1095
zcmV-N1i1T0Nk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000
z5C9MWhY)QYYl^D1((OiAWrMHSg>j|Y>Gx8Gg*;YPlD+0;ps7cGXqdz6fV$!ybTjPr
z{CS_mXRu>VmxR{b>L!CkgmkEjN{nH5ertVkf{Uw@zwV|CMT>Wjw%{y&OdEnV6@o3c*8LN7B!rpFlS-Q9@ceU~
zypL6vfW`1%m!g-#`GvFFoW%7Hc_DCYU6sJ>l~ta%+x2|2#b%qGrONk?!R5o;^gD@V
zFM?3)`Tv)|=Wvj=W`Up6=lO_VnvF)1aHhL|yy%F)@qx7C8F?*}!t*MGNk@`+iKoS%?P9)mfHi^58bdx)~vZl<-1!0L6U
z!GW&IveEGqdM1!ek)X-%n^d6B<@hy7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T61xpAmD}{5>rC3v9PDl78w)NfO#PzPnsKP
zoB&Z#frFePY7Br8!vsl-C`rD!aM9pGjTcFhyr5BH!5kwiKp+xB01guxZE|dI;06kS
zA0r&>5M%~R7Y9G|tO;|54h0mTe>fNtV8;m1DB|FO@uvq5&}$B)K+U7a7#&FhDRCX<
z$B8T~eyq_mLV=hB8roE0K|#U{1a-(znRDm32r)-sAQ3?b!T>@?u!|89BjO5^1P5U(
NG_$ZhlPduM06T;>bVmRH
literal 0
HcmV?d00001
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
index 0000000000000000000000000000000000000000..a695f4340447bfd1a7725c52281a2f3d55037f5c
GIT binary patch
literal 1058
zcmV+-1l{{bNk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000
z5C9MWhe13ubgbaM+3|01Y_qeoi->>b_5X5!i$PCYi@D{Z$n289>Q`Q3WQnYEczV?3
z_Wl0s@GXgR$K7^z_BW#BO+iVq#s5jfR=Q=Z3cA
zZik(Wz3cM#{76MU!QA(2mc6^z@Q{mvdxVU7eS39&gObGZtIzVE$nR-qW7y~R?DYFa
zR%CT{a*@C3Yinz-)AaQE{>k3*goK2PjER1-;(dsYWn^G>jGtOtSaXGxk&lRt!t~qe
z_mGNz$jHcffP~ZM`^De*o5Ja{)bw$2Z_D8HLQ!2#PEJoxPf$=$QBhG+Qc_b>Q&dz`
zRaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%
zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1ulq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6L^M31AYsBA7IrXHC?Wxq5fChZ
zOc3M7h!HIkx)_om0K=Ih1RxZFkVe4=5CqJOxg%tR2rWQ1!2kdW5&$sx03sm)4H_UE5Gg>x!;Bd^C=@_3Bf|o`D}qo^p<+Xk
zB`PQ^HjFrkju{#tK+y3+vI@!|R#2Fr1A+zuDmr+Wd^oh?0XcH0sL{i-VW>tVd+5;P
cg=)_rXe6NlB!zJv960dcVf;XXBmn^cJHq}<6#xJL
literal 0
HcmV?d00001
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 669ec2be0..89f5aefe6 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
@@ -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,
--
2.34.1