- improve FakeApplication and SceneApplication cleanup

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10105 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2013-01-19 00:45:38 +00:00
parent 733ad2fdbe
commit 20dce97f5d
2 changed files with 10 additions and 13 deletions

View File

@ -394,11 +394,11 @@ public class FakeApplication extends SimpleApplication {
private ScheduledThreadPoolExecutor fakeAppThread = new ScheduledThreadPoolExecutor(1);
public void cleanupFakeApp() {
if (rootNode == null) {
return;
}
clearNode(rootNode);
runQueuedFake();
appStateManager = new FakeAppStateManager(this);
if (rootNode != null) {
clearNode(rootNode);
}
}
public void startFakeApp() {

View File

@ -325,8 +325,6 @@ public class SceneApplication extends Application implements LookupProvider {
}
}
//TODO: Lookup for Application
public Lookup createAdditionalLookup(Lookup baseContext) {
return Lookups.fixed(getApplication());
@ -477,7 +475,7 @@ public class SceneApplication extends Application implements LookupProvider {
}
private void checkSave(SceneRequest request) {
if ((request != null)
if ((request != null) && request.getDataObject() != null
&& request.getDataObject().isModified()) {
final DataObject req = request.getDataObject();
Confirmation mesg = new NotifyDescriptor.Confirmation("Scene has not been saved,\ndo you want to save it?",
@ -658,5 +656,4 @@ public class SceneApplication extends Application implements LookupProvider {
public boolean isAwt() {
return java.awt.EventQueue.isDispatchThread();
}
}