diff --git a/src/main/java/avatartranslator/AvatarAction.java b/src/main/java/avatartranslator/AvatarAction.java
index 1ecfd5e3b42f7a99db2f9262661260eed95d4aa2..b0c957a25fd134201ce4ef2d4fe9314af0e92575 100644
--- a/src/main/java/avatartranslator/AvatarAction.java
+++ b/src/main/java/avatartranslator/AvatarAction.java
@@ -36,12 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
* Class AvatarAction
@@ -75,5 +72,5 @@ public interface AvatarAction {
* @param attributesMapping
* The mapping used to replace the attributes of the action. All the attributes of the block should be present as keys.
*/
- void replaceAttributes(HashMap<AvatarAttribute, AvatarAttribute> attributesMapping);
+ void replaceAttributes(Map<AvatarAttribute, AvatarAttribute> attributesMapping);
}
diff --git a/src/main/java/avatartranslator/AvatarActionAssignment.java b/src/main/java/avatartranslator/AvatarActionAssignment.java
index 0fb0455ef78bb0edec33fe2695947b3cb5c85652..d758d35991a90fe54ccc55e8e696edddc7254921 100644
--- a/src/main/java/avatartranslator/AvatarActionAssignment.java
+++ b/src/main/java/avatartranslator/AvatarActionAssignment.java
@@ -36,13 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
* Class AvatarActionAssignment
@@ -99,7 +95,7 @@ public class AvatarActionAssignment implements AvatarAction {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
if (this.leftHand instanceof AvatarAttribute)
this.leftHand = attributesMapping.get (this.leftHand);
else
diff --git a/src/main/java/avatartranslator/AvatarArithmeticOp.java b/src/main/java/avatartranslator/AvatarArithmeticOp.java
index 029d0856cebb5b648b1838221d6f6df6bf8da825..c439b3ceda8b6cb601c4344f6d5b36a66480db1b 100644
--- a/src/main/java/avatartranslator/AvatarArithmeticOp.java
+++ b/src/main/java/avatartranslator/AvatarArithmeticOp.java
@@ -36,12 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
* Class AvatarArithmeticOp
@@ -114,7 +111,7 @@ public class AvatarArithmeticOp extends AvatarTerm {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
if (this.term1 instanceof AvatarAttribute)
this.term1 = attributesMapping.get (this.term1);
else
diff --git a/src/main/java/avatartranslator/AvatarAttribute.java b/src/main/java/avatartranslator/AvatarAttribute.java
index 1701e29ad4eee2d71ce697f516a7f1d416ac152a..775a1f8e68958f117e78519f69220a60498b0ef5 100644
--- a/src/main/java/avatartranslator/AvatarAttribute.java
+++ b/src/main/java/avatartranslator/AvatarAttribute.java
@@ -39,9 +39,9 @@
package avatartranslator;
-import myutil.TraceManager;
+import java.util.Map;
-import java.util.HashMap;
+import myutil.TraceManager;
/**
* Class AvatarAttribute
@@ -189,7 +189,7 @@ public class AvatarAttribute extends AvatarLeftHand {
}
@Override
- public void replaceAttributes(HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
TraceManager.addDev("!!! ERROR !!! (replaceAttributes in AvatarAttribute)");
/* !!! We should never arrive here !!! */
}
diff --git a/src/main/java/avatartranslator/AvatarConstant.java b/src/main/java/avatartranslator/AvatarConstant.java
index f9cf2f5069af9eefab5a1ef855ca0995b66ddcee..03a1710cccf0ad5399c90b7ad2f5ae1ec46ec3ff 100644
--- a/src/main/java/avatartranslator/AvatarConstant.java
+++ b/src/main/java/avatartranslator/AvatarConstant.java
@@ -36,13 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
* Class AvatarTerm
@@ -74,19 +70,20 @@ public class AvatarConstant extends AvatarTerm {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) { }
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) { }
@Override
public String toString() {
- return getName();
+ return getName();
}
public AvatarConstant advancedClone() {
if (this == AvatarConstant.TRUE || this == AvatarConstant.FALSE)
return this;
- AvatarConstant ac = new AvatarConstant(getName(), getReferenceObject());
- cloneLinkToReferenceObjects(ac);
- return ac;
+ AvatarConstant ac = new AvatarConstant(getName(), getReferenceObject());
+ cloneLinkToReferenceObjects(ac);
+
+ return ac;
}
}
diff --git a/src/main/java/avatartranslator/AvatarTerm.java b/src/main/java/avatartranslator/AvatarTerm.java
index a1a3b96671587561fabd5a1b12b4036353260d68..c9a995e1128c3271a29861fc93ee37c22125d737 100644
--- a/src/main/java/avatartranslator/AvatarTerm.java
+++ b/src/main/java/avatartranslator/AvatarTerm.java
@@ -36,17 +36,13 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
+import java.util.Map;
+
import myutil.TraceManager;
-import translator.RTLOTOSKeyword;
import translator.JKeyword;
-
-import java.util.HashMap;
+import translator.RTLOTOSKeyword;
/**
* Class AvatarTerm
@@ -176,5 +172,5 @@ public abstract class AvatarTerm extends AvatarElement {
* @param attributesMapping
* The mapping used to replace the attributes of the term. All the attributes of the block should be present as keys.
*/
- public abstract void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping);
+ public abstract void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping);
}
diff --git a/src/main/java/avatartranslator/AvatarTermFunction.java b/src/main/java/avatartranslator/AvatarTermFunction.java
index 67da1aeb40e0f4b306c4c3a33f1fc9723a1db34b..0ad5fb2c3b157202b574b9755786cb6e53505dab 100644
--- a/src/main/java/avatartranslator/AvatarTermFunction.java
+++ b/src/main/java/avatartranslator/AvatarTermFunction.java
@@ -36,12 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
* Class AvatarTermFunction
@@ -126,7 +123,7 @@ public class AvatarTermFunction extends AvatarTerm implements AvatarAction {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
this.args.replaceAttributes (attributesMapping);
}
}
diff --git a/src/main/java/avatartranslator/AvatarTermRaw.java b/src/main/java/avatartranslator/AvatarTermRaw.java
index 5ac5006c7459e4bd731302f572bf2a03a39ae592..e21ce93c8b113325eea25724a75709de341571be 100644
--- a/src/main/java/avatartranslator/AvatarTermRaw.java
+++ b/src/main/java/avatartranslator/AvatarTermRaw.java
@@ -36,12 +36,9 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package avatartranslator;
-import java.util.HashMap;
+import java.util.Map;
/**
* Class AvatarTermRaw
@@ -76,5 +73,5 @@ public class AvatarTermRaw extends AvatarTerm {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) { }
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) { }
}
diff --git a/src/main/java/avatartranslator/AvatarTuple.java b/src/main/java/avatartranslator/AvatarTuple.java
index 973c9059020bc38373c2aee81a2e9c0a60aa6bf3..4386fe06f5aa479f3d67bd7b677d09608beb90b3 100644
--- a/src/main/java/avatartranslator/AvatarTuple.java
+++ b/src/main/java/avatartranslator/AvatarTuple.java
@@ -36,14 +36,11 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
-
package avatartranslator;
-import java.util.HashMap;
import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
/**
* Class AvatarTuple
@@ -52,7 +49,7 @@ import java.util.LinkedList;
* @author Florian LUGOU
*/
public class AvatarTuple extends AvatarLeftHand {
- LinkedList<AvatarTerm> components;
+ List<AvatarTerm> components;
public AvatarTuple (Object _referenceObject) {
super (null, _referenceObject);
@@ -96,7 +93,7 @@ public class AvatarTuple extends AvatarLeftHand {
this.components.add (term);
}
- public LinkedList<AvatarTerm> getComponents () {
+ public List<AvatarTerm> getComponents () {
return this.components;
}
@@ -104,6 +101,7 @@ public class AvatarTuple extends AvatarLeftHand {
return this.toString ();
}
+ @Override
public String toString () {
String result = "(";
boolean first = true;
@@ -142,8 +140,8 @@ public class AvatarTuple extends AvatarLeftHand {
}
@Override
- public void replaceAttributes (HashMap<AvatarAttribute, AvatarAttribute> attributesMapping) {
- LinkedList<AvatarTerm> components = new LinkedList<AvatarTerm> ();
+ public void replaceAttributes( Map<AvatarAttribute, AvatarAttribute> attributesMapping) {
+ List<AvatarTerm> components = new LinkedList<AvatarTerm> ();
for (AvatarTerm term: this.components)
if (term instanceof AvatarAttribute)
components.add (attributesMapping.get (term));
diff --git a/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java b/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java
index 932a74073f476b904837c299c1bcb87c231b266c..9d051e403f48e79576b1fdcf4c1a6b8b1078d41a 100755
--- a/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java
+++ b/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java
@@ -1200,7 +1200,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
if (rightHand instanceof AvatarTermFunction) {
// If it's a function call
String name = ((AvatarTermFunction) rightHand).getMethod ().getName ();
- LinkedList<AvatarTerm> args = ((AvatarTermFunction) rightHand).getArgs ().getComponents ();
+ List<AvatarTerm> args = ((AvatarTermFunction) rightHand).getArgs ().getComponents ();
if (name.equals ("concat2") || name.equals ("concat3") || name.equals ("concat4")) {
// If it's a concat function, just use tuples
@@ -1279,7 +1279,7 @@ public class AVATAR2ProVerif implements AvatarTranslator {
if (name.equals ("get2") || name.equals ("get3") || name.equals ("get4")) {
// If the function called is get[234]
- LinkedList<AvatarTerm> args = action.getArgs ().getComponents ();
+ List<AvatarTerm> args = action.getArgs ().getComponents ();
int index = (int) name.charAt (3) - 48;
boolean ok = true;
diff --git a/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java b/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java
index c7da1aa5f675c38a8990891252105be5add4b7b2..eece4d11c74345c512f71d6589257456637baee5 100755
--- a/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java
+++ b/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java
@@ -36,9 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package avatartranslator.touppaal;
import avatartranslator.*;
@@ -53,10 +50,12 @@ import uppaaldesc.UPPAALSpec;
import uppaaldesc.UPPAALTemplate;
import uppaaldesc.UPPAALTransition;
-import java.awt.*;
+import java.awt.Point;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
/**
* Class AVATAR2UPPAAL
@@ -74,15 +73,15 @@ public class AVATAR2UPPAAL {
private UPPAALSpec spec;
private AvatarSpecification avspec;
- private LinkedList<CheckingError> warnings;
+ private List<CheckingError> warnings;
private int currentX, currentY;
- private java.util.List<String> gatesNotSynchronized; // String
- private java.util.List<String> gatesSynchronized;
- private java.util.List<AvatarRelation> gatesSynchronizedRelations;
- private java.util.List<String> gatesAsynchronized;
- private java.util.List<String> unoptStates;
+ private List<String> gatesNotSynchronized; // String
+ private List<String> gatesSynchronized;
+ private List<AvatarRelation> gatesSynchronizedRelations;
+ private List<String> gatesAsynchronized;
+ private List<String> unoptStates;
private int nbOfIntParameters, nbOfBooleanParameters;
private Hashtable <AvatarStateMachineElement, UPPAALLocation> hash;
@@ -150,22 +149,22 @@ public class AVATAR2UPPAAL {
//
}
-
- public LinkedList<CheckingError> getWarnings() {
+ public List<CheckingError> getWarnings() {
return warnings;
}
/*public RelationTIFUPPAAL getRelationTIFUPPAAL () {
return table;
}*/
- public Hashtable <String, String> getHash(){
- return translateString;
+ public Map<String, String> getHash(){
+ return translateString;
}
+
public UPPAALSpec generateUPPAAL(boolean _debug, boolean _optimize) {
warnings = new LinkedList<CheckingError>();
hash = new Hashtable<AvatarStateMachineElement, UPPAALLocation>();
hashChecking = new Hashtable<AvatarStateMachineElement, UPPAALLocation>();
- translateString = new Hashtable<String, String>();
+ translateString = new Hashtable<String, String>();
spec = new UPPAALSpec();
avspec.removeCompositeStates();
@@ -173,16 +172,17 @@ public class AVATAR2UPPAAL {
avspec.removeTimers();
//avspec.removeFIFOs(2);
avspec.makeRobustness();
- java.util.List<String> uppaalPragmas = avspec.getSafetyPragmas();
- unoptStates= new LinkedList<String>();
- for (String s: uppaalPragmas){
- String[] split = s.split("[^a-zA-Z0-9\\.]");
- for (String t:split){
- if (t.contains(".")){
- unoptStates.add(t);
- }
- }
- }
+ List<String> uppaalPragmas = avspec.getSafetyPragmas();
+ unoptStates= new LinkedList<String>();
+
+ for (String s: uppaalPragmas){
+ String[] split = s.split("[^a-zA-Z0-9\\.]");
+ for (String t:split){
+ if (t.contains(".")){
+ unoptStates.add(t);
+ }
+ }
+ }
//TraceManager.addDev("-> Spec:" + avspec.toString());
@@ -582,7 +582,7 @@ public class AVATAR2UPPAAL {
TraceManager.addDev("************************* NULL PREVIOUS !!!!!!!*****************");
}
//TraceManager.addDev("Linking myself = " + _elt + " to " + loc);
- UPPAALLocation locc = hashChecking.get(_elt);
+ //UPPAALLocation locc = hashChecking.get(_elt);
if (_elt != null) {
//TraceManager.addDev("In hash:" + _elt + " in location:" + locc);
}
@@ -1059,7 +1059,7 @@ public class AVATAR2UPPAAL {
//TraceManager.addDev("Method name:" + mc);
setSynchronization(_tr, mc);
- LinkedList<AvatarTerm> arguments = action.getArgs ().getComponents ();
+ List<AvatarTerm> arguments = action.getArgs ().getComponents ();
for(AvatarTerm arg: arguments) {
if (!(arg instanceof AvatarAttribute))
continue;
diff --git a/src/main/java/ui/window/JDialogUPPAALValidation.java b/src/main/java/ui/window/JDialogUPPAALValidation.java
index ba0199cdd454e899df7b58f521b13d34379a813e..7acaf31c0d55969bf344ae46dbf86bf73f6a5f2d 100644
--- a/src/main/java/ui/window/JDialogUPPAALValidation.java
+++ b/src/main/java/ui/window/JDialogUPPAALValidation.java
@@ -757,7 +757,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
UPPAALSpec spec = mgui.gtm.getLastUPPAALSpecification();
AVATAR2UPPAAL avatar2uppaal = mgui.gtm.getAvatar2Uppaal();
AvatarSpecification avspec = mgui.gtm.getAvatarSpecification();
- Hashtable<String, String> hash = avatar2uppaal.getHash();
+ Map<String, String> hash = avatar2uppaal.getHash();
String finQuery = query + " ";
/* String[] split = query.split("[\\s-()=]+");
for (String s: split){