diff options
Diffstat (limited to 'org.aspectj.ajdt.core')
2 files changed, 9 insertions, 13 deletions
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java index aba047974..ed0b9aa69 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EmacsStructureModelManager.java @@ -95,11 +95,10 @@ public class EmacsStructureModelManager { private void printDecls(IProgramElement node) { print("("); - for (Object nodeObject : node.getChildren()) { + for (IProgramElement child : node.getChildren()) { // this ignores relations on the compile unit // throw new RuntimeException("unimplemented"); // if (nodeObject instanceof IProgramElement) { - IProgramElement child = (IProgramElement) nodeObject; printDecl(child, true); // } // else if (nodeObject instanceof LinkNode) { @@ -179,13 +178,10 @@ public class EmacsStructureModelManager { if (it3.hasNext()) { while (it3.hasNext()) { // this ignores relations on the compile unit - Object nodeObject = it3.next(); - if (nodeObject instanceof IProgramElement) { - IProgramElement currNode = (IProgramElement) nodeObject; - if (// !currNode.isStmntKind() && - !currNode.getKind().equals("<undefined>")) { - printDecl(currNode, true); - } + IProgramElement currNode = it3.next(); + if (// !currNode.isStmntKind() && + !currNode.getKind().equals("<undefined>")) { + printDecl(currNode, true); } } } diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java index c38fbd96e..bc4904bd7 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java @@ -658,10 +658,10 @@ public class AjASTConverter extends ASTConverter { } else if (declare instanceof DeclareParents) { DeclareParents dp = (DeclareParents) declare; declareDeclaration = new org.aspectj.org.eclipse.jdt.core.dom.DeclareParentsDeclaration(this.ast, dp.isExtends()); - org.aspectj.org.eclipse.jdt.core.dom.PatternNode pNode = convert(dp.getChild()); + AbstractTypePattern pNode = convert(dp.getChild()); if (pNode instanceof AbstractTypePattern) { ((DeclareParentsDeclaration) declareDeclaration) - .setChildTypePattern((AbstractTypePattern) pNode); + .setChildTypePattern(pNode); } TypePattern[] weaverTypePatterns = dp.getParents().getTypePatterns(); List typePatterns = ((DeclareParentsDeclaration) declareDeclaration).parentTypePatterns(); @@ -680,10 +680,10 @@ public class AjASTConverter extends ASTConverter { declareDeclaration = new DeclareSoftDeclaration(this.ast); DeclareSoft ds = (DeclareSoft) declare; ((DeclareSoftDeclaration) declareDeclaration).setPointcut(convert(ds.getPointcut())); - org.aspectj.org.eclipse.jdt.core.dom.PatternNode pNode = convert(ds.getException()); + AbstractTypePattern pNode = convert(ds.getException()); if (pNode instanceof AbstractTypePattern) { ((DeclareSoftDeclaration) declareDeclaration) - .setTypePattern((AbstractTypePattern) pNode); + .setTypePattern(pNode); } } |