[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2766] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal/core/search/matching/SuperTypeReferencePattern.java

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

Revision: 2766
          http://svn.sourceforge.net/rubyeclipse/?rev=2766&view=rev
Author:   cawilliams
Date:     2007-07-16 08:59:10 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
fix up creation of super reference index key

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/matching/SuperTypeReferencePattern.java

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/matching/SuperTypeReferencePattern.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/matching/SuperTypeReferencePattern.java	2007-07-16 15:12:48 UTC (rev 2765)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/search/matching/SuperTypeReferencePattern.java	2007-07-16 15:59:10 UTC (rev 2766)
@@ -54,7 +54,7 @@
 		superTypeName = OBJECT;
 	char[] superSimpleName = CharOperation.lastSegment(superTypeName, "::");
 	char[] superQualification = null;
-	if (superSimpleName != superTypeName) {
+	if (!CharOperation.equals(superSimpleName, superTypeName)) {
 		int length = superTypeName.length - superSimpleName.length - 1;
 		superQualification = new char[length];
 		System.arraycopy(superTypeName, 0, superQualification, 0, length);
@@ -63,7 +63,7 @@
 	// if the supertype name contains a $, then split it into: source name and append the $ prefix to the qualification
 	//	e.g. p.A$B ---> p.A$ + B
 	char[] superTypeSourceName = CharOperation.lastSegment(superSimpleName, "::");
-	if (superTypeSourceName != superSimpleName) {
+	if (!CharOperation.equals(superSimpleName, superTypeSourceName)) {
 		int start = superQualification == null ? 0 : superQualification.length + 1;
 		int prefixLength = superSimpleName.length - superTypeSourceName.length;
 		char[] mangledQualification = new char[start + prefixLength];
@@ -82,7 +82,7 @@
 		packageName = ONE_ZERO; // save some space
 	
 
-	// superSimpleName / superQualification / simpleName / enclosingTypeName / typeParameters / packageName / superClassOrInterface classOrInterface modifiers
+	// superSimpleName / superQualification / simpleName / enclosingTypeName / packageName / superClassOrModule classOrModule modifiers
 	int superLength = superSimpleName == null ? 0 : superSimpleName.length;
 	int superQLength = superQualification == null ? 0 : superQualification.length;
 	int simpleLength = simpleName == null ? 0 : simpleName.length;


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