@@ -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; |
@@ -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()); | |||
} |
@@ -729,8 +729,8 @@ public abstract class ResolvedTypeX extends TypeX { | |||
public final ResolvedTypeX[] getDeclaredInterfaces() { | |||
return | |||
new ResolvedTypeX[] { | |||
world.resolve(CLONEABLE), | |||
world.resolve(SERIALIZABLE) | |||
world.getCoreType(CLONEABLE), | |||
world.getCoreType(SERIALIZABLE) | |||
}; | |||
} | |||
public final ResolvedMember[] getDeclaredPointcuts() { | |||
@@ -738,7 +738,7 @@ public abstract class ResolvedTypeX extends TypeX { | |||
} | |||
public final ResolvedTypeX getSuperclass() { | |||
return world.resolve(OBJECT); | |||
return world.getCoreType(OBJECT); | |||
} | |||
public final boolean isAssignableFrom(TypeX o) { | |||
if (! o.isArray()) return false; | |||
@@ -1064,7 +1064,7 @@ public abstract class ResolvedTypeX extends TypeX { | |||
if (!compareToExistingMembers(munger, getMethods())) return; | |||
if (this.isInterface()) { | |||
if (!compareToExistingMembers(munger, | |||
Arrays.asList(world.resolve(OBJECT).getDeclaredMethods()).iterator())) return; | |||
Arrays.asList(world.getCoreType(OBJECT).getDeclaredMethods()).iterator())) return; | |||
} | |||
} else if (sig.getKind() == Member.FIELD) { | |||
if (!compareToExistingMembers(munger, Arrays.asList(getDeclaredFields()).iterator())) return; |
@@ -169,8 +169,8 @@ public class BcelAdvice extends Advice { | |||
Collection ret = new ArrayList(); | |||
World world = concreteAspect.getWorld(); | |||
ResolvedTypeX runtimeException = world.resolve(TypeX.RUNTIME_EXCEPTION); | |||
ResolvedTypeX error = world.resolve(TypeX.ERROR); | |||
ResolvedTypeX runtimeException = world.getCoreType(TypeX.RUNTIME_EXCEPTION); | |||
ResolvedTypeX error = world.getCoreType(TypeX.ERROR); | |||
for (int i=0, len=excs.length; i < len; i++) { | |||
ResolvedTypeX t = world.resolve(excs[i]); |
@@ -960,7 +960,7 @@ public class BcelShadow extends Shadow { | |||
Constants.INVOKESTATIC)); | |||
break; | |||
case 1: | |||
((BcelVar)getArgVar(0)).appendLoadAndConvert(il, fact, world.resolve(ResolvedTypeX.OBJECT)); | |||
((BcelVar)getArgVar(0)).appendLoadAndConvert(il, fact, world.getCoreType(ResolvedTypeX.OBJECT)); | |||
il.append(fact.createInvoke("org.aspectj.runtime.reflect.Factory", | |||
"makeJP", LazyClassGen.tjpType, | |||
new Type[] { LazyClassGen.staticTjpType, | |||
@@ -968,8 +968,8 @@ public class BcelShadow extends Shadow { | |||
Constants.INVOKESTATIC)); | |||
break; | |||
case 2: | |||
((BcelVar)getArgVar(0)).appendLoadAndConvert(il, fact, world.resolve(ResolvedTypeX.OBJECT)); | |||
((BcelVar)getArgVar(1)).appendLoadAndConvert(il, fact, world.resolve(ResolvedTypeX.OBJECT)); | |||
((BcelVar)getArgVar(0)).appendLoadAndConvert(il, fact, world.getCoreType(ResolvedTypeX.OBJECT)); | |||
((BcelVar)getArgVar(1)).appendLoadAndConvert(il, fact, world.getCoreType(ResolvedTypeX.OBJECT)); | |||
il.append(fact.createInvoke("org.aspectj.runtime.reflect.Factory", | |||
"makeJP", LazyClassGen.tjpType, | |||
new Type[] { LazyClassGen.staticTjpType, | |||
@@ -994,7 +994,7 @@ public class BcelShadow extends Shadow { | |||
Field field = getEnclosingClass().getTjpField(this); | |||
thisJoinPointStaticPartVar = | |||
new BcelFieldRef( | |||
world.resolve(TypeX.forName("org.aspectj.lang.JoinPoint$StaticPart")), | |||
world.getCoreType(TypeX.forName("org.aspectj.lang.JoinPoint$StaticPart")), | |||
getEnclosingClass().getClassName(), | |||
field.getName()); | |||
// getEnclosingClass().warnOnAddedStaticInitializer(this,munger.getSourceLocation()); | |||
@@ -2030,7 +2030,7 @@ public class BcelShadow extends Shadow { | |||
final InstructionFactory fact = getFactory(); | |||
BcelVar arrayVar = new BcelVar( | |||
world.resolve(TypeX.OBJECTARRAY), | |||
world.getCoreType(TypeX.OBJECTARRAY), | |||
extractedMethod.allocateLocal(1)); | |||
int len = superConstructorTypes.length; |
@@ -115,7 +115,7 @@ public class DeclareParents extends Declare { | |||
TypeX iType = typePattern.getExactType(); | |||
ResolvedTypeX parentType = iType.resolve(world); | |||
if (targetType.equals(world.resolve(TypeX.OBJECT))) { | |||
if (targetType.equals(world.getCoreType(TypeX.OBJECT))) { | |||
world.showMessage(IMessage.ERROR, | |||
WeaverMessages.format(WeaverMessages.DECP_OBJECT), | |||
this.getSourceLocation(), null); |
@@ -86,7 +86,7 @@ public class DeclareSoft extends Declare { | |||
exception = exception.resolveBindings(scope, null, false, true); | |||
TypeX excType = exception.getExactType(); | |||
if (excType != ResolvedTypeX.MISSING) { | |||
if (!scope.getWorld().resolve(TypeX.THROWABLE).isAssignableFrom(excType)) { | |||
if (!scope.getWorld().getCoreType(TypeX.THROWABLE).isAssignableFrom(excType)) { | |||
scope.getWorld().showMessage(IMessage.ERROR, | |||
WeaverMessages.format(WeaverMessages.NOT_THROWABLE,excType.getName()), | |||
exception.getSourceLocation(), null); |