diff --git a/bin/config.xml b/bin/config.xml
index e1ffd713004571e2c2e1433065e8631ba8d8ef28..bd18ddb8867412f0104ee87447c1a92a2c954c3c 100755
--- a/bin/config.xml
+++ b/bin/config.xml
@@ -6,7 +6,7 @@
<DTA2DOTPath data="/packages/RT-LOTOS.0.12/bin/dta2dot" />
<RG2TLSAPath data="/packages/RT-LOTOS.0.12/bin/rg2tlsa" />
<RGSTRAPPath data="/packages/RT-LOTOS.0.12/bin/rgstrap" />
-<DOTTYPath data="//opt/csw/bin/dotty" />
+<DOTTYPath data="/opt/csw/bin/dotty" />
<DOTTYHost data="localhost" />
<AldebaranHost data="localhost" />
<AldebaranPath data="/packages/cadp/com/aldebaran" />
@@ -16,57 +16,58 @@
<BcgmergePath data="/packages/cadp/com/bcg_merge" />
<CaesarPath data="/packages/cadp/bin.iX86/caesar" />
<CaesarOpenPath data="/packages/cadp/com/caesar.open" />
-<FILEPath data="/users/enseig/genius/TURTLE/modeling" />
-<LIBPath data="/users/enseig/genius/TURTLE/lib" />
-<IMGPath data="/users/enseig/genius/TURTLE/figure" />
-<LOTOSPath data="/users/enseig/genius/TURTLE/lotos" />
-<GGraphPath data="/users/enseig/genius/TURTLE/graphs" />
-<TGraphPath data="/users/enseig/genius/TURTLE/graphs" />
+<FILEPath data="/home/andream/TURTLE/modeling" />
+<LIBPath data="/home/andream/TURTLE/lib" />
+<IMGPath data="/home/andream/TURTLE/figure" />
+<LOTOSPath data="/home/andream/TURTLE/lotos" />
+<GGraphPath data="/home/andream/TURTLE/graphs" />
+<TGraphPath data="/home/andream/TURTLE/graphs" />
<TToolUpdateURL data="" data1="http://labsoc.comelec.enst.fr/turtle/ttoolversion.html" />
<TToolUpdateProxy data="false" />
<TToolUpdateProxyPort data="8080" />
<TToolUpdateProxyHost data="To Be Completed" />
-<JavaCodeDirectory data="/users/enseig/genius/TURTLE/javacode" />
+<JavaCodeDirectory data="/home/andream/TURTLE/javacode" />
<JavaCompilerPath data="/usr/bin/javac" />
-<TToolClassPath data="/users/enseig/genius/TURTLE/javacode" />
+<TToolClassPath data="/home/andream/TURTLE/javacode" />
<JavaExecutePath data="/usr/bin/java" />
<JavaHeader data="import java.sql.*;" />
-<SystemCCodeDirectory data="/users/enseig/genius/TURTLE/simulators/c++2/" />
+<SystemCCodeDirectory data="/home/andream/TURTLE/simulators/c++2/" />
<SystemCHost data="localhost"/>
-<SystemCCodeCompileCommand data="make -C /users/enseig/genius/TURTLE/simulators/c++2/" />
-<SystemCCodeExecuteCommand data="/users/enseig/genius/TURTLE/simulators/c++2/run.x -ovcd /users/enseig/genius/TURTLE/simulators/c++2/vcddump.vcd" />
-<SystemCCodeInteractiveExecuteCommand data="/users/enseig/genius/TURTLE/simulators/c++2/run.x -server" />
-<TMLCodeDirectory data="/users/enseig/genius/TURTLE/tmlcode" />
+<SystemCCodeCompileCommand data="make -C /home/andream/TURTLE/simulators/c++2/" />
+<SystemCCodeExecuteCommand data="/home/andream/TURTLE/simulators/c++2/run.x -ovcd /home/andream/TURTLE/simulators/c++2/vcddump.vcd" />
+<SystemCCodeInteractiveExecuteCommand data="/home/andream/TURTLE/simulators/c++2/run.x -server" />
+<TMLCodeDirectory data="/home/andream/TURTLE/tmlcode" />
+<CCodeDirectory data="/home/andream/TURTLE/Ccode" />
<GTKWavePath data="/opt/local/bin/gtkwave" />
-<VCDPath data="/users/enseig/genius/TURTLE/vcd/" />
-<UPPAALCodeDirectory data="/users/enseig/genius/TURTLE/uppaal/" />
+<VCDPath data="/home/andream/TURTLE/vcd/" />
+<UPPAALCodeDirectory data="/home/andream/TURTLE/uppaal/" />
<UPPAALVerifierPath data="/packages/uppaal-4.0.11/verifyta" />
<UPPAALVerifierHost data="localhost" />
-<ProVerifCodeDirectory data="/users/enseig/genius/TURTLE/proverif/" />
+<ProVerifCodeDirectory data="/home/andream/TURTLE/proverif/" />
<ProVerifVerifierPath data="/packages/proverif/proverif" />
<ProVerifVerifierHost data="localhost" />
-<AVATARExecutableCodeDirectory data="/users/enseig/genius/TURTLE/executablecode/" />
-<AVATARMPSoCCodeDirectory data="/users/enseig/genius/TURTLE/MPSoC/" />
-<AVATARMPSoCCompileCommand data="make -C /users/enseig/genius/TURTLE/MPSoC updategeneratedcode compilesoclib" />
+<AVATARExecutableCodeDirectory data="/home/andream/TURTLE/executablecode/" />
+<AVATARMPSoCCodeDirectory data="/home/andream/TURTLE/MPSoC/" />
+<AVATARMPSoCCompileCommand data="make -C /home/andream/TURTLE/MPSoC updategeneratedcode compilesoclib" />
<AVATARExecutableCodeHost data="localhost"/>
-<AVATARExecutableCodeCompileCommand data="make -C /users/enseig/genius/TURTLE/executablecode" />
-<AVATARExecutableCodeExecuteCommand data="/users/enseig/genius/TURTLE/executablecode/run.x" />
-<AVATARExecutableSoclibCodeCompileCommand data="make -C /users/enseig/genius/TURTLE/MPSoC updategeneratedcode compilesoclib" />
-<AVATARExecutableSoclibCodeExecuteCommand data="make -C /users/enseig/genius/TURTLE/MPSoC runsoclib" />
-<AVATARExecutableSoclibCodeTraceCommand data="make -C /users/enseig/genius/TURTLE/MPSoC runsoclib-trace" />
-<AVATARExecutableSoclibTraceFile data="/users/enseig/genius/Prog/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/trace" />
+<AVATARExecutableCodeCompileCommand data="make -C /home/andream/TURTLE/executablecode" />
+<AVATARExecutableCodeExecuteCommand data="/home/andream/TURTLE/executablecode/run.x" />
+<AVATARExecutableSoclibCodeCompileCommand data="make -C /home/andream/TURTLE/MPSoC updategeneratedcode compilesoclib" />
+<AVATARExecutableSoclibCodeExecuteCommand data="make -C /home/andream/TURTLE/MPSoC runsoclib" />
+<AVATARExecutableSoclibCodeTraceCommand data="make -C /home/andream/TURTLE/MPSoC runsoclib-trace" />
+<AVATARExecutableSoclibTraceFile data="/home/andream/TURTLE/Prog/soclib/soclib/platform/topcells/caba-vgmn-mutekh_kernel_tutorial/trace" />
<ExternalCommand1Host data="localhost"/>
-<ExternalCommand1 data="/opt/local/bin/gtkwave /users/enseig/genius/TURTLE/simulators/c++2/vcddump.vcd"/>
+<ExternalCommand1 data="/opt/local/bin/gtkwave /home/andream/TURTLE/simulators/c++2/vcddump.vcd"/>
<ExternalCommand2Host data="localhost"/>
-<ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal /users/enseig/genius/TURTLE/uppaal/spec.xml"/>
+<ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal /home/andream/TURTLE/uppaal/spec.xml"/>
-<LastOpenFile data="/users/enseig/genius/TURTLE/modeling/MicroWaveOven_SimpleSynchronousDeploy2CPU2RAM.xml"/>
+<LastOpenFile data="/home/andream/TURTLE/papers/papersAndreaENRICI/Zigbee/models/ZigBeeDEMO.xml"/>
-<LastWindowAttributes x="1097" y="89" width="1075" height="848" max="false" />
+<LastWindowAttributes x="65" y="24" width="1301" height="744" max="true" />
<ProVerifHash data=""/>
diff --git a/src/tmltranslator/HwLink.java b/src/tmltranslator/HwLink.java
index 7414693281ed243adb2c7f1e9d932175e9b4d11c..25acc8ccdcd161bb891cc9ccd53d77870101b50c 100755
--- a/src/tmltranslator/HwLink.java
+++ b/src/tmltranslator/HwLink.java
@@ -78,4 +78,4 @@ public class HwLink implements Comparable<HwLink> {
return 0;
}
-}
\ No newline at end of file
+}
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index b6cf8d23df4da3639791af552f59778ea2003542..f5d5fbe515553f5702c48737c620b394af53bfeb 100755
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -4167,19 +4167,23 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
public void generateUPPAAL(boolean showWindow) {
- //TraceManager.addDev("Generate UPPAAL!");
+ TraceManager.addDev("Generate UPPAAL!");
//gtm.mergeChoices(true);
if (gtm.getTURTLEModelingState() > 0) {
+ TraceManager.addDev("4173");
if (gtm.getTURTLEModelingState() == 3) {
//AVATAR
boolean result = gtm.generateUPPAALFromAVATAR(ConfigurationTTool.UPPAALCodeDirectory);
+ TraceManager.addDev("4177");
if (showWindow) {
+ TraceManager.addDev("4178");
if (result) {
JOptionPane.showMessageDialog(frame,
"0 error, " + getCheckingWarnings().size() + " warning(s). UPPAAL specification generated",
"Successful translation to UPPAAL",
JOptionPane.INFORMATION_MESSAGE);
- } else {
+ }
+ else {
JOptionPane.showMessageDialog(frame,
"" + getCheckingErrors().size() + " errors, " +getCheckingWarnings().size() + " warning(s). UPPAAL specification could NOT be generated",
"Translation to UPPAAL failed",
@@ -4188,13 +4192,17 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
}
+ TraceManager.addDev("4196");
if (!result) {
return;
}
- } else {
+ }
+ else {
if (generateTURTLEModelingFromState(gtm.getTURTLEModelingState(), false, UPPAAL) == -1) {
+ TraceManager.addDev("4202");
return;
}
+ TraceManager.addDev( "About to open the window at line 4198" );
if (showWindow) {
JDialogUPPAALGeneration jgen = new JDialogUPPAALGeneration(frame, this, "UPPAAL code generation", ConfigurationTTool.UPPAALCodeDirectory, JDialogUPPAALGeneration.DIPLODOCUS_MODE);
jgen.setSize(450, 500);
@@ -4206,6 +4214,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
}
}
+ TraceManager.addDev( "gtm.getTURTLEModelingState() <= 0)" );
//TraceManager.addDev("After UPPAAL");
if (showWindow) {
JDialogUPPAALGeneration jgen = new JDialogUPPAALGeneration(frame, this, "UPPAAL code generation", ConfigurationTTool.UPPAALCodeDirectory, JDialogUPPAALGeneration.TURTLE_MODE);
@@ -8964,7 +8973,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
newTMLMethodo = createMenuItem("New DIPLODOCUS Methodology");
newTMLDesign = createMenuItem("New Partitioning - Design");
- newTMLComponentDesign = createMenuItem("New Partitioning - functional view");
+ newTMLComponentDesign = createMenuItem("New Partitioning - Functional view");
newTMLArchi = createMenuItem("New Partitioning - Architecture and Mapping");
newTMLCP = createMenuItem("New Partitioning - Communication Pattern");
newProactiveDesign = createMenuItem("New Proactive Design");
diff --git a/src/ui/TGUIAction.java b/src/ui/TGUIAction.java
index b2af1100603e91952412014319a35deb073e42e2..9d51c094b013eaa6b12b4c731951310cd700d77b 100755
--- a/src/ui/TGUIAction.java
+++ b/src/ui/TGUIAction.java
@@ -969,7 +969,7 @@ public class TGUIAction extends AbstractAction {
actions[TMLCP_EDIT] = new TAction("edit-tmlcp-diagram", "Edit communication pattern diagram", IconManager.imgic100, IconManager.imgic101, "Edit communication pattern diagram", "Make it possible to edit the currently opened communication pattern diagram", 0);
actions[TMLCP_CONNECTOR] = new TAction("add-tmlcp-connector", "Add CP Connector", IconManager.imgic202, IconManager.imgic202, "Connector", "Add a Connector between two components of the currently opened communication pattern diagram", 0);
actions[TMLCP_REF_SD] = new TAction("add-ref-sd-tmlcp", "Add reference to a SD", IconManager.imgic400, IconManager.imgic400, "Reference to a SD", "Add a reference to a sequence diagram in the the currently opened communication pattern diagram", 0);
- actions[TMLCP_REF_CP] = new TAction("add-ref-cp-tmlcp", "Add reference to a CP", IconManager.imgic400, IconManager.imgic400, "Reference to a CP", "Add a reference to a communication pattern diagram in the currently opened communication pattern diagram", 0);
+ actions[TMLCP_REF_CP] = new TAction("add-ref-cp-tmlcp", "Add reference to a CP", IconManager.imgic400, IconManager.imgic400, "Reference to an AD", "Add a reference to a communication pattern diagram in the currently opened communication pattern diagram", 0);
actions[TMLCP_FORK] = new TAction("add-tmlcp-fork", "Add fork", IconManager.imgic206, IconManager.imgic206, "Fork", "Add a fork to the currently opened communication pattern diagram", 0);
actions[TMLCP_JOIN] = new TAction("add-tmlcp-join", "Add join", IconManager.imgic206, IconManager.imgic206, "Join", "Add a join to the currently opened communication pattern diagram", 0);
actions[TMLCP_CHOICE] = new TAction("add-tmlcp-choice", "Add Choice", IconManager.imgic208, IconManager.imgic208, "Choice", "Add a choice - non-deterministic or guarded - to the currently opened communication pattern diagram", 0);
@@ -978,8 +978,8 @@ public class TGUIAction extends AbstractAction {
actions[TMLCP_JUNCTION] = new TAction("add-tmlcp-junction", "Add Junction", IconManager.imgic212, IconManager.imgic212, "Junction", "Add a junction with three inputs to the currently opened communication pattern diagram", 0);
actions[TMLCP_FOR_LOOP] = new TAction("add-tmlcp-forloop", "Add loop", IconManager.imgic912, IconManager.imgic912, "Loop", "Add a for loop to the currently opened communication pattern diagram", 0);
- actions[TMLSD_EDIT] = new TAction("edit-tmlsd-diagram", "Edit CP-SD diagram", IconManager.imgic100, IconManager.imgic101, "Edit The sequence diagram of communication patterns", "Make it possible to edit the currently opened communication pattern sequence diagram", 0);
- actions[TMLSD_MESSAGE_ASYNC] = new TAction("add-tmlsd-messageasync", "Add async msg", IconManager.imgic202, IconManager.imgic202, "Asynchronous msg", "Add an asynchronous message between two components of the currently opened communication pattern sequence diagram", 0);
+ actions[TMLSD_EDIT] = new TAction("edit-tmlsd-diagram", "Edit CP-SD diagram", IconManager.imgic100, IconManager.imgic101, "Edit the Sequence Diagram", "Make it possible to edit the currently opened communication pattern sequence diagram", 0);
+ actions[TMLSD_MESSAGE_ASYNC] = new TAction("add-tmlsd-messageasync", "Add async msg", IconManager.imgic202, IconManager.imgic202, "Asynchronous message", "Add an asynchronous message between two components of the currently opened communication pattern sequence diagram", 0);
actions[TMLSD_STORAGE_INSTANCE] = new TAction("add-storage-instance-tmlsd", "Storage instance", IconManager.imgic500, IconManager.imgic500, "Storage instance", "Add a storage instance to the currently opened communication pattern sequence diagram", 0);
actions[TMLSD_TRANSFER_INSTANCE] = new TAction("add-transfer-instance-tmlsd", "Transfer instance", IconManager.imgic500, IconManager.imgic500, "Transfer instance", "Add a transfer instance to the currently opened communication pattern sequence diagram", 0);
actions[TMLSD_CONTROLLER_INSTANCE] = new TAction("add-controller-instance-tmlsd", "Controller instance", IconManager.imgic500, IconManager.imgic500, "Controller instance", "Add a controller instance to the currently opened communication pattern sequence diagram", 0);
diff --git a/src/ui/iod/IODRefSD.java b/src/ui/iod/IODRefSD.java
index 28d853ee2bc6e9a2e394c094d86ea94c07b1c909..f213ced949796309f9cdb43c9813053b2d1a4ed9 100755
--- a/src/ui/iod/IODRefSD.java
+++ b/src/ui/iod/IODRefSD.java
@@ -140,7 +140,7 @@ public class IODRefSD extends TGCOneLineText {
if (b) {
isSDCreated = new JMenuItem("Open diagram");
} else {
- isSDCreated = new JMenuItem("Create sequence diagram");
+ isSDCreated = new JMenuItem("Create Sequence Diagram");
}
isSDCreated.addActionListener(menuAL);
diff --git a/src/ui/tmlcp/TMLCPRefAD.java b/src/ui/tmlcp/TMLCPRefAD.java
index d2256aa03345ddd5fb78427aece1487991e0bcef..490bee270cc60baf4eb9420f6d6cd094a4cd2d50 100755
--- a/src/ui/tmlcp/TMLCPRefAD.java
+++ b/src/ui/tmlcp/TMLCPRefAD.java
@@ -79,7 +79,7 @@ public class TMLCPRefAD extends TGCOneLineText {
editable = true;
removable = true;
- value = "Reference to a CP";
+ value = "Reference to an AD";
name = "ActivityDiagram";
myImageIcon = IconManager.imgic400;
@@ -146,7 +146,7 @@ public class TMLCPRefAD extends TGCOneLineText {
isCPCreated = new JMenuItem("Open diagram");
}
else {
- isCPCreated = new JMenuItem("Create communication pattern");
+ isCPCreated = new JMenuItem("Create Activity Diagram");
}
isCPCreated.addActionListener( menuAL );
diff --git a/src/ui/tmlcp/TMLCPRefSD.java b/src/ui/tmlcp/TMLCPRefSD.java
index b633e2b7da197cc1d351858b7089f73858dbde72..0f0308677b5b5a046571a09d6b916a7a532f451a 100755
--- a/src/ui/tmlcp/TMLCPRefSD.java
+++ b/src/ui/tmlcp/TMLCPRefSD.java
@@ -146,7 +146,7 @@ public class TMLCPRefSD extends TGCOneLineText {
isSDCreated = new JMenuItem("Open diagram");
}
else {
- isSDCreated = new JMenuItem( "Create sequence diagram" );
+ isSDCreated = new JMenuItem( "Create Sequence Diagram" );
}
isSDCreated.addActionListener( menuAL );
diff --git a/src/ui/tmldd/TMLArchiBUSNode.java b/src/ui/tmldd/TMLArchiBUSNode.java
index b6c933137df4b8df077e771ee6500ec46beca331..dd078e7be45eec27814ece8037d619d3516abb16 100755
--- a/src/ui/tmldd/TMLArchiBUSNode.java
+++ b/src/ui/tmldd/TMLArchiBUSNode.java
@@ -290,11 +290,11 @@ public class TMLArchiBUSNode extends TMLArchiCommunicationNode implements Swallo
if (clockRatio <= 0) {
clockRatio = tmp;
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
} catch (Exception e) {
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
}
@@ -410,7 +410,7 @@ public class TMLArchiBUSNode extends TMLArchiCommunicationNode implements Swallo
attr += "Arbitration policy = priority based\n";
}
attr += "Slice time (in microseconds) = " + sliceTime + "\n";
- attr += "Clock diviser = " + clockRatio + "\n";
+ attr += "Clock divider = " + clockRatio + "\n";
return attr;
}
diff --git a/src/ui/tmldd/TMLArchiBridgeNode.java b/src/ui/tmldd/TMLArchiBridgeNode.java
index 7dd06a06dc2ed03e47aa5a883a31982ba66af3e7..6021f0752f4faa4451434fa93e0506d64e98299e 100755
--- a/src/ui/tmldd/TMLArchiBridgeNode.java
+++ b/src/ui/tmldd/TMLArchiBridgeNode.java
@@ -215,11 +215,11 @@ public class TMLArchiBridgeNode extends TMLArchiCommunicationNode implements Swa
if (clockRatio <= 0) {
clockRatio = tmp;
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
} catch (Exception e) {
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
}
@@ -306,7 +306,7 @@ public class TMLArchiBridgeNode extends TMLArchiCommunicationNode implements Swa
public String getAttributes() {
String attr = "";
attr += "Buffer size (in byte) = " + bufferByteDataSize + "\n";
- attr += "Clock diviser = " + clockRatio + "\n";
+ attr += "Clock divider = " + clockRatio + "\n";
return attr;
}
diff --git a/src/ui/tmldd/TMLArchiCPUNode.java b/src/ui/tmldd/TMLArchiCPUNode.java
index 5dac587ed297fc0612dea3307cf709251ce75c47..3ce37425f986c21845a675d128d9e78be1ec218c 100755
--- a/src/ui/tmldd/TMLArchiCPUNode.java
+++ b/src/ui/tmldd/TMLArchiCPUNode.java
@@ -391,11 +391,11 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
if (clockRatio < 1) {
clockRatio = tmp;
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
} catch (Exception e) {
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
}
encryption = dialog.getEncryption();
@@ -638,7 +638,7 @@ public class TMLArchiCPUNode extends TMLArchiNode implements SwallowTGComponent,
attr += "EXECC exec. time (in cycle) = " + execcTime + "\n";
attr += "Branch. pred. misrate (in %) = " + branchingPredictionPenalty + "\n";
attr += "Cache miss (in %) = " + cacheMiss + "\n";
- attr += "Clock diviser = " + clockRatio + "\n";
+ attr += "Clock divider = " + clockRatio + "\n";
attr += "MECType = " + MECType.getIndex() + "\n";
attr += "encryption = " + encryption+ "\n";
return attr;
diff --git a/src/ui/tmldd/TMLArchiDMANode.java b/src/ui/tmldd/TMLArchiDMANode.java
index f7047c81005c5939c7cc6bc3a9670740348fddba..cfd3a74fb95917d5b8f8f16308fd66f68c0016ee 100755
--- a/src/ui/tmldd/TMLArchiDMANode.java
+++ b/src/ui/tmldd/TMLArchiDMANode.java
@@ -234,11 +234,11 @@ public class TMLArchiDMANode extends TMLArchiCommunicationNode implements Swallo
if (clockRatio <= 0) {
clockRatio = tmp;
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
} catch (Exception e) {
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
}
@@ -330,7 +330,7 @@ public class TMLArchiDMANode extends TMLArchiCommunicationNode implements Swallo
String attr = "";
attr += "Data size (in byte) = " + byteDataSize + "\n";
attr += "Nb of channels = " + nbOfChannels + "\n";
- attr += "Clock diviser = " + clockRatio + "\n";
+ attr += "Clock divider = " + clockRatio + "\n";
return attr;
}
diff --git a/src/ui/tmldd/TMLArchiHWANode.java b/src/ui/tmldd/TMLArchiHWANode.java
index 3d9a7efd0387631b43352f827986991cff1b319f..e8288c8a8de54413c4b9128fa8866a160ce5e756 100755
--- a/src/ui/tmldd/TMLArchiHWANode.java
+++ b/src/ui/tmldd/TMLArchiHWANode.java
@@ -234,11 +234,11 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
if (clockRatio <= 0) {
clockRatio = tmp;
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
} catch (Exception e) {
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
}
@@ -379,7 +379,7 @@ public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent,
String attr = "";
attr += "Data size (in byte) = " + byteDataSize + "\n";
attr += "Execi execution time (in cycle) = " + execiTime + "\n";
- attr += "Clock diviser = " + clockRatio + "\n";
+ attr += "Clock divider = " + clockRatio + "\n";
return attr;
}
diff --git a/src/ui/tmldd/TMLArchiMemoryNode.java b/src/ui/tmldd/TMLArchiMemoryNode.java
index 84b72616879dac6bb5b73841a008f21aac036829..dd8baf33f12c368f9fe5b5d39505ed096251c9e3 100755
--- a/src/ui/tmldd/TMLArchiMemoryNode.java
+++ b/src/ui/tmldd/TMLArchiMemoryNode.java
@@ -230,11 +230,11 @@ public class TMLArchiMemoryNode extends TMLArchiCommunicationNode implements Swa
if (clockRatio <= 0) {
clockRatio = tmp;
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
} catch (Exception e) {
error = true;
- errors += "Clock diviser ";
+ errors += "Clock divider ";
}
}
@@ -339,7 +339,7 @@ public class TMLArchiMemoryNode extends TMLArchiCommunicationNode implements Swa
public String getAttributes() {
String attr = "";
attr += "Data size (in byte) = " + byteDataSize + "\n";
- attr += "Clock diviser = " + clockRatio + "\n";
+ attr += "Clock divider = " + clockRatio + "\n";
return attr;
}
diff --git a/src/ui/window/JDialogBUSNode.java b/src/ui/window/JDialogBUSNode.java
index 9467905b23f6e43f528b0ad9d33e24c0bc782734..b50cff438fd82991ec6ee999d949bb3dbb414368 100755
--- a/src/ui/window/JDialogBUSNode.java
+++ b/src/ui/window/JDialogBUSNode.java
@@ -160,7 +160,7 @@ public class JDialogBUSNode extends javax.swing.JDialog implements ActionListene
panel2.add(sliceTime, c2);
c2.gridwidth = 1;
- panel2.add(new JLabel("Clock diviser:"), c2);
+ panel2.add(new JLabel("Clock divider:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
clockRatio = new JTextField(""+node.getClockRatio(), 15);
panel2.add(clockRatio, c2);
diff --git a/src/ui/window/JDialogBridgeNode.java b/src/ui/window/JDialogBridgeNode.java
index 6b0d255d96110f188af0e077c757a113531ed4e8..e8309cac608106c9144c8f417b3892d44b7b5245 100755
--- a/src/ui/window/JDialogBridgeNode.java
+++ b/src/ui/window/JDialogBridgeNode.java
@@ -134,7 +134,7 @@ public class JDialogBridgeNode extends javax.swing.JDialog implements ActionList
panel2.add(bufferByteDataSize, c2);
c2.gridwidth = 1;
- panel2.add(new JLabel("Clock diviser:"), c2);
+ panel2.add(new JLabel("Clock divider:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
clockRatio = new JTextField(""+node.getClockRatio(), 15);
panel2.add(clockRatio, c2);
diff --git a/src/ui/window/JDialogCPUNode.java b/src/ui/window/JDialogCPUNode.java
index b5cbfa449eff923f241b8927bb5a8afaf120fc55..eb15310c66154c22258890e8571521547046b93e 100755
--- a/src/ui/window/JDialogCPUNode.java
+++ b/src/ui/window/JDialogCPUNode.java
@@ -216,7 +216,7 @@ public class JDialogCPUNode extends javax.swing.JDialog implements ActionListene
panel2.add(execcTime, c2);
c2.gridwidth = 1;
- panel2.add(new JLabel("Clock diviser:"), c2);
+ panel2.add(new JLabel("Clock divider:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
clockRatio = new JTextField(""+node.getClockRatio(), 15);
panel2.add(clockRatio, c2);
diff --git a/src/ui/window/JDialogDMANode.java b/src/ui/window/JDialogDMANode.java
index dfa5bf8d6d05e9912a7de3af314ef05f4290379d..7fcd842d3409478d66b3239f14c60202a6e12bc3 100644
--- a/src/ui/window/JDialogDMANode.java
+++ b/src/ui/window/JDialogDMANode.java
@@ -141,7 +141,7 @@ public class JDialogDMANode extends javax.swing.JDialog implements ActionListene
panel2.add(nbOfChannels, c2);
c2.gridwidth = 1;
- panel2.add(new JLabel("Clock diviser:"), c2);
+ panel2.add(new JLabel("Clock divider:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
clockRatio = new JTextField(""+node.getClockRatio(), 15);
panel2.add(clockRatio, c2);
diff --git a/src/ui/window/JDialogHwANode.java b/src/ui/window/JDialogHwANode.java
index 2d87ec667e7fee79ec995ae9ed667aa2f33f93d6..91a8a4505e2be290d9609351ef9a0ca02625ad47 100755
--- a/src/ui/window/JDialogHwANode.java
+++ b/src/ui/window/JDialogHwANode.java
@@ -141,7 +141,7 @@ public class JDialogHwANode extends javax.swing.JDialog implements ActionListene
panel2.add(execiTime, c2);
c2.gridwidth = 1;
- panel2.add(new JLabel("Clock diviser:"), c2);
+ panel2.add(new JLabel("Clock divider:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
clockRatio = new JTextField(""+node.getClockRatio(), 15);
panel2.add(clockRatio, c2);
diff --git a/src/ui/window/JDialogMemoryNode.java b/src/ui/window/JDialogMemoryNode.java
index f79e4eebdc08921b384c10c69b2c68c9fed83821..4e0b783f48e3b8fa490cfea8a2323f0007cbb0c0 100755
--- a/src/ui/window/JDialogMemoryNode.java
+++ b/src/ui/window/JDialogMemoryNode.java
@@ -165,7 +165,7 @@ public class JDialogMemoryNode extends javax.swing.JDialog implements ActionList
panel2.add(monitored, c2);
c2.gridwidth = 1;
- panel2.add(new JLabel("Clock diviser:"), c2);
+ panel2.add(new JLabel("Clock divider:"), c2);
c2.gridwidth = GridBagConstraints.REMAINDER; //end row
clockRatio = new JTextField(""+node.getClockRatio(), 15);
panel2.add(clockRatio, c2);