bug 137374 - Restore Defaults on Annotation Processing property page caused gen src dir setting to be lost.

1 files changed, 13 insertions, 2 deletions

diff --git a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/BaseConfigurationBlock.java b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/BaseConfigurationBlock.java
index c6d4e66a1b..3504944b45 100644
--- a/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/BaseConfigurationBlock.java
+++ b/org.eclipse.jdt.apt.ui/src/org/eclipse/jdt/apt/ui/internal/preferences/BaseConfigurationBlock.java
@@ -642,10 +642,21 @@ public abstract class BaseConfigurationBlock {
 	
 	
 	public void performDefaults() {
-		IScopeContext defaultScope= (fProject == null) ? new DefaultScope() : new InstanceScope();
+		IScopeContext[] lookupOrder; // not same as fLookupOrder!  Starts one layer deeper.
+		if (fProject != null) {
+			lookupOrder= new IScopeContext[] {
+				new InstanceScope(),
+				new DefaultScope()
+			};
+		} else {
+			lookupOrder= new IScopeContext[] {
+				new DefaultScope()
+			};
+		}
+
 		for (int i= 0; i < fAllKeys.length; i++) {
 			Key curr= fAllKeys[i];
-			String defValue= curr.getStoredValue(defaultScope, null);
+			String defValue= curr.getStoredValue(lookupOrder, false, null);
 			setValue(curr, defValue);
 		}