@@ -38,7 +38,7 @@ public class AsmManager { | |||
private IElementHandleProvider handleProvider; | |||
private List structureListeners = new ArrayList(); | |||
private boolean shouldSaveModel = true; | |||
// private boolean shouldSaveModel = true; | |||
public void setRelationshipMap(IRelationshipMap irm) { mapper = irm;} | |||
@@ -245,9 +245,9 @@ public class AsmManager { | |||
return configFilePath.substring(0, configFilePath.lastIndexOf(".lst")) + ".ajsym"; | |||
} | |||
public void setShouldSaveModel(boolean shouldSaveModel) { | |||
this.shouldSaveModel = shouldSaveModel; | |||
} | |||
// public void setShouldSaveModel(boolean shouldSaveModel) { | |||
// this.shouldSaveModel = shouldSaveModel; | |||
// } | |||
// ==== implementation of canonical file path map and accessors ============== | |||
@@ -700,7 +700,7 @@ public class AsmManager { | |||
// flightrecorder.append("In removeNode, about to chuck away: "+progElem+"\n"); | |||
verifyAssumption(progElem!=null); | |||
boolean deleteOK = false; | |||
// boolean deleteOK = false; | |||
IProgramElement parent = progElem.getParent(); | |||
// flightrecorder.append("Parent of it is "+parent+"\n"); | |||
List kids = parent.getChildren(); | |||
@@ -710,7 +710,7 @@ public class AsmManager { | |||
if (kids.get(i).equals(progElem)) { | |||
kids.remove(i); | |||
// flightrecorder.append("Removing it\n"); | |||
deleteOK=true; | |||
// deleteOK=true; | |||
break; | |||
} | |||
} |
@@ -21,14 +21,14 @@ package org.aspectj.asm; | |||
*/ | |||
public abstract class HierarchyWalker { | |||
private IHierarchy hierarchy; | |||
// private IHierarchy hierarchy; | |||
public HierarchyWalker() { | |||
super(); | |||
} | |||
public HierarchyWalker(IHierarchy hierarchy) { | |||
this.hierarchy = hierarchy; | |||
// this.hierarchy = hierarchy; | |||
} | |||
protected void preProcess(IProgramElement node) { } |
@@ -32,6 +32,7 @@ public interface IProgramElement extends Serializable { | |||
// Extra stuff | |||
// Could be just a string but may prove more useful as an object in the long run ... | |||
public static class ExtraInformation implements Serializable { | |||
private static final long serialVersionUID = -3880735494840820638L; | |||
private String extraInfo; | |||
public ExtraInformation() { extraInfo = "";} | |||
@@ -148,6 +149,8 @@ public interface IProgramElement extends Serializable { | |||
*/ | |||
public static class Modifiers implements Serializable { | |||
private static final long serialVersionUID = -8279300899976607927L; | |||
public static final Modifiers STATIC = new Modifiers("static"); | |||
public static final Modifiers FINAL = new Modifiers("final"); | |||
public static final Modifiers ABSTRACT = new Modifiers("abstract"); | |||
@@ -180,6 +183,8 @@ public interface IProgramElement extends Serializable { | |||
*/ | |||
public static class Accessibility implements Serializable { | |||
private static final long serialVersionUID = 5371838588180918519L; | |||
public static final Accessibility PUBLIC = new Accessibility("public"); | |||
public static final Accessibility PACKAGE = new Accessibility("package"); | |||
public static final Accessibility PROTECTED = new Accessibility("protected"); | |||
@@ -209,6 +214,8 @@ public interface IProgramElement extends Serializable { | |||
*/ | |||
public static class Kind implements Serializable { | |||
private static final long serialVersionUID = -1963553877479266124L; | |||
public static final Kind PROJECT = new Kind("project"); | |||
public static final Kind PACKAGE = new Kind("package"); | |||
public static final Kind FILE = new Kind("file"); |
@@ -38,7 +38,9 @@ public interface IRelationship extends Serializable { | |||
*/ | |||
public static class Kind implements Serializable { | |||
public static final Kind DECLARE_WARNING = new Kind("declare warning"); | |||
private static final long serialVersionUID = -2691351740214705220L; | |||
public static final Kind DECLARE_WARNING = new Kind("declare warning"); | |||
public static final Kind DECLARE_ERROR = new Kind("declare error"); | |||
public static final Kind ADVICE_AROUND = new Kind("around advice"); | |||
public static final Kind ADVICE_AFTERRETURNING = new Kind("after returning advice"); |
@@ -25,7 +25,9 @@ import org.aspectj.bridge.*; | |||
*/ | |||
public class AspectJElementHierarchy implements IHierarchy { | |||
protected IProgramElement root = null; | |||
private static final long serialVersionUID = 6462734311117048620L; | |||
protected IProgramElement root = null; | |||
protected String configFile = null; | |||
private Map fileMap = null; |
@@ -29,6 +29,8 @@ import org.aspectj.bridge.ISourceLocation; | |||
*/ | |||
public class ProgramElement implements IProgramElement { | |||
private static final long serialVersionUID = 171673495267384449L; | |||
protected IProgramElement parent = null; | |||
protected String name = ""; | |||
// children.listIterator() should support remove() operation | |||
@@ -43,7 +45,7 @@ public class ProgramElement implements IProgramElement { | |||
private Accessibility accessibility; | |||
private String declaringType = ""; | |||
private String formalComment = ""; | |||
private String packageName = null; | |||
//private String packageName = null; | |||
private boolean runnable = false; | |||
private boolean implementor = false; | |||
private boolean overrider = false; | |||
@@ -116,7 +118,7 @@ public class ProgramElement implements IProgramElement { | |||
this.modifiers = genModifiers(modifiers); | |||
this.accessibility = accessibility; | |||
this.declaringType = declaringType; | |||
this.packageName = packageName; | |||
//this.packageName = packageName; | |||
this.formalComment = formalComment; | |||
this.relations = relations; | |||
cacheByHandle(); |
@@ -25,6 +25,8 @@ import org.aspectj.asm.IRelationship; | |||
*/ | |||
public class Relationship implements IRelationship { | |||
private static final long serialVersionUID = 3855166397957609120L; | |||
private String name; | |||
private Kind kind; | |||
private String sourceHandle; |
@@ -25,18 +25,21 @@ import org.aspectj.asm.IRelationship.Kind; | |||
*/ | |||
public class RelationshipMap extends HashMap implements IRelationshipMap { | |||
// As this gets serialized, make the hierarchy transient and | |||
// settable | |||
private transient IHierarchy hierarchy; | |||
private static final long serialVersionUID = 496638323566589643L; | |||
// // As this gets serialized, make the hierarchy transient and | |||
// // settable | |||
// private transient IHierarchy hierarchy; | |||
public RelationshipMap() { } | |||
public RelationshipMap(IHierarchy hierarchy) { | |||
this.hierarchy = hierarchy; | |||
// this.hierarchy = hierarchy; | |||
} | |||
public void setHierarchy(IHierarchy hierarchy) { | |||
this.hierarchy = hierarchy; | |||
// commented out as field never read ! | |||
// this.hierarchy = hierarchy; | |||
} | |||
public List get(String handle) { |