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

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

Revision: 2755
          http://svn.sourceforge.net/rubyeclipse/?rev=2755&view=rev
Author:   cawilliams
Date:     2007-07-12 09:02:39 -0700 (Thu, 12 Jul 2007)

Log Message:
-----------
add '/' between folder names and script name in type label

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyElementLabels.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyElementLabels.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyElementLabels.java	2007-07-12 15:27:34 UTC (rev 2754)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyElementLabels.java	2007-07-12 16:02:39 UTC (rev 2755)
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.rubypeople.rdt.ui;
 
+import java.io.File;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
@@ -552,10 +554,11 @@
                     buf.append('.');
                     getElementLabel(type.getParent(), 0, buf);
                 }
-            } else {
+            } else { // FIXME This ends up happening before the enclosing types get spit out
             	ISourceFolder folder = type.getSourceFolder();
             	if (!folder.isDefaultPackage()) {
-                  getSourceFolderLabel(type.getSourceFolder(), flags & QUALIFIER_FLAGS, buf);
+                  getSourceFolderLabel(folder, flags & QUALIFIER_FLAGS, buf);
+                  buf.append('/');
             	}
                 getRubyScriptLabel(type.getRubyScript(), (flags & QUALIFIER_FLAGS), buf);
                 try {
@@ -665,7 +668,8 @@
 				}
 				buf.append(name.substring(start));
 		} else {
-			buf.append(pack.getElementName());
+			String name = pack.getElementName();
+			buf.append(name.replace(File.separatorChar, '/'));
 		}
 		if (getFlag(flags, P_POST_QUALIFIED)) {
 			buf.append(CONCAT_STRING);


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