projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made get/setHighLevelState ordering uniform: get... comes before set...
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
model
/
components
/
atomic
/
GUIManualSwitch.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
index
2fd1749
..
b79ec2f
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
@@
-82,31
+82,31
@@
public class GUIManualSwitch extends GUIComponent
}
@Override
}
@Override
- public
void setHighLevelState(String stateID, Object newState
)
+ public
Object getHighLevelState(String stateID
)
{
switch (stateID)
{
case "out":
if (logicSwitch != null)
{
switch (stateID)
{
case "out":
if (logicSwitch != null)
-
logicSwitch.setToValueOf((Bit) newState
);
-
break
;
+
return logicSwitch.getValue(
);
+
return null
;
default:
default:
- super.setHighLevelState(stateID, newState);
- break;
+ return super.getHighLevelState(stateID);
}
}
@Override
}
}
@Override
- public
Object getHighLevelState(String stateID
)
+ public
void setHighLevelState(String stateID, Object newState
)
{
switch (stateID)
{
case "out":
if (logicSwitch != null)
{
switch (stateID)
{
case "out":
if (logicSwitch != null)
-
return logicSwitch.getValue(
);
-
return null
;
+
logicSwitch.setToValueOf((Bit) newState
);
+
break
;
default:
default:
- return super.getHighLevelState(stateID);
+ super.setHighLevelState(stateID, newState);
+ break;
}
}
}
}