Revision: 4818 http://sourceforge.net/p/vexi/code/4818 Author: mkpg2 Date: 2015-10-26 22:25:06 +0000 (Mon, 26 Oct 2015) Log Message: ----------- Close .vexipath after reading. Fix outline page NPE (seen sometimes when closing editor).
Modified Paths: -------------- trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/VexiProject.java trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/outline/VexiOutlinePage.java Modified: trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/VexiProject.java =================================================================== --- trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/VexiProject.java 2015-10-26 22:19:54 UTC (rev 4817) +++ trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/VexiProject.java 2015-10-26 22:25:06 UTC (rev 4818) @@ -38,7 +38,9 @@ public Xml.ProjectPath load() throws Exception{ IFile file = project.getFile(".vexipath"); if(file.exists()){ - return (Xml.ProjectPath)Xml.deserialize(new FileReader(file.getRawLocation().toFile()), Xml.ProjectPath.class); + try(FileReader fr= new FileReader(file.getRawLocation().toFile())){ + return (Xml.ProjectPath)Xml.deserialize(fr, Xml.ProjectPath.class); + } } return Xml.emptyProjectPath(); } Modified: trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/outline/VexiOutlinePage.java =================================================================== --- trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/outline/VexiOutlinePage.java 2015-10-26 22:19:54 UTC (rev 4817) +++ trunk/tools/org.vexi.vexidev/src/org/vexi/vexidev/outline/VexiOutlinePage.java 2015-10-26 22:25:06 UTC (rev 4818) @@ -58,7 +58,7 @@ public void update() { - if(getControl().isDisposed()) return; + if(getControl()==null || getControl().isDisposed()) return; getControl().setRedraw(false); getTreeViewer().setInput(getContentOutline()); getTreeViewer().expandAll(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ _______________________________________________ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn