diff options
Diffstat (limited to 'tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java')
| -rw-r--r-- | tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java index a16a8255b..d4ab0bc86 100644 --- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java +++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java @@ -56,45 +56,53 @@ public class SubSystemConfigTestVariableService extends VariableService{ }
try{
boolean changed = false;
- id = "/SubSystemConfigTest/top/testee2/dc_i/long_array_i";
- long[] _long_array_i = null;
+ id = "/SubSystemConfigTest/top/testee2/dc_i/int_i";
+ Integer _int_i = null;
object = values.get(id);
if(object != null){
- _long_array_i = ensureLongArray(object, 1);
- if(!Arrays.equals(_long_array_i, (long[])getDiffMap().get(id)))
+ _int_i = ensureInt(object);
+ if(!_int_i.equals((Integer)getDiffMap().get(id)))
changed = true;
} else
warning(id, "is missing");
- id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i";
- Double _double_i = null;
+ id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i";
+ char[] _char_i = null;
object = values.get(id);
if(object != null){
- _double_i = ensureDouble(object);
- if(!_double_i.equals((Double)getDiffMap().get(id)))
+ _char_i = ensureCharArray(object, 10);
+ if(!Arrays.equals(_char_i, (char[])getDiffMap().get(id)))
changed = true;
} else
warning(id, "is missing");
- id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i";
- char[] _char_i = null;
+ id = "/SubSystemConfigTest/top/testee2/dc_i/long_array_i";
+ long[] _long_array_i = null;
object = values.get(id);
if(object != null){
- _char_i = ensureCharArray(object, 10);
- if(!Arrays.equals(_char_i, (char[])getDiffMap().get(id)))
+ _long_array_i = ensureLongArray(object, 1);
+ if(!Arrays.equals(_long_array_i, (long[])getDiffMap().get(id)))
changed = true;
} else
warning(id, "is missing");
- id = "/SubSystemConfigTest/top/testee2/dc_i/int_i";
- Integer _int_i = null;
+ id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i";
+ Double _double_i = null;
object = values.get(id);
if(object != null){
- _int_i = ensureInt(object);
- if(!_int_i.equals((Integer)getDiffMap().get(id)))
+ _double_i = ensureDouble(object);
+ if(!_double_i.equals((Double)getDiffMap().get(id)))
changed = true;
} else
warning(id, "is missing");
if(changed)
synchronized(_top_testee2.getDc_iLock()){
if(_top_testee2.getDc_iLock().isUpdate()){
+ if(_int_i != null){
+ _top_testee2.getDc_i().setInt_i(_int_i);
+ getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _int_i);
+ }
+ if(_char_i != null){
+ _top_testee2.getDc_i().getDc_i().setChar_i(_char_i);
+ getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", _char_i);
+ }
if(_long_array_i != null){
_top_testee2.getDc_i().setLong_array_i(_long_array_i);
getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", _long_array_i);
@@ -103,14 +111,6 @@ public class SubSystemConfigTestVariableService extends VariableService{ _top_testee2.getDc_i().getDc_i().setDouble_i(_double_i);
getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i", _double_i);
}
- if(_char_i != null){
- _top_testee2.getDc_i().getDc_i().setChar_i(_char_i);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", _char_i);
- }
- if(_int_i != null){
- _top_testee2.getDc_i().setInt_i(_int_i);
- getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _int_i);
- }
}
}
}catch(IllegalArgumentException e){
@@ -168,10 +168,10 @@ public class SubSystemConfigTestVariableService extends VariableService{ protected Map<String, Object> getAttributeValues(){
Map<String, Object> values = new HashMap<String, Object>();
values.put("/SubSystemConfigTest/top/testee2/int_i", _top_testee2.getInt_i());
+ values.put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _top_testee2.getDc_i().getInt_i());
+ values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", toObjectArray(_top_testee2.getDc_i().getDc_i().getChar_i()));
values.put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", toObjectArray(_top_testee2.getDc_i().getLong_array_i()));
values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i", _top_testee2.getDc_i().getDc_i().getDouble_i());
- values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", toObjectArray(_top_testee2.getDc_i().getDc_i().getChar_i()));
- values.put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _top_testee2.getDc_i().getInt_i());
values.put("/SubSystemConfigTest/top/testee2/blockMe", _top_testee2.getBlockMe());
values.put("/SubSystemConfigTest/top/testee2/blocker", _top_testee2.getBlocker());
@@ -186,15 +186,15 @@ public class SubSystemConfigTestVariableService extends VariableService{ // DataClasses write operations
+ private void writeDataClass(String id, Dyn_DC2 object, Map<String, Object> map){
+ map.put(id+"/double_i", object.getDouble_i());
+ map.put(id+"/char_i", toObjectArray(object.getChar_i()));
+ }
private void writeDataClass(String id, Dyn_DC1 object, Map<String, Object> map){
map.put(id+"/int_i", object.getInt_i());
map.put(id+"/long_array_i", toObjectArray(object.getLong_array_i()));
writeDataClass(id+"/dc_i", object.getDc_i(), map);
}
- private void writeDataClass(String id, Dyn_DC2 object, Map<String, Object> map){
- map.put(id+"/double_i", object.getDouble_i());
- map.put(id+"/char_i", toObjectArray(object.getChar_i()));
- }
@Override
protected int getPollingTimerUser(){
|