Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TTool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mbe-tools
TTool
Commits
5428497f
Commit
5428497f
authored
6 years ago
by
Dominique Blouin
Browse files
Options
Downloads
Patches
Plain Diff
Code cleanup
parent
7ecbb1b7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/avatartranslator/AvatarActionOnSignal.java
+26
-25
26 additions, 25 deletions
src/main/java/avatartranslator/AvatarActionOnSignal.java
src/main/java/avatartranslator/AvatarAttributeState.java
+8
-9
8 additions, 9 deletions
src/main/java/avatartranslator/AvatarAttributeState.java
with
34 additions
and
34 deletions
src/main/java/avatartranslator/AvatarActionOnSignal.java
+
26
−
25
View file @
5428497f
...
@@ -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
Linked
List
<
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
Linked
List
<
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
()
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/avatartranslator/AvatarAttributeState.java
+
8
−
9
View file @
5428497f
...
@@ -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
();
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment