Bug 465986 - during reconcile role files are not properly added to the

team's TypeDeclaration
- NPE fix (smap generation)
- adjusted one more test to changed compile order

2 files changed, 7 insertions, 7 deletions

diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/smap/RoleSmapGenerator.java b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/smap/RoleSmapGenerator.java
index 6679d18f6..6ab0051de 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/smap/RoleSmapGenerator.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/objectteams/otdt/internal/core/compiler/smap/RoleSmapGenerator.java
@@ -111,7 +111,7 @@ public class RoleSmapGenerator extends AbstractSmapGenerator
 	        // for testability ensure stable order:
 	        ReferenceBinding[] types = typesSet.toArray(new ReferenceBinding[typesSet.size()]);
 	        Arrays.sort(types, new Comparator<ReferenceBinding>() {
-	        	public int compare(ReferenceBinding o1, ReferenceBinding o2) { return CharOperation.compareTo(o1.constantPoolName, o2.constantPoolName); }
+	        	public int compare(ReferenceBinding o1, ReferenceBinding o2) { return CharOperation.compareTo(o1.constantPoolName(), o2.constantPoolName()); }
 			});
 			for (ReferenceBinding copySrc : types)

 	        {

diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutMethodBinding.java b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutMethodBinding.java
index 73d311e1e..1d36dfe30 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutMethodBinding.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/otjld/org/eclipse/objectteams/otdt/tests/otjld/calloutbinding/CalloutMethodBinding.java
@@ -3145,6 +3145,12 @@ public class CalloutMethodBinding extends AbstractOTJLDTest {
             "Zork cannot be resolved to a type\n" + 
             "----------\n"
             :
+        	"----------\n" + 
+        	"1. WARNING in t\\Team3117ic14_1.java (at line 10)\n" + 
+        	"	protected class Role1 implements IBase playedBy BaseClass {\n" + 
+        	"	                                                ^^^^^^^^^\n" + 
+        	"Base class b.BaseClass has class file version 52 which cannot be handled by the traditional OTRE based on BCEL. Please consider using the ASM based OTDRE instead.\n" + 
+        	"----------\n" +
     		"----------\n" + 
     		"1. WARNING in t\\Team3117ic14_2.java (at line 7)\n" + 
     		"	protected class Role1 {\n" + 
@@ -3155,12 +3161,6 @@ public class CalloutMethodBinding extends AbstractOTJLDTest {
     		"	Zork extra2;\n" + 
     		"	^^^^\n" + 
     		"Zork cannot be resolved to a type\n" + 
-    		"----------\n" + 
-    		"----------\n" + 
-    		"1. WARNING in t\\Team3117ic14_1.java (at line 10)\n" + 
-    		"	protected class Role1 implements IBase playedBy BaseClass {\n" + 
-    		"	                                                ^^^^^^^^^\n" + 
-    		"Base class b.BaseClass has class file version 52 which cannot be handled by the traditional OTRE based on BCEL. Please consider using the ASM based OTDRE instead.\n" + 
     		"----------\n"
     		),
             null,//libs