[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [3215] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt

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

Revision: 3215
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3215&view=rev
Author:   cawilliams
Date:     2007-09-20 15:45:17 -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/corext/util/ExternalFileTypeInfo.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/PackageExplorerContentProvider.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/SourceFolderProvider.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/StandardRubyElementContentProvider.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/ExternalFileTypeInfo.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/ExternalFileTypeInfo.java	2007-09-18 20:51:26 UTC (rev 3214)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/corext/util/ExternalFileTypeInfo.java	2007-09-20 22:45:17 UTC (rev 3215)
@@ -131,10 +131,7 @@
 	}
 		
 	public String getPath() {
-		StringBuffer result= new StringBuffer(fPath);
-//		result.append(IRubySearchScope.JAR_FILE_ENTRY_SEPARATOR);
-		getElementPath(result);
-		return result.toString();
+		return fPath;
 	}
 	
 	public long getContainerTimestamp() {

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/PackageExplorerContentProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/PackageExplorerContentProvider.java	2007-09-18 20:51:26 UTC (rev 3214)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/PackageExplorerContentProvider.java	2007-09-20 22:45:17 UTC (rev 3215)
@@ -369,6 +369,10 @@
 			// have to handle additions to them specially. 
 			if (parent instanceof ISourceFolder) {
 				Object grandparent= internalGetParent(parent);
+				if (((ISourceFolder)parent).isDefaultPackage()) {
+					parent = grandparent;
+					grandparent = internalGetParent(parent);
+				}
 				// 1GE8SI6: ITPJUI:WIN98 - Rename is not shown in Packages View
 				// avoid posting a refresh to an unvisible parent
 				if (parent.equals(fInput)) {

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-18 20:51:26 UTC (rev 3214)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/packageview/SourceFolderProvider.java	2007-09-20 22:45:17 UTC (rev 3215)
@@ -175,8 +175,13 @@
 		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
-			if (iRubyElement instanceof ISourceFolder && (iRubyElement.getElementName().indexOf(File.separatorChar)==-1) && !(((ISourceFolder)iRubyElement).isDefaultPackage()) ) {
+			} else if (iRubyElement instanceof ISourceFolder && (iRubyElement.getElementName().indexOf(File.separatorChar)==-1) && !(((ISourceFolder)iRubyElement).isDefaultPackage()) ) {
 				topLevelElements.add(iRubyElement);
 			}
 		}	

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/StandardRubyElementContentProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/StandardRubyElementContentProvider.java	2007-09-18 20:51:26 UTC (rev 3214)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/StandardRubyElementContentProvider.java	2007-09-20 22:45:17 UTC (rev 3215)
@@ -12,6 +12,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
@@ -198,7 +199,10 @@
 		for (int i = 0; i < fragments.length; i++) {
 			if (!(fragments[i] instanceof ISourceFolder)) continue;
 			ISourceFolder folder = (ISourceFolder) fragments[i];
-			if (folder.isDefaultPackage()) continue;
+			if (folder.isDefaultPackage()) {
+				list.addAll(Arrays.asList(folder.getRubyScripts()));
+				continue;
+			}
 			String name = folder.getElementName();
 			int index = name.indexOf(File.separatorChar);
 			if (index == -1) list.add(folder);


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