eliminated a dependency on org.eclipse.core.runtime that had crept

into this source - only the org.eclipse.jdt.core project should
contain links to other portions of eclipse source.

diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index 54e709410909eedd66d1c286feec8ebde709820b..65f769299afb1df22d4496553ba4513ddd843958 100644 (file)
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -24,7 +24,7 @@ import org.aspectj.ajdt.ajc.*;
 import org.aspectj.ajdt.internal.core.builder.*;
 import org.aspectj.bridge.*;
 import org.aspectj.util.LangUtil;
-import org.eclipse.core.runtime.OperationCanceledException;
+//import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 
 public class CompilerAdapter {
@@ -107,10 +107,10 @@ public class CompilerAdapter {
                 } 
                 return buildManager.batchBuild(buildConfig, messageHandler); 
             }
-        } catch (OperationCanceledException ce) {
-                       Ajde.getDefault().getErrorHandler().handleWarning(
-                               "build cancelled by user");
-            return false;
+//        } catch (OperationCanceledException ce) {
+//                     Ajde.getDefault().getErrorHandler().handleWarning(
+//                             "build cancelled by user");
+//            return false;
                } catch (AbortException e) {
             final IMessage message = e.getIMessage();
             if (null == message) {

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
index 5cf5d8a8c830718c1b4464a0efd75d628a4e56fc..e60618f112674f8da6948fa1a00a1d928c039416 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/core/builder/AjBuildManagerTest.java
@@ -26,7 +26,7 @@ import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.MessageHandler;
 import org.aspectj.bridge.MessageWriter;
 import org.aspectj.util.StreamPrintWriter;
-import org.eclipse.core.runtime.CoreException;
+//import org.eclipse.core.runtime.CoreException;
 
 public class AjBuildManagerTest extends TestCase {
 
@@ -59,7 +59,7 @@ public class AjBuildManagerTest extends TestCase {
                super(name);
        }
        
-       public void testSimpleStructure() throws IOException, CoreException {
+       public void testSimpleStructure() throws IOException /*, CoreException */ {
                
                AjBuildManager manager = new AjBuildManager(messageWriter);
                BuildArgParser parser = new BuildArgParser(messageWriter);