From ff3b7af1c113182291a1385e8b00e34a7247d769 Mon Sep 17 00:00:00 2001
From: dblouin <dominique.blouin@telecom-paristech.fr>
Date: Tue, 24 Jul 2018 23:32:34 +0200
Subject: [PATCH] Code cleanup
---
.../directsimulation/AvatarSimulationBlock.java | 14 +++++++-------
.../modelchecker/SpecificationBlock.java | 2 +-
.../avatartranslator/touppaal/AVATAR2UPPAAL.java | 6 +++---
.../toSoclib/TasksAndMainGenerator.java | 13 ++++++-------
.../java/proverifspec/ProVerifResultTrace.java | 13 ++++++-------
5 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java b/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java
index e0768d667d..c5c5564faf 100644
--- a/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java
+++ b/src/main/java/avatartranslator/directsimulation/AvatarSimulationBlock.java
@@ -547,7 +547,7 @@ public class AvatarSimulationBlock {
public void makeAction(String _action, Vector<String> _attributeValues, Vector<String> _actions) {
String nameOfVar;
String act;
- String nameOfMethod;
+ //String nameOfMethod;
int ind;
AvatarAction action = AvatarTerm.createActionFromString(block, _action);
@@ -568,12 +568,12 @@ public class AvatarSimulationBlock {
}
act = act.substring(0, ind);
- ind = nameOfVar.indexOf("=");
- if (ind != -1) {
- nameOfMethod = nameOfVar.substring(ind + 1, nameOfVar.length());
- } else {
- nameOfMethod = nameOfVar;
- }
+ //ind = nameOfVar.indexOf("=");
+// if (ind != -1) {
+// nameOfMethod = nameOfVar.substring(ind + 1, nameOfVar.length());
+// } else {
+// nameOfMethod = nameOfVar;
+// }
String[] params = act.split(",");
String parameters = "";
diff --git a/src/main/java/avatartranslator/modelchecker/SpecificationBlock.java b/src/main/java/avatartranslator/modelchecker/SpecificationBlock.java
index e0c612d927..517040496f 100644
--- a/src/main/java/avatartranslator/modelchecker/SpecificationBlock.java
+++ b/src/main/java/avatartranslator/modelchecker/SpecificationBlock.java
@@ -70,7 +70,7 @@ public class SpecificationBlock {
}
public int getHash() {
- return Arrays.hashCode(values);
+ return Arrays.hashCode(values);
}
public void init(AvatarBlock _block, boolean _ignoreEmptyTransitions) {
diff --git a/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java b/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java
index eece4d11c7..2f30039703 100755
--- a/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java
+++ b/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java
@@ -84,9 +84,9 @@ public class AVATAR2UPPAAL {
private List<String> unoptStates;
private int nbOfIntParameters, nbOfBooleanParameters;
- private Hashtable <AvatarStateMachineElement, UPPAALLocation> hash;
- private Hashtable <AvatarStateMachineElement, UPPAALLocation> hashChecking;
- private Hashtable <String, String> translateString;
+ private Map<AvatarStateMachineElement, UPPAALLocation> hash;
+ private Map<AvatarStateMachineElement, UPPAALLocation> hashChecking;
+ private Map<String, String> translateString;
public final static int STEP_X = 5;
public final static int STEP_Y = 70;
public final static int STEP_LOOP_X = 150;
diff --git a/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java b/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
index 571c021e0b..d1a5a5c5ee 100755
--- a/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
+++ b/src/main/java/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
@@ -126,8 +126,7 @@ public class TasksAndMainGenerator {
}
public void saveInFiles(String path) throws FileException {
-
- System.err.println("ok");
+ System.err.println("ok");
TraceManager.addDev("Generating files");
if (mainFile != null) {
@@ -137,8 +136,8 @@ public class TasksAndMainGenerator {
}
for(TaskFileSoclib taskFile: taskFiles) {
- FileUtils.saveFile(path + GENERATED_PATH + taskFile.getName() + ".h", Conversion.indentString(taskFile.getFullHeaderCode/*Soclib*/(), 2));
- FileUtils.saveFile(path + GENERATED_PATH + taskFile.getName() + ".c", Conversion.indentString(taskFile.getMainCode(), 2));
+ FileUtils.saveFile(path + GENERATED_PATH + taskFile.getName() + ".h", Conversion.indentString(taskFile.getFullHeaderCode/*Soclib*/(), 2));
+ FileUtils.saveFile(path + GENERATED_PATH + taskFile.getName() + ".c", Conversion.indentString(taskFile.getMainCode(), 2));
}
// Standard Makefile
@@ -176,11 +175,11 @@ public class TasksAndMainGenerator {
makeMainMutex();
- makeSynchronousChannels();
+ makeSynchronousChannels();
makeAsynchronousChannels();
- makeThreadsInMain(debug);
+ makeThreadsInMain(debug);
}
public void makeMainMutex() {
@@ -216,7 +215,7 @@ public class TasksAndMainGenerator {
mainFile.appendToMainCode("pthread_attr_t *attr_t = malloc(sizeof(pthread_attr_t));" +CR);
mainFile.appendToMainCode("pthread_attr_init(attr_t);" + CR );
mainFile.appendToMainCode("pthread_mutex_init(&__mainMutex, NULL);" +CR2);
- mainFile.appendToMainCode("int sizeParams;" +CR2); //DG 13.06.
+ mainFile.appendToMainCode("int sizeParams;" +CR2); //DG 13.06.
}
public void makeSynchronousChannels() {
diff --git a/src/main/java/proverifspec/ProVerifResultTrace.java b/src/main/java/proverifspec/ProVerifResultTrace.java
index 65d43fcb0f..1dbf4c6c64 100644
--- a/src/main/java/proverifspec/ProVerifResultTrace.java
+++ b/src/main/java/proverifspec/ProVerifResultTrace.java
@@ -36,9 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package proverifspec;
import avatartranslator.toproverif.AVATAR2ProVerif;
@@ -51,6 +48,8 @@ import java.io.BufferedWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -66,10 +65,10 @@ public class ProVerifResultTrace {
private static Pattern blockNamePattern;
private static Pattern attrPattern;
- private LinkedList<ProVerifResultTraceStep> trace;
+ private List<ProVerifResultTraceStep> trace;
private StringBuilder buffer;
- private LinkedList<String> proverifProcess;
- private HashMap<String, Integer> attackerNamesMap;
+ private List<String> proverifProcess;
+ private Map<String, Integer> attackerNamesMap;
static
@@ -200,7 +199,7 @@ public class ProVerifResultTrace {
this.buffer = null;
}
- public LinkedList<ProVerifResultTraceStep> getTrace()
+ public List<ProVerifResultTraceStep> getTrace()
{
return this.trace;
}
--
GitLab