Upgraded to Eclipse 3.0 final JDT core. v_449a_head_before_30_maintenance

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
index f80fd75c1335c7292803073703a88cdf0242d07b..3b82006c5454428aff1aaedbabcfeda8a5a5fabf 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
@@ -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() {

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
index a379fccb6b6447edf7e21ee5e1b9d6429c31508e..734fd8816a78e9ca8c6a0ca17f33a98cadd8e776 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
@@ -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,        

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
index 1027ba06760ad504f77835d962cf757db9af8dd4..81825caf2b46e42e6761085c8a8b0cb1e5de9081 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeMethodDeclaration.java
@@ -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),

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser1.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser1.rsc
deleted file mode 100644 (file)
index 2ab81a6..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser1.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser10.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser10.rsc
deleted file mode 100644 (file)
index 6c119b5..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser10.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser11.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser11.rsc
deleted file mode 100644 (file)
index 84d2080..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser11.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser12.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser12.rsc
deleted file mode 100644 (file)
index 922bbfb..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser12.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser13.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser13.rsc
deleted file mode 100644 (file)
index b5eec36..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser13.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser14.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser14.rsc
deleted file mode 100644 (file)
index 4dbb94f..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser14.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser15.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser15.rsc
deleted file mode 100644 (file)
index b2c68dc..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser15.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser16.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser16.rsc
deleted file mode 100644 (file)
index 6a2e477..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser16.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser17.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser17.rsc
deleted file mode 100644 (file)
index 4593e0a..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser17.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser18.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser18.rsc
deleted file mode 100644 (file)
index a783457..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser18.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser19.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser19.rsc
deleted file mode 100644 (file)
index 5c4e24f..0000000
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser19.rsc
+++ /dev/null
@@ -1 +0,0 @@
-\1d\1d\17\1d\1d\1d\1d\1d]]\1d\1d\1d\1d\17\17\17\17\1dIII\1dJJ^000\17\1d3\1d\1d\1d\1d\1d\1d\1d\1d\1d\17\17I\1d[\17\17\17300000\170Y!\1d3M'\17\17Jdd\ 1\ 1
\ No newline at end of file

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser2.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser2.rsc
deleted file mode 100644 (file)
index e4744a8..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser2.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser20.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser20.rsc
deleted file mode 100644 (file)
index cfcbbef..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser20.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser3.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser3.rsc
deleted file mode 100644 (file)
index fb48102..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser3.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser4.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser4.rsc
deleted file mode 100644 (file)
index 344c25c..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser4.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser5.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser5.rsc
deleted file mode 100644 (file)
index a9070dc..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser5.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser6.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser6.rsc
deleted file mode 100644 (file)
index 915d79c..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser6.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser7.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser7.rsc
deleted file mode 100644 (file)
index 580a08c..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser7.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser8.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser8.rsc
deleted file mode 100644 (file)
index 12b6cfb..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser8.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser9.rsc b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser9.rsc
deleted file mode 100644 (file)
index 596dd6b..0000000
Binary files a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/parser/parser9.rsc and /dev/null differ

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 50fe61f9a528181b0e063bdf83bf2d862a2b448f..096bb88556701d113601c88c056ad708bce879ee 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -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));