Skip to content
Snippets Groups Projects
Commit 5428497f authored by Dominique Blouin's avatar Dominique Blouin
Browse files

Code cleanup

parent 7ecbb1b7
No related branches found
No related tags found
No related merge requests found
...@@ -42,6 +42,7 @@ package avatartranslator; ...@@ -42,6 +42,7 @@ package avatartranslator;
import myutil.TraceManager; import myutil.TraceManager;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List;
/** /**
...@@ -52,7 +53,7 @@ import java.util.LinkedList; ...@@ -52,7 +53,7 @@ import java.util.LinkedList;
*/ */
public class AvatarActionOnSignal extends AvatarStateMachineElement { public class AvatarActionOnSignal extends AvatarStateMachineElement {
private AvatarSignal signal; private AvatarSignal signal;
private LinkedList<String> values; private List<String> values;
private boolean checkLatency; private boolean checkLatency;
public AvatarActionOnSignal(String _name, AvatarSignal _signal, Object _referenceObject) { public AvatarActionOnSignal(String _name, AvatarSignal _signal, Object _referenceObject) {
...@@ -75,7 +76,7 @@ public class AvatarActionOnSignal extends AvatarStateMachineElement { ...@@ -75,7 +76,7 @@ public class AvatarActionOnSignal extends AvatarStateMachineElement {
values.add(_val); values.add(_val);
} }
public LinkedList<String> getValues() { public List<String> getValues() {
return values; return values;
} }
...@@ -104,32 +105,32 @@ public class AvatarActionOnSignal extends AvatarStateMachineElement { ...@@ -104,32 +105,32 @@ public class AvatarActionOnSignal extends AvatarStateMachineElement {
} }
public AvatarActionOnSignal basicCloneMe(AvatarStateMachineOwner _block) { public AvatarActionOnSignal basicCloneMe(AvatarStateMachineOwner _block) {
//TraceManager.addDev("I HAVE BEEN CLONED: " + this); //TraceManager.addDev("I HAVE BEEN CLONED: " + this);
AvatarSignal sig = _block.getAvatarSignalWithName(getSignal().getName()); AvatarSignal sig = _block.getAvatarSignalWithName(getSignal().getName());
if (sig != null) { if (sig != null) {
AvatarActionOnSignal aaos = new AvatarActionOnSignal(getName() + "__clone", sig, getReferenceObject(), isCheckable(), isChecked()); AvatarActionOnSignal aaos = new AvatarActionOnSignal(getName() + "__clone", sig, getReferenceObject(), isCheckable(), isChecked());
for(int i=0; i<getNbOfValues(); i++) { for(int i=0; i<getNbOfValues(); i++) {
aaos.addValue(getValue(i)); aaos.addValue(getValue(i));
} }
return aaos; return aaos;
} else { } else {
TraceManager.addDev("NULL signal in new spec: " + getSignal().getName()); TraceManager.addDev("NULL signal in new spec: " + getSignal().getName());
} }
return null; return null;
} }
public String getExtendedName() { public String getExtendedName() {
if (getSignal() == null) { if (getSignal() == null) {
String s = getName() + " refobjt=" + referenceObject.toString(); String s = getName() + " refobjt=" + referenceObject.toString();
TraceManager.addDev("Null signal" + " res=" + s); TraceManager.addDev("Null signal" + " res=" + s);
return s; return s;
} }
if (getName() == null) { if (getName() == null) {
TraceManager.addDev("Null name"); TraceManager.addDev("Null name");
} }
return getName() + ":" + getSignal().getName(); return getName() + ":" + getSignal().getName();
} }
public String getNiceName() { public String getNiceName() {
......
...@@ -36,9 +36,6 @@ ...@@ -36,9 +36,6 @@
* knowledge of the CeCILL license and that you accept its terms. * knowledge of the CeCILL license and that you accept its terms.
*/ */
package avatartranslator; package avatartranslator;
/** /**
...@@ -52,14 +49,16 @@ public class AvatarAttributeState extends AvatarElement { ...@@ -52,14 +49,16 @@ public class AvatarAttributeState extends AvatarElement {
private AvatarState state; private AvatarState state;
public AvatarAttributeState(String _name, Object _referenceObject, AvatarAttribute attr, AvatarState st) { public AvatarAttributeState(String _name, Object _referenceObject, AvatarAttribute attr, AvatarState st) {
super(_name, _referenceObject); super(_name, _referenceObject);
attribute = attr; attribute = attr;
state = st; state = st;
} }
public AvatarAttribute getAttribute(){ public AvatarAttribute getAttribute(){
return attribute; return attribute;
} }
public AvatarState getState(){ public AvatarState getState(){
return state; return state;
} }
public AvatarAttributeState advancedClone (AvatarSpecification avspec) { public AvatarAttributeState advancedClone (AvatarSpecification avspec) {
...@@ -72,8 +71,8 @@ public class AvatarAttributeState extends AvatarElement { ...@@ -72,8 +71,8 @@ public class AvatarAttributeState extends AvatarElement {
return result; return result;
} }
public String toString() @Override
{ public String toString() {
return this.attribute.getBlock().getName().replaceAll("__", ".") + "." + this.state.getName() + "." + this.attribute.getName(); return this.attribute.getBlock().getName().replaceAll("__", ".") + "." + this.state.getName() + "." + this.attribute.getName();
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment