From cc6862f2b54c3333d645a0efb28f5366b0a2bcc3 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Tue, 25 Oct 2005 12:40:39 +0000
Subject: [PATCH] test and fix for 112615 (-XhasMember not working if passed
 through AJDT).  Patch from Helen Hawkins.

---
 ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java | 7 +++++++
 .../aspectj/ajdt/internal/core/builder/AjBuildConfig.java  | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java b/ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java
index 0b8c176f1..2b2abb179 100644
--- 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 5ef08ee2a..d5f80f1a8 100644
--- 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);
         }
-- 
2.39.5