diff --git a/modeling/testavatar.xml b/modeling/testavatar.xml
index d3ec3fc3924a492df8402f46be7a364ae8b8c17e..784db4d3c88442afadfe33606c1dddfa9108860b 100644
--- a/modeling/testavatar.xml
+++ b/modeling/testavatar.xml
@@ -1066,7 +1066,7 @@
</CONNECTOR>
<COMPONENT type="302" id="496" >
<cdparam x="219" y="346" />
-<sizeparam width="297" height="71" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="255" height="71" minWidth="80" minHeight="10" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Proverif Pragma" value="#PublicConstant v.c
@@ -1732,12 +1732,86 @@
<Modeling type="ADD" nameTab="Deployment" >
<ADDDiagramPanel name="Deployment Diagram" minX="10" maxX="2500" minY="10" maxY="1500" attributes="0" masterClockFrequency="200" >
-<COMPONENT type="5355" id="836" >
+<COMPONENT type="5355" id="845" >
<cdparam x="479" y="81" />
<sizeparam width="200" height="200" minWidth="100" minHeight="35" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Memory0" value="name" />
+<TGConnectingPoint num="0" id="821" />
+<TGConnectingPoint num="1" id="822" />
+<TGConnectingPoint num="2" id="823" />
+<TGConnectingPoint num="3" id="824" />
+<TGConnectingPoint num="4" id="825" />
+<TGConnectingPoint num="5" id="826" />
+<TGConnectingPoint num="6" id="827" />
+<TGConnectingPoint num="7" id="828" />
+<TGConnectingPoint num="8" id="829" />
+<TGConnectingPoint num="9" id="830" />
+<TGConnectingPoint num="10" id="831" />
+<TGConnectingPoint num="11" id="832" />
+<TGConnectingPoint num="12" id="833" />
+<TGConnectingPoint num="13" id="834" />
+<TGConnectingPoint num="14" id="835" />
+<TGConnectingPoint num="15" id="836" />
+<TGConnectingPoint num="16" id="837" />
+<TGConnectingPoint num="17" id="838" />
+<TGConnectingPoint num="18" id="839" />
+<TGConnectingPoint num="19" id="840" />
+<TGConnectingPoint num="20" id="841" />
+<TGConnectingPoint num="21" id="842" />
+<TGConnectingPoint num="22" id="843" />
+<TGConnectingPoint num="23" id="844" />
+<extraparam>
+<info stereotype="RAM" nodeName="Memory0" />
+<attributes byteDataSize="4" index="0" />
+</extraparam>
+</COMPONENT>
+<SUBCOMPONENT type="5362" id="802" >
+<father id="845" num="0" />
+<cdparam x="552" y="177" />
+<sizeparam width="89" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="111" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="B0/in m2" />
+<TGConnectingPoint num="0" id="794" />
+<TGConnectingPoint num="1" id="795" />
+<TGConnectingPoint num="2" id="796" />
+<TGConnectingPoint num="3" id="797" />
+<TGConnectingPoint num="4" id="798" />
+<TGConnectingPoint num="5" id="799" />
+<TGConnectingPoint num="6" id="800" />
+<TGConnectingPoint num="7" id="801" />
+<extraparam>
+<info value="B0/in m2" channelName="B0/in m2() #--# B1/out m2()" fullChannelName="TestAsynchronous1::B0/in m2() #--# B1/out m2()" referenceDiagram="TestAsynchronous1" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5362" id="811" >
+<father id="845" num="1" />
+<cdparam x="542" y="227" />
+<sizeparam width="99" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="101" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="B0/out m0" />
+<TGConnectingPoint num="0" id="803" />
+<TGConnectingPoint num="1" id="804" />
+<TGConnectingPoint num="2" id="805" />
+<TGConnectingPoint num="3" id="806" />
+<TGConnectingPoint num="4" id="807" />
+<TGConnectingPoint num="5" id="808" />
+<TGConnectingPoint num="6" id="809" />
+<TGConnectingPoint num="7" id="810" />
+<extraparam>
+<info value="B0/out m0" channelName="B0/out m0() #--# B1/in m0()" fullChannelName="TestAsynchronous1::B0/out m0() #--# B1/in m0()" referenceDiagram="TestAsynchronous1" />
+</extraparam>
+</SUBCOMPONENT>
+<SUBCOMPONENT type="5362" id="820" >
+<father id="845" num="2" />
+<cdparam x="513" y="128" />
+<sizeparam width="136" height="40" minWidth="75" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<hidden value="false" />
+<cdrectangleparam minX="0" maxX="64" minY="0" maxY="160" />
+<infoparam name="TGComponent" value="Block0/out send" />
<TGConnectingPoint num="0" id="812" />
<TGConnectingPoint num="1" id="813" />
<TGConnectingPoint num="2" id="814" />
@@ -1746,153 +1820,136 @@
<TGConnectingPoint num="5" id="817" />
<TGConnectingPoint num="6" id="818" />
<TGConnectingPoint num="7" id="819" />
-<TGConnectingPoint num="8" id="820" />
-<TGConnectingPoint num="9" id="821" />
-<TGConnectingPoint num="10" id="822" />
-<TGConnectingPoint num="11" id="823" />
-<TGConnectingPoint num="12" id="824" />
-<TGConnectingPoint num="13" id="825" />
-<TGConnectingPoint num="14" id="826" />
-<TGConnectingPoint num="15" id="827" />
-<TGConnectingPoint num="16" id="828" />
-<TGConnectingPoint num="17" id="829" />
-<TGConnectingPoint num="18" id="830" />
-<TGConnectingPoint num="19" id="831" />
-<TGConnectingPoint num="20" id="832" />
-<TGConnectingPoint num="21" id="833" />
-<TGConnectingPoint num="22" id="834" />
-<TGConnectingPoint num="23" id="835" />
<extraparam>
-<info stereotype="RAM" nodeName="Memory0" />
-<attributes byteDataSize="4" index="0" />
+<info value="Block0/out send" channelName="Block0/out send() #--# Block1/in receive()" fullChannelName="Design::Block0/out send() #--# Block1/in receive()" referenceDiagram="Design" />
</extraparam>
-</COMPONENT>
+</SUBCOMPONENT>
-<COMPONENT type="5363" id="861" >
+<COMPONENT type="5363" id="870" >
<cdparam x="548" y="472" />
<sizeparam width="250" height="50" minWidth="100" minHeight="50" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="Bus0" value="name" />
-<TGConnectingPoint num="0" id="837" />
-<TGConnectingPoint num="1" id="838" />
-<TGConnectingPoint num="2" id="839" />
-<TGConnectingPoint num="3" id="840" />
-<TGConnectingPoint num="4" id="841" />
-<TGConnectingPoint num="5" id="842" />
-<TGConnectingPoint num="6" id="843" />
-<TGConnectingPoint num="7" id="844" />
-<TGConnectingPoint num="8" id="845" />
-<TGConnectingPoint num="9" id="846" />
-<TGConnectingPoint num="10" id="847" />
-<TGConnectingPoint num="11" id="848" />
-<TGConnectingPoint num="12" id="849" />
-<TGConnectingPoint num="13" id="850" />
-<TGConnectingPoint num="14" id="851" />
-<TGConnectingPoint num="15" id="852" />
-<TGConnectingPoint num="16" id="853" />
-<TGConnectingPoint num="17" id="854" />
-<TGConnectingPoint num="18" id="855" />
-<TGConnectingPoint num="19" id="856" />
-<TGConnectingPoint num="20" id="857" />
-<TGConnectingPoint num="21" id="858" />
-<TGConnectingPoint num="22" id="859" />
-<TGConnectingPoint num="23" id="860" />
+<TGConnectingPoint num="0" id="846" />
+<TGConnectingPoint num="1" id="847" />
+<TGConnectingPoint num="2" id="848" />
+<TGConnectingPoint num="3" id="849" />
+<TGConnectingPoint num="4" id="850" />
+<TGConnectingPoint num="5" id="851" />
+<TGConnectingPoint num="6" id="852" />
+<TGConnectingPoint num="7" id="853" />
+<TGConnectingPoint num="8" id="854" />
+<TGConnectingPoint num="9" id="855" />
+<TGConnectingPoint num="10" id="856" />
+<TGConnectingPoint num="11" id="857" />
+<TGConnectingPoint num="12" id="858" />
+<TGConnectingPoint num="13" id="859" />
+<TGConnectingPoint num="14" id="860" />
+<TGConnectingPoint num="15" id="861" />
+<TGConnectingPoint num="16" id="862" />
+<TGConnectingPoint num="17" id="863" />
+<TGConnectingPoint num="18" id="864" />
+<TGConnectingPoint num="19" id="865" />
+<TGConnectingPoint num="20" id="866" />
+<TGConnectingPoint num="21" id="867" />
+<TGConnectingPoint num="22" id="868" />
+<TGConnectingPoint num="23" id="869" />
<extraparam>
<info stereotype="VGSB" nodeName="Bus0" />
<attributes index="0" nbOfAttachedInitiators="0" nbOfAttachedTargets="0" minLatency="0" fifoDepth="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5354" id="886" >
-<cdparam x="759" y="170" />
+<COMPONENT type="5354" id="895" >
+<cdparam x="807" y="141" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="TTY0" value="name" />
-<TGConnectingPoint num="0" id="862" />
-<TGConnectingPoint num="1" id="863" />
-<TGConnectingPoint num="2" id="864" />
-<TGConnectingPoint num="3" id="865" />
-<TGConnectingPoint num="4" id="866" />
-<TGConnectingPoint num="5" id="867" />
-<TGConnectingPoint num="6" id="868" />
-<TGConnectingPoint num="7" id="869" />
-<TGConnectingPoint num="8" id="870" />
-<TGConnectingPoint num="9" id="871" />
-<TGConnectingPoint num="10" id="872" />
-<TGConnectingPoint num="11" id="873" />
-<TGConnectingPoint num="12" id="874" />
-<TGConnectingPoint num="13" id="875" />
-<TGConnectingPoint num="14" id="876" />
-<TGConnectingPoint num="15" id="877" />
-<TGConnectingPoint num="16" id="878" />
-<TGConnectingPoint num="17" id="879" />
-<TGConnectingPoint num="18" id="880" />
-<TGConnectingPoint num="19" id="881" />
-<TGConnectingPoint num="20" id="882" />
-<TGConnectingPoint num="21" id="883" />
-<TGConnectingPoint num="22" id="884" />
-<TGConnectingPoint num="23" id="885" />
+<TGConnectingPoint num="0" id="871" />
+<TGConnectingPoint num="1" id="872" />
+<TGConnectingPoint num="2" id="873" />
+<TGConnectingPoint num="3" id="874" />
+<TGConnectingPoint num="4" id="875" />
+<TGConnectingPoint num="5" id="876" />
+<TGConnectingPoint num="6" id="877" />
+<TGConnectingPoint num="7" id="878" />
+<TGConnectingPoint num="8" id="879" />
+<TGConnectingPoint num="9" id="880" />
+<TGConnectingPoint num="10" id="881" />
+<TGConnectingPoint num="11" id="882" />
+<TGConnectingPoint num="12" id="883" />
+<TGConnectingPoint num="13" id="884" />
+<TGConnectingPoint num="14" id="885" />
+<TGConnectingPoint num="15" id="886" />
+<TGConnectingPoint num="16" id="887" />
+<TGConnectingPoint num="17" id="888" />
+<TGConnectingPoint num="18" id="889" />
+<TGConnectingPoint num="19" id="890" />
+<TGConnectingPoint num="20" id="891" />
+<TGConnectingPoint num="21" id="892" />
+<TGConnectingPoint num="22" id="893" />
+<TGConnectingPoint num="23" id="894" />
<extraparam>
<info stereotype="TTY" nodeName="TTY0" />
<attributes index="0" />
</extraparam>
</COMPONENT>
-<COMPONENT type="5351" id="911" >
+<COMPONENT type="5351" id="920" >
<cdparam x="160" y="150" />
<sizeparam width="250" height="200" minWidth="150" minHeight="100" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="2500" minY="10" maxY="1500" />
<infoparam name="CPU0" value="name" />
-<TGConnectingPoint num="0" id="887" />
-<TGConnectingPoint num="1" id="888" />
-<TGConnectingPoint num="2" id="889" />
-<TGConnectingPoint num="3" id="890" />
-<TGConnectingPoint num="4" id="891" />
-<TGConnectingPoint num="5" id="892" />
-<TGConnectingPoint num="6" id="893" />
-<TGConnectingPoint num="7" id="894" />
-<TGConnectingPoint num="8" id="895" />
-<TGConnectingPoint num="9" id="896" />
-<TGConnectingPoint num="10" id="897" />
-<TGConnectingPoint num="11" id="898" />
-<TGConnectingPoint num="12" id="899" />
-<TGConnectingPoint num="13" id="900" />
-<TGConnectingPoint num="14" id="901" />
-<TGConnectingPoint num="15" id="902" />
-<TGConnectingPoint num="16" id="903" />
-<TGConnectingPoint num="17" id="904" />
-<TGConnectingPoint num="18" id="905" />
-<TGConnectingPoint num="19" id="906" />
-<TGConnectingPoint num="20" id="907" />
-<TGConnectingPoint num="21" id="908" />
-<TGConnectingPoint num="22" id="909" />
-<TGConnectingPoint num="23" id="910" />
+<TGConnectingPoint num="0" id="896" />
+<TGConnectingPoint num="1" id="897" />
+<TGConnectingPoint num="2" id="898" />
+<TGConnectingPoint num="3" id="899" />
+<TGConnectingPoint num="4" id="900" />
+<TGConnectingPoint num="5" id="901" />
+<TGConnectingPoint num="6" id="902" />
+<TGConnectingPoint num="7" id="903" />
+<TGConnectingPoint num="8" id="904" />
+<TGConnectingPoint num="9" id="905" />
+<TGConnectingPoint num="10" id="906" />
+<TGConnectingPoint num="11" id="907" />
+<TGConnectingPoint num="12" id="908" />
+<TGConnectingPoint num="13" id="909" />
+<TGConnectingPoint num="14" id="910" />
+<TGConnectingPoint num="15" id="911" />
+<TGConnectingPoint num="16" id="912" />
+<TGConnectingPoint num="17" id="913" />
+<TGConnectingPoint num="18" id="914" />
+<TGConnectingPoint num="19" id="915" />
+<TGConnectingPoint num="20" id="916" />
+<TGConnectingPoint num="21" id="917" />
+<TGConnectingPoint num="22" id="918" />
+<TGConnectingPoint num="23" id="919" />
<extraparam>
<info stereotype="CPU" nodeName="CPU0" />
<attributes nbOfIrq="6" iCacheWays="0" iCacheSets="0" iCacheWords="0" dCacheWays="0" dCacheSets="0" dCacheWords="0" />
</extraparam>
</COMPONENT>
-<CONNECTOR type="5350" id="912" >
+<CONNECTOR type="5350" id="921" >
<cdparam x="718" y="347" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="821" y="370" id="876" />
-<P2 x="673" y="472" id="838" />
+<P1 x="869" y="341" id="885" />
+<P2 x="673" y="472" id="847" />
<AutomaticDrawing data="true" />
<extraparam>
<spy value="true" />
</extraparam>
</CONNECTOR>
-<CONNECTOR type="5350" id="913" >
+<CONNECTOR type="5350" id="922" >
<cdparam x="435" y="296" />
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector" value="{info}" />
-<P1 x="347" y="350" id="902" />
-<P2 x="610" y="472" id="845" />
+<P1 x="347" y="350" id="911" />
+<P2 x="610" y="472" id="854" />
<AutomaticDrawing data="true" />
<extraparam>
<spy value="false" />
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index d91fd5bbe81dfb45f4a3a5df3d424295177dac4c..422d2598433319f7998856a12dd1fd79dcfb09b5 100755
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -1865,7 +1865,19 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void setStatusBarText(String s) {
// captitalizeFirstLetter
- status.setText(s.substring(0, 1).toUpperCase() + s.substring(1, s.length()));
+ if (s == null) {
+ return;
+ }
+
+ if (s.length() == 0) {
+ return;
+ }
+
+ if (s.length() > 1) {
+ status.setText(s.substring(0, 1).toUpperCase() + s.substring(1, s.length()));
+ } else {
+ status.setText(s);
+ }
}
public void reinitMainTabbedPane() {
diff --git a/src/ui/TDiagramPanel.java b/src/ui/TDiagramPanel.java
index 32719e11e20af8f066504e0752c6c5df1d6b9e0a..afd2a80549d0388ab6825c7439d25a9f3721e916 100755
--- a/src/ui/TDiagramPanel.java
+++ b/src/ui/TDiagramPanel.java
@@ -713,6 +713,8 @@ public abstract class TDiagramPanel extends JPanel implements GenericTree {
if (!pointedElementFound) {
componentPointed = tgcTmp;
tgc.setState(TGState.POINTED);
+ String tmpinfo = componentPointed.getStatusInformation();
+ if (tmpinfo != null) { mgui.setStatusBarText(tmpinfo);}
pointedElementFound = true;
info = 2;
} else {
diff --git a/src/ui/TGComponent.java b/src/ui/TGComponent.java
index 33cdf440f428c42db769504fc5dcdd3d7ec6579d..c84e6abc1d93af32d781c9054a50abc81d8e74a4 100755
--- a/src/ui/TGComponent.java
+++ b/src/ui/TGComponent.java
@@ -286,7 +286,7 @@ public abstract class TGComponent implements CDElement, GenericTree {
}
public String getStatusInformation() {
- return null;
+ return " ";
}
diff --git a/src/ui/avatardd/ADDChannelArtifact.java b/src/ui/avatardd/ADDChannelArtifact.java
index 836fc7b246e3264118f9a9ab3a344845695507db..bd31aee70595bcac263dcded33dadffd0e1b7b3f 100755
--- a/src/ui/avatardd/ADDChannelArtifact.java
+++ b/src/ui/avatardd/ADDChannelArtifact.java
@@ -298,4 +298,8 @@ public class ADDChannelArtifact extends TGCWithoutInternalComponent implements S
return fullChannelName;
}
+ public String getStatusInformation() {
+ return fullChannelName;
+ }
+
}
diff --git a/src/ui/window/JDialogAvatarChannelArtifact.java b/src/ui/window/JDialogAvatarChannelArtifact.java
index 7624b1938203eae9061ec5993c993d061c33c853..baa9659a20a78230e41d15ef2923afd8d92cd41a 100755
--- a/src/ui/window/JDialogAvatarChannelArtifact.java
+++ b/src/ui/window/JDialogAvatarChannelArtifact.java
@@ -217,10 +217,6 @@ public class JDialogAvatarChannelArtifact extends javax.swing.JDialog implements
return (String)(referenceDiagram.getSelectedItem());
}
- public string getStatusInformation() {
- return fullChannelName;
- }
-
public int indexOf(Vector<String> _list, String name) {
int i = 0;