[ jEdit-commits ] SF.net SVN: jedit:[20545] jEdit/trunk/org/gjt/sp/jedit/io/FileVFS.java

[<ev...@us...>]

Revision: 20545
          http://jedit.svn.sourceforge.net/jedit/?rev=20545&view=rev
Author:   evanpw
Date:     2011-12-05 22:01:32 +0000 (Mon, 05 Dec 2011)
Log Message:
-----------
Early initialization of FileSystemView in FileVFS broke Quartz rendering on OS X

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/io/FileVFS.java

Modified: jEdit/trunk/org/gjt/sp/jedit/io/FileVFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/FileVFS.java	2011-12-05 21:55:24 UTC (rev 20544)
+++ jEdit/trunk/org/gjt/sp/jedit/io/FileVFS.java	2011-12-05 22:01:32 UTC (rev 20545)
@@ -358,6 +358,8 @@
 		File directory = new File(path);
 		File[] list = null;
 		if(directory.exists())
+			if (fsView == null)
+				fsView = FileSystemView.getFileSystemView();
 			list = fsView.getFiles(directory,false);
 
 		if(list == null)
@@ -680,6 +682,6 @@
 	//}}}
 
 	//{{{ Private members
-	private static final FileSystemView fsView = FileSystemView.getFileSystemView();
+	private static FileSystemView fsView = null;
 	//}}}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.