diff --git a/src/ui/AvatarDesignPanel.java b/src/ui/AvatarDesignPanel.java
index ef4f7e517761caf8b4e773f216f535137a794903..3aa8afea21737a327f34a00b98a8b7742e942374 100644
--- a/src/ui/AvatarDesignPanel.java
+++ b/src/ui/AvatarDesignPanel.java
@@ -127,7 +127,7 @@ public class AvatarDesignPanel extends TURTLEPanel {
jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
toolBarPanel.add(toolBarAvatarBD, BorderLayout.NORTH);
toolBarPanel.add(jsp, BorderLayout.CENTER);
- tabbedPane.addTab("AVATAR Design", IconManager.imgic62, toolBarPanel, "Opens the AVATAR Design");
+ tabbedPane.addTab("AVATAR Design", IconManager.imgic80, toolBarPanel, "Opens the AVATAR Design");
tabbedPane.setSelectedIndex(0);
//jsp.setVisible(true);
diff --git a/src/ui/AvatarRequirementPanel.java b/src/ui/AvatarRequirementPanel.java
index 05ac04df1f00759e2a9e4e68465948414140b093..2055cb565dfe7f8e57a52030d11207822d1fff0e 100755
--- a/src/ui/AvatarRequirementPanel.java
+++ b/src/ui/AvatarRequirementPanel.java
@@ -106,7 +106,7 @@ public class AvatarRequirementPanel extends TURTLEPanel {
jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
toolBarPanel.add(ardtb, BorderLayout.NORTH);
toolBarPanel.add(jsp, BorderLayout.CENTER);
- tabbedPane.addTab(s, IconManager.imgic1000, toolBarPanel, "Opens requirement diagram");
+ tabbedPane.addTab(s, IconManager.imgic84, toolBarPanel, "Opens requirement diagram");
tabbedPane.setSelectedIndex(0);
JPanel toolBarPanel = new JPanel();
toolBarPanel.setLayout(new BorderLayout());
@@ -135,7 +135,7 @@ public class AvatarRequirementPanel extends TURTLEPanel {
jsp.getVerticalScrollBar().setUnitIncrement(mgui.INCREMENT);
toolBarPanel.add(apdtb, BorderLayout.NORTH);
toolBarPanel.add(jsp, BorderLayout.CENTER);
- tabbedPane.addTab(s, IconManager.imgic1000, toolBarPanel, "Opens Parametric Diagram");
+ tabbedPane.addTab(s, IconManager.imgic82, toolBarPanel, "Opens Parametric Diagram");
tabbedPane.setSelectedIndex(0);
JPanel toolBarPanel = new JPanel();
toolBarPanel.setLayout(new BorderLayout());
diff --git a/src/ui/IconManager.java b/src/ui/IconManager.java
index 602c90c4d81f3382e89811a2b1aab54dbe61791a..4d096385147eb33211151a258ea06eb46712d047 100755
--- a/src/ui/IconManager.java
+++ b/src/ui/IconManager.java
@@ -74,6 +74,7 @@ public class IconManager {
public static ImageIcon imgic50, imgic51, imgic52, imgic53, imgic54, imgic55, imgic56, imgic57, imgic58, imgic59;
public static ImageIcon imgic60, imgic61, imgic62, imgic63, imgic64, imgic65, imgic66;
public static ImageIcon imgic70, imgic71, imgic72, imgic73, imgic75, imgic76, imgic77;
+ public static ImageIcon imgic80, imgic82, imgic84;
// Class diagram
public static ImageIcon imgic100, imgic101, imgic102, imgic104, imgic106, imgic108;
@@ -139,7 +140,8 @@ public class IconManager {
public static ImageIcon imgic5000, imgic5002, imgic5004, imgic5006, imgic5008;
public static ImageIcon imgic5010, imgic5012, imgic5014, imgic5016, imgic5018;
public static ImageIcon imgic5020, imgic5022, imgic5024, imgic5026, imgic5028;
- public static ImageIcon imgic5030, imgic5032, imgic5034, imgic5036;
+ public static ImageIcon imgic5030, imgic5032, imgic5034, imgic5036, imgic5038;
+ public static ImageIcon imgic5040, imgic5042;
public static ImageIcon imgic5100, imgic5102, imgic5104;
@@ -236,6 +238,10 @@ public class IconManager {
private static String icon77 = "images/toolbarButtonGraphics/general/Preferences24.gif";
+ private static String icon80 = "images/avatarbd.gif";
+ private static String icon82 = "images/avatarpd.gif";
+ private static String icon84 = "images/avatarrd.gif";
+
private static String icon100 = "images/toolbarButtonGraphics/general/Properties16.gif";
private static String icon101 = "images/toolbarButtonGraphics/general/Properties24.gif";
private static String icon102 = "images/cdassociation.gif";
@@ -502,6 +508,9 @@ public class IconManager {
private static String icon5032 = "images/avatarpdalias.gif";
private static String icon5034 = "images/avatardatatype.gif";
private static String icon5036 = "images/avatarstate.gif";
+ private static String icon5038 = "images/avatarsettimer.gif";
+ private static String icon5040 = "images/avatarresettimer.gif";
+ private static String icon5042 = "images/avatarexpiretimer.gif";
private static String icon5100 = "images/avatarhead16.gif";
private static String icon5102 = "images/avatarhead32.gif";
@@ -619,6 +628,10 @@ public class IconManager {
imgic75 = getIcon(icon75);
imgic76 = getIcon(icon76);
imgic77 = getIcon(icon77);
+
+ imgic80 = getIcon(icon80);
+ imgic82 = getIcon(icon82);
+ imgic84 = getIcon(icon84);
imgic100 = getIcon(icon100);
imgic101 = getIcon(icon101);
@@ -840,6 +853,9 @@ public class IconManager {
imgic5032 = getIcon(icon5032);
imgic5034 = getIcon(icon5034);
imgic5036 = getIcon(icon5036);
+ imgic5038 = getIcon(icon5038);
+ imgic5040 = getIcon(icon5040);
+ imgic5042 = getIcon(icon5042);
imgic5100 = getIcon(icon5100);
imgic5102 = getIcon(icon5102);
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index 134f670e105655f8148d75361e63d6426d2beafb..f01160bc0083feeec657128e9775df1c82f17591 100755
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -828,7 +828,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener {
mainTabbedPane.add(adp.tabbedPane, index);
mainTabbedPane.setToolTipTextAt(index, "Open AVATAR design diagrams");
mainTabbedPane.setTitleAt(index, name);
- mainTabbedPane.setIconAt(index, IconManager.imgic14);
+ mainTabbedPane.setIconAt(index, IconManager.imgic80);
//mainTabbedPane.addTab(name, IconManager.imgic14, dp.tabbedPane, "Opens design diagrams");
adp.init();
//ystem.out.println("Design added");
@@ -844,7 +844,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener {
mainTabbedPane.add(arp.tabbedPane, index);
mainTabbedPane.setToolTipTextAt(index, "Open AVATAR requirement diagrams");
mainTabbedPane.setTitleAt(index, name);
- mainTabbedPane.setIconAt(index, IconManager.imgic14);
+ mainTabbedPane.setIconAt(index, IconManager.imgic82);
//mainTabbedPane.addTab(name, IconManager.imgic14, dp.tabbedPane, "Opens design diagrams");
arp.init();
//ystem.out.println("Design added");
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index 34d29eb40b5600eb3a09512fba39dc1f805ba76a..22b88daf1c4a093550674da9d30ee51efb83f0a5 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -849,9 +849,9 @@ public class TGUIAction extends AbstractAction {
actions[ASMD_STATE] = new TAction("add-asmd-state", "State", IconManager.imgic5036, IconManager.imgic5036, "State", "Add a new state to the currently opened AVATAR state machine diagram", 0);
actions[ASMD_CHOICE] = new TAction("add-asmd-choice", "Add Choice", IconManager.imgic208, IconManager.imgic208, "Choice", "Add a choice - non-deterministic or guarded - to the currently opened AVATAR state machine diagram", 0);
actions[ASMD_RANDOM] = new TAction("add-asmd-random", "Add random", IconManager.imgic924, IconManager.imgic924, "Select random", "Add a random operator to the currently opened AVATAR State Machine diagram", 0);
- actions[ASMD_SET_TIMER] = new TAction("add-asmd-setrimer", "Set timer", IconManager.imgic924, IconManager.imgic924, "Set timer", "Add a set timer operator to the currently opened AVATAR State Machine diagram", 0);
- actions[ASMD_RESET_TIMER] = new TAction("add-asmd-resettimer", "Reset timer", IconManager.imgic924, IconManager.imgic924, "Reset timer", "Add a reset timer operator to the currently opened AVATAR State Machine diagram", 0);
- actions[ASMD_EXPIRE_TIMER] = new TAction("add-asmd-expiretimer", "Timer expiration", IconManager.imgic924, IconManager.imgic924, "Wait for timer expiration", "Add a timer expiration operator to the currently opened AVATAR State Machine diagram", 0);
+ actions[ASMD_SET_TIMER] = new TAction("add-asmd-setrimer", "Set timer", IconManager.imgic5038, IconManager.imgic5038, "Set timer", "Add a set timer operator to the currently opened AVATAR State Machine diagram", 0);
+ actions[ASMD_RESET_TIMER] = new TAction("add-asmd-resettimer", "Reset timer", IconManager.imgic5040, IconManager.imgic5040, "Reset timer", "Add a reset timer operator to the currently opened AVATAR State Machine diagram", 0);
+ actions[ASMD_EXPIRE_TIMER] = new TAction("add-asmd-expiretimer", "Timer expiration", IconManager.imgic5042, IconManager.imgic5042, "Wait for timer expiration", "Add a timer expiration operator to the currently opened AVATAR State Machine diagram", 0);
// AVATAR Requirement Diagrams
diff --git a/src/ui/avatarsmd/AvatarSMDExpireTimer.java b/src/ui/avatarsmd/AvatarSMDExpireTimer.java
index bbbb52d71796d2921e551c2a69440e7941ea91d6..998fade9c7257a81d0f92f8b0564de9a6e1cae98 100644
--- a/src/ui/avatarsmd/AvatarSMDExpireTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDExpireTimer.java
@@ -152,6 +152,12 @@ public class AvatarSMDExpireTimer extends AvatarSMDBasicComponent implements Che
g.drawLine(x, y+height, x+linebreak, y+height/2);
// hourglass
+ g.setColor(ColorManager.AVATAR_SET_TIMER);
+ g.drawLine(x+width+hourglassSpace+1, y+1, x+width+hourglassSpace + hourglassWidth+1, y+1);
+ g.drawLine(x+width+hourglassSpace+1, y+height+1, x+width+hourglassSpace + hourglassWidth+1, y+height+1);
+ g.drawLine(x+width+hourglassSpace+1, y+1, x+width+hourglassSpace + hourglassWidth+1, y+height+1);
+ g.drawLine(x+width+hourglassSpace+1, y+height+1, x+width+hourglassSpace + hourglassWidth+1, y+1);
+ g.setColor(c);
g.drawLine(x+width+hourglassSpace, y, x+width+hourglassSpace + hourglassWidth, y);
g.drawLine(x+width+hourglassSpace, y+height, x+width+hourglassSpace + hourglassWidth, y+height);
g.drawLine(x+width+hourglassSpace, y, x+width+hourglassSpace + hourglassWidth, y+height);
diff --git a/src/ui/avatarsmd/AvatarSMDResetTimer.java b/src/ui/avatarsmd/AvatarSMDResetTimer.java
index 4291c9f20c0615c6376589257ec5f4da0bdd7e6b..4ccd90a5320008118442b9b3090f03e58d2e001f 100644
--- a/src/ui/avatarsmd/AvatarSMDResetTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDResetTimer.java
@@ -148,6 +148,12 @@ public class AvatarSMDResetTimer extends AvatarSMDBasicComponent implements Chec
g.drawLine(x+width-linebreak, y+height, x+width, y+height/2);
// hourglass
+ g.setColor(ColorManager.AVATAR_SET_TIMER);
+ g.drawLine(x+width+hourglassSpace+1, y+1, x+width+hourglassSpace + hourglassWidth+1, y+1);
+ g.drawLine(x+width+hourglassSpace+1, y+height+1, x+width+hourglassSpace + hourglassWidth+1, y+height+1);
+ g.drawLine(x+width+hourglassSpace+1, y+1, x+width+hourglassSpace + hourglassWidth+1, y+height+1);
+ g.drawLine(x+width+hourglassSpace+1, y+height+1, x+width+hourglassSpace + hourglassWidth+1, y+1);
+ g.setColor(c);
g.drawLine(x+width+hourglassSpace, y, x+width+hourglassSpace + hourglassWidth, y);
g.drawLine(x+width+hourglassSpace, y+height, x+width+hourglassSpace + hourglassWidth, y+height);
g.drawLine(x+width+hourglassSpace, y, x+width+hourglassSpace + hourglassWidth, y+height);
diff --git a/src/ui/avatarsmd/AvatarSMDSetTimer.java b/src/ui/avatarsmd/AvatarSMDSetTimer.java
index 30b35c46d9962959772d09ba1bcd6c65c503de2d..c531035107499215223148b3539376604f113f61 100644
--- a/src/ui/avatarsmd/AvatarSMDSetTimer.java
+++ b/src/ui/avatarsmd/AvatarSMDSetTimer.java
@@ -148,11 +148,19 @@ public class AvatarSMDSetTimer extends AvatarSMDBasicComponent implements Checka
g.drawLine(x+width-linebreak, y+height, x+width, y+height/2);
// hourglass
+ g.setColor(ColorManager.AVATAR_SET_TIMER);
+ g.drawLine(x+width+hourglassSpace+1, y+1, x+width+hourglassSpace + hourglassWidth+1, y+1);
+ g.drawLine(x+width+hourglassSpace+1, y+height+1, x+width+hourglassSpace + hourglassWidth+1, y+height+1);
+ g.drawLine(x+width+hourglassSpace+1, y+1, x+width+hourglassSpace + hourglassWidth+1, y+height+1);
+ g.drawLine(x+width+hourglassSpace+1, y+height+1, x+width+hourglassSpace + hourglassWidth+1, y+1);
+ g.setColor(c);
g.drawLine(x+width+hourglassSpace, y, x+width+hourglassSpace + hourglassWidth, y);
g.drawLine(x+width+hourglassSpace, y+height, x+width+hourglassSpace + hourglassWidth, y+height);
g.drawLine(x+width+hourglassSpace, y, x+width+hourglassSpace + hourglassWidth, y+height);
g.drawLine(x+width+hourglassSpace, y+height, x+width+hourglassSpace + hourglassWidth, y);
+
+
//g.drawString("sig()", x+(width-w) / 2, y);
g.drawString(value, x + (width - w) / 2 , y + textY);
diff --git a/src/ui/images/avatarbd.gif b/src/ui/images/avatarbd.gif
new file mode 100644
index 0000000000000000000000000000000000000000..60901954f47f59ccb6f29b93104c774564b0b2b7
Binary files /dev/null and b/src/ui/images/avatarbd.gif differ
diff --git a/src/ui/images/avatarexpiretimer.gif b/src/ui/images/avatarexpiretimer.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2f716ee0d6df34dfecc794c8eebc4f6ed3cc436f
Binary files /dev/null and b/src/ui/images/avatarexpiretimer.gif differ
diff --git a/src/ui/images/avatarpd.gif b/src/ui/images/avatarpd.gif
new file mode 100644
index 0000000000000000000000000000000000000000..09fcd7e641b211ee86b3881e60a5352149bcc519
Binary files /dev/null and b/src/ui/images/avatarpd.gif differ
diff --git a/src/ui/images/avatarrd.gif b/src/ui/images/avatarrd.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2edd2d5a2ccc8619f5aa37f00f3d677ecd1fb161
Binary files /dev/null and b/src/ui/images/avatarrd.gif differ
diff --git a/src/ui/images/avatarresettimer.gif b/src/ui/images/avatarresettimer.gif
new file mode 100644
index 0000000000000000000000000000000000000000..35b7a56d96e9f235b47711e64fac7a8c4d0c9fab
Binary files /dev/null and b/src/ui/images/avatarresettimer.gif differ
diff --git a/src/ui/images/avatarsettimer.gif b/src/ui/images/avatarsettimer.gif
new file mode 100644
index 0000000000000000000000000000000000000000..18726dba052962e03f8ef80a09b4a7fd257d4e45
Binary files /dev/null and b/src/ui/images/avatarsettimer.gif differ
diff --git a/src/ui/tree/DiagramTreeRenderer.java b/src/ui/tree/DiagramTreeRenderer.java
index 28e96f934978130416cd2bdd8c06e202a95bc73e..f6c8293140bf4207a0340668aeae2c0ec002b533 100755
--- a/src/ui/tree/DiagramTreeRenderer.java
+++ b/src/ui/tree/DiagramTreeRenderer.java
@@ -71,6 +71,12 @@ import ui.ncdd.*;
import ui.oscd.*;
import ui.osad.*;
+import ui.avatarbd.*;
+import ui.avatarsmd.*;
+import ui.avatarrd.*;
+import ui.avatarpd.*;
+
+
public class DiagramTreeRenderer extends DefaultTreeCellRenderer {
public DiagramTreeRenderer() {
@@ -90,8 +96,25 @@ public class DiagramTreeRenderer extends DefaultTreeCellRenderer {
tree, value, sel,
expanded, leaf, row,
hasFocus);
-
- if (value instanceof GTURTLEModeling) {
+ if (value instanceof AvatarDesignPanel) {
+ setIcon(IconManager.imgic80);
+ setToolTipText("Avatar Design");
+ } else if (value instanceof AvatarBDPanel) {
+ setIcon(IconManager.imgic80);
+ setToolTipText("Avatar Block Diagram");
+ } else if (value instanceof AvatarSMDPanel) {
+ setIcon(IconManager.imgic63);
+ setToolTipText("Avatar Block Diagram");
+ } else if (value instanceof AvatarRequirementPanel) {
+ setIcon(IconManager.imgic82);
+ setToolTipText("Avatar Block Diagram");
+ } else if (value instanceof AvatarPDPanel) {
+ setIcon(IconManager.imgic82);
+ setToolTipText("Avatar Block Diagram");
+ } else if (value instanceof AvatarRDPanel) {
+ setIcon(IconManager.imgic84);
+ setToolTipText("Avatar Block Diagram");
+ } else if (value instanceof GTURTLEModeling) {
setIcon(IconManager.imgic8);
setToolTipText("TURTLE modeling");
} else if (value instanceof DesignPanel) {