From 5428497fa77a3a21d9e6d911ff1a76a73acdf7da Mon Sep 17 00:00:00 2001
From: dblouin <dominique.blouin@telecom-paristech.fr>
Date: Tue, 24 Jul 2018 21:50:36 +0200
Subject: [PATCH] Code cleanup
---
.../AvatarActionOnSignal.java | 51 ++++++++++---------
.../AvatarAttributeState.java | 17 +++----
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/main/java/avatartranslator/AvatarActionOnSignal.java b/src/main/java/avatartranslator/AvatarActionOnSignal.java
index 0f4ccc5000..6e19cef006 100644
--- a/src/main/java/avatartranslator/AvatarActionOnSignal.java
+++ b/src/main/java/avatartranslator/AvatarActionOnSignal.java
@@ -42,6 +42,7 @@ package avatartranslator;
import myutil.TraceManager;
import java.util.LinkedList;
+import java.util.List;
/**
@@ -52,7 +53,7 @@ import java.util.LinkedList;
*/
public class AvatarActionOnSignal extends AvatarStateMachineElement {
private AvatarSignal signal;
- private LinkedList<String> values;
+ private List<String> values;
private boolean checkLatency;
public AvatarActionOnSignal(String _name, AvatarSignal _signal, Object _referenceObject) {
@@ -75,7 +76,7 @@ public class AvatarActionOnSignal extends AvatarStateMachineElement {
values.add(_val);
}
- public LinkedList<String> getValues() {
+ public List<String> getValues() {
return values;
}
@@ -104,32 +105,32 @@ public class AvatarActionOnSignal extends AvatarStateMachineElement {
}
public AvatarActionOnSignal basicCloneMe(AvatarStateMachineOwner _block) {
- //TraceManager.addDev("I HAVE BEEN CLONED: " + this);
- AvatarSignal sig = _block.getAvatarSignalWithName(getSignal().getName());
- if (sig != null) {
- AvatarActionOnSignal aaos = new AvatarActionOnSignal(getName() + "__clone", sig, getReferenceObject(), isCheckable(), isChecked());
- for(int i=0; i<getNbOfValues(); i++) {
- aaos.addValue(getValue(i));
- }
- return aaos;
- } else {
- TraceManager.addDev("NULL signal in new spec: " + getSignal().getName());
- }
-
- return null;
+ //TraceManager.addDev("I HAVE BEEN CLONED: " + this);
+ AvatarSignal sig = _block.getAvatarSignalWithName(getSignal().getName());
+ if (sig != null) {
+ AvatarActionOnSignal aaos = new AvatarActionOnSignal(getName() + "__clone", sig, getReferenceObject(), isCheckable(), isChecked());
+ for(int i=0; i<getNbOfValues(); i++) {
+ aaos.addValue(getValue(i));
+ }
+ return aaos;
+ } else {
+ TraceManager.addDev("NULL signal in new spec: " + getSignal().getName());
+ }
+
+ return null;
}
public String getExtendedName() {
- if (getSignal() == null) {
- String s = getName() + " refobjt=" + referenceObject.toString();
- TraceManager.addDev("Null signal" + " res=" + s);
- return s;
- }
- if (getName() == null) {
- TraceManager.addDev("Null name");
- }
-
- return getName() + ":" + getSignal().getName();
+ if (getSignal() == null) {
+ String s = getName() + " refobjt=" + referenceObject.toString();
+ TraceManager.addDev("Null signal" + " res=" + s);
+ return s;
+ }
+ if (getName() == null) {
+ TraceManager.addDev("Null name");
+ }
+
+ return getName() + ":" + getSignal().getName();
}
public String getNiceName() {
diff --git a/src/main/java/avatartranslator/AvatarAttributeState.java b/src/main/java/avatartranslator/AvatarAttributeState.java
index becf79f442..fb260813c8 100644
--- a/src/main/java/avatartranslator/AvatarAttributeState.java
+++ b/src/main/java/avatartranslator/AvatarAttributeState.java
@@ -36,9 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms.
*/
-
-
-
package avatartranslator;
/**
@@ -52,14 +49,16 @@ public class AvatarAttributeState extends AvatarElement {
private AvatarState state;
public AvatarAttributeState(String _name, Object _referenceObject, AvatarAttribute attr, AvatarState st) {
super(_name, _referenceObject);
- attribute = attr;
- state = st;
+ attribute = attr;
+ state = st;
}
+
public AvatarAttribute getAttribute(){
- return attribute;
+ return attribute;
}
+
public AvatarState getState(){
- return state;
+ return state;
}
public AvatarAttributeState advancedClone (AvatarSpecification avspec) {
@@ -72,8 +71,8 @@ public class AvatarAttributeState extends AvatarElement {
return result;
}
- public String toString()
- {
+ @Override
+ public String toString() {
return this.attribute.getBlock().getName().replaceAll("__", ".") + "." + this.state.getName() + "." + this.attribute.getName();
}
}
--
GitLab