hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up calls to invoke / display.

Browse Source 
I misread the JOGL javadoc and thought that these methods did not come
from a common superclass, for some reason they are listed under class
methods, not inherited methods.
This commit is contained in:
bkuker 2013-09-24 09:14:48 -04:00
parent 1db67037b1
commit a4c0b3bb56
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
View File

@ -109,16 +109,8 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
} }
} }
private void invoke(boolean wait, GLRunnable r) {
if (canvas instanceof GLCanvas) {
((GLCanvas) canvas).invoke(wait, r);
} else if (canvas instanceof GLJPanel) {
((GLJPanel) canvas).invoke(wait, r);
}
}
public void flushTextureCaches() { public void flushTextureCaches() {
invoke(true, new GLRunnable() { ((GLAutoDrawable) canvas).invoke(true, new GLRunnable() {
@Override @Override
public boolean run(GLAutoDrawable drawable) { public boolean run(GLAutoDrawable drawable) {
rr.flushTextureCache(drawable); rr.flushTextureCache(drawable);
@ -550,7 +542,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
log.debug("3D Figure Updated"); log.debug("3D Figure Updated");
cachedBounds = null; cachedBounds = null;
if (canvas != null) { if (canvas != null) {
invoke(true, new GLRunnable() { ((GLAutoDrawable) canvas).invoke(true, new GLRunnable() {
@Override @Override
public boolean run(GLAutoDrawable drawable) { public boolean run(GLAutoDrawable drawable) {
rr.updateFigure(drawable); rr.updateFigure(drawable);
@ -562,11 +554,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
private void internalRepaint() { private void internalRepaint() {
if (canvas != null) { if (canvas != null) {
if (canvas instanceof GLCanvas) { ((GLAutoDrawable) canvas).display();
((GLCanvas) canvas).display();
} else if (canvas instanceof GLJPanel) {
((GLJPanel) canvas).display();
}
} }
super.repaint(); super.repaint();
} }
@ -705,7 +693,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
} else if (canvas instanceof GLJPanel && !((GLJPanel) canvas).isRealized()) { } else if (canvas instanceof GLJPanel && !((GLJPanel) canvas).isRealized()) {
rr = newRR; rr = newRR;
} else { } else {
invoke(true, new GLRunnable() { ((GLAutoDrawable) canvas).invoke(true, new GLRunnable() {
@Override @Override
public boolean run(GLAutoDrawable drawable) { public boolean run(GLAutoDrawable drawable) {
rr.dispose(drawable); rr.dispose(drawable);