Reimplemented ASM API as described in bug "41254: revise asm and create interfaces". Containment hierarchy is done and tests added. Relationships are not done yet. All clients except AJDT ported. More UI porting in Swing clients required.

1 files changed, 13 insertions, 9 deletions

diff --git a/testing/src/org/aspectj/testing/ajde/CompileCommand.java b/testing/src/org/aspectj/testing/ajde/CompileCommand.java
index fa8fb7d99..02da4ab43 100644
--- a/testing/src/org/aspectj/testing/ajde/CompileCommand.java
+++ b/testing/src/org/aspectj/testing/ajde/CompileCommand.java
@@ -16,15 +16,14 @@ import java.awt.Frame;
 import java.io.*;
 import java.lang.reflect.*;
 import java.util.*;
-import java.util.List;
 
 import org.aspectj.ajde.*;
 import org.aspectj.ajde.ui.*;
 import org.aspectj.ajde.ui.internal.*;
 import org.aspectj.ajde.ui.swing.*;
-import org.aspectj.asm.StructureNode;
+import org.aspectj.asm.*;
+import org.aspectj.asm.IProgramElement;
 import org.aspectj.bridge.*;
-import org.aspectj.util.*;
 import org.aspectj.util.FileUtil;
 
 /**
@@ -147,12 +146,17 @@ public class CompileCommand implements ICommand {
         };
         StructureViewNodeFactory structureViewNodeFactory =
             new StructureViewNodeFactory(iconRegistry) {
-            protected StructureViewNode createConcreteNode(
-                StructureNode node,
-                AbstractIcon icon,
-                List children) {
-                return new SwingTreeViewNode(node, icon, children);
-            }
+	            protected StructureViewNode createConcreteNode(
+	                IProgramElement node,
+	                AbstractIcon icon,
+	                List children) {
+	                return new SwingTreeViewNode(node, icon, children);
+	            }
+				protected StructureViewNode createConcreteNode(
+					IRelationship node,
+					AbstractIcon icon) {
+					return new SwingTreeViewNode(node, icon);
+				}	            
         };
 
         Ajde.init(