No really, this *is* the last fix that will make the build work.

diff --git a/ajde/testsrc/org/aspectj/ajde/SavedModelConsistencyTest.java b/ajde/testsrc/org/aspectj/ajde/SavedModelConsistencyTest.java
index faa095054ad917053103a976ee4e4b5c8a337768..68938152318f50618e5940503933013859ef2c5f 100644 (file)
--- a/ajde/testsrc/org/aspectj/ajde/SavedModelConsistencyTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/SavedModelConsistencyTest.java
@@ -49,14 +49,15 @@ public class SavedModelConsistencyTest extends AjdeTestCase {
                assertTrue(testFile.exists());
                
                IProgramElement nodePreBuild = model.findElementForSourceLine(testFile.getAbsolutePath(), 5);   
-//             System.err.println(nodePreBuild.getKind());
+               //System.err.println(nodePreBuild.getKind());
 
                doSynchronousBuild(CONFIG_FILE_PATH);   
 
                IProgramElement nodePostBuild = model.findElementForSourceLine(testFile.getAbsolutePath(), 5);  
-//             System.err.println(nodePostBuild.getKind());
+               //System.err.println(nodePostBuild.getKind());
                
-               assertTrue(nodePreBuild.getKind().equals(nodePostBuild.getKind()));
+               assertTrue("Nodes should be identical: Prebuild kind = "+nodePreBuild.getKind()+
+                                  "   Postbuild kind = "+nodePostBuild.getKind(),nodePreBuild.getKind().equals(nodePostBuild.getKind()));
                
        }
 
@@ -88,7 +89,7 @@ public class SavedModelConsistencyTest extends AjdeTestCase {
 //             System.err.println(preBuildKinds);
 //             System.err.println(postBuildKinds);
                
-               assertTrue(preBuildKinds.equals(postBuildKinds));
+               assertTrue("Lists should be the same: PRE"+preBuildKinds.toString()+"  POST"+postBuildKinds.toString(),preBuildKinds.equals(postBuildKinds));
                
        }
          

diff --git a/asm/src/org/aspectj/asm/internal/RelationshipMap.java b/asm/src/org/aspectj/asm/internal/RelationshipMap.java
index b70887af6d8375f406b46ff6a8746ac16095cfdf..6fb5b74c4744c01279c739e18d042f65bb31be6f 100644 (file)
--- a/asm/src/org/aspectj/asm/internal/RelationshipMap.java
+++ b/asm/src/org/aspectj/asm/internal/RelationshipMap.java
@@ -111,7 +111,8 @@ public class RelationshipMap extends HashMap implements IRelationshipMap {
                super.remove(source);   
        }
        
-       public Object put(Object o, Object p) {throw new RuntimeException("Fuck off!");
+       public Object put(Object o, Object p) {
+               return super.put(o,p);
        }
        public void put(String source, IRelationship relationship) {
                System.err.println(">> for: " + source + ", put::" + relationship);