diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 13b40c37dd0d13f356848f11915584a47eb33d09..62ace982a1676d041130d8c68e51f1facbdf7cb6 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -698,8 +698,8 @@ public class TGUIAction extends AbstractAction {
actions[ACT_NEW_DESIGN] = new TAction("new-command-design", "New design", IconManager.imgic14, IconManager.imgic14, "New design", "New TURTLE design", 0);
actions[ACT_NEW_ANALYSIS] = new TAction("new-command-analysis", "New analysis", IconManager.imgic17, IconManager.imgic17, "New analysis", "New TURTLE analysis", 0);
actions[ACT_OPEN] = new TAction("open-command","Open Model", IconManager.imgic22, IconManager.imgic23, "Open Model", "Open an existing TTool model",'O', true);
- actions[ACT_OPEN_PROJECT] = new TAction("open-project-command","Open project", IconManager.imgic22, IconManager.imgic23, "Open project", "Open an existing TTool project",'O', true);
- actions[ACT_OPEN_FROM_NETWORK] = new TAction("open-command-from-network","Open project from TTool repository", IconManager.imgic22, IconManager.imgic23, "Open project from TTool repository", "Open an existing TTool model from the TTool repository (TTool website)",'0', true);
+ actions[ACT_OPEN_PROJECT] = new TAction("open-project-command","Open project", IconManager.imgic22_proj, IconManager.imgic23_proj, "Open project", "Open an existing TTool project",'O', true);
+ actions[ACT_OPEN_FROM_NETWORK] = new TAction("open-command-from-network","Open project from TTool repository", IconManager.imgic22_net, IconManager.imgic23_net, "Open project from TTool repository", "Open an existing TTool model from the TTool repository (TTool website)",'0', true);
actions[ACT_OPEN_LAST] = new TAction("openlast-command","Open file: " + ConfigurationTTool.LastOpenFile, IconManager.imgic22, IconManager.imgic23, "Open: " + ConfigurationTTool.LastOpenFile, "Open the lastly saved TTool model", 0);
actions[ACT_MERGE] = new TAction("merge-command","Merge", IconManager.imgic22, IconManager.imgic23, "Merge", "Merge the current TTool modeling with another one saved in a file ", 0);
actions[ACT_SAVE] = new TAction("save-command", "Save",IconManager.imgic24, IconManager.imgic25, "Save", "Save an opened or a new TTool modeling", 'S', true);
diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java
index 4cc671e42bc8678ccd4102c4c6f07947ad3fc3cc..b0f4a0448ae8061d607dc5f1da26ddd69f1b711e 100755
--- a/src/main/java/ui/util/IconManager.java
+++ b/src/main/java/ui/util/IconManager.java
@@ -37,9 +37,6 @@
*/
-
-
-
package ui.util;
import javax.swing.*;
@@ -48,11 +45,12 @@ import java.net.URL;
/**
-* Class IconManager
-* Creation: 15/12/2003
-* @version 1.1 15/12/2003
-* @author Ludovic APVRILLE
-*/
+ * Class IconManager
+ * Creation: 15/12/2003
+ *
+ * @author Ludovic APVRILLE
+ * @version 1.1 15/12/2003
+ */
public class IconManager {
public static ImageIcon imgic8, imgic9;
@@ -65,7 +63,7 @@ public class IconManager {
public static ImageIcon imgic13, imgic14, imgic15, imgic16, imgic17, imgic18, imgic19;
public static ImageIcon imgic20, imgic21, imgic22, imgic23, imgic24, imgic25, imgic26, imgic27, imgic28, imgic29;
- public static ImageIcon imgic20_proj, imgic21_proj;
+ public static ImageIcon imgic20_proj, imgic21_proj, imgic22_proj, imgic23_proj, imgic22_net, imgic23_net;
public static ImageIcon imgic30, imgic31, imgic32, imgic33, imgic34, imgic35, imgic36, imgic37, imgic38, imgic39;
@@ -113,8 +111,8 @@ public class IconManager {
public static ImageIcon imgic920, imgic922, imgic924, imgic926, imgic928, imgic930;
public static ImageIcon imgic940, imgic941;
// Requirement diagrams
- public static ImageIcon imgic1000, imgic1002, imgic1004,imgic1006,imgic1008, imgic1010, imgic1012, imgic1014, imgic1016, imgic1018;
- public static ImageIcon imgic1050, imgic1052, imgic1054,imgic1056, imgic1058, imgic1060;
+ public static ImageIcon imgic1000, imgic1002, imgic1004, imgic1006, imgic1008, imgic1010, imgic1012, imgic1014, imgic1016, imgic1018;
+ public static ImageIcon imgic1050, imgic1052, imgic1054, imgic1056, imgic1058, imgic1060;
// Attack Tree Diagrams
public static ImageIcon imgic1070, imgic1072, imgic1074, imgic1076, imgic1078;
@@ -140,10 +138,10 @@ public class IconManager {
// SMD diagram
- public static ImageIcon imgic2000, imgic2002, imgic2004,imgic2006,imgic2008,imgic2010, imgic2012;
+ public static ImageIcon imgic2000, imgic2002, imgic2004, imgic2006, imgic2008, imgic2010, imgic2012;
// CSD diagram
- public static ImageIcon imgic2100, imgic2104, imgic2106,imgic2108,imgic2110;
+ public static ImageIcon imgic2100, imgic2104, imgic2106, imgic2108, imgic2110;
// NC
@@ -160,21 +158,21 @@ public class IconManager {
public static ImageIcon imgic5070;
public static ImageIcon imgic5100, imgic5102, imgic5104, imgic5106, imgic5108;
- public static ImageIcon imgic5110, imgic5112, imgic5113,imgic5114;
+ public static ImageIcon imgic5110, imgic5112, imgic5113, imgic5114;
public static ImageIcon imgic5200;
- //pragmas
- public static ImageIcon imgic6000, imgic6001, imgic6002, imgic6003, imgic6004, imgic6005;
+ //pragmas
+ public static ImageIcon imgic6000, imgic6001, imgic6002, imgic6003, imgic6004, imgic6005;
//Security
public static ImageIcon imgic7000, imgic7001;
//Safety
public static ImageIcon imgic7002, imgic7003, imgic7004, imgic7005, imgic7006;
- //Show traces
+ //Show traces
public static ImageIcon imgic7007;
- //Attacker Scenarios
+ //Attacker Scenarios
public static ImageIcon imgic7008;
- //UPPAAL Help popup
+ //UPPAAL Help popup
public static ImageIcon imgic7009;
// Delegate ports image removed, by Solange
//public static ImageIcon imgic2102;
@@ -187,11 +185,11 @@ public class IconManager {
private static String icon8 = "turtle_16.gif";
private static String icon9 = "diplodocus2_16.gif";
//Added by Solange
- private static String icon0= "hideifce.gif";
+ private static String icon0 = "hideifce.gif";
//Added by Solange, the component icon
- private static String icon1= "procomp.gif";
+ private static String icon1 = "procomp.gif";
//root for the image of the help icon, created by Solange
- private static String icon2111= "sole.gif";
+ private static String icon2111 = "sole.gif";
//private static String icon10 = "toolbarButtonGraphics/general/Add24.gif";
//private static String icon11 = "toolbarButtonGraphics/general/Save16.gif";
@@ -211,8 +209,12 @@ public class IconManager {
private static String icon21 = "New24.gif";
private static String icon20_proj = "NewP16.gif";
private static String icon21_proj = "NewP24.gif";
- private static String icon22 = "toolbarButtonGraphics/general/Open16.gif";
- private static String icon23 = "toolbarButtonGraphics/general/Open24.gif";
+ private static String icon22 = "Open16.gif";
+ private static String icon23 = "Open24.gif";
+ private static String icon22_proj = "OpenP16.gif";
+ private static String icon23_proj = "OpenP24.gif";
+ private static String icon22_net = "OpenN16.gif";
+ private static String icon23_net = "OpenN24.gif";
private static String icon24 = "toolbarButtonGraphics/general/Save16.gif";
private static String icon25 = "toolbarButtonGraphics/general/Save24.gif";
private static String icon26 = "toolbarButtonGraphics/general/Stop16.gif";
@@ -433,7 +435,6 @@ public class IconManager {
// Deployment diagrams
private static String icon700 = "ddnode.gif";
private static String icon702 = "ddartifact.gif";
-
// TML
@@ -475,7 +476,7 @@ public class IconManager {
private static String icon1014 = "ebrddobs.gif";
private static String icon1016 = "reqref.gif";
private static String icon1018 = "reqsatisfy.gif";
-
+
// EBRDD
private static String icon1050 = "ebrdderc.gif";
@@ -550,8 +551,8 @@ public class IconManager {
private static String icon2004 = "adchoice.gif";
private static String icon2006 = "adjonction.gif"; //junction
private static String icon2008 = "prosmdsubmachine1.gif"; //
- private static String icon2010= "actionstate.gif";
- private static String icon2012= "prosmdstate.gif";
+ private static String icon2010 = "actionstate.gif";
+ private static String icon2012 = "prosmdstate.gif";
//CSD diagrams
@@ -563,7 +564,7 @@ public class IconManager {
private static String icon2108 = "proCSDOutPort.gif";
private static String icon2110 = "ProCSDConector.gif";
- private static String icon3000= "nc.gif";
+ private static String icon3000 = "nc.gif";
// AVATAR
@@ -621,8 +622,8 @@ public class IconManager {
// Avatar DD
private static String icon5200 = "search-ideogram-25px.png";
-
- //Dfferent Pragma
+
+ //Dfferent Pragma
private static String icon6000 = "toolbarButtonGraphics/general/pragma16.gif";
private static String icon6001 = "toolbarButtonGraphics/general/pragma24.gif";
private static String icon6002 = "toolbarButtonGraphics/general/safepragma16.gif";
@@ -637,16 +638,15 @@ public class IconManager {
private static String icon7003 = "A2.gif";
private static String icon7004 = "E1.gif";
private static String icon7005 = "E2.gif";
- private static String icon7006 = "imply.gif";
- //Show traces
+ private static String icon7006 = "imply.gif";
+ //Show traces
private static String icon7007 = "toolbarButtonGraphics/general/showTrace.gif";
- //Attacker Scenarios
+ //Attacker Scenarios
private static String icon7008 = "attacker.gif";
- private static String icon7009 = "uppaal.gif";
-
- //
+ private static String icon7009 = "uppaal.gif";
+ //
public IconManager() {
@@ -654,10 +654,10 @@ public class IconManager {
}
- public ImageIcon getIcon(String s){
+ public ImageIcon getIcon(String s) {
URL url = this.getClass().getResource(s);
- if (url != null) {
+ if (url != null) {
return new ImageIcon(url);
} else {
System.out.println("Could not load " + s);
@@ -709,6 +709,10 @@ public class IconManager {
imgic21_proj = getIcon(icon21_proj);
imgic22 = getIcon(icon22);
imgic23 = getIcon(icon23);
+ imgic22_proj = getIcon(icon22_proj);
+ imgic23_proj = getIcon(icon23_proj);
+ imgic22_net = getIcon(icon22_net);
+ imgic23_net = getIcon(icon23_net);
imgic24 = getIcon(icon24);
imgic25 = getIcon(icon25);
imgic26 = getIcon(icon26);
@@ -756,7 +760,7 @@ public class IconManager {
imgic64 = getIcon(icon64);
imgic65 = getIcon(icon65);
imgic66 = getIcon(icon66);
- imgic68 = getIcon(icon68);
+ imgic68 = getIcon(icon68);
imgic70 = getIcon(icon70);
imgic71 = getIcon(icon71);
@@ -803,8 +807,8 @@ public class IconManager {
imgic134 = getIcon(icon134);
imgic136 = getIcon(icon136);
imgic138 = getIcon(icon138);
- imgic140 = getIcon(icon140);
- imgic142 = getIcon(icon142);
+ imgic140 = getIcon(icon140);
+ imgic142 = getIcon(icon142);
imgic200 = getIcon(icon200);
imgic201 = getIcon(icon201);
@@ -915,8 +919,8 @@ public class IconManager {
imgic926 = getIcon(icon926);
imgic928 = getIcon(icon928);
imgic930 = getIcon(icon930);
- imgic940 = getIcon(icon940);
- imgic941 = getIcon(icon941);
+ imgic940 = getIcon(icon940);
+ imgic941 = getIcon(icon941);
imgic1000 = getIcon(icon1000);
imgic1002 = getIcon(icon1002);
@@ -927,7 +931,7 @@ public class IconManager {
imgic1012 = getIcon(icon1012);
imgic1014 = getIcon(icon1014);
imgic1016 = getIcon(icon1016);
- imgic1018 = getIcon(icon1018);
+ imgic1018 = getIcon(icon1018);
imgic1050 = getIcon(icon1050);
imgic1052 = getIcon(icon1052);
@@ -1013,7 +1017,7 @@ public class IconManager {
imgic1324 = getIcon(icon1324);
imgic1326 = getIcon(icon1326);
imgic1328 = getIcon(icon1328);
- imgic1330 = getIcon(icon1330);
+ imgic1330 = getIcon(icon1330);
imgic2000 = getIcon(icon2000);
imgic2002 = getIcon(icon2002);
@@ -1071,8 +1075,8 @@ public class IconManager {
imgic5062 = getIcon(icon5062);
imgic5064 = getIcon(icon5064);
imgic5066 = getIcon(icon5066);
- imgic5068 = getIcon(icon5068);
- imgic5070 = getIcon(icon5070);
+ imgic5068 = getIcon(icon5068);
+ imgic5070 = getIcon(icon5070);
imgic5100 = getIcon(icon5100);
imgic5102 = getIcon(icon5102);
@@ -1091,29 +1095,29 @@ public class IconManager {
imgic5113 = getIcon(icon5113);
imgic5114 = getIcon(icon5114);
- imgic5200 = getIcon(icon5200);
- if (imgic5200 != null) {
+ imgic5200 = getIcon(icon5200);
+ if (imgic5200 != null) {
img5200 = imgic5200.getImage();
}
- imgic6000 = getIcon(icon6000);
- imgic6001 = getIcon(icon6001);
- imgic6002 = getIcon(icon6002);
- imgic6003 = getIcon(icon6003);
- imgic6004 = getIcon(icon6004);
- imgic6005 = getIcon(icon6005);
-
-
- imgic7000 = getIcon(icon7000);
- imgic7001 = getIcon(icon7001);
- imgic7002 = getIcon(icon7002);
- imgic7003 = getIcon(icon7003);
- imgic7004 = getIcon(icon7004);
- imgic7005 = getIcon(icon7005);
- imgic7006 = getIcon(icon7006);
- imgic7007 = getIcon(icon7007);
- imgic7008 = getIcon(icon7008);
- imgic7009 = getIcon(icon7009);
+ imgic6000 = getIcon(icon6000);
+ imgic6001 = getIcon(icon6001);
+ imgic6002 = getIcon(icon6002);
+ imgic6003 = getIcon(icon6003);
+ imgic6004 = getIcon(icon6004);
+ imgic6005 = getIcon(icon6005);
+
+
+ imgic7000 = getIcon(icon7000);
+ imgic7001 = getIcon(icon7001);
+ imgic7002 = getIcon(icon7002);
+ imgic7003 = getIcon(icon7003);
+ imgic7004 = getIcon(icon7004);
+ imgic7005 = getIcon(icon7005);
+ imgic7006 = getIcon(icon7006);
+ imgic7007 = getIcon(icon7007);
+ imgic7008 = getIcon(icon7008);
+ imgic7009 = getIcon(icon7009);
}
} // Class
diff --git a/src/main/resources/ui/util/Open16.gif b/src/main/resources/ui/util/Open16.gif
new file mode 100755
index 0000000000000000000000000000000000000000..f6ce31c2b55363cd2f046ec4b1746086717f3f3c
Binary files /dev/null and b/src/main/resources/ui/util/Open16.gif differ
diff --git a/src/main/resources/ui/util/Open24.gif b/src/main/resources/ui/util/Open24.gif
new file mode 100755
index 0000000000000000000000000000000000000000..d0497ec51d40791c53487919e28a255ecf7fb7e5
Binary files /dev/null and b/src/main/resources/ui/util/Open24.gif differ
diff --git a/src/main/resources/ui/util/OpenN16.gif b/src/main/resources/ui/util/OpenN16.gif
new file mode 100755
index 0000000000000000000000000000000000000000..79d24ec9c478ad1046b96d91cbdd79b8d7edae26
Binary files /dev/null and b/src/main/resources/ui/util/OpenN16.gif differ
diff --git a/src/main/resources/ui/util/OpenN24.gif b/src/main/resources/ui/util/OpenN24.gif
new file mode 100755
index 0000000000000000000000000000000000000000..1cf7fa982211cc24433d377d3cce0de7282a2b26
Binary files /dev/null and b/src/main/resources/ui/util/OpenN24.gif differ
diff --git a/src/main/resources/ui/util/OpenP16.gif b/src/main/resources/ui/util/OpenP16.gif
new file mode 100755
index 0000000000000000000000000000000000000000..63a15ee19b4b604abc05793c211fb18bfadb864b
Binary files /dev/null and b/src/main/resources/ui/util/OpenP16.gif differ
diff --git a/src/main/resources/ui/util/OpenP24.gif b/src/main/resources/ui/util/OpenP24.gif
new file mode 100755
index 0000000000000000000000000000000000000000..bd418339d365dfa965b9682a91305c4b50be1559
Binary files /dev/null and b/src/main/resources/ui/util/OpenP24.gif differ