diff --git a/modeling/testavatar.xml b/modeling/testavatar.xml
index e38ea427377351fdff6ea892a6a1bcc3c90b98e3..8d83b8dd02024ca5b538b9fd51ebd9efe961cc1c 100644
--- a/modeling/testavatar.xml
+++ b/modeling/testavatar.xml
@@ -188,8 +188,8 @@
</COMPONENT>
<COMPONENT type="5103" id="83" >
-<cdparam x="344" y="127" />
-<sizeparam width="77" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<cdparam x="346" y="127" />
+<sizeparam width="73" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="Send signal" value="testsig(y, b)" />
@@ -203,6 +203,7 @@
<TGConnectingPoint num="7" id="80" />
<TGConnectingPoint num="8" id="81" />
<TGConnectingPoint num="9" id="82" />
+<accessibility />
</COMPONENT>
<COMPONENT type="5100" id="85" >
@@ -223,13 +224,13 @@
<sizeparam width="0" height="0" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<infoparam name="connector from Send signal to stop state" value="null" />
<TGConnectingPoint num="0" id="91" />
-<P1 x="422" y="257" id="110" />
-<P2 x="452" y="309" id="107" />
+<P1 x="425" y="254" id="108" />
+<P2 x="452" y="309" id="118" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="90" >
<father id="92" num="0" />
<cdparam x="468" y="290" />
-<sizeparam width="60" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="60" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -255,12 +256,12 @@
<infoparam name="connector from state0 to Send signal" value="null" />
<TGConnectingPoint num="0" id="98" />
<P1 x="387" y="172" id="135" />
-<P2 x="422" y="227" id="109" />
+<P2 x="425" y="224" id="107" />
<AutomaticDrawing data="true" />
</CONNECTOR><SUBCOMPONENT type="-1" id="97" >
<father id="99" num="0" />
<cdparam x="440" y="204" />
-<sizeparam width="70" height="15" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<sizeparam width="70" height="16" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
<infoparam name="List of all parameters of an Avatar SMD transition" value="" />
@@ -309,32 +310,32 @@
</extraparam>
</SUBCOMPONENT>
-<COMPONENT type="5101" id="108" >
-<cdparam x="442" y="314" />
-<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5104" id="117" >
+<cdparam x="385" y="229" />
+<sizeparam width="80" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="stop state" value="null" />
+<infoparam name="Receive signal" value="testsig(x, b)" />
<TGConnectingPoint num="0" id="107" />
+<TGConnectingPoint num="1" id="108" />
+<TGConnectingPoint num="2" id="109" />
+<TGConnectingPoint num="3" id="110" />
+<TGConnectingPoint num="4" id="111" />
+<TGConnectingPoint num="5" id="112" />
+<TGConnectingPoint num="6" id="113" />
+<TGConnectingPoint num="7" id="114" />
+<TGConnectingPoint num="8" id="115" />
+<TGConnectingPoint num="9" id="116" />
+<accessibility />
</COMPONENT>
-<COMPONENT type="5104" id="119" >
-<cdparam x="379" y="232" />
-<sizeparam width="86" height="20" minWidth="30" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
+<COMPONENT type="5101" id="119" >
+<cdparam x="442" y="314" />
+<sizeparam width="20" height="20" minWidth="0" minHeight="0" maxWidth="1000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" />
<hidden value="false" />
<cdrectangleparam minX="10" maxX="1400" minY="10" maxY="900" />
-<infoparam name="Send signal" value="testsig(x, b)" />
-<TGConnectingPoint num="0" id="109" />
-<TGConnectingPoint num="1" id="110" />
-<TGConnectingPoint num="2" id="111" />
-<TGConnectingPoint num="3" id="112" />
-<TGConnectingPoint num="4" id="113" />
-<TGConnectingPoint num="5" id="114" />
-<TGConnectingPoint num="6" id="115" />
-<TGConnectingPoint num="7" id="116" />
-<TGConnectingPoint num="8" id="117" />
-<TGConnectingPoint num="9" id="118" />
-<accessibility />
+<infoparam name="stop state" value="null" />
+<TGConnectingPoint num="0" id="118" />
</COMPONENT>
<COMPONENT type="5106" id="144" >
diff --git a/src/ui/AvatarDesignPanelTranslator.java b/src/ui/AvatarDesignPanelTranslator.java
index e9aacfdf05c4c9fe8fefcef1ddbaf477e67bb4b9..de9187d9eea932ef59066c56aea2a6fa46c8ed11 100644
--- a/src/ui/AvatarDesignPanelTranslator.java
+++ b/src/ui/AvatarDesignPanelTranslator.java
@@ -637,7 +637,7 @@ public class AvatarDesignPanelTranslator {
aaos.setCheckable();
}
if (aaos.isSending()) {
- CheckingError ce = new CheckingError(CheckingError.BEHAVIOR_ERROR, "a sending signal is used for receiving: " + asmdrs.getValue());
+ CheckingError ce = new CheckingError(CheckingError.BEHAVIOR_ERROR, "A sending signal is used for receiving: " + asmdrs.getValue());
ce.setAvatarBlock(_ab);
ce.setTDiagramPanel(tdp);
ce.setTGComponent(tgc);
diff --git a/src/ui/avatarbd/AvatarBDPortConnector.java b/src/ui/avatarbd/AvatarBDPortConnector.java
index 0ef5822000b543f856b51687f3e2edc25ad80bb1..e64830d7607b08ce1bf4f666282f525d1e94f0c1 100644
--- a/src/ui/avatarbd/AvatarBDPortConnector.java
+++ b/src/ui/avatarbd/AvatarBDPortConnector.java
@@ -252,7 +252,7 @@ public class AvatarBDPortConnector extends TGConnectorWithCommentConnectionPoint
Vector v = getAssociationSignals();
JDialogSignalAssociation jdas = new JDialogSignalAssociation(frame, block1, block2, v, this, "Setting signal association");
- jdas.setSize(750, 500);
+ jdas.setSize(850, 550);
GraphicLib.centerOnParent(jdas);
jdas.show(); // blocked until dialog has been closed
diff --git a/src/ui/window/JDialogSignalAssociation.java b/src/ui/window/JDialogSignalAssociation.java
index 2b55ccd2f5d53ea3170670121a59f9318c36036c..2167d10c89b6f58313b0061e67df34ef06b135d0 100644
--- a/src/ui/window/JDialogSignalAssociation.java
+++ b/src/ui/window/JDialogSignalAssociation.java
@@ -132,22 +132,22 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
panel1 = new JPanel();
panel1.setLayout(gridbag1);
panel1.setBorder(new javax.swing.border.TitledBorder("Adding signals"));
- panel1.setPreferredSize(new Dimension(400, 250));
+ panel1.setMinimumSize(new Dimension(325, 250));
panel2 = new JPanel();
panel2.setLayout(gridbag2);
panel2.setBorder(new javax.swing.border.TitledBorder("Managing Signals"));
- panel2.setPreferredSize(new Dimension(300, 250));
+ panel2.setMinimumSize(new Dimension(325, 250));
panel3 = new JPanel();
panel3.setLayout(gridbag3);
panel3.setBorder(new javax.swing.border.TitledBorder("Connector type"));
- panel3.setPreferredSize(new Dimension(600, 100));
+ panel3.setMinimumSize(new Dimension(700, 150));
panel4 = new JPanel();
panel4.setLayout(gridbag4);
panel4.setBorder(new javax.swing.border.TitledBorder("Security issues"));
- panel4.setPreferredSize(new Dimension(600, 50));
+ panel4.setMinimumSize(new Dimension(700, 50));
// first line panel1
c1.weighty = 1.0;
@@ -168,12 +168,14 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
signalsBlock1 = new JComboBox();
signalsBlock1.addActionListener(this);
+ //signalsBlock1.setMinimumSize(new Dimension(150, 50));
panel1.add(signalsBlock1, c1);
c1.gridwidth = 1;
panel1.add(new JLabel(" = "), c1);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
signalsBlock2 = new JComboBox();
+ //signalsBlock2.setMinimumSize(new Dimension(150, 50));
signalsBlock2.addActionListener(this);
panel1.add(signalsBlock2, c1);
@@ -195,7 +197,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
listSignals.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
listSignals.addListSelectionListener(this);
JScrollPane scrollPane = new JScrollPane(listSignals);
- scrollPane.setSize(300, 250);
+ //scrollPane.setSize(300, 250);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
c2.fill = GridBagConstraints.BOTH;
c2.gridheight = 5;
@@ -281,6 +283,7 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
c0.gridheight = 10;
c0.weighty = 1.0;
c0.weightx = 1.0;
+ c0.fill = GridBagConstraints.BOTH;
c.add(panel1, c0);
c0.gridwidth = GridBagConstraints.REMAINDER; //end row
@@ -299,6 +302,28 @@ public class JDialogSignalAssociation extends javax.swing.JDialog implements Act
cancelButton = new JButton("Cancel", IconManager.imgic27);
cancelButton.addActionListener(this);
c.add(cancelButton, c0);
+
+ /*JPanel panelButton = new JPanel();
+ closeButton = new JButton("Save and Close", IconManager.imgic25);
+ //closeButton.setPreferredSize(new Dimension(600, 50));
+ closeButton.addActionListener(this);
+ panelButton.add(closeButton);
+ cancelButton = new JButton("Cancel", IconManager.imgic27);
+ cancelButton.addActionListener(this);
+ panelButton.add(cancelButton);
+
+ JPanel middlePanel = new JPanel(new BorderLayout());
+ middlePanel.add(panel3, BorderLayout.NORTH);
+ middlePanel.add(panel4, BorderLayout.CENTER);
+ middlePanel.add(panelButton, BorderLayout.SOUTH);
+
+ JPanel topPanel = new JPanel();
+ topPanel.add(panel1);
+ topPanel.add(panel2);
+ c.setLayout(new BorderLayout());
+ c.add(topPanel, BorderLayout.CENTER);
+ c.add(middlePanel, BorderLayout.SOUTH);*/
+
}
public void actionPerformed(ActionEvent evt) {