From 356a8c6a61cf7d8bcdbc59c39d2abd73e2a9eaa0 Mon Sep 17 00:00:00 2001
From: hoenicke <hoenicke@379699f6-c40d-0410-875b-85095c16579e>
Date: Thu, 27 Jul 2000 09:36:47 +0000
Subject: [PATCH] New implementation to get the alias of a class
 getClassAlias(). PackageIdentifer.findAlias() removed since it was broken.

git-svn-id: https://svn.code.sf.net/p/jode/code/branches/branch_1_1@1259 379699f6-c40d-0410-875b-85095c16579e
---
 jode/jode/obfuscator/ClassBundle.java.in       |  9 ++++++++-
 jode/jode/obfuscator/PackageIdentifier.java.in | 15 ---------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/jode/jode/obfuscator/ClassBundle.java.in b/jode/jode/obfuscator/ClassBundle.java.in
index c9ba0f6..361e7d3 100644
--- a/jode/jode/obfuscator/ClassBundle.java.in
+++ b/jode/jode/obfuscator/ClassBundle.java.in
@@ -248,6 +248,13 @@ public class ClassBundle implements OptionHandler {
 	return alias;
     }
 
+    public String getClassAlias(String className) {
+	ClassIdentifier classIdent = getClassIdentifier(className);
+	if (classIdent == null)
+	    return className;
+	return classIdent.getFullAlias();
+    }
+
     public String getTypeAlias(String typeSig) {
 	String alias = (String) aliasesHash.get(typeSig);
 	if (alias == null) { 
@@ -256,7 +263,7 @@ public class ClassBundle implements OptionHandler {
 	    while ((nextindex = typeSig.indexOf('L', index)) != -1) {
 		newSig.append(typeSig.substring(index, nextindex+1));
 		index = typeSig.indexOf(';', nextindex);
-		String typeAlias = basePackage.findAlias
+		String typeAlias = getClassAlias
 		    (typeSig.substring(nextindex+1, index).replace('/','.'));
 		newSig.append(typeAlias.replace('.', '/'));
 	    }
diff --git a/jode/jode/obfuscator/PackageIdentifier.java.in b/jode/jode/obfuscator/PackageIdentifier.java.in
index cf239f3..a8b3ee5 100644
--- a/jode/jode/obfuscator/PackageIdentifier.java.in
+++ b/jode/jode/obfuscator/PackageIdentifier.java.in
@@ -310,21 +310,6 @@ public class PackageIdentifier extends Identifier {
 	return "";
     }
 
-    public String findAlias(String className) {
-	int index = className.indexOf('.');
-	if (index == -1) {
-	    Identifier ident = getIdentifier(className);
-	    if (ident != null)
-		return ident.getFullAlias();
-	} else {
-	    Identifier pack = getIdentifier(className.substring(0, index));
-	    if (pack != null)
-		return ((PackageIdentifier)pack)
-		    .findAlias(className.substring(index+1));
-	}
-	return className;
-    }
-
     public void buildTable(Renamer renameRule) {
 	loadOnDemand = false;
 	super.buildTable(renameRule);