[ jEdit-commits ] SF.net SVN: jedit:[19896] jEdit/branches/4.4.x

[<ez...@us...>]

Revision: 19896
          http://jedit.svn.sourceforge.net/jedit/?rev=19896&view=rev
Author:   ezust
Date:     2011-09-01 16:28:41 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Fix jEdit not starting with nosettings
Merge req# 3401858

Modified Paths:
--------------
    jEdit/branches/4.4.x/doc/CHANGES.txt
    jEdit/branches/4.4.x/org/gjt/sp/jedit/bufferset/BufferSetManager.java

Property Changed:
----------------
    jEdit/branches/4.4.x/


Property changes on: jEdit/branches/4.4.x
___________________________________________________________________
Modified: svn:mergeinfo
   - /jEdit/branches/4.4.x-merge-request-for-r18847-r18954-r19206-r19210:19223
/jEdit/branches/4.4.x-merge-request-for-r19197:19216
/jEdit/branches/4.4.x-merge-request-for-r19201:19218,19229
/jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:18847,18954,18960-18961,19052,19084,19118,19121,19124,19138,19172,19185,19197,19199-19206,19208-19214,19246,19263,19289,19297-19299,19318,19325,19327,19346,19349-19350,19353,19377,19422,19489,19491,19501,19530,19547,19560-19561,19568-19571,19578,19588-19589,19592,19645,19724,19770,19833-19834,19846-19848
   + /jEdit/branches/4.4.x-merge-request-for-r18847-r18954-r19206-r19210:19223
/jEdit/branches/4.4.x-merge-request-for-r19197:19216
/jEdit/branches/4.4.x-merge-request-for-r19201:19218,19229
/jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:18847,18954,18960-18961,19052,19084,19118,19121,19124,19138,19172,19185,19197,19199-19206,19208-19214,19246,19263,19289,19297-19299,19318,19325,19327,19346,19349-19350,19353,19377,19422,19489,19491,19501,19530,19547,19560-19561,19568-19571,19578,19588-19589,19592,19645,19724,19770,19833-19834,19846-19848,19895

Modified: jEdit/branches/4.4.x/doc/CHANGES.txt
===================================================================
--- jEdit/branches/4.4.x/doc/CHANGES.txt	2011-08-31 22:32:56 UTC (rev 19895)
+++ jEdit/branches/4.4.x/doc/CHANGES.txt	2011-09-01 16:28:41 UTC (rev 19896)
@@ -4,12 +4,15 @@
 
 {{{ Version 4.4.2
 
-Thanks to Björn "Vampire" Kautler and Matthieu Casanova for contributing to this release.
+Thanks to Björn "Vampire" Kautler, Alan Ezust, and Matthieu Casanova for 
+contributing to this release.
 
 {{{ Bug Fixes
 - Untitled buffer should not be created on VFS without write capability
   (#3399387) (Matthieu Casanova)
 
+- Fixed NPE when starting jEdit with nosettings (#3401814) (Matthieu Casanova)
+
 - Fixed a corner case when trying to move caret during a buffer operation
   (loading, transaction, undo) prevent to move the caret forever
   (Matthieu Casanova)

Modified: jEdit/branches/4.4.x/org/gjt/sp/jedit/bufferset/BufferSetManager.java
===================================================================
--- jEdit/branches/4.4.x/org/gjt/sp/jedit/bufferset/BufferSetManager.java	2011-08-31 22:32:56 UTC (rev 19895)
+++ jEdit/branches/4.4.x/org/gjt/sp/jedit/bufferset/BufferSetManager.java	2011-09-01 16:28:41 UTC (rev 19896)
@@ -338,7 +338,17 @@
 		int untitledCount = jEdit.getNextUntitledBufferId();
 
 		View view = jEdit.getActiveView();
-		String parent = view.getBuffer().getDirectory();
+		String parent = null;
+
+		if (view != null)
+		{
+			Buffer buffer = view.getBuffer();
+			parent = buffer.getDirectory();
+		}
+		if (parent == null)
+		{
+			parent = System.getProperty("user.home");
+		}
 		VFS vfs = VFSManager.getVFSForPath(parent);
 		if ((vfs.getCapabilities() & VFS.WRITE_CAP) == 0)
 		{

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