diff --git a/src/main/java/ui/ftd/FTDConstraint.java b/src/main/java/ui/ftd/FTDConstraint.java index adaf5d2510f6e06b551b6e836e48f7a1bbd38904..cf5e948679a888f782a1a6ef2102d483219226dd 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 20e7c6cd44140a73fce2b75f93a4774efc1c623b..28ab55629ad52579252f40f811207d2eba5ef6c0 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 Binary files /dev/null and b/src/main/resources/ui/util/OrFT.png differ 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 Binary files /dev/null and b/src/main/resources/ui/util/VoteFT.png differ 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 Binary files /dev/null and b/src/main/resources/ui/util/XorFT.png differ