141730 - latest variant of program element signature processing

5 files changed, 3 insertions, 38 deletions

diff --git a/asm/src/org/aspectj/asm/AsmManager.java b/asm/src/org/aspectj/asm/AsmManager.java
index f7d0c677e..e9b8c4bc1 100644
--- a/asm/src/org/aspectj/asm/AsmManager.java
+++ b/asm/src/org/aspectj/asm/AsmManager.java
@@ -77,9 +77,8 @@ public class AsmManager {
         handleProvider = new OptimizedFullPathHandleProvider(); 
     }
 	
-	public void createNewASM(INameConvertor convertor) {
+	public void createNewASM() {
 		hierarchy = new AspectJElementHierarchy();
-		hierarchy.setNameConvertor(convertor);
 		mapper = new RelationshipMap(hierarchy);
 	}
 	
diff --git a/asm/src/org/aspectj/asm/IHierarchy.java b/asm/src/org/aspectj/asm/IHierarchy.java
index 82428481b..d458da338 100644
--- a/asm/src/org/aspectj/asm/IHierarchy.java
+++ b/asm/src/org/aspectj/asm/IHierarchy.java
@@ -102,7 +102,4 @@ public interface IHierarchy extends Serializable {
 	public void flushHandleMap();
 
 	public void updateHandleMap(Set deletedFiles);
-	
-	public void setNameConvertor(INameConvertor convertor);
-	public INameConvertor getNameConvertor();
 }
\ No newline at end of file
diff --git a/asm/src/org/aspectj/asm/INameConvertor.java b/asm/src/org/aspectj/asm/INameConvertor.java
deleted file mode 100644
index 58197bbf7..000000000
--- a/asm/src/org/aspectj/asm/INameConvertor.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/********************************************************************
- * Copyright (c) 2006 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
- * 				 Helen Hawkins   - initial version
- *******************************************************************/
-package org.aspectj.asm;
-
-public interface INameConvertor {
-
-	public char[] convertName(char[] name);
-	
-}
diff --git a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
index 62a1a31a8..42c60a203 100644
--- a/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
+++ b/asm/src/org/aspectj/asm/internal/AspectJElementHierarchy.java
@@ -29,7 +29,6 @@ public class AspectJElementHierarchy implements IHierarchy {
 	
 	protected  IProgramElement root = null;
     protected String configFile = null;
-    private transient INameConvertor convertor = null;
 
     private Map fileMap = null;
     private Map handleMap = null;
@@ -450,13 +449,5 @@ public class AspectJElementHierarchy implements IHierarchy {
 		return hid.substring(0,hid.indexOf("|"));
 	}
 
-	public void setNameConvertor(INameConvertor convertor) {
-		this.convertor = convertor;
-	}
-
-	public INameConvertor getNameConvertor() {
-		return convertor;
-	}
-
 }
 
diff --git a/asm/src/org/aspectj/asm/internal/ProgramElement.java b/asm/src/org/aspectj/asm/internal/ProgramElement.java
index 0e8826fc1..acddddfb2 100644
--- a/asm/src/org/aspectj/asm/internal/ProgramElement.java
+++ b/asm/src/org/aspectj/asm/internal/ProgramElement.java
@@ -22,11 +22,11 @@ import java.util.Map;
 
 import org.aspectj.asm.AsmManager;
 import org.aspectj.asm.HierarchyWalker;
-import org.aspectj.asm.INameConvertor;
 import org.aspectj.asm.IProgramElement;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
 import org.aspectj.util.CharOperation;
+import org.aspectj.util.NameConvertor;
 
 
 /**
@@ -519,12 +519,7 @@ public class ProgramElement implements IProgramElement {
 		List params = new ArrayList();
 		for (Iterator iter = l.iterator(); iter.hasNext();) {
 			char[] param = (char[])iter.next();
-			INameConvertor convertor = AsmManager.getDefault().getHierarchy().getNameConvertor();
-			if (convertor != null) {
-				params.add(convertor.convertName(param));				
-			} else {
-				params.add(param);
-			}
+			params.add(NameConvertor.convertFromSignature(param));
 		}
 		return params;
 	}