@@ -13,7 +13,6 @@ package org.aspectj.ajdt.core; | |||
import java.util.Map; | |||
import org.aspectj.ajdt.internal.core.builder.AjCompilerOptions; | |||
import org.eclipse.core.runtime.IPluginDescriptor; | |||
import org.eclipse.jdt.core.JavaCore; | |||
/** | |||
@@ -38,8 +37,8 @@ public class AspectJCore extends JavaCore { | |||
public static final String COMPILER_REWEAVABLE = AjCompilerOptions.OPTION_XReweavable; | |||
public static final String COMPILER_REWEAVABLE_COMPRESS = AjCompilerOptions.OPTION_XReweavableCompress; | |||
public AspectJCore(IPluginDescriptor pluginDescriptor) { | |||
super(pluginDescriptor); | |||
public AspectJCore() { | |||
super(); | |||
} | |||
public static AspectJCore getAspectJCore() { |
@@ -94,9 +94,7 @@ public class WeaverMessageHandler implements IMessageHandler { | |||
severity, | |||
startPos, | |||
endPos, | |||
sLoc != null ? sLoc.getLine() : 0, | |||
referenceContext, | |||
problemSource | |||
sLoc != null ? sLoc.getLine() : 0 | |||
); | |||
IProblem[] seeAlso = buildSeeAlsoProblems(message.getExtraSourceLocations(), | |||
problemSource, |
@@ -29,6 +29,7 @@ import org.eclipse.jdt.internal.compiler.flow.InitializationFlowContext; | |||
import org.eclipse.jdt.internal.compiler.lookup.*; | |||
import org.eclipse.jdt.internal.compiler.parser.Parser; | |||
import org.eclipse.jdt.internal.compiler.problem.AbortCompilation; | |||
import org.eclipse.jdt.internal.compiler.problem.AbortCompilationUnit; | |||
/** | |||
* An inter-type method declaration. | |||
@@ -75,7 +76,7 @@ public class InterTypeMethodDeclaration extends InterTypeDeclaration { | |||
public void resolveStatements() { | |||
if ((modifiers & AccSemicolonBody) != 0) { | |||
if ((declaredModifiers & AccAbstract) == 0) | |||
scope.problemReporter().methodNeedingAbstractModifier(this); | |||
scope.problemReporter().methodNeedBody(this); | |||
} else { | |||
// the method HAS a body --> abstract native modifiers are forbiden | |||
if (((declaredModifiers & AccAbstract) != 0)) | |||
@@ -105,7 +106,9 @@ public class InterTypeMethodDeclaration extends InterTypeDeclaration { | |||
if (binding == null) { | |||
// if binding is null, we failed to find a type used in the method params, this error | |||
// has already been reported. | |||
throw new AbortCompilation(compilationResult); | |||
this.ignoreFurtherInvestigation = true; | |||
//return null; | |||
throw new AbortCompilationUnit(compilationResult,null); | |||
} | |||
ResolvedMember sig = new ResolvedMember(Member.METHOD, EclipseFactory.fromBinding(onTypeBinding), | |||
declaredModifiers, EclipseFactory.fromBinding(binding.returnType), new String(declaredSelector), |
@@ -1 +0,0 @@ | |||
]]IIIJJ^0003I[3000000Y!3M'Jdd |
@@ -602,7 +602,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc | |||
CompilerOptions options = compiler.options; | |||
options.produceReferenceInfo(true); //TODO turn off when not needed | |||
options.produceReferenceInfo = true; //TODO turn off when not needed | |||
try { | |||
compiler.compile(getCompilationUnits(filenames, encodings)); |