diff options
| author | aclement <aclement> | 2004-09-06 15:40:02 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2004-09-06 15:40:02 +0000 |
| commit | b133299238024b1751afc0fb5119ca9b80e91be2 (patch) | |
| tree | 6abc9fc9272c51ae4770f117aed0c7e4dcc4f88e /ajde | |
| parent | d1551bda9b14c6c2035e0c8df6f09bf4634041de (diff) | |
| download | aspectj-b133299238024b1751afc0fb5119ca9b80e91be2.tar.gz aspectj-b133299238024b1751afc0fb5119ca9b80e91be2.zip | |
Fix for Bugzilla Bug 73334
Avoid clashes in the org.eclipse namespace by renaming our duplicates.
Diffstat (limited to 'ajde')
| -rw-r--r-- | ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java | 4 | ||||
| -rw-r--r-- | ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java | 2 | ||||
| -rw-r--r-- | ajde/testsrc/org/aspectj/ajde/ExtensionTests.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java index b1b761356..704cbcaf4 100644 --- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java +++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java @@ -25,7 +25,7 @@ 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.jdt.internal.compiler.impl.CompilerOptions; +import org.aspectj.org.eclipse.jdt.internal.compiler.impl.CompilerOptions; public class CompilerAdapter { @@ -524,7 +524,7 @@ public class CompilerAdapter { Ajde.getDefault().logEvent("building with classpath: " + both); } } - + // Handle boot classpath propcp = properties.getBootClasspath(); if (!LangUtil.isEmpty(propcp)) { diff --git a/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java b/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java index 61e96f396..17391a628 100644 --- a/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java +++ b/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java @@ -26,7 +26,7 @@ import org.aspectj.ajdt.internal.core.builder.AjBuildConfig; import org.aspectj.bridge.*; import org.aspectj.bridge.MessageHandler; import org.aspectj.util.LangUtil; -import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; +import org.aspectj.org.eclipse.jdt.internal.compiler.impl.CompilerOptions; /** * Tests that a correctly populated AjBuildConfig object is created diff --git a/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java b/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java index ed7c4079d..c2a8f2670 100644 --- a/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java +++ b/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java @@ -20,7 +20,7 @@ import org.aspectj.asm.IProgramElement; import org.aspectj.bridge.IMessage; import org.aspectj.tools.ajc.AjcTestCase; import org.aspectj.tools.ajc.CompilationResult; -import org.eclipse.jdt.core.compiler.IProblem; +import org.aspectj.org.eclipse.jdt.core.compiler.IProblem; /** * Tests the 'extensions' to AJDE: |