projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged SampleERCP into master
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
tests
/
GUITest.java
diff --git
a/era.mi/src/era/mi/logic/tests/GUITest.java
b/era.mi/src/era/mi/logic/tests/GUITest.java
index
2599b54
..
b93d4b6
100644
(file)
--- a/
era.mi/src/era/mi/logic/tests/GUITest.java
+++ b/
era.mi/src/era/mi/logic/tests/GUITest.java
@@
-241,7
+241,7
@@
public class GUITest extends JPanel
g.setColor(Color.BLACK);
break;
case U:
g.setColor(Color.BLACK);
break;
case U:
- g.setColor(Color.
BLUE
);
+ g.setColor(Color.
MAGENTA
);
break;
default:
throw new IllegalArgumentException();
break;
default:
throw new IllegalArgumentException();
@@
-282,7
+282,7
@@
public class GUITest extends JPanel
gt.repaint(12);
try
{
gt.repaint(12);
try
{
- Thread.sleep(Math.max(
16
- System.currentTimeMillis() + lastFrame, 0));
+ Thread.sleep(Math.max(
updateT
- System.currentTimeMillis() + lastFrame, 0));
}
catch (Exception e)
{
}
catch (Exception e)
{