diff --git a/modeling/DIPLODOCUS/SmartCardProtocol.xml b/modeling/DIPLODOCUS/SmartCardProtocol.xml index 05a580bb9e528da3e14343a94e5f459a7f0b3af8..48c86e7064449fff42b0cf33dc77a89de4e94f07 100755 --- a/modeling/DIPLODOCUS/SmartCardProtocol.xml +++ b/modeling/DIPLODOCUS/SmartCardProtocol.xml @@ -1823,7 +1823,7 @@ <SUBCOMPONENT type="-1" id="336" > <father id="339" num="0" /> <cdparam x="1539" y="1274" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -1842,7 +1842,7 @@ <SUBCOMPONENT type="-1" id="340" > <father id="343" num="0" /> <cdparam x="1538" y="1088" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -1935,7 +1935,7 @@ <SUBCOMPONENT type="-1" id="360" > <father id="363" num="0" /> <cdparam x="1655" y="1254" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -1954,7 +1954,7 @@ <SUBCOMPONENT type="-1" id="364" > <father id="367" num="0" /> <cdparam x="2219" y="1083" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -1973,7 +1973,7 @@ <SUBCOMPONENT type="-1" id="368" > <father id="371" num="0" /> <cdparam x="2288" y="1044" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2030,7 +2030,7 @@ <SUBCOMPONENT type="-1" id="380" > <father id="383" num="0" /> <cdparam x="1218" y="1127" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2087,7 +2087,7 @@ <SUBCOMPONENT type="-1" id="392" > <father id="395" num="0" /> <cdparam x="732" y="714" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2106,7 +2106,7 @@ <SUBCOMPONENT type="-1" id="396" > <father id="399" num="0" /> <cdparam x="953" y="1045" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2164,7 +2164,7 @@ <SUBCOMPONENT type="-1" id="408" > <father id="411" num="0" /> <cdparam x="818" y="1031" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2222,7 +2222,7 @@ <SUBCOMPONENT type="-1" id="420" > <father id="423" num="0" /> <cdparam x="354" y="785" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2241,7 +2241,7 @@ <SUBCOMPONENT type="-1" id="424" > <father id="427" num="0" /> <cdparam x="146" y="818" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2296,7 +2296,7 @@ <SUBCOMPONENT type="-1" id="436" > <father id="439" num="0" /> <cdparam x="474" y="802" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2315,7 +2315,7 @@ <SUBCOMPONENT type="-1" id="440" > <father id="443" num="0" /> <cdparam x="245" y="885" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2334,7 +2334,7 @@ <SUBCOMPONENT type="-1" id="444" > <father id="447" num="0" /> <cdparam x="1059" y="1077" /> -<sizeparam width="8" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="10" height="15" minWidth="10" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="-75" maxX="30" minY="10" maxY="30" /> <infoparam name="value of the delay" value="b" /> @@ -2954,7 +2954,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="622" > <cdparam x="998" y="850" /> -<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="50" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="Final @@ -3016,7 +3016,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="647" > <cdparam x="781" y="950" /> -<sizeparam width="94" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="94" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="Active Open @@ -3044,7 +3044,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="664" > <cdparam x="715" y="907" /> -<sizeparam width="104" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="104" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="Passive Open @@ -3117,7 +3117,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="692" > <cdparam x="884" y="1068" /> -<sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="115" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="send Ack of Fin @@ -3179,7 +3179,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="717" > <cdparam x="1000" y="1094" /> -<sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="115" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="send Ack of Fin @@ -3559,7 +3559,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="813" > <cdparam x="1159" y="1153" /> -<sizeparam width="115" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="115" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="send Ack of Fin @@ -3692,7 +3692,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="854" > <cdparam x="1759" y="1192" /> -<sizeparam width="92" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="92" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="Correct ack @@ -3720,7 +3720,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="871" > <cdparam x="1635" y="1168" /> -<sizeparam width="76" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="76" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="false ack @@ -3771,7 +3771,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="893" > <cdparam x="1469" y="1295" /> -<sizeparam width="137" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="137" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="return acknowldge @@ -3799,7 +3799,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="910" > <cdparam x="1620" y="927" /> -<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="50" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="data @@ -3969,7 +3969,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="961" > <cdparam x="1825" y="889" /> -<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="50" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="Syn @@ -3997,7 +3997,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="978" > <cdparam x="1707" y="945" /> -<sizeparam width="50" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="50" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="ack @@ -4126,7 +4126,7 @@ On prend b=1 comme exemple <COMPONENT type="301" id="1018" > <cdparam x="2283" y="1065" /> -<sizeparam width="121" height="15" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="121" height="20" minWidth="50" minHeight="20" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> <cdrectangleparam minX="10" maxX="2900" minY="10" maxY="1900" /> <infoparam name="UML Note" value="send Ack of SYN @@ -6943,10 +6943,10 @@ the smart card and the terminal </COMPONENT> <SUBCOMPONENT type="1101" id="1606" > <father id="1631" num="0" /> -<cdparam x="49" y="276" /> -<sizeparam width="172" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<cdparam x="56" y="276" /> +<sizeparam width="163" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="-7" minY="0" maxY="86" /> +<cdrectangleparam minX="0" maxX="2" minY="0" maxY="86" /> <infoparam name="TGComponent" value="AppC::InterfaceDevice" /> <TGConnectingPoint num="0" id="1598" /> <TGConnectingPoint num="1" id="1599" /> @@ -6999,9 +6999,9 @@ the smart card and the terminal <SUBCOMPONENT type="1101" id="1640" > <father id="1683" num="0" /> <cdparam x="272" y="94" /> -<sizeparam width="109" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="108" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="163" minY="0" maxY="121" /> +<cdrectangleparam minX="0" maxX="164" minY="0" maxY="121" /> <infoparam name="TGComponent" value="AppC::TCPIP" /> <TGConnectingPoint num="0" id="1632" /> <TGConnectingPoint num="1" id="1633" /> @@ -7018,9 +7018,9 @@ the smart card and the terminal <SUBCOMPONENT type="1101" id="1649" > <father id="1683" num="1" /> <cdparam x="288" y="169" /> -<sizeparam width="144" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="139" height="40" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="128" minY="0" maxY="121" /> +<cdrectangleparam minX="0" maxX="133" minY="0" maxY="121" /> <infoparam name="TGComponent" value="AppC::Application" /> <TGConnectingPoint num="0" id="1641" /> <TGConnectingPoint num="1" id="1642" /> @@ -7037,9 +7037,9 @@ the smart card and the terminal <SUBCOMPONENT type="1101" id="1658" > <father id="1683" num="2" /> <cdparam x="387" y="123" /> -<sizeparam width="141" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> +<sizeparam width="136" height="37" minWidth="75" minHeight="1" maxWidth="2000" maxHeight="2000" minDesiredWidth="0" minDesiredHeight="0" /> <hidden value="false" /> -<cdrectangleparam minX="0" maxX="131" minY="0" maxY="124" /> +<cdrectangleparam minX="0" maxX="136" minY="0" maxY="124" /> <infoparam name="TGComponent" value="AppC::SmartCard" /> <TGConnectingPoint num="0" id="1650" /> <TGConnectingPoint num="1" id="1651" /> diff --git a/src/main/java/ui/window/JDialogCPUNode.java b/src/main/java/ui/window/JDialogCPUNode.java index 69e1be69fd8032442952188938a4f56da0daa04e..ed07ab649788e48498e37303cd381fcf7ec2e0ff 100644 --- a/src/main/java/ui/window/JDialogCPUNode.java +++ b/src/main/java/ui/window/JDialogCPUNode.java @@ -282,11 +282,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(schedulingPolicy, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(1), c2); + addHelpButton(1, panel2, c2); c2.gridwidth = 1; //issue 183 @@ -298,11 +294,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(sliceTime, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(2),c2); + addHelpButton(2, panel2, c2); c2.gridwidth = 1; //issue 183 @@ -315,11 +307,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(nbOfCores, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(3),c2); + addHelpButton(3, panel2, c2); c2.gridwidth = 1; //issue 183 @@ -331,11 +319,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(byteDataSize, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(4),c2); + addHelpButton(4, panel2, c2); c2.gridwidth = 1; //issue 183 @@ -347,11 +331,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(pipelineSize, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(5),c2); + addHelpButton(5, panel2, c2); c2.gridwidth = 1; //issue 183 @@ -363,11 +343,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(taskSwitchingTime, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(6),c2); + addHelpButton(6, panel2, c2); c2.gridwidth = 1; //issue 183 @@ -395,11 +371,8 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(cacheMiss, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(8),c2); + addHelpButton(8, panel2, c2); + c2.gridwidth = 1; //issue 183 @@ -411,11 +384,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(goIdleTime, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(9), c2); + addHelpButton(9, panel2, c2); c2.gridwidth = 1; //issue 183 @@ -427,11 +396,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(maxConsecutiveIdleCycles, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(10), c2); + addHelpButton(10, panel2, c2); c2.gridwidth = 1; //issue 183 @@ -443,11 +408,8 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(execiTime, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(11),c2); + addHelpButton(11, panel2, c2); + c2.gridwidth = 1; //issue 183 @@ -459,11 +421,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(execcTime, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(12),c2); + addHelpButton(12, panel2, c2); c2.gridwidth = 1; //issue 183 @@ -475,11 +433,8 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel2.add(clockRatio, c2); //issue 183 - c2.weighty = 0.5; - c2.weightx = 0.5; - c2.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel2.add(buttons.get(13), c2); + addHelpButton(13, panel2, c2); + // monitored /*c2.gridwidth = 1; @@ -514,11 +469,8 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { encryption.setSelectedIndex(node.getEncryption()); panel4.add(encryption, c4); //issue 183 - c4.weighty = 0.5; - c4.weightx = 0.5; - c4.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel4.add(buttons.get(14),c4); + addHelpButton(14, panel4, c4); + c4.weighty = 1.0; c4.weightx = 1.0; @@ -530,11 +482,7 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { panel4.add(operation, c4); //issue 183 - c4.weighty = 0.5; - c4.weightx = 0.5; - c4.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel4.add(buttons.get(16),c4); + addHelpButton(16, panel4, c4); c4.weighty = 1.0; c4.weightx = 1.0; @@ -552,11 +500,8 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { MECTypeCB.addActionListener(this); panel4.add( MECTypeCB, c4); - c4.weighty = 0.5; - c4.weightx = 0.5; - c4.gridwidth = GridBagConstraints.REMAINDER; - if (buttons != null) - panel4.add(buttons.get(15),c4); + addHelpButton(15, panel4, c4); + TraceManager.addDev("Transactions size=" + transactions.size()); if (transactions.size()!=0) { @@ -726,6 +671,15 @@ public class JDialogCPUNode extends JDialogBase implements ActionListener { return false; } } + + private void addHelpButton(int index, JPanel panel, GridBagConstraints c) { + //issue 183 + c.weighty = 0.5; + c.weightx = 0.5; + c.gridwidth = GridBagConstraints.REMAINDER; + if (buttons != null) + panel.add(buttons.get(index), c); + } class MyFrame extends JPanel implements MouseMotionListener, MouseListener{ Map<Range, String> toolMap = new HashMap<Range, String>(); diff --git a/src/main/resources/help/architecture.html b/src/main/resources/help/architecture.html index f2544af4044fc2f9f1cea52964e25742156c3766..7be937d2fb3327c9e6b9d22a852953ce4861e616 100644 --- a/src/main/resources/help/architecture.html +++ b/src/main/resources/help/architecture.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>architecture</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} diff --git a/src/main/resources/help/avatar.html b/src/main/resources/help/avatar.html index 77432669d8dc7b1e46f9daf9cbed4a5b8764352d..8b6fcb05bd0756047fd6aea1d587c413c5cfebed 100644 --- a/src/main/resources/help/avatar.html +++ b/src/main/resources/help/avatar.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>avatar</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} diff --git a/src/main/resources/help/clockdivider.html b/src/main/resources/help/clockdivider.html index 9968d7cd7ea66feab9dcedafde7bc8528ed5e8d2..fe41d5f24c7cfbd6a07329c10f1d5fe2cbac6af3 100644 --- a/src/main/resources/help/clockdivider.html +++ b/src/main/resources/help/clockdivider.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>clockdivider</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} diff --git a/src/main/resources/help/cpu.html b/src/main/resources/help/cpu.html index 35ab96ea24f60becbe24a06a83bc42608c6f2dd4..819841f9953bd48930d329ef4c903f3874bd77ce 100644 --- a/src/main/resources/help/cpu.html +++ b/src/main/resources/help/cpu.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>cpu</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} diff --git a/src/main/resources/help/diplodocus.html b/src/main/resources/help/diplodocus.html index 9bcb1f8ea928080ebaa9154b640762efa3752144..8d4612e3f612c1b8e687f8bcf89a5e355a0544da 100644 --- a/src/main/resources/help/diplodocus.html +++ b/src/main/resources/help/diplodocus.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>diplodocus</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} diff --git a/src/main/resources/help/general.html b/src/main/resources/help/general.html index 21411ee04a8c4f0527efb6ad6e84eb2324fc3703..7f2c824fd9cd1aef4e98cc810426b3ecc9d5ca4c 100644 --- a/src/main/resources/help/general.html +++ b/src/main/resources/help/general.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>general</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} diff --git a/src/main/resources/help/mapping.html b/src/main/resources/help/mapping.html index f9556702f63afbe474914b3496189b384cff54c0..04d2f00eb8586ee4bc7d2d5ab2263ee3178b806c 100644 --- a/src/main/resources/help/mapping.html +++ b/src/main/resources/help/mapping.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>mapping</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} diff --git a/src/main/resources/help/none.html b/src/main/resources/help/none.html index baecce4f338a2d549ce9d7182a5d132182c841a2..36502980f96c11aa4e8cc80c9907e38528c26f5f 100644 --- a/src/main/resources/help/none.html +++ b/src/main/resources/help/none.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>none</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} diff --git a/src/main/resources/help/operation.html b/src/main/resources/help/operation.html index 9cc7a85a5a553e993d699958bb933b866e189d3a..2e4874e6124dceb19632f81ef3b8eabef3c1f89b 100644 --- a/src/main/resources/help/operation.html +++ b/src/main/resources/help/operation.html @@ -17,6 +17,6 @@ </head> <body> <h2 id="operation">Operation</h2> -<p>Operation …</p> +<p>Operation type of the component. For instance, the operation could be “FFT†or “LDPCâ€</p> </body> </html> diff --git a/src/main/resources/help/operation.md b/src/main/resources/help/operation.md index 1e02b486d7715358da273c7bd8a972b38a8d7fdd..e2114df21b5fbb23bcd34b58727ca30331df0616 100644 --- a/src/main/resources/help/operation.md +++ b/src/main/resources/help/operation.md @@ -1,2 +1,2 @@ ## Operation -Operation ... \ No newline at end of file +Operation type of the component. For instance, the operation could be "FFT" or "LDPC" \ No newline at end of file diff --git a/src/main/resources/help/searchresult.html b/src/main/resources/help/searchresult.html index 471bee0b285916a97a3057215c901cdb8a89d426..da73f3c4d58e989e7afca6ad85c88a013356afe5 100644 --- a/src/main/resources/help/searchresult.html +++ b/src/main/resources/help/searchresult.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>searchresult</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} diff --git a/src/main/resources/help/taskmapping.html b/src/main/resources/help/taskmapping.html index 4be2dd24a66a6119b45ae4303083e5c2ff821992..4108c87d93236d6a7a522f7ffd8851d247b204f5 100644 --- a/src/main/resources/help/taskmapping.html +++ b/src/main/resources/help/taskmapping.html @@ -4,7 +4,7 @@ <meta charset="utf-8" /> <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> - <title>taskmapping</title> + <title>TTool help</title> <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;}