test and fix for 112615 (-XhasMember not working if passed through AJDT). Patch...

diff --git a/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java b/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
index 0b8c176f13b2c4c48e370fbbf390cca32d695b3e..2b2abb17982ff72f824fb1852c8b8ce3fbf9cdd3 100644 (file)
--- a/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
+++ b/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
@@ -487,6 +487,13 @@ public class BuildConfigurationTests extends AjdeTestCase {
                assertNotNull("output jar", buildConfig.getOutputJar());
         assertEquals( "out jar", outJar, buildConfig.getOutputJar().toString() );                              
        }
+       
+       public void testXHasMember() {
+               buildOptions.setNonStandardOptions("-XhasMember");
+               buildConfig = compilerAdapter.genBuildConfig( configFile );                     
+        assertTrue(configFile + " failed", null != buildConfig);            
+               assertTrue( "XhasMember", buildConfig.isXHasMemberEnabled() );
+       }
 
        protected void setUp() throws Exception {
                preferencesAdapter = new UserPreferencesStore(false);

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
index 5ef08ee2aaa1a4d1c90b11f37d08c584737773ca..d5f80f1a894ab783a5c48a9016ac31f27a44dd39 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
@@ -366,6 +366,9 @@ public class AjBuildConfig {
         if (!isXlazyTjp() && global.isXlazyTjp()) {
                setXlazyTjp(true);
         }
+        if (!isXHasMemberEnabled() && global.isXHasMemberEnabled()) {
+               setXHasMemberSupport(true);
+        }
         if (!isXNotReweavable() && global.isXNotReweavable()) {
                setXnotReweavable(true);
         }