summaryrefslogtreecommitdiffstats
path: root/org.aspectj.ajdt.core
diff options
context:
space:
mode:
authoraclement <aclement>2004-08-06 15:04:45 +0000
committeraclement <aclement>2004-08-06 15:04:45 +0000
commit061395c8c7fe681ab40ab53a7d1bfeb8e17c1028 (patch)
tree25cee8928dd692d64c1931d86be654a973fd6f41 /org.aspectj.ajdt.core
parent30df47dcff68326f5d90ff66023b375b90f5a5d1 (diff)
downloadaspectj-061395c8c7fe681ab40ab53a7d1bfeb8e17c1028.tar.gz
aspectj-061395c8c7fe681ab40ab53a7d1bfeb8e17c1028.zip
More work on 'cant find type' (bug 44191)
Diffstat (limited to 'org.aspectj.ajdt.core')
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java4
-rw-r--r--org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index 9025cf439..432e4f76c 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -128,13 +128,13 @@ public class AspectDeclaration extends TypeDeclaration {
// can't be Serializable/Cloneable unless -XserializableAspects
if (!world.isXSerializableAspects()) {
- if (world.getWorld().resolve(TypeX.SERIALIZABLE).isAssignableFrom(myType)) {
+ if (world.getWorld().getCoreType(TypeX.SERIALIZABLE).isAssignableFrom(myType)) {
scope.problemReporter().signalError(sourceStart, sourceEnd,
"aspects may not implement Serializable");
ignoreFurtherInvestigation = true;
return;
}
- if (world.getWorld().resolve(TypeX.CLONEABLE).isAssignableFrom(myType)) {
+ if (world.getWorld().getCoreType(TypeX.CLONEABLE).isAssignableFrom(myType)) {
scope.problemReporter().signalError(sourceStart, sourceEnd,
"aspects may not implement Cloneable");
ignoreFurtherInvestigation = true;
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
index 2667909bc..00cadb8a1 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
@@ -71,7 +71,7 @@ public class EclipseSourceType extends ResolvedTypeX.ConcreteName {
}
public ResolvedTypeX getSuperclass() {
- if (binding.isInterface()) return getResolvedTypeX().getWorld().resolve(TypeX.OBJECT);
+ if (binding.isInterface()) return getResolvedTypeX().getWorld().getCoreType(TypeX.OBJECT);
//XXX what about java.lang.Object
return eclipseWorld().fromEclipse(binding.superclass());
}