diff options
| author | Andy Clement <aclement@gopivotal.com> | 2013-08-01 09:54:14 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@gopivotal.com> | 2013-08-01 09:54:14 -0700 |
| commit | 7716a15cbe03d6bd518ac013c4d9ffd7b9f05a3f (patch) | |
| tree | 986eca0bb39e84a0181322a89464363e4c876651 | |
| parent | 3b8fac4dbc514eb2965a6271a0a833832fee9958 (diff) | |
| download | aspectj-7716a15cbe03d6bd518ac013c4d9ffd7b9f05a3f.tar.gz aspectj-7716a15cbe03d6bd518ac013c4d9ffd7b9f05a3f.zip | |
improving ITIT support
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java | 3 | ||||
| -rw-r--r-- | org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java | 3 | ||||
| -rw-r--r-- | org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip | bin | 4167541 -> 4167575 bytes | |||
| -rw-r--r-- | org.eclipse.jdt.core/jdtcore-for-aspectj.jar | bin | 7533263 -> 7533281 bytes |
4 files changed, 4 insertions, 2 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java index b920ce0da..6b079949d 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/IntertypeMemberClassDeclaration.java @@ -18,6 +18,7 @@ import org.aspectj.ajdt.internal.compiler.lookup.EclipseFactory; import org.aspectj.ajdt.internal.compiler.lookup.EclipseSourceLocation; import org.aspectj.ajdt.internal.compiler.lookup.EclipseTypeMunger; import org.aspectj.ajdt.internal.compiler.lookup.InterTypeScope; +import org.aspectj.org.eclipse.jdt.core.compiler.CharOperation; import org.aspectj.org.eclipse.jdt.internal.compiler.ClassFile; import org.aspectj.org.eclipse.jdt.internal.compiler.CompilationResult; import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; @@ -272,6 +273,6 @@ public class IntertypeMemberClassDeclaration extends TypeDeclaration { } public char[] alternativeName() { - return onType.getLastToken(); + return CharOperation.concatWith(onType.getTypeName(),'.');//onType.getLastToken(); } } diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java index e324e2571..88b81ebc1 100644 --- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java +++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java @@ -2204,7 +2204,8 @@ public class AjState implements CompilerConfigurationChangeFlags, TypeDelegateRe ClassParser parser = new ClassParser(f.toString()); return world.buildBcelDelegate(referenceType, parser.parse(), true, false); } catch (IOException e) { - IMessage msg = new Message("Failed to recover " + referenceType, referenceType.getSourceLocation(), false); + IMessage msg = new Message("Failed to recover " + referenceType, + referenceType.getDelegate()==null?null:referenceType.getSourceLocation(), false); buildManager.handler.handleMessage(msg); } return null; diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip Binary files differindex 6b70b1efa..4dc475e26 100644 --- a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip +++ b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar Binary files differindex 55770d0cb..8b35515fc 100644 --- a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar +++ b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar |