import org.aspectj.bridge.ISourceLocation;
/**
- * The Abstract Structure Model (ASM) represents the containment hierarchy and crossccutting structure map for AspectJ programs. It
- * is used by IDE views such as the document outline, and by other tools such as ajdoc to show both AspectJ declarations and
- * crosscutting links, such as which advice affects which join point shadows.
+ * The Abstract Structure Model (ASM) represents the containment hierarchy and
+ * crossccutting structure map for AspectJ programs. It is used by IDE views
+ * such as the document outline, and by other tools such as ajdoc to show both
+ * AspectJ declarations and crosscutting links, such as which advice affects
+ * which join point shadows.
*
* @author Mik Kersten
*/
private static AsmManager instance = new AsmManager();
private IElementHandleProvider handleProvider;
- private List structureListeners = new ArrayList();
+ private final List structureListeners = new ArrayList();
- // The model is 'manipulated' by the AjBuildManager.setupModel() code which trashes all the
+ // The model is 'manipulated' by the AjBuildManager.setupModel() code which
+ // trashes all the
// fields when setting up a new model for a batch build.
- // Due to the requirements of incremental compilation we need to tie some of the info
- // below to the AjState for a compilation and recover it if switching between projects.
+ // Due to the requirements of incremental compilation we need to tie some of
+ // the info
+ // below to the AjState for a compilation and recover it if switching
+ // between projects.
protected IHierarchy hierarchy;
private IRelationshipMap mapper;
private static boolean creatingModel = false;
- public static boolean dumpModelPostBuild = false; // Dumping the model is expensive
- // SECRETAPI asc pull the secret options together into a system API you lazy fool
+ public static boolean dumpModelPostBuild = false; // Dumping the model is
+ // expensive
+ // SECRETAPI asc pull the secret options together into a system API you lazy
+ // fool
public static boolean attemptIncrementalModelRepairs = false;
// For offline debugging, you can now ask for the AsmManager to
private static boolean reporting = false;
private static boolean completingTypeBindings = false;
- private CanonicalFilePathMap canonicalFilePathMap = new CanonicalFilePathMap();
- // Record the Set<File> for which the model has been modified during the last incremental build
- private Set lastBuildChanges = new HashSet();
+ private final CanonicalFilePathMap canonicalFilePathMap = new CanonicalFilePathMap();
+ // Record the Set<File> for which the model has been modified during the
+ // last incremental build
+ private final Set lastBuildChanges = new HashSet();
// static {
// setReporting("c:/model.nfo",true,true,true,true);
/**
* Constructs map each time it's called.
*/
- public HashMap getInlineAnnotations(String sourceFile, boolean showSubMember, boolean showMemberAndType) {
+ public HashMap getInlineAnnotations(String sourceFile,
+ boolean showSubMember, boolean showMemberAndType) {
if (!hierarchy.isValid())
return null;
} else {
IProgramElement fileNode = node;
ArrayList peNodes = new ArrayList();
- getAllStructureChildren(fileNode, peNodes, showSubMember, showMemberAndType);
+ getAllStructureChildren(fileNode, peNodes, showSubMember,
+ showMemberAndType);
for (Iterator it = peNodes.iterator(); it.hasNext();) {
IProgramElement peNode = (IProgramElement) it.next();
List entries = new ArrayList();
}
}
- private void getAllStructureChildren(IProgramElement node, List result, boolean showSubMember, boolean showMemberAndType) {
+ private void getAllStructureChildren(IProgramElement node, List result,
+ boolean showSubMember, boolean showMemberAndType) {
List children = node.getChildren();
if (node.getChildren() == null)
return;
IProgramElement next = (IProgramElement) it.next();
List rels = AsmManager.getDefault().getRelationshipMap().get(next);
if (next != null
- && ((next.getKind() == IProgramElement.Kind.CODE && showSubMember) || (next.getKind() != IProgramElement.Kind.CODE && showMemberAndType))
+ && ((next.getKind() == IProgramElement.Kind.CODE && showSubMember) || (next
+ .getKind() != IProgramElement.Kind.CODE && showMemberAndType))
&& rels != null && rels.size() > 0) {
result.add(next);
}
- getAllStructureChildren(next, result, showSubMember, showMemberAndType);
+ getAllStructureChildren(next, result, showSubMember,
+ showMemberAndType);
}
}
fos.close();
s.close();
} catch (Exception e) {
- // System.err.println("AsmManager: Unable to write structure model: "+configFilePath+" because of:");
+ //System.err.println("AsmManager: Unable to write structure model: "
+ // +configFilePath+" because of:");
// e.printStackTrace();
}
}
/**
- * @param configFilePath path to an ".lst" file
+ * @param configFilePath
+ * path to an ".lst" file
*/
public void readStructureModel(String configFilePath) {
boolean hierarchyReadOK = false;
} catch (EOFException eofe) {
// Might be an old format sym file that is missing its relationships
if (!hierarchyReadOK) {
- System.err.println("AsmManager: Unable to read structure model: " + configFilePath + " because of:");
+ System.err
+ .println("AsmManager: Unable to read structure model: "
+ + configFilePath + " because of:");
eofe.printStackTrace();
hierarchy.setRoot(IHierarchy.NO_STRUCTURE);
}
} catch (Exception e) {
- // System.err.println("AsmManager: Unable to read structure model: "+configFilePath+" because of:");
+ //System.err.println("AsmManager: Unable to read structure model: "+
+ // configFilePath+" because of:");
// e.printStackTrace();
hierarchy.setRoot(IHierarchy.NO_STRUCTURE);
} finally {
private String genExternFilePath(String configFilePath) {
// sometimes don't have ".lst"
if (configFilePath.lastIndexOf(".lst") != -1) {
- configFilePath = configFilePath.substring(0, configFilePath.lastIndexOf(".lst"));
+ configFilePath = configFilePath.substring(0, configFilePath
+ .lastIndexOf(".lst"));
}
return configFilePath + ".ajsym";
}
private static class CanonicalFilePathMap {
private static final int MAX_SIZE = 4000;
- private Map pathMap = new HashMap(20);
+ private final Map pathMap = new HashMap(20);
// // guards to ensure correctness and liveness
// private boolean cacheInUse = false;
// }
// new Thread() {
// public void run() {
- // System.out.println("Starting cache population: " + System.currentTimeMillis());
+ // System.out.println("Starting cache population: " +
+ // System.currentTimeMillis());
// Iterator it = files.iterator();
// while (!isStopRequested() && it.hasNext()) {
// File f = (File)it.next();
//
// /**
// * Stop pre-populating the cache - our customers are ready to use it.
- // * If there are any cache misses from this point on, we'll populate the
+ // * If there are any cache misses from this point on, we'll populate
+ // the
// * cache as we go.
- // * The handover is done this way to ensure that only one thread is ever
+ // * The handover is done this way to ensure that only one thread is
+ // ever
// * accessing the cache, and that we minimize synchronization.
// */
// public synchronized void handover() {
// }
public String get(File f) {
- // if (!cacheInUse) { // unsynchronized test - should never be parallel
+ // if (!cacheInUse) { // unsynchronized test - should never be
+ // parallel
// // threads at this point
// throw new IllegalStateException(
// "Must take ownership of cache before using by calling " +
}
// SECRETAPI
- public static void setReporting(String filename, boolean dModel, boolean dRels, boolean dDeltaProcessing, boolean deletefile) {
+ public static void setReporting(String filename, boolean dModel,
+ boolean dRels, boolean dDeltaProcessing, boolean deletefile) {
reporting = true;
dumpModel = dModel;
dumpRelationships = dRels;
dumpFilename = filename;
}
- public static void setReporting(String filename, boolean dModel, boolean dRels, boolean dDeltaProcessing, boolean deletefile,
+ public static void setReporting(String filename, boolean dModel,
+ boolean dRels, boolean dDeltaProcessing, boolean deletefile,
IModelFilter aFilter) {
setReporting(filename, dModel, dRels, dDeltaProcessing, deletefile);
modelFilter = aFilter;
FileWriter fw = new FileWriter(dumpFilename, true);
BufferedWriter bw = new BufferedWriter(fw);
if (dumpModel) {
- bw.write("=== MODEL STATUS REPORT ========= " + reasonForReport + "\n");
- dumptree(bw, AsmManager.getDefault().getHierarchy().getRoot(), 0);
+ bw.write("=== MODEL STATUS REPORT ========= " + reasonForReport
+ + "\n");
+ dumptree(bw, AsmManager.getDefault().getHierarchy().getRoot(),
+ 0);
bw.write("=== END OF MODEL REPORT =========\n");
}
if (dumpRelationships) {
- bw.write("=== RELATIONSHIPS REPORT ========= " + reasonForReport + "\n");
+ bw.write("=== RELATIONSHIPS REPORT ========= "
+ + reasonForReport + "\n");
dumprels(bw);
bw.write("=== END OF RELATIONSHIPS REPORT ==\n");
}
Properties p = ModelInfo.summarizeModel().getProperties();
Enumeration pkeyenum = p.keys();
- bw.write("=== Properties of the model and relationships map =====\n");
+ bw
+ .write("=== Properties of the model and relationships map =====\n");
while (pkeyenum.hasMoreElements()) {
String pkey = (String) pkeyenum.nextElement();
bw.write(pkey + "=" + p.getProperty(pkey) + "\n");
bw.flush();
fw.close();
} catch (IOException e) {
- System.err.println("InternalError: Unable to report model information:");
+ System.err
+ .println("InternalError: Unable to report model information:");
e.printStackTrace();
}
}
- public static void dumptree(Writer w, IProgramElement node, int indent) throws IOException {
+ public static void dumptree(Writer w, IProgramElement node, int indent)
+ throws IOException {
for (int i = 0; i < indent; i++)
w.write(" ");
String loc = "";
loc = modelFilter.processFilelocation(loc);
}
}
- w.write(node + " [" + (node == null ? "null" : node.getKind().toString()) + "] " + loc + "\n");
+ w.write(node + " ["
+ + (node == null ? "null" : node.getKind().toString()) + "] "
+ + loc + "\n");
if (node != null)
for (Iterator i = node.getChildren().iterator(); i.hasNext();) {
dumptree(w, (IProgramElement) i.next(), indent + 2);
}
}
- public static void dumptree(IProgramElement node, int indent) throws IOException {
+ public static void dumptree(IProgramElement node, int indent)
+ throws IOException {
for (int i = 0; i < indent; i++)
System.out.print(" ");
String loc = "";
if (node.getSourceLocation() != null)
loc = node.getSourceLocation().toString();
}
- System.out.println(node + " [" + (node == null ? "null" : node.getKind().toString()) + "] " + loc);
+ System.out.println(node + " ["
+ + (node == null ? "null" : node.getKind().toString()) + "] "
+ + loc);
if (node != null)
for (Iterator i = node.getChildren().iterator(); i.hasNext();) {
dumptree((IProgramElement) i.next(), indent + 2);
for (Iterator iterator = rels.iterator(); iterator.hasNext();) {
IRelationship ir = (IRelationship) iterator.next();
List targets = ir.getTargets();
- for (Iterator iterator2 = targets.iterator(); iterator2.hasNext();) {
+ for (Iterator iterator2 = targets.iterator(); iterator2
+ .hasNext();) {
String thid = (String) iterator2.next();
StringBuffer sb = new StringBuffer();
if (modelFilter == null || modelFilter.wantsHandleIds())
sb.append("Hid:" + (ctr++) + ":");
- sb.append("(targets=" + targets.size() + ") " + hid + " (" + ir.getName() + ") " + thid + "\n");
+ sb.append("(targets=" + targets.size() + ") " + hid + " ("
+ + ir.getName() + ") " + thid + "\n");
w.write(sb.toString());
}
}
for (Iterator iterator = rels.iterator(); iterator.hasNext();) {
IRelationship ir = (IRelationship) iterator.next();
List targets = ir.getTargets();
- for (Iterator iterator2 = targets.iterator(); iterator2.hasNext();) {
+ for (Iterator iterator2 = targets.iterator(); iterator2
+ .hasNext();) {
String thid = (String) iterator2.next();
- System.err.println("Hid:" + (ctr++) + ":(targets=" + targets.size() + ") " + hid + " (" + ir.getName() + ") "
- + thid);
+ System.err.println("Hid:" + (ctr++) + ":(targets="
+ + targets.size() + ") " + hid + " (" + ir.getName()
+ + ") " + thid);
}
}
}
System.err.println("End of relationships dump for: " + key);
}
- // ===================== DELTA PROCESSING CODE ============== start ==========//
+ // ===================== DELTA PROCESSING CODE ============== start
+ // ==========//
/**
- * Removes the hierarchy structure for the specified files from the structure model. Returns true if it deleted anything
+ * Removes the hierarchy structure for the specified files from the
+ * structure model. Returns true if it deleted anything
*/
- public boolean removeStructureModelForFiles(Writer fw, Collection files) throws IOException {
+ public boolean removeStructureModelForFiles(Writer fw, Collection files)
+ throws IOException {
IHierarchy model = AsmManager.getDefault().getHierarchy();
Set deletedNodes = new HashSet();
for (Iterator iter = files.iterator(); iter.hasNext();) {
File fileForCompilation = (File) iter.next();
- String correctedPath = AsmManager.getDefault().getCanonicalFilePath(fileForCompilation);
- IProgramElement progElem = (IProgramElement) model.findInFileMap(correctedPath);
+ String correctedPath = AsmManager.getDefault()
+ .getCanonicalFilePath(fileForCompilation);
+ IProgramElement progElem = (IProgramElement) model
+ .findInFileMap(correctedPath);
if (progElem != null) {
// Found it, let's remove it
if (dumpDeltaProcessing) {
- fw.write("Deleting " + progElem + " node for file " + fileForCompilation + "\n");
+ fw.write("Deleting " + progElem + " node for file "
+ + fileForCompilation + "\n");
}
removeNode(progElem);
lastBuildChanges.add(fileForCompilation);
- deletedNodes.add(getCanonicalFilePath(progElem.getSourceLocation().getSourceFile()));
+ deletedNodes.add(getCanonicalFilePath(progElem
+ .getSourceLocation().getSourceFile()));
if (!model.removeFromFileMap(correctedPath))
- throw new RuntimeException("Whilst repairing model, couldn't remove entry for file: " + correctedPath
- + " from the filemap");
+ throw new RuntimeException(
+ "Whilst repairing model, couldn't remove entry for file: "
+ + correctedPath + " from the filemap");
modelModified = true;
}
}
// This code is *SLOW* but it isnt worth fixing until we address the
// bugs in binary weaving.
- public void fixupStructureModel(Writer fw, List filesToBeCompiled, Set files_added, Set files_deleted) throws IOException {
+ public void fixupStructureModel(Writer fw, List filesToBeCompiled,
+ Set files_added, Set files_deleted) throws IOException {
// Three kinds of things to worry about:
// 1. New files have been added since the last compile
// 2. Files have been deleted since the last compile
- // 3. Files have 'changed' since the last compile (really just those in config.getFiles())
+ // 3. Files have 'changed' since the last compile (really just those in
+ // config.getFiles())
// List files = config.getFiles();
IHierarchy model = AsmManager.getDefault().getHierarchy();
boolean modelModified = false;
- // Files to delete are: those to be compiled + those that have been deleted
+ // Files to delete are: those to be compiled + those that have been
+ // deleted
Set filesToRemoveFromStructureModel = new HashSet(filesToBeCompiled);
filesToRemoveFromStructureModel.addAll(files_deleted);
Set deletedNodes = new HashSet();
- for (Iterator iter = filesToRemoveFromStructureModel.iterator(); iter.hasNext();) {
+ for (Iterator iter = filesToRemoveFromStructureModel.iterator(); iter
+ .hasNext();) {
File fileForCompilation = (File) iter.next();
- String correctedPath = AsmManager.getDefault().getCanonicalFilePath(fileForCompilation);
- IProgramElement progElem = (IProgramElement) model.findInFileMap(correctedPath);
+ String correctedPath = AsmManager.getDefault()
+ .getCanonicalFilePath(fileForCompilation);
+ IProgramElement progElem = (IProgramElement) model
+ .findInFileMap(correctedPath);
if (progElem != null) {
// Found it, let's remove it
if (dumpDeltaProcessing) {
- fw.write("Deleting " + progElem + " node for file " + fileForCompilation + "\n");
+ fw.write("Deleting " + progElem + " node for file "
+ + fileForCompilation + "\n");
}
removeNode(progElem);
- deletedNodes.add(getCanonicalFilePath(progElem.getSourceLocation().getSourceFile()));
+ deletedNodes.add(getCanonicalFilePath(progElem
+ .getSourceLocation().getSourceFile()));
if (!model.removeFromFileMap(correctedPath))
- throw new RuntimeException("Whilst repairing model, couldn't remove entry for file: " + correctedPath
- + " from the filemap");
+ throw new RuntimeException(
+ "Whilst repairing model, couldn't remove entry for file: "
+ + correctedPath + " from the filemap");
modelModified = true;
}
}
}
}
- public void processDelta(Collection files_tobecompiled, Set files_added, Set files_deleted) {
+ public void processDelta(Collection files_tobecompiled, Set files_added,
+ Set files_deleted) {
try {
Writer fw = null;
FileWriter filew = new FileWriter(dumpFilename, true);
fw = new BufferedWriter(filew);
fw.write("=== Processing delta changes for the model ===\n");
- fw.write("Files for compilation:#" + files_tobecompiled.size() + ":" + files_tobecompiled + "\n");
- fw.write("Files added :#" + files_added.size() + ":" + files_added + "\n");
- fw.write("Files deleted :#" + files_deleted.size() + ":" + files_deleted + "\n");
+ fw.write("Files for compilation:#" + files_tobecompiled.size()
+ + ":" + files_tobecompiled + "\n");
+ fw.write("Files added :#" + files_added.size() + ":"
+ + files_added + "\n");
+ fw.write("Files deleted :#" + files_deleted.size() + ":"
+ + files_deleted + "\n");
}
long stime = System.currentTimeMillis();
- // fixupStructureModel(fw,filesToBeCompiled,files_added,files_deleted);
+ //fixupStructureModel(fw,filesToBeCompiled,files_added,files_deleted
+ // );
// Let's remove all the files that are deleted on this compile
removeStructureModelForFiles(fw, files_deleted);
- long etime1 = System.currentTimeMillis(); // etime1-stime = time to fix up the model
+ long etime1 = System.currentTimeMillis(); // etime1-stime = time to
+ // fix up the model
repairRelationships(fw);
- long etime2 = System.currentTimeMillis(); // etime2-stime = time to repair the relationship map
+ long etime2 = System.currentTimeMillis(); // etime2-stime = time to
+ // repair the
+ // relationship map
removeStructureModelForFiles(fw, files_tobecompiled);
if (dumpDeltaProcessing) {
fw.write("===== Delta Processing timing ==========\n");
- fw.write("Hierarchy=" + (etime1 - stime) + "ms Relationshipmap=" + (etime2 - etime1) + "ms\n");
+ fw.write("Hierarchy=" + (etime1 - stime)
+ + "ms Relationshipmap=" + (etime2 - etime1) + "ms\n");
fw.write("===== Traversal ========================\n");
// fw.write("Source handles processed="+srchandlecounter+"\n");
// fw.write("Target handles processed="+tgthandlecounter+"\n");
*
* A affects B B affectedBy A
*
- * Both of these relationships are added when 'B' is modified. Concrete examples are 'advises/advisedby' or
- * 'annotates/annotatedby'.
+ * Both of these relationships are added when 'B' is modified. Concrete
+ * examples are 'advises/advisedby' or 'annotates/annotatedby'.
*
- * What we need to do is when 'B' is going to be woven, remove all relationships that may reoccur when it is woven. So - remove
- * 'affects' relationships where the target is 'B', remove all 'affectedBy' relationships where the source is 'B'.
+ * What we need to do is when 'B' is going to be woven, remove all
+ * relationships that may reoccur when it is woven. So - remove 'affects'
+ * relationships where the target is 'B', remove all 'affectedBy'
+ * relationships where the source is 'B'.
*
*/
public void removeRelationshipsTargettingThisType(String typename) {
boolean debug = false;
if (debug)
- System.err.println(">>removeRelationshipsTargettingThisType " + typename);
+ System.err.println(">>removeRelationshipsTargettingThisType "
+ + typename);
String pkg = null;
String type = typename;
int lastSep = typename.lastIndexOf('.');
IProgramElement typeNode = hierarchy.findElementForType(pkg, type);
// Reasons for that being null:
- // 1. the file has fundamental errors and so doesn't exist in the model (-proceedOnError probably forced us to weave)
+ // 1. the file has fundamental errors and so doesn't exist in the model
+ // (-proceedOnError probably forced us to weave)
if (typeNode == null)
return;
Set sourcesToRemove = new HashSet();
- // Iterate over the source handles in the relationships map, the aim here is to remove any 'affected by'
- // relationships where the source of the relationship is the specified type (since it will be readded
+ // Iterate over the source handles in the relationships map, the aim
+ // here is to remove any 'affected by'
+ // relationships where the source of the relationship is the specified
+ // type (since it will be readded
// when the type is woven)
Set sourcehandlesSet = mapper.getEntries();
List relationshipsToRemove = new ArrayList();
// worth continuing as there may be a relationship to remove
relationshipsToRemove.clear();
List relationships = mapper.get(hid);
- for (Iterator reliter = relationships.iterator(); reliter.hasNext();) {
+ for (Iterator reliter = relationships.iterator(); reliter
+ .hasNext();) {
IRelationship rel = (IRelationship) reliter.next();
if (rel.getKind() == IRelationship.Kind.USES_POINTCUT)
- continue; // these relationships are added at compile time, argh
+ continue; // these relationships are added at compile
+ // time, argh
if (rel.isAffects())
- continue; // we want 'affected by' relationships - (e.g. advised by)
- relationshipsToRemove.add(rel); // all the relationships can be removed, regardless of the target(s)
+ continue; // we want 'affected by' relationships - (e.g.
+ // advised by)
+ relationshipsToRemove.add(rel); // all the relationships can
+ // be removed, regardless of
+ // the target(s)
}
- // Now, were any relationships emptied during that processing and so need removing for this source handle
+ // Now, were any relationships emptied during that processing
+ // and so need removing for this source handle
if (relationshipsToRemove.size() > 0) {
didsomething = true;
if (relationshipsToRemove.size() == relationships.size())
// Remove sources that have no valid relationships any more
for (Iterator srciter = sourcesToRemove.iterator(); srciter.hasNext();) {
String hid = (String) srciter.next();
- // System.err.println(" source handle: all relationships have gone for "+hid);
+ // System.err.println(
+ // " source handle: all relationships have gone for "+hid);
mapper.removeAll(hid);
IProgramElement ipe = hierarchy.getElement(hid);
if (ipe != null) {
// If the relationship was hanging off a 'code' node, delete it.
if (ipe.getKind().equals(IProgramElement.Kind.CODE)) {
if (debug)
- System.err.println(" source handle: it was code node, removing that as well... code=" + ipe + " parent="
- + ipe.getParent());
+ System.err
+ .println(" source handle: it was code node, removing that as well... code="
+ + ipe + " parent=" + ipe.getParent());
removeSingleNode(ipe);
}
}
dumprelsStderr("before processing 'affects'");
// Iterate over the source handles in the relationships map
sourcehandlesSet = mapper.getEntries();
- for (Iterator keyiter = sourcehandlesSet.iterator(); keyiter.hasNext();) {
+ for (Iterator keyiter = sourcehandlesSet.iterator(); keyiter
+ .hasNext();) {
String hid = (String) keyiter.next();
relationshipsToRemove.clear();
List relationships = mapper.get(hid);
- for (Iterator reliter = relationships.iterator(); reliter.hasNext();) {
+ for (Iterator reliter = relationships.iterator(); reliter
+ .hasNext();) {
IRelationship rel = (IRelationship) reliter.next();
if (rel.getKind() == IRelationship.Kind.USES_POINTCUT)
- continue; // these relationships are added at compile time, argh
+ continue; // these relationships are added at compile
+ // time, argh
if (!rel.isAffects())
continue;
List targets = rel.getTargets();
List targetsToRemove = new ArrayList();
- // find targets that target the type we are interested in, they need removing
- for (Iterator targetsIter = targets.iterator(); targetsIter.hasNext();) {
+ // find targets that target the type we are interested in,
+ // they need removing
+ for (Iterator targetsIter = targets.iterator(); targetsIter
+ .hasNext();) {
String targethid = (String) targetsIter.next();
// Does this point to the same type?
- IProgramElement existingTarget = hierarchy.getElement(targethid);
- if (existingTarget == null || sameType(targethid, existingTarget, typeNode))
+ IProgramElement existingTarget = hierarchy
+ .getElement(targethid);
+ if (existingTarget == null
+ || sameType(targethid, existingTarget, typeNode))
targetsToRemove.add(targethid);
}
relationshipsToRemove.add(rel);
else {
// Remove all the targets that are no longer valid
- for (Iterator targsIter = targetsToRemove.iterator(); targsIter.hasNext();) {
+ for (Iterator targsIter = targetsToRemove
+ .iterator(); targsIter.hasNext();) {
String togo = (String) targsIter.next();
targets.remove(togo);
}
}
}
}
- // Now, were any relationships emptied during that processing and so need removing for this source handle
+ // Now, were any relationships emptied during that processing
+ // and so need removing for this source handle
if (relationshipsToRemove.size() > 0) {
- // Are we removing *all* of the relationships for this source handle?
+ // Are we removing *all* of the relationships for this
+ // source handle?
if (relationshipsToRemove.size() == relationships.size())
sourcesToRemove.add(hid);
else {
}
}
// Remove sources that have no valid relationships any more
- for (Iterator srciter = sourcesToRemove.iterator(); srciter.hasNext();) {
+ for (Iterator srciter = sourcesToRemove.iterator(); srciter
+ .hasNext();) {
String hid = (String) srciter.next();
- // System.err.println(" source handle: all relationships have gone for "+hid);
+ // System.err.println(
+ // " source handle: all relationships have gone for "+hid);
mapper.removeAll(hid);
IProgramElement ipe = hierarchy.getElement(hid);
if (ipe != null) {
- // If the relationship was hanging off a 'code' node, delete it.
+ // If the relationship was hanging off a 'code' node, delete
+ // it.
if (ipe.getKind().equals(IProgramElement.Kind.CODE)) {
if (debug)
- System.err.println(" source handle: it was code node, removing that as well... code=" + ipe
- + " parent=" + ipe.getParent());
+ System.err
+ .println(" source handle: it was code node, removing that as well... code="
+ + ipe
+ + " parent="
+ + ipe.getParent());
removeSingleNode(ipe);
}
}
/**
* Return true if the target element is in the type specified.
*/
- private boolean sameType(String hid, IProgramElement target, IProgramElement type) {
+ private boolean sameType(String hid, IProgramElement target,
+ IProgramElement type) {
IProgramElement containingType = target;
if (target == null)
throw new RuntimeException("target can't be null!");
if (type == null)
throw new RuntimeException("type can't be null!");
if (target.getKind().isSourceFile()) {
- // @AJ aspect with broken relationship endpoint - we couldn't find the real
- // endpoint (the declare parents or ITD or similar) so defaulted to the
+ // @AJ aspect with broken relationship endpoint - we couldn't find
+ // the real
+ // endpoint (the declare parents or ITD or similar) so defaulted to
+ // the
// first line of the source file...
// FRAGILE
- // Let's assume the worst, and that it is the same type if the source files
- // are the same. This will break for multiple top level types in a file...
+ // Let's assume the worst, and that it is the same type if the
+ // source files
+ // are the same. This will break for multiple top level types in a
+ // file...
if (target.getSourceLocation() == null)
- return false; // these four possibilities should really be FIXED so we don't have this situation
+ return false; // these four possibilities should really be FIXED
+ // so we don't have this situation
if (type.getSourceLocation() == null)
return false;
if (target.getSourceLocation().getSourceFile() == null)
return false;
if (type.getSourceLocation().getSourceFile() == null)
return false;
- return (target.getSourceLocation().getSourceFile().equals(type.getSourceLocation().getSourceFile()));
+ return (target.getSourceLocation().getSourceFile().equals(type
+ .getSourceLocation().getSourceFile()));
}
while (!containingType.getKind().isType()) {
- // System.err.println("Checked: "+containingType.getKind()+" "+containingType);
+ // System.err.println("Checked: "+containingType.getKind()+" "+
+ // containingType);
containingType = containingType.getParent();
}
return (type.equals(containingType));
}
/**
- * Go through all the relationships in the model, if any endpoints no longer exist (the node it points to has been deleted from
- * the model) then delete the relationship.
+ * Go through all the relationships in the model, if any endpoints no longer
+ * exist (the node it points to has been deleted from the model) then delete
+ * the relationship.
*/
private void repairRelationships(Writer fw) {
try {
IHierarchy model = AsmManager.getDefault().getHierarchy();
// TODO Speed this code up by making this assumption:
- // the only piece of the handle that is interesting is the file name. We are working at file granularity, if the
- // file does not exist (i.e. its not in the filemap) then any handle inside that file cannot exist.
+ // the only piece of the handle that is interesting is the file
+ // name. We are working at file granularity, if the
+ // file does not exist (i.e. its not in the filemap) then any handle
+ // inside that file cannot exist.
if (dumpDeltaProcessing)
fw.write("Repairing relationships map:\n");
// Now sort out the relationships map
IRelationshipMap irm = AsmManager.getDefault().getRelationshipMap();
Set sourcesToRemove = new HashSet();
- Set nonExistingHandles = new HashSet(); // Cache of handles that we *know* are invalid
+ Set nonExistingHandles = new HashSet(); // Cache of handles that we
+ // *know* are invalid
int srchandlecounter = 0;
int tgthandlecounter = 0;
// We better check if it actually exists
IProgramElement existingElement = model.getElement(hid);
if (dumpDeltaProcessing)
- fw.write("Looking for handle [" + hid + "] in model, found: " + existingElement + "\n");
+ fw.write("Looking for handle [" + hid
+ + "] in model, found: " + existingElement
+ + "\n");
// Did we find it?
if (existingElement == null) {
// Ok, so the source is valid, what about the targets?
List relationships = irm.get(hid);
List relationshipsToRemove = new ArrayList();
- // Iterate through the relationships against this source handle
- for (Iterator reliter = relationships.iterator(); reliter.hasNext();) {
+ // Iterate through the relationships against this source
+ // handle
+ for (Iterator reliter = relationships.iterator(); reliter
+ .hasNext();) {
IRelationship rel = (IRelationship) reliter.next();
List targets = rel.getTargets();
List targetsToRemove = new ArrayList();
// Iterate through the targets for this relationship
- for (Iterator targetIter = targets.iterator(); targetIter.hasNext();) {
+ for (Iterator targetIter = targets.iterator(); targetIter
+ .hasNext();) {
String targethid = (String) targetIter.next();
tgthandlecounter++;
// Do we already know it doesn't exist?
if (nonExistingHandles.contains(targethid)) {
if (dumpDeltaProcessing)
- fw.write("Target handle [" + targethid + "] for srchid[" + hid + "]rel[" + rel.getName()
+ fw.write("Target handle [" + targethid
+ + "] for srchid[" + hid
+ + "]rel[" + rel.getName()
+ "] does not exist\n");
targetsToRemove.add(targethid);
} else {
// We better check
- IProgramElement existingTarget = model.getElement(targethid);
+ IProgramElement existingTarget = model
+ .getElement(targethid);
if (existingTarget == null) {
if (dumpDeltaProcessing)
- fw.write("Target handle [" + targethid + "] for srchid[" + hid + "]rel["
- + rel.getName() + "] does not exist\n");
+ fw.write("Target handle ["
+ + targethid
+ + "] for srchid[" + hid
+ + "]rel[" + rel.getName()
+ + "] does not exist\n");
targetsToRemove.add(targethid);
nonExistingHandles.add(targethid);
}
// Do we have some targets that need removing?
if (targetsToRemove.size() != 0) {
- // Are we removing *all* of the targets for this relationship (i.e. removing the relationship)
+ // Are we removing *all* of the targets for this
+ // relationship (i.e. removing the relationship)
if (targetsToRemove.size() == targets.size()) {
if (dumpDeltaProcessing)
- fw.write("No targets remain for srchid[" + hid + "] rel[" + rel.getName()
- + "]: removing it\n");
+ fw
+ .write("No targets remain for srchid["
+ + hid
+ + "] rel["
+ + rel.getName()
+ + "]: removing it\n");
relationshipsToRemove.add(rel);
} else {
- // Remove all the targets that are no longer valid
- for (Iterator targsIter = targetsToRemove.iterator(); targsIter.hasNext();) {
+ // Remove all the targets that are no longer
+ // valid
+ for (Iterator targsIter = targetsToRemove
+ .iterator(); targsIter.hasNext();) {
String togo = (String) targsIter.next();
targets.remove(togo);
}
- // Should have already been caught above, but lets double check ...
+ // Should have already been caught above,
+ // but lets double check ...
if (targets.size() == 0) {
if (dumpDeltaProcessing)
- fw.write("No targets remain for srchid[" + hid + "] rel[" + rel.getName()
- + "]: removing it\n");
- relationshipsToRemove.add(rel); // TODO Should only remove this relationship for the srchid?
+ fw
+ .write("No targets remain for srchid["
+ + hid
+ + "] rel["
+ + rel.getName()
+ + "]: removing it\n");
+ relationshipsToRemove.add(rel); // TODO
+ // Should
+ // only
+ // remove
+ // this
+ // relationship
+ // for
+ // the
+ // srchid
+ // ?
}
}
}
}
- // Now, were any relationships emptied during that processing and so need removing for this source handle
+ // Now, were any relationships emptied during that
+ // processing and so need removing for this source
+ // handle
if (relationshipsToRemove.size() > 0) {
- // Are we removing *all* of the relationships for this source handle?
- if (relationshipsToRemove.size() == relationships.size()) {
- // We know they are all going to go, so just delete the source handle.
+ // Are we removing *all* of the relationships for
+ // this source handle?
+ if (relationshipsToRemove.size() == relationships
+ .size()) {
+ // We know they are all going to go, so just
+ // delete the source handle.
sourcesToRemove.add(hid);
} else {
- // MEMORY LEAK - we don't remove the relationships !!
- for (int i = 0; i < relationshipsToRemove.size(); i++) {
- IRelationship irel = (IRelationship) relationshipsToRemove.get(i);
- verifyAssumption(irm.remove(hid, irel), "Failed to remove relationship " + irel.getName()
- + " for shid " + hid);
+ // MEMORY LEAK - we don't remove the
+ // relationships !!
+ for (int i = 0; i < relationshipsToRemove
+ .size(); i++) {
+ IRelationship irel = (IRelationship) relationshipsToRemove
+ .get(i);
+ verifyAssumption(irm.remove(hid, irel),
+ "Failed to remove relationship "
+ + irel.getName()
+ + " for shid " + hid);
}
List rels = irm.get(hid);
if (rels == null || rels.size() == 0)
}
}
// Remove sources that have no valid relationships any more
- for (Iterator srciter = sourcesToRemove.iterator(); srciter.hasNext();) {
+ for (Iterator srciter = sourcesToRemove.iterator(); srciter
+ .hasNext();) {
String hid = (String) srciter.next();
irm.removeAll(hid);
IProgramElement ipe = model.getElement(hid);
if (ipe != null) {
- // If the relationship was hanging off a 'code' node, delete it.
+ // If the relationship was hanging off a 'code' node, delete
+ // it.
if (ipe.getKind().equals(IProgramElement.Kind.CODE)) {
// System.err.println("Deleting code node");
removeSingleNode(ipe);
}
/**
- * Removes a specified program element from the structure model. We go to the parent of the program element, ask for all its
- * children and remove the node we want to delete from the list of children.
+ * Removes a specified program element from the structure model. We go to
+ * the parent of the program element, ask for all its children and remove
+ * the node we want to delete from the list of children.
*/
private void removeSingleNode(IProgramElement progElem) {
verifyAssumption(progElem != null);
}
/**
- * Removes a specified program element from the structure model. Two processing stages:
+ * Removes a specified program element from the structure model. Two
+ * processing stages:
* <p>
- * First: We go to the parent of the program element, ask for all its children and remove the node we want to delete from the
- * list of children.
+ * First: We go to the parent of the program element, ask for all its
+ * children and remove the node we want to delete from the list of children.
* <p>
- * Second:We check if that parent has any other children. If it has no other children and it is either a CODE node or a PACKAGE
- * node, we delete it too.
+ * Second:We check if that parent has any other children. If it has no other
+ * children and it is either a CODE node or a PACKAGE node, we delete it
+ * too.
*/
private void removeNode(IProgramElement progElem) {
// StringBuffer flightrecorder = new StringBuffer();
try {
- // flightrecorder.append("In removeNode, about to chuck away: "+progElem+"\n");
+ // flightrecorder.append("In removeNode, about to chuck away: "+
+ // progElem+"\n");
verifyAssumption(progElem != null);
// boolean deleteOK = false;
// Are there any kids left for this node?
if (parent.getChildren().size() == 0
&& parent.getParent() != null
- && (parent.getKind().equals(IProgramElement.Kind.CODE) || parent.getKind().equals(IProgramElement.Kind.PACKAGE))) {
- // This node is on its own, we should trim it too *as long as its not a structural node* which we currently check by
+ && (parent.getKind().equals(IProgramElement.Kind.CODE) || parent
+ .getKind().equals(IProgramElement.Kind.PACKAGE))) {
+ // This node is on its own, we should trim it too *as long as
+ // its not a structural node* which we currently check by
// making sure its a code node
// We should trim if it
// System.err.println("Deleting parent:"+parent);
removeNode(parent);
}
} catch (NullPointerException npe) {
- // Occurred when commenting out other 2 ras classes in wsif?? reproducable?
+ // Occurred when commenting out other 2 ras classes in wsif??
+ // reproducable?
// System.err.println(flightrecorder.toString());
npe.printStackTrace();
}
}
}
- // ===================== DELTA PROCESSING CODE ============== end ==========//
+ // ===================== DELTA PROCESSING CODE ============== end
+ // ==========//
/**
- * A ModelInfo object captures basic information about the structure model. It is used for testing and producing debug info.
+ * A ModelInfo object captures basic information about the structure model.
+ * It is used for testing and producing debug info.
*/
public static class ModelInfo {
- private Hashtable nodeTypeCount = new Hashtable();
- private Properties extraProperties = new Properties();
+ private final Hashtable nodeTypeCount = new Hashtable();
+ private final Properties extraProperties = new Properties();
private ModelInfo(IHierarchy hierarchy, IRelationshipMap relationshipMap) {
IProgramElement ipe = hierarchy.getRoot();
walkModel(ipe);
- recordStat("FileMapSize", new Integer(hierarchy.getFileMapEntrySet().size()).toString());
- recordStat("RelationshipMapSize", new Integer(relationshipMap.getEntries().size()).toString());
+ recordStat("FileMapSize", new Integer(hierarchy
+ .getFileMapEntrySet().size()).toString());
+ recordStat("RelationshipMapSize", new Integer(relationshipMap
+ .getEntries().size()).toString());
}
private void walkModel(IProgramElement ipe) {
}
public static ModelInfo summarizeModel() {
- return new ModelInfo(AsmManager.getDefault().getHierarchy(), AsmManager.getDefault().getRelationshipMap());
+ return new ModelInfo(AsmManager.getDefault().getHierarchy(),
+ AsmManager.getDefault().getRelationshipMap());
}
}
/**
- * Set to indicate whether we are currently building a structure model, should be set up front.
+ * Set to indicate whether we are currently building a structure model,
+ * should be set up front.
*/
public static void setCreatingModel(boolean b) {
creatingModel = b;
}
/**
- * returns true if we are currently generating a structure model, enables guarding of expensive operations on an empty/null
- * model.
+ * returns true if we are currently generating a structure model, enables
+ * guarding of expensive operations on an empty/null model.
*/
public static boolean isCreatingModel() {
return creatingModel;
}
/**
- * @return the Set of files for which the structure model was modified (they may have been removed or otherwise rebuilt)
+ * @return the Set of files for which the structure model was modified (they
+ * may have been removed or otherwise rebuilt)
*/
public Set getModelChangesOnLastBuild() {
return lastBuildChanges;
package org.aspectj.asm;
-import java.io.*;
-import java.util.*;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
-import org.aspectj.bridge.*;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.ISourceLocation;
/**
* Represents program elements in the AspectJ containment hierarchy.
* @author Mik Kersten
*/
public interface IProgramElement extends Serializable {
-
- public List/*IProgramElement*/ getChildren();
- public void setChildren(List children);
+ public List/* IProgramElement */getChildren();
+
+ public void setChildren(List children);
+
public void addChild(IProgramElement child);
+
public boolean removeChild(IProgramElement child);
-
+
// Extra stuff
- // Could be just a string but may prove more useful as an object in the long run ...
+ // 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 = "";}
-
- public void setExtraAdviceInformation(String string) {extraInfo = string;}
- public String getExtraAdviceInformation() {return extraInfo;}
-
+
+ public ExtraInformation() {
+ extraInfo = "";
+ }
+
+ public void setExtraAdviceInformation(String string) {
+ extraInfo = string;
+ }
+
+ public String getExtraAdviceInformation() {
+ return extraInfo;
+ }
+
public String toString() {
- return "ExtraInformation: ["+extraInfo+"]";
+ return "ExtraInformation: [" + extraInfo + "]";
}
}
-
+
public void setExtraInfo(ExtraInformation info);
+
public ExtraInformation getExtraInfo();
public IProgramElement getParent();
+
public void setParent(IProgramElement parent);
public String getName();
+
public void setName(String name);
public String getDetails();
+
public void setDetails(String details);
-
+
public IProgramElement.Kind getKind();
+
public void setKind(Kind kind);
-
+
public List getModifiers();
+
public void setModifiers(int i);
public Accessibility getAccessibility();
- public String getDeclaringType(); // TODO: remove (Emacs uses it)
+ public String getDeclaringType(); // TODO: remove (Emacs uses it)
+
public String getPackageName();
/**
- * @param method return types or field types
+ * @param method
+ * return types or field types
*/
public void setCorrespondingType(String returnType);
- /**
+ /**
* This correponds to both method return types and field types.
*/
- public String getCorrespondingType();
+ public String getCorrespondingType();
+
public String getCorrespondingType(boolean getFullyQualifiedType);
-
+
public String toSignatureString();
+
public String toSignatureString(boolean getFullyQualifiedArgTypes);
-
+
public void setRunnable(boolean value);
+
public boolean isRunnable();
-
+
public boolean isImplementor();
+
public void setImplementor(boolean value);
-
+
public boolean isOverrider();
+
public void setOverrider(boolean value);
public IMessage getMessage();
+
public void setMessage(IMessage message);
public ISourceLocation getSourceLocation();
+
public void setSourceLocation(ISourceLocation sourceLocation);
-
+
public String toString();
/**
- * @return the javadoc comment for this program element, null if not available
+ * @return the javadoc comment for this program element, null if not
+ * available
*/
public String getFormalComment();
+
public void setFormalComment(String comment);
-
+
/**
* Includes information about the origin of the node.
*/
public String toLinkLabelString();
+
public String toLinkLabelString(boolean getFullyQualifiedArgTypes);
/**
* Includes name, parameter types (if any) and details (if any).
*/
public String toLabelString();
+
public String toLabelString(boolean getFullyQualifiedArgTypes);
public List getParameterNames();
+
public void setParameterNames(List list);
-
+
public List getParameterSignatures();
+
public void setParameterSignatures(List list);
+
public List getParameterTypes();
-
+
/**
- * The format of the string handle is not specified, but is stable across
+ * The format of the string handle is not specified, but is stable across
* compilation sessions.
*
- * @return a string representation of this element
+ * @return a string representation of this element
*/
public String getHandleIdentifier();
+
public String getHandleIdentifier(boolean create);
+
public void setHandleIdentifier(String handle);
-
+
/**
- * @return a string representation of this node and all of its children (recursive)
+ * @return a string representation of this node and all of its children
+ * (recursive)
*/
public String toLongString();
-
+
public String getBytecodeName();
+
public String getBytecodeSignature();
+
public void setBytecodeName(String bytecodeName);
+
public void setBytecodeSignature(String bytecodeSignature);
/**
* @return the full signature of this element, as it appears in the source
*/
public String getSourceSignature();
+
public void setSourceSignature(String string);
-
+
public IProgramElement walk(HierarchyWalker walker);
/**
* Uses "typesafe enum" pattern.
*/
public static class Modifiers implements Serializable {
-
+
private static final long serialVersionUID = -8279300899976607927L;
-
- public static final Modifiers STATIC = new Modifiers("static",0x0008);
- public static final Modifiers FINAL = new Modifiers("final",0x0010);
- public static final Modifiers ABSTRACT = new Modifiers("abstract",0x0400);
- public static final Modifiers SYNCHRONIZED = new Modifiers("synchronized",0x0020);
- public static final Modifiers VOLATILE = new Modifiers("volatile",0x0040);
- public static final Modifiers STRICTFP = new Modifiers("strictfp",0x0800);
- public static final Modifiers TRANSIENT = new Modifiers("transient",0x0080);
- public static final Modifiers NATIVE = new Modifiers("native",0x0100);
- public static final Modifiers[] ALL = { STATIC, FINAL, ABSTRACT, SYNCHRONIZED, VOLATILE, STRICTFP, TRANSIENT, NATIVE };
+
+ public static final Modifiers STATIC = new Modifiers("static", 0x0008);
+ public static final Modifiers FINAL = new Modifiers("final", 0x0010);
+ public static final Modifiers ABSTRACT = new Modifiers("abstract",
+ 0x0400);
+ public static final Modifiers SYNCHRONIZED = new Modifiers(
+ "synchronized", 0x0020);
+ public static final Modifiers VOLATILE = new Modifiers("volatile",
+ 0x0040);
+ public static final Modifiers STRICTFP = new Modifiers("strictfp",
+ 0x0800);
+ public static final Modifiers TRANSIENT = new Modifiers("transient",
+ 0x0080);
+ public static final Modifiers NATIVE = new Modifiers("native", 0x0100);
+ public static final Modifiers[] ALL = { STATIC, FINAL, ABSTRACT,
+ SYNCHRONIZED, VOLATILE, STRICTFP, TRANSIENT, NATIVE };
private final String name;
- private int bit;
-
+ private final int bit;
+
private Modifiers(String name, int bit) {
this.name = name;
this.bit = bit;
}
-
+
public String toString() {
return name;
- }
-
+ }
+
public int getBit() {
return bit;
}
// The 4 declarations below are necessary for serialization
private static int nextOrdinal = 0;
private final int ordinal = nextOrdinal++;
+
private Object readResolve() throws ObjectStreamException {
return ALL[ordinal];
}
* Uses "typesafe enum" pattern.
*/
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");
+ public static final Accessibility PROTECTED = new Accessibility(
+ "protected");
public static final Accessibility PRIVATE = new Accessibility("private");
- public static final Accessibility PRIVILEGED = new Accessibility("privileged");
- public static final Accessibility[] ALL = { PUBLIC, PACKAGE, PROTECTED, PRIVATE, PRIVILEGED };
+ public static final Accessibility PRIVILEGED = new Accessibility(
+ "privileged");
+ public static final Accessibility[] ALL = { PUBLIC, PACKAGE, PROTECTED,
+ PRIVATE, PRIVILEGED };
private final String name;
-
+
private Accessibility(String name) {
this.name = name;
}
-
+
public String toString() {
return name;
- }
-
+ }
+
// The 4 declarations below are necessary for serialization
private static int nextOrdinal = 0;
private final int ordinal = nextOrdinal++;
+
private Object readResolve() throws ObjectStreamException {
return ALL[ordinal];
}
* Uses "typesafe enum" pattern.
*/
public static class Kind implements Serializable {
-
+
private static final long serialVersionUID = -1963553877479266124L;
public static final Kind PROJECT = new Kind("project");
public static final Kind ANNOTATION = new Kind("annotation");
public static final Kind INITIALIZER = new Kind("initializer");
public static final Kind INTER_TYPE_FIELD = new Kind("inter-type field");
- public static final Kind INTER_TYPE_METHOD = new Kind("inter-type method");
- public static final Kind INTER_TYPE_CONSTRUCTOR = new Kind("inter-type constructor");
- public static final Kind INTER_TYPE_PARENT = new Kind("inter-type parent");
+ public static final Kind INTER_TYPE_METHOD = new Kind(
+ "inter-type method");
+ public static final Kind INTER_TYPE_CONSTRUCTOR = new Kind(
+ "inter-type constructor");
+ public static final Kind INTER_TYPE_PARENT = new Kind(
+ "inter-type parent");
public static final Kind CONSTRUCTOR = new Kind("constructor");
public static final Kind METHOD = new Kind("method");
- public static final Kind FIELD = new Kind("field");
+ public static final Kind FIELD = new Kind("field");
public static final Kind POINTCUT = new Kind("pointcut");
public static final Kind ADVICE = new Kind("advice");
public static final Kind DECLARE_PARENTS = new Kind("declare parents");
public static final Kind DECLARE_WARNING = new Kind("declare warning");
public static final Kind DECLARE_ERROR = new Kind("declare error");
public static final Kind DECLARE_SOFT = new Kind("declare soft");
- public static final Kind DECLARE_PRECEDENCE= new Kind("declare precedence");
+ public static final Kind DECLARE_PRECEDENCE = new Kind(
+ "declare precedence");
public static final Kind CODE = new Kind("code");
public static final Kind ERROR = new Kind("error");
- public static final Kind DECLARE_ANNOTATION_AT_CONSTRUCTOR = new Kind("declare @constructor");
- public static final Kind DECLARE_ANNOTATION_AT_FIELD = new Kind("declare @field");
- public static final Kind DECLARE_ANNOTATION_AT_METHOD = new Kind("declare @method");
- public static final Kind DECLARE_ANNOTATION_AT_TYPE = new Kind("declare @type");
-
-
-
- public static final Kind[] ALL =
- {
- PROJECT,
- PACKAGE,
- FILE,
- FILE_JAVA,
- FILE_ASPECTJ,
- FILE_LST,
- IMPORT_REFERENCE,
- CLASS,
- INTERFACE,
- ASPECT,
- ENUM,
- ENUM_VALUE,
- ANNOTATION,
- INITIALIZER,
- INTER_TYPE_FIELD,
- INTER_TYPE_METHOD,
- INTER_TYPE_CONSTRUCTOR,
- INTER_TYPE_PARENT,
- CONSTRUCTOR,
- METHOD,
- FIELD,
- POINTCUT,
- ADVICE,
- DECLARE_PARENTS,
- DECLARE_WARNING,
- DECLARE_ERROR,
- DECLARE_SOFT,
- DECLARE_PRECEDENCE,
- CODE,
- ERROR,
- DECLARE_ANNOTATION_AT_CONSTRUCTOR,
- DECLARE_ANNOTATION_AT_FIELD,
- DECLARE_ANNOTATION_AT_METHOD,
- DECLARE_ANNOTATION_AT_TYPE
-
- };
-
+ public static final Kind DECLARE_ANNOTATION_AT_CONSTRUCTOR = new Kind(
+ "declare @constructor");
+ public static final Kind DECLARE_ANNOTATION_AT_FIELD = new Kind(
+ "declare @field");
+ public static final Kind DECLARE_ANNOTATION_AT_METHOD = new Kind(
+ "declare @method");
+ public static final Kind DECLARE_ANNOTATION_AT_TYPE = new Kind(
+ "declare @type");
+ public static final Kind SOURCE_FOLDER = new Kind("source folder");
+
+ public static final Kind[] ALL = { PROJECT, PACKAGE, FILE, FILE_JAVA,
+ FILE_ASPECTJ, FILE_LST, IMPORT_REFERENCE, CLASS, INTERFACE,
+ ASPECT, ENUM, ENUM_VALUE, ANNOTATION, INITIALIZER,
+ INTER_TYPE_FIELD, INTER_TYPE_METHOD, INTER_TYPE_CONSTRUCTOR,
+ INTER_TYPE_PARENT, CONSTRUCTOR, METHOD, FIELD, POINTCUT,
+ ADVICE, DECLARE_PARENTS, DECLARE_WARNING, DECLARE_ERROR,
+ DECLARE_SOFT, DECLARE_PRECEDENCE, CODE, ERROR,
+ DECLARE_ANNOTATION_AT_CONSTRUCTOR, DECLARE_ANNOTATION_AT_FIELD,
+ DECLARE_ANNOTATION_AT_METHOD, DECLARE_ANNOTATION_AT_TYPE,
+ SOURCE_FOLDER
+
+ };
+
public static Kind getKindForString(String kindString) {
for (int i = 0; i < ALL.length; i++) {
- if (ALL[i].toString().equals(kindString)) return ALL[i];
+ if (ALL[i].toString().equals(kindString))
+ return ALL[i];
}
return ERROR;
}
-
+
private final String name;
-
+
private Kind(String name) {
this.name = name;
}
-
+
public String toString() {
return name;
- }
-
+ }
+
public static List getNonAJMemberKinds() {
List list = new ArrayList();
list.add(METHOD);
list.add(CONSTRUCTOR);
return list;
}
-
+
public boolean isMember() {
- return this == FIELD
- || this == METHOD
- || this == CONSTRUCTOR
- || this == POINTCUT
- || this == ADVICE
- || this == ENUM_VALUE;
+ return this == FIELD || this == METHOD || this == CONSTRUCTOR
+ || this == POINTCUT || this == ADVICE || this == ENUM_VALUE;
}
public boolean isInterTypeMember() {
- return this == INTER_TYPE_CONSTRUCTOR
- || this == INTER_TYPE_FIELD
- || this == INTER_TYPE_METHOD;
+ return this == INTER_TYPE_CONSTRUCTOR || this == INTER_TYPE_FIELD
+ || this == INTER_TYPE_METHOD;
}
-
+
public boolean isType() {
- return this == CLASS
- || this == INTERFACE
- || this == ASPECT
- || this == ANNOTATION
- || this == ENUM;
+ return this == CLASS || this == INTERFACE || this == ASPECT
+ || this == ANNOTATION || this == ENUM;
}
public boolean isSourceFile() {
- return this == FILE_ASPECTJ
- || this == FILE_JAVA;
+ return this == FILE_ASPECTJ || this == FILE_JAVA;
}
-
+
public boolean isDeclare() {
- return name.startsWith("declare");
- }
+ return name.startsWith("declare");
+ }
public boolean isDeclareAnnotation() {
- return name.startsWith("declare @");
+ return name.startsWith("declare @");
}
-
+
// The 4 declarations below are necessary for serialization
private static int nextOrdinal = 0;
private final int ordinal = nextOrdinal++;
+
private Object readResolve() throws ObjectStreamException {
return ALL[ordinal];
}
/**
* Creates JDT-like handles, for example
*
- * method with string argument: <tjp{Demo.java[Demo~main~\[QString;
- * method with generic argument: <pkg{MyClass.java[MyClass~myMethod~QList\<QString;>;
- * an aspect: <pkg*A1.aj}A1
- * advice with Integer arg: <pkg*A8.aj}A8&afterReturning&QInteger;
- *
method call: <pkg*A10.aj[C~m1?method-call(void pkg.C.m2())
- *
+ * method with string argument: <tjp{Demo.java[Demo~main~\[QString; method with
+ * generic argument: <pkg{MyClass.java[MyClass~myMethod~QList\<QString;>; an
+ * aspect: <pkg*A1.aj}A1 advice with Integer arg:
+ * <pkg*A8.aj}A8&afterReturning&QInteger; method call:
+ * <pkg*A10.aj[C~m1?method-call(void pkg.C.m2())
+ *
*/
public class JDTLikeHandleProvider implements IElementHandleProvider {
-
+
// Need to keep our own count of the number of initializers
// because this information cannot be gained from the ipe.
private int initializerCounter = 0;
-
- private char[] empty = new char[]{};
- private char[] countDelim = new char[]{HandleProviderDelimiter.COUNT.getDelimiter()};
-
- private String backslash = "\\";
- private String emptyString = "";
-
+
+ private final char[] empty = new char[] {};
+ private final char[] countDelim = new char[] { HandleProviderDelimiter.COUNT
+ .getDelimiter() };
+
+ private final String backslash = "\\";
+ private final String emptyString = "";
+
public String createHandleIdentifier(IProgramElement ipe) {
// AjBuildManager.setupModel --> top of the tree is either
// <root> or the .lst file
- if (ipe == null ||
- (ipe.getKind().equals(IProgramElement.Kind.FILE_JAVA)
- && ipe.getName().equals("<root>"))) {
+ if (ipe == null
+ || (ipe.getKind().equals(IProgramElement.Kind.FILE_JAVA) && ipe
+ .getName().equals("<root>"))) {
return "";
} else if (ipe.getHandleIdentifier(false) != null) {
// have already created the handle for this ipe
// therefore just return it
return ipe.getHandleIdentifier();
} else if (ipe.getKind().equals(IProgramElement.Kind.FILE_LST)) {
- String configFile = AsmManager.getDefault().getHierarchy().getConfigFile();
+ String configFile = AsmManager.getDefault().getHierarchy()
+ .getConfigFile();
int start = configFile.lastIndexOf(File.separator);
int end = configFile.lastIndexOf(".lst");
if (end != -1) {
- configFile = configFile.substring(start+1,end);
+ configFile = configFile.substring(start + 1, end);
} else {
- configFile = configFile.substring(start+1);
+ configFile = new StringBuffer("=").append(
+ configFile.substring(start + 1)).toString();
}
ipe.setHandleIdentifier(configFile);
return configFile;
+ } else if (ipe.getKind() == IProgramElement.Kind.SOURCE_FOLDER) {
+ StringBuffer sb = new StringBuffer();
+ sb.append(createHandleIdentifier(ipe.getParent())).append("/");
+ sb.append(ipe.getName());
+ String handle = sb.toString();
+ ipe.setHandleIdentifier(handle);
+ return handle;
}
IProgramElement parent = ipe.getParent();
- if (parent != null &&
- parent.getKind().equals(IProgramElement.Kind.IMPORT_REFERENCE)) {
+ if (parent != null
+ && parent.getKind().equals(
+ IProgramElement.Kind.IMPORT_REFERENCE)) {
// want to miss out '#import declaration' in the handle
parent = ipe.getParent().getParent();
}
-
+
StringBuffer handle = new StringBuffer();
// add the handle for the parent
handle.append(createHandleIdentifier(parent));
// add the name and any parameters unless we're an initializer
// (initializer's names are '...')
if (!ipe.getKind().equals(IProgramElement.Kind.INITIALIZER)) {
- handle.append(ipe.getName() + getParameters(ipe));
+ if (ipe.getKind() == IProgramElement.Kind.CLASS
+ && ipe.getName().endsWith("{..}")) {
+ // format: 'new Runnable() {..}'
+ String n = ipe.getName();
+ int bracketPos = n.indexOf("(");
+ handle.append(n.substring(0, bracketPos));
+ } else {
+ handle.append(ipe.getName()).append(getParameters(ipe));
+ }
}
// add the count, for example '!2' if its the second ipe of its
// kind in the aspect
ipe.setHandleIdentifier(handle.toString());
return handle.toString();
- }
+ }
private String getParameters(IProgramElement ipe) {
- if (ipe.getParameterSignatures() == null || ipe.getParameterSignatures().isEmpty()) return "";
+ if (ipe.getParameterSignatures() == null
+ || ipe.getParameterSignatures().isEmpty())
+ return "";
StringBuffer sb = new StringBuffer();
List parameterTypes = ipe.getParameterSignatures();
for (Iterator iter = parameterTypes.iterator(); iter.hasNext();) {
// its an array
sb.append(HandleProviderDelimiter.ESCAPE.getDelimiter());
sb.append(HandleProviderDelimiter.TYPE.getDelimiter());
- sb.append(NameConvertor.getTypeName(
- CharOperation.subarray(element,1,element.length)));
+ sb.append(NameConvertor.getTypeName(CharOperation.subarray(
+ element, 1, element.length)));
} else if (element[0] == NameConvertor.PARAMETERIZED) {
// its a parameterized type
sb.append(NameConvertor.createShortName(element));
}
return sb.toString();
}
-
+
private char[] getCount(IProgramElement ipe) {
char[] byteCodeName = ipe.getBytecodeName().toCharArray();
if (ipe.getKind().isDeclare()) {
- int index = CharOperation.lastIndexOf('_',byteCodeName);
+ int index = CharOperation.lastIndexOf('_', byteCodeName);
if (index != -1) {
return convertCount(CharOperation.subarray(byteCodeName,
- index+1,byteCodeName.length));
+ index + 1, byteCodeName.length));
}
} else if (ipe.getKind().equals(IProgramElement.Kind.ADVICE)) {
- int lastDollar = CharOperation.lastIndexOf('$',byteCodeName);
+ int lastDollar = CharOperation.lastIndexOf('$', byteCodeName);
if (lastDollar != -1) {
- char[] upToDollar = CharOperation.subarray(byteCodeName,0,lastDollar);
- int secondToLastDollar = CharOperation.lastIndexOf('$',upToDollar);
+ char[] upToDollar = CharOperation.subarray(byteCodeName, 0,
+ lastDollar);
+ int secondToLastDollar = CharOperation.lastIndexOf('$',
+ upToDollar);
if (secondToLastDollar != -1) {
return convertCount(CharOperation.subarray(upToDollar,
- secondToLastDollar+1,upToDollar.length));
+ secondToLastDollar + 1, upToDollar.length));
}
- }
- } else if (ipe.getKind().equals(IProgramElement.Kind.INITIALIZER)) {
+ }
+ } else if (ipe.getKind().equals(IProgramElement.Kind.INITIALIZER)) {
return String.valueOf(++initializerCounter).toCharArray();
} else if (ipe.getKind().equals(IProgramElement.Kind.CODE)) {
- int index = CharOperation.lastIndexOf('!',byteCodeName);
+ int index = CharOperation.lastIndexOf('!', byteCodeName);
if (index != -1) {
return convertCount(CharOperation.subarray(byteCodeName,
- index+1,byteCodeName.length));
+ index + 1, byteCodeName.length));
}
}
return empty;
}
-
+
/**
* Only returns the count if it's not equal to 1
*/
private char[] convertCount(char[] c) {
if ((c.length == 1 && c[0] != ' ' && c[0] != '1') || c.length > 1) {
- return CharOperation.concat(countDelim,c);
+ return CharOperation.concat(countDelim, c);
}
return empty;
}
-
- public String getFileForHandle(String handle) {
- IProgramElement node = AsmManager.getDefault().getHierarchy().getElement(handle);
- if (node != null) {
- return AsmManager.getDefault().getCanonicalFilePath(node.getSourceLocation().getSourceFile());
- } else if (handle.charAt(0) == HandleProviderDelimiter.ASPECT_CU.getDelimiter()
- || handle.charAt(0) == HandleProviderDelimiter.COMPILATIONUNIT.getDelimiter()) {
+
+ public String getFileForHandle(String handle) {
+ IProgramElement node = AsmManager.getDefault().getHierarchy()
+ .getElement(handle);
+ if (node != null) {
+ return AsmManager.getDefault().getCanonicalFilePath(
+ node.getSourceLocation().getSourceFile());
+ } else if (handle.charAt(0) == HandleProviderDelimiter.ASPECT_CU
+ .getDelimiter()
+ || handle.charAt(0) == HandleProviderDelimiter.COMPILATIONUNIT
+ .getDelimiter()) {
// it's something like *MyAspect.aj or {MyClass.java. In other words
- // it's a file node that's been created with no children and no parent
+ // it's a file node that's been created with no children and no
+ // parent
return backslash + handle.substring(1);
- }
- return emptyString;
- }
-
- public int getLineNumberForHandle(String handle) {
- IProgramElement node = AsmManager.getDefault().getHierarchy().getElement(handle);
- if (node != null) {
- return node.getSourceLocation().getLine();
- } else if (handle.charAt(0) == HandleProviderDelimiter.ASPECT_CU.getDelimiter()
- || handle.charAt(0) == HandleProviderDelimiter.COMPILATIONUNIT.getDelimiter()) {
+ }
+ return emptyString;
+ }
+
+ public int getLineNumberForHandle(String handle) {
+ IProgramElement node = AsmManager.getDefault().getHierarchy()
+ .getElement(handle);
+ if (node != null) {
+ return node.getSourceLocation().getLine();
+ } else if (handle.charAt(0) == HandleProviderDelimiter.ASPECT_CU
+ .getDelimiter()
+ || handle.charAt(0) == HandleProviderDelimiter.COMPILATIONUNIT
+ .getDelimiter()) {
// it's something like *MyAspect.aj or {MyClass.java. In other words
- // it's a file node that's been created with no children and no parent
+ // it's a file node that's been created with no children and no
+ // parent
return 1;
- }
- return -1;
- }
+ }
+ return -1;
+ }
public int getOffSetForHandle(String handle) {
- IProgramElement node = AsmManager.getDefault().getHierarchy().getElement(handle);
- if (node != null) {
- return node.getSourceLocation().getOffset();
- } else if (handle.charAt(0) == HandleProviderDelimiter.ASPECT_CU.getDelimiter()
- || handle.charAt(0) == HandleProviderDelimiter.COMPILATIONUNIT.getDelimiter()) {
+ IProgramElement node = AsmManager.getDefault().getHierarchy()
+ .getElement(handle);
+ if (node != null) {
+ return node.getSourceLocation().getOffset();
+ } else if (handle.charAt(0) == HandleProviderDelimiter.ASPECT_CU
+ .getDelimiter()
+ || handle.charAt(0) == HandleProviderDelimiter.COMPILATIONUNIT
+ .getDelimiter()) {
// it's something like *MyAspect.aj or {MyClass.java. In other words
- // it's a file node that's been created with no children and no parent
+ // it's a file node that's been created with no children and no
+ // parent
return 0;
- }
- return -1;
+ }
+ return -1;
}
public String createHandleIdentifier(ISourceLocation location) {
- IProgramElement node = AsmManager.getDefault().getHierarchy().findElementForSourceLine(location);
+ IProgramElement node = AsmManager.getDefault().getHierarchy()
+ .findElementForSourceLine(location);
if (node != null) {
return createHandleIdentifier(node);
}
return null;
}
- public String createHandleIdentifier(File sourceFile, int line, int column, int offset) {
- IProgramElement node = AsmManager.getDefault().getHierarchy().findElementForOffSet(sourceFile.getAbsolutePath(),line,offset);
+ public String createHandleIdentifier(File sourceFile, int line, int column,
+ int offset) {
+ IProgramElement node = AsmManager.getDefault().getHierarchy()
+ .findElementForOffSet(sourceFile.getAbsolutePath(), line,
+ offset);
if (node != null) {
return createHandleIdentifier(node);
}
return null;
}
-
+
public boolean dependsOnLocation() {
// handles are independent of soureLocations therefore return false
return false;
projects / aspectj.git / commitdiff