From 4088e07bfa94dfc2da7fa80524208aeed14133c7 Mon Sep 17 00:00:00 2001
From: Sophie Coudert <sophie.coudert@telecom-paris.fr>
Date: Mon, 27 Mar 2023 15:34:45 +0200
Subject: [PATCH] Version just before integration. Intermediate versiond
 deleted

---
 src/main/java/avatartranslator/AvatarBlock.java                | 3 ++-
 src/main/java/avatartranslator/AvatarSpecification.java        | 3 ++-
 src/main/java/avatartranslator/AvatarStateMachineElement.java  | 3 ++-
 .../java/avatartranslator/modelchecker/SpecificationBlock.java | 3 ++-
 .../java/avatartranslator/modelchecker/SpecificationState.java | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/avatartranslator/AvatarBlock.java b/src/main/java/avatartranslator/AvatarBlock.java
index 866f007d8a..464d414555 100644
--- a/src/main/java/avatartranslator/AvatarBlock.java
+++ b/src/main/java/avatartranslator/AvatarBlock.java
@@ -39,6 +39,7 @@
 package avatartranslator;
 
 import myutil.NameChecker;
+import myutil.intboolsolver.IBSParamComp;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -51,7 +52,7 @@ import java.util.List;
  * @author Ludovic APVRILLE, Raja GATGOUT
  * @version 1.1 01/07/2014
  */
-public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwner, NameChecker.NameStartWithUpperCase {
+public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwner, NameChecker.NameStartWithUpperCase, IBSParamComp {
 
     private AvatarBlock father;
     private List<AvatarAttribute> attributes;
diff --git a/src/main/java/avatartranslator/AvatarSpecification.java b/src/main/java/avatartranslator/AvatarSpecification.java
index 75a828471e..42161dcb08 100644
--- a/src/main/java/avatartranslator/AvatarSpecification.java
+++ b/src/main/java/avatartranslator/AvatarSpecification.java
@@ -40,6 +40,7 @@ package avatartranslator;
 
 import myutil.NameChecker;
 import myutil.TraceManager;
+import myutil.intboolsolver.IBSParamSpec;
 
 import java.util.*;
 
@@ -51,7 +52,7 @@ import java.util.*;
  * @author Ludovic APVRILLE
  * @version 1.0 20/05/2010
  */
-public class AvatarSpecification extends AvatarElement {
+public class AvatarSpecification extends AvatarElement implements IBSParamSpec {
 
     public final static int UPPAAL_MAX_INT = 32767;
 
diff --git a/src/main/java/avatartranslator/AvatarStateMachineElement.java b/src/main/java/avatartranslator/AvatarStateMachineElement.java
index 7cd31738a3..18c27f1061 100644
--- a/src/main/java/avatartranslator/AvatarStateMachineElement.java
+++ b/src/main/java/avatartranslator/AvatarStateMachineElement.java
@@ -40,6 +40,7 @@
 package avatartranslator;
 
 import myutil.TraceManager;
+import myutil.intboolsolver.IBSParamState;
 import ui.TGComponent;
 
 import java.util.HashMap;
@@ -54,7 +55,7 @@ import java.util.List;
  * @author Ludovic APVRILLE
  * @version 1.0 20/05/2010
  */
-public abstract class AvatarStateMachineElement extends AvatarElement {
+public abstract class AvatarStateMachineElement extends AvatarElement implements IBSParamState {
 
     protected List<AvatarStateMachineElement> nexts;
     private AvatarState myState;
diff --git a/src/main/java/avatartranslator/modelchecker/SpecificationBlock.java b/src/main/java/avatartranslator/modelchecker/SpecificationBlock.java
index 16c2445414..8b62c67ed7 100644
--- a/src/main/java/avatartranslator/modelchecker/SpecificationBlock.java
+++ b/src/main/java/avatartranslator/modelchecker/SpecificationBlock.java
@@ -40,6 +40,7 @@ package avatartranslator.modelchecker;
 
 import avatartranslator.AvatarAttribute;
 import avatartranslator.AvatarBlock;
+import myutil.intboolsolver.IBSParamCompState;
 
 import java.util.Arrays;
 import java.util.List;
@@ -53,7 +54,7 @@ import java.util.Vector;
  * @author Ludovic APVRILLE
  * @version 1.0 31/05/2016
  */
-public class SpecificationBlock {
+public class SpecificationBlock implements IBSParamCompState {
 
     public static final int HEADER_VALUES = 3;
 
diff --git a/src/main/java/avatartranslator/modelchecker/SpecificationState.java b/src/main/java/avatartranslator/modelchecker/SpecificationState.java
index 05d53ec188..0a0354c12b 100644
--- a/src/main/java/avatartranslator/modelchecker/SpecificationState.java
+++ b/src/main/java/avatartranslator/modelchecker/SpecificationState.java
@@ -45,6 +45,7 @@ package avatartranslator.modelchecker;
 
 import avatartranslator.AvatarBlock;
 import avatartranslator.AvatarSpecification;
+import myutil.intboolsolver.IBSParamSpecState;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -57,7 +58,7 @@ import java.util.LinkedList;
    * @version 1.0 31/05/2016
    * @author Ludovic APVRILLE
  */
-public class SpecificationState implements Comparable<SpecificationState>  {
+public class SpecificationState implements Comparable<SpecificationState>, IBSParamSpecState {
     public SpecificationBlock [] blocks;
     public int hashValue;
     public boolean hashComputed;
-- 
GitLab