[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [3218] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt/internal/ui/packageview/SourceFolderProvider.java

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

Revision: 3218
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3218&view=rev
Author:   cawilliams
Date:     2007-09-20 15:48:45 -0700 (Thu, 20 Sep 2007)

Log Message:
-----------
port fixes from Aptana SVN repo over to old RDT repo

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/SourceFolderProvider.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/SourceFolderProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/SourceFolderProvider.java	2007-09-20 22:45:27 UTC (rev 3217)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/SourceFolderProvider.java	2007-09-20 22:48:45 UTC (rev 3218)
@@ -175,13 +175,8 @@
 		ArrayList topLevelElements= new ArrayList(elements.length);
 		for (int i= 0; i < elements.length; i++) {
 			IRubyElement iRubyElement= elements[i];
-			if (iRubyElement instanceof ISourceFolder && (((ISourceFolder)iRubyElement).isDefaultPackage())) {
-				Object[] children = ((ISourceFolder)iRubyElement).getRubyScripts();
-				for (int j = 0; j < children.length; j++) {
-					topLevelElements.add(children[j]);
-				}
-			//if the name of the SourceFolder is the top level package it will contain no "/" separators
-			} else if (iRubyElement instanceof ISourceFolder && (iRubyElement.getElementName().indexOf(File.separatorChar)==-1) && !(((ISourceFolder)iRubyElement).isDefaultPackage()) ) {
+			// for default src folder, grab it's scripts (unless it's part of project as src folder root)			
+			if (iRubyElement instanceof ISourceFolder && (iRubyElement.getElementName().indexOf(File.separatorChar)==-1) && !(((ISourceFolder)iRubyElement).isDefaultPackage()) ) {
 				topLevelElements.add(iRubyElement);
 			}
 		}	


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