From ebf65ca6c7040217b2bb70708b4fab43eecaf397 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Wed, 24 Jan 2018 13:12:31 +0000
Subject: [PATCH] All icons for Fault Trees
---
src/main/java/ui/ftd/FTDConstraint.java | 4 ++--
src/main/java/ui/util/IconManager.java | 18 ++++++++++++++++++
src/main/resources/ui/util/OrFT.png | Bin 0 -> 1779 bytes
src/main/resources/ui/util/VoteFT.png | Bin 0 -> 624 bytes
src/main/resources/ui/util/XorFT.png | Bin 0 -> 1348 bytes
5 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 src/main/resources/ui/util/OrFT.png
create mode 100644 src/main/resources/ui/util/VoteFT.png
create mode 100644 src/main/resources/ui/util/XorFT.png
diff --git a/src/main/java/ui/ftd/FTDConstraint.java b/src/main/java/ui/ftd/FTDConstraint.java
index adaf5d2510..cf5e948679 100644
--- a/src/main/java/ui/ftd/FTDConstraint.java
+++ b/src/main/java/ui/ftd/FTDConstraint.java
@@ -65,9 +65,9 @@ public class FTDConstraint extends TGCScalableWithInternalComponent implements S
public static final String[] STEREOTYPES = {"<<OR>>", "<<XOR>>", "<<AND>>", "<<NOT>>", "<<SEQUENCE>>", "<<AFTER>>",
"<<BEFORE>>", "<<VOTE>>"};
- public static final Image[] ICONS = {IconManager.img1400, IconManager.img1400, IconManager.img1400,
+ public static final Image[] ICONS = {IconManager.img1410, IconManager.img1412, IconManager.img1400,
IconManager.img1408, IconManager.img1402, IconManager.img1404
- , IconManager.img1406, IconManager.img1400};
+ , IconManager.img1406, IconManager.img1414};
protected String oldValue = "";
diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java
index 20e7c6cd44..28ab55629a 100755
--- a/src/main/java/ui/util/IconManager.java
+++ b/src/main/java/ui/util/IconManager.java
@@ -121,7 +121,9 @@ public class IconManager {
// Fault Tree Diagrams
public static ImageIcon imgic1400, imgic1402, imgic1404, imgic1406, imgic1408;
+ public static ImageIcon imgic1410, imgic1412, imgic1414;
public static Image img1400, img1402, img1404, img1406, img1408;
+ public static Image img1410, img1412, img1414;
// TMLDD
public static ImageIcon imgic1100, imgic1102, imgic1104, imgic1106, imgic1108;
@@ -497,6 +499,9 @@ public class IconManager {
private static String icon1404 = "AfterFT.png";
private static String icon1406 = "BeforeFT.png";
private static String icon1408 = "NotFT.png";
+ private static String icon1410 = "OrFT.png";
+ private static String icon1412 = "XorFT.png";
+ private static String icon1414 = "VoteFT.png";
// DIPLODOCUS architecture
private static String icon1100 = "tmlcpunode.gif";
@@ -955,6 +960,19 @@ public class IconManager {
if (imgic1406 != null) {
img1406 = imgic1406.getImage();
}
+ imgic1410 = getIcon(icon1410);
+ if (imgic1410 != null) {
+ img1410 = imgic1410.getImage();
+ }
+ imgic1412 = getIcon(icon1412);
+ if (imgic1412 != null) {
+ img1412 = imgic1412.getImage();
+ }
+ imgic1414 = getIcon(icon1414);
+ if (imgic1414 != null) {
+ img1414 = imgic1414.getImage();
+ }
+
imgic1100 = getIcon(icon1100);
imgic1102 = getIcon(icon1102);
imgic1104 = getIcon(icon1104);
diff --git a/src/main/resources/ui/util/OrFT.png b/src/main/resources/ui/util/OrFT.png
new file mode 100644
index 0000000000000000000000000000000000000000..33778869ea1269a9390e512cce0b8a6c36059ae2
GIT binary patch
literal 1779
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
literal 0
HcmV?d00001
diff --git a/src/main/resources/ui/util/VoteFT.png b/src/main/resources/ui/util/VoteFT.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca5213a7096a200a2c8ce30cb9e0c8891ccade9d
GIT binary patch
literal 624
zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSV36ZrV_;zL<&x24U|?WN@^*J&U|_Ig=rP{0
z=N$tB180FpWHAE+w=f7ZGR&GI!N9=4UgGKN%KnH^f|px&Vp;$T0|Vn<PZ!4!kK=Er
z8|Ghj5IJ6-9-pJm!ja_2;j*NwGk=0&>X}>p2PW{c1Z{dIy~HW$bckYVndA+{i4g*_
zn@SgOIyH4}E9!JQckZc#lg_P0vqB1YJ<*Tc^!MK0-#_2&-M#sN($wt>qnnE^FOHVq
z{PWTw3C_#E4?MrIK3Y5`=p^rHU+xNqB&KJt@2g#2sc5$S;J3Wb?_LT%RV#VT&3Gb3
z{I#Ob_k#=t8#aqZ|N8syjaxr|y8L538>X;N5|QSeZtKsN*@gdEcS)>d{!)eul^+FX
zdViCazu);eEtBDM!nB(C5+`5m-rTZAS5SdZt!!pnzS+Dt|1Q5xNasHDM7Te`^7MSB
zhI5~jbKZLwZ8_6>n#qE5`qA~1w|8Fj+n4+2<M}`CKI!}TW>o%8+9;vw^F^d(>yEcR
ziJS)$3{D(jcw1(@Dnx6h0Z(LW%=M$+YlGK@wXy_w8A|nbEXq)2h{~Q4#I2IpHHjg}
z>!AgoQ^(YjR~CFhUV_YT-oDMeUh3|(G9Y`dR_l~YJJ!AaQnfd`p>`G5Iwz(N4bca_
zhpl#98KSf{>w^vd{qLD3QVic4<b@=d-5Gw?%yU{eLCV2ww(9iLXXW`Bw_egRI5x+c
zC$>^@9pg2I>;}^VEA1C6aBws|NSA0^`KH55(^!UY{rqUY+}r0e)=uBaShM3m7=xUr
g=G>DhLVww8J62?-zs_CDz`(%Z>FVdQ&MBb@04VPX^#A|>
literal 0
HcmV?d00001
diff --git a/src/main/resources/ui/util/XorFT.png b/src/main/resources/ui/util/XorFT.png
new file mode 100644
index 0000000000000000000000000000000000000000..178edd77b4a64711749687a9e7f8adef1d2c4815
GIT binary patch
literal 1348
zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU{K>=V_;xdsyy>00|NtFlDE4H!+#K5uy^@n
z1_lPs0*}aI1_o|n5N2eUHAjMhfq}im)7O>#5u*f;q2iw1D-szPST1_HIEF+VJ~}-+
zLnc(@c)jt>xo_6pU3PNW#&v1gTSONfY1ksg!RCBGA?t|OtM)Jzt|acDwF)cU0z8&x
zIz3u^OsgY^_nRZP<}O1KVL|U2!Q42n&7S6w7pLTkC&g_4J?rCX$(d?qzO!<w6K3o!
ze}Cuy&i}>lDi1tzWi4tr>%ii{c%GrsK}>R5D3c5WPi0Bvf5seko0&}dtbGv;#~Thm
zefm`J!Isp2-V1UpZ=PV9$9{}ef$z=zz182ZA58erT3}JLZsp3A(izN)#LT1`-Yjj(
zK43lVGOvlbx%#i)zxmso6q9Re?np>W8#^tWU}$4gvta2`RkkmY*W_7>o-+qL`}yAL
zfkc3+PR*n5zvZ<wHBb7gO_pdY{OH!zbT=<OB}FABHnx_bBJiITXAWyqcc25aAH(-k
zvz`Sn_scEbeOEh;`TWg*zz(;?msM3&*E9T1sbaXnp(3{G!0`i<KmG1?P}txdD3WTp
z&6wwK#P+<qdI|kLe^tEB?7Y1BxISk^)!A95>T2rh@o_pk3>NzM`Mvx2v*xXkwi(0x
zv-@N>o8RO3qrg{^l9iQJY$6pqN!)s_-=4Vl?FTMzdcWA=`BI6DN#7IF)6?$<9b`<}
zC{ee+-r<kK#OSHt>$!56v>2nJql1?&U7CAZ)T67r`+in_{(P}u5vKKL%^I0n8l)Q+
zFAR9G(M4(Fn#3!4+aG`ad5?J;<K+Xf2X>rvSlh6?;n!0(b`Q154AqU23926!WHPx5
z@f<L3bXZ^?d@`k^q{N}9L+RX#6_fV9n_{}RYtatlr46fA<vj?N3}c$5rTHz)L0?D5
zX6DP9xcK<{>5})Bcj(%&2RS=C=UdM`H+N=;LuhDMSJywbFoxV!70M1ro)*15W5T>^
z-E2;-gk~<0lL`epT{ia=Mcv!J!eJlJp%`1kjW(;6W_iZAvOY??6~6OW(OQuo=WphO
zfBL%gRI_&BBUa6X%{K!=MMFb7k3V*Q{Bg%LucezxV#A;2y*8VzyEZfG(!+wBOQo{0
z*FBd8g|BNko92AkWYeZiFW$bjmEvLRPESh<GdDB)=8^t{<;^A=)<4W=OiWBdcEqeZ
zacgUK{pwY#x|p|qte8_`m7D6Za|sh)JG1ZQbET!Fdv9L894y`G;?*y2AE%&Lt@`0z
zje1s2jt@g-!q)4reM7>+*tE2?_^w^KvV-^V4Z-fC&qS8qJ@D7T-9qMGP<Z(E`lO^q
zMFj;0ygyV@lv2N*KcG?IcPYzBMl1SM1^<S)T`RtRy33lNq^|xvCo=M;i@W=A;h#T$
z-fk?*eEnjYZ{5cVo9DWBdl~0UWm?2gz&)XArk%6!Qtl_Wji>!h+PQP5)rYA)m&4e6
zW-{_I$}`wUt$Y1;l4(9u-h|6my32bQ>Y4U?OMlm%AhN)^A-(aq>Ze(D1%k|%54ek+
z`m7QtE6k8Q@jUASZ!2x%JG+-?^v;;O_2dDqgy~bBeD~P+VUERI$=&C>-=1f#@4UWT
zmv@bGp8Gt8s)pCPiFNZ!qVIEe=cWnnaeec(BV&%(+eJa@d-!a0uD<DFZQ&Jvz$(WO
z)u`VRJ9%dQQ4zTZp(?Wb^CJy(Ze8tqtQ&eK=>J>RU%D3U4Z8(*&z@|3BvD4P<G)ma
z^oJ=&m!DIZQll=Hx0|cegE5coPg>BbxCOb>qc=6K{m&Hidh?@GTT1vC7#J8lUHx3v
IIVCg!08&_4F8}}l
literal 0
HcmV?d00001
--
GitLab