[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2833] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal/core/SourceFolderRootInfo.java

[<caw...@us...>]

Revision: 2833
          http://svn.sourceforge.net/rubyeclipse/?rev=2833&view=rev
Author:   cawilliams
Date:     2007-07-24 10:31:04 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
fix #5141 - Ruby Class Wizard folder/source root folder fields are confusing. Combine the two dialog fields into one. Now user just selects the ultimate folder they want the type/test placed into.

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceFolderRootInfo.java

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceFolderRootInfo.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceFolderRootInfo.java	2007-07-24 17:30:58 UTC (rev 2832)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/SourceFolderRootInfo.java	2007-07-24 17:31:04 UTC (rev 2833)
@@ -96,7 +96,8 @@
 		int nonJavaResourcesCounter = 0;
 		try {
 			ILoadpathEntry[] classpath = project.getResolvedLoadpath(true/*ignoreUnresolvedEntry*/, false/*don't generateMarkerOnError*/, false/*don't returnResolutionInProgress*/);
-			IResource[] members = folder.members();
+			IResource[] members = new IResource[0];
+			if (folder != null) members = folder.members();
 			nextResource: for (int i = 0, max = members.length; i < max; i++) {
 				IResource member = members[i];
 				switch (member.getType()) {


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