Andy Clement's patch for enh 46347: "-inpath"

3 files changed, 12 insertions, 2 deletions

diff --git a/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java b/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java
index 2934932ee..6ba8134bb 100644
--- a/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java
+++ b/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java
@@ -69,6 +69,14 @@ public interface ProjectPropertiesAdapter {
 	public Set getInJars();
 	
 	/**
+	 * Get the set of input path elements for this compilation.
+	 * Set members should be of the type java.io.File.
+	 * An empty set or null is acceptable for this option.
+	 * From -injars
+	 */
+	public Set getInpath();
+	
+	/**
 	 * Get the set of non-Java resources for this compilation.
 	 * Set members should be of type java.io.File.
 	 * An empty set or null is acceptable for this option.
diff --git a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
index 84e0bb8ec..8006af593 100644
--- a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
+++ b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
@@ -188,6 +188,7 @@ public class AspectJBuildManager implements BuildManager {
 				+ "\n-> classpath: " + properties.getClasspath()
 				+ "\n-> bootclasspath: " + properties.getBootClasspath()
 				+ "\n-> -injars " + formatSet(properties.getInJars())
+				+ "\n-> -inpath " + formatSet(properties.getInpath())
 				+ "\n-> -outjar " + formatOptionalString(properties.getOutJar())
 				+ "\n-> -sourceroots " + formatSet(properties.getSourceRoots())
 				+ "\n-> -aspectpath " + formatSet(properties.getAspectPath())
diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index 9ee5f111e..d7db8e849 100644
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -451,8 +451,8 @@ public class CompilerAdapter {
 	/**
 	 * Add new options from the ProjectPropertiesAdapter to the configuration.
      * <ul>
-     * <li>New list entries are added if not duplicates,
-     *     for classpath, aspectpath, injars, and sourceroots</li>
+     * <li>New list entries are added if not duplicates in,
+     *     for classpath, aspectpath, injars, inpath and sourceroots</li>
      * <li>New bootclasspath entries are ignored XXX</li>
      * <li>Set only one new entry for output dir or output jar
      *     only if there is no output dir/jar entry in the config</li>
@@ -497,6 +497,7 @@ public class CompilerAdapter {
 
         join(config.getSourceRoots(), properties.getSourceRoots());
         join(config.getInJars(), properties.getInJars());
+        join(config.getInpath(),properties.getInpath());
 		config.setSourcePathResources(properties.getSourcePathResources());
         join(config.getAspectpath(), properties.getAspectPath());
 	}