sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK:

Browse Source 
- fix niftygui editor locking file when loading fails

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9110 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2012-01-23 23:34:19 +00:00
parent edc7a8b37c
commit e9614a683a
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdk/jme3-gui/src/com/jme3/gde/gui/multiview/NiftyPreviewPanel.java
View File

@ -19,6 +19,8 @@ import java.awt.event.KeyListener;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener; import java.awt.event.MouseMotionListener;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
@ -124,8 +126,10 @@ public class NiftyPreviewPanel extends PanelView {
if (pm == null) { if (pm == null) {
Logger.getLogger(NiftyPreviewPanel.class.getName()).log(Level.WARNING, "No Project AssetManager found!"); Logger.getLogger(NiftyPreviewPanel.class.getName()).log(Level.WARNING, "No Project AssetManager found!");
} }
InputStream in = null;
try { try {
doc = XMLUtil.parse(new InputSource(niftyObject.getPrimaryFile().getInputStream()), false, false, null, null); in = niftyObject.getPrimaryFile().getInputStream();
doc = XMLUtil.parse(new InputSource(in), false, false, null, null);
NiftyFileNode rootContext = new NiftyFileNode(doc.getDocumentElement()); NiftyFileNode rootContext = new NiftyFileNode(doc.getDocumentElement());
setRoot(rootContext); setRoot(rootContext);
comp.setRootContext(rootContext); comp.setRootContext(rootContext);
@ -136,6 +140,14 @@ public class NiftyPreviewPanel extends PanelView {
DialogDisplayer.getDefault().notifyLater(msg); DialogDisplayer.getDefault().notifyLater(msg);
Exceptions.printStackTrace(ex); Exceptions.printStackTrace(ex);
return; return;
} finally {
if (in != null) {
try {
in.close();
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
}
} }
SceneApplication.getApplication().enqueue(new Callable<Object>() { SceneApplication.getApplication().enqueue(new Callable<Object>() {