Index: src/org/eclipse/jdt/core/tests/model/OptionTests.java
===================================================================
RCS file: /data/cvs/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/OptionTests.java,v
retrieving revision 1.6
diff -u -r1.6 OptionTests.java
--- src/org/eclipse/jdt/core/tests/model/OptionTests.java	21 Jan 2004 13:57:11 -0000	1.6
+++ src/org/eclipse/jdt/core/tests/model/OptionTests.java	5 May 2004 16:34:35 -0000
@@ -11,417 +11,459 @@
 package org.eclipse.jdt.core.tests.model;
 
 import java.util.Hashtable;
-
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Preferences.PropertyChangeEvent;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.internal.core.JavaProject;
 
 public class OptionTests extends ModifyingResourceTests {
-
-int eventCount = 0;
-
-class TestPropertyListener implements Preferences.IPropertyChangeListener {
-	public void propertyChange(PropertyChangeEvent event) {
-		eventCount++;
+	
+	int eventCount = 0;
+	
+	class TestPropertyListener implements IEclipsePreferences.IPreferenceChangeListener {
+		public void preferenceChange(PreferenceChangeEvent event) {
+			eventCount++;
+		}
 	}
-}
-
-public OptionTests(String name) {
-	super(name);
-}
-public static Test suite() {
-
-	if (false){
-		TestSuite suite = new Suite(OptionTests.class.getName());
-		suite.addTest(new ClasspathTests("testDenseCycleDetection"));
-		return suite;
-	}
-	return new Suite(OptionTests.class);	
-}
-/**
- * Test persistence of project custom options
- */
-public void test01() throws CoreException {
-	try {
-		IJavaProject projectA = 
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-		IJavaProject projectB = 
-			this.createJavaProject(
-				"B", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-				
-		Hashtable options = new Hashtable();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.DISABLED);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "8.0");
-		options.put(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, JavaCore.ERROR);
-		JavaCore.setOptions(options);
-
-		options.clear();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
-		projectA.setOptions(options);
-
-		// check project A custom options		
-		assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, true));
-		assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOption(JavaCore.COMPILER_COMPLIANCE, true));
-		assertEquals("projA:unexpected inherited value1 for hidden-catch option", JavaCore.ERROR, projectA.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, true));
-		
-		// check project B custom options	(should be none, indicating it sees global ones only)
-		assertEquals("projB:unexpected custom value for deprecation option", JavaCore.DISABLED, projectB.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, true));
-		assertEquals("projB:unexpected custom value for compliance option", "8.0", projectB.getOption(JavaCore.COMPILER_COMPLIANCE, true));
-		assertEquals("projB:unexpected inherited value for hidden-catch option", JavaCore.ERROR, projectB.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, true));
-
-		// flush custom options - project A should revert to global ones
-		projectA.setOptions(null); 
-		assertEquals("projA:unexpected reverted value for deprecation option", JavaCore.DISABLED, projectA.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, true));
-		assertEquals("projA:unexpected reverted value for compliance option", "8.0", projectA.getOption(JavaCore.COMPILER_COMPLIANCE, true));
-		assertEquals("projA:unexpected inherited value2 for hidden-catch option", JavaCore.ERROR, projectA.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, true));
-
-	} finally {
-		this.deleteProject("A");
-		this.deleteProject("B");
+	
+	public OptionTests(String name) {
+		super(name);
 	}
-}
-
-/**
- * Test custom encoding
- */
-public void test02() throws CoreException {
-	try {
-		IJavaProject projectA = 
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-		IJavaProject projectB = 
-			this.createJavaProject(
-				"B", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-				
-		String globalEncoding = JavaCore.getOption(JavaCore.CORE_ENCODING);
-
-		Hashtable options = new Hashtable();
-		options.put(JavaCore.CORE_ENCODING, "custom");
-		projectA.setOptions(options);
-
-		// check project A custom options		
-		assertEquals("projA:unexpected custom encoding", "custom", projectA.getOption(JavaCore.CORE_ENCODING, true));
-		
-		// check project B custom options	(should be none, indicating it sees global ones only)
-		assertEquals("projB:unexpected custom encoding", globalEncoding, projectB.getOption(JavaCore.CORE_ENCODING, true));
-
-		// flush custom options - project A should revert to global ones
-		projectA.setOptions(null); 
-		assertEquals("projA:unexpected reverted encoding", globalEncoding, projectA.getOption(JavaCore.CORE_ENCODING, true));
-
-	} finally {
-		this.deleteProject("A");
-		this.deleteProject("B");
+	public static Test suite() {
+	
+		if (false){
+			TestSuite suite = new Suite(OptionTests.class.getName());
+			suite.addTest(new OptionTests("test02"));
+			suite.addTest(new OptionTests("test03"));
+			suite.addTest(new OptionTests("test07"));
+			suite.addTest(new OptionTests("test08"));
+			return suite;
+		}
+		return new Suite(OptionTests.class);	
 	}
-}
-
-/**
- * Test custom project option (if not considering JavaCore options)
- */
-public void test03() throws CoreException {
-	try {
-		IJavaProject projectA = 
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-		IJavaProject projectB = 
-			this.createJavaProject(
-				"B", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-				
-		Hashtable options = new Hashtable();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.DISABLED);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "8.0");
-		options.put(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, JavaCore.ERROR);
-		JavaCore.setOptions(options);
-
-		options.clear();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
-		projectA.setOptions(options);
-
-		// check project A custom options		
-		assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, false));
-		assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOption(JavaCore.COMPILER_COMPLIANCE, false));
-		assertEquals("projA:unexpected inherited value1 for hidden-catch option", null, projectA.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, false));
+	/**
+	 * Test persistence of project custom options
+	 */
+	public void test01() throws CoreException {
+		try {
+			IJavaProject projectA = 
+				this.createJavaProject(
+					"A", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+			IJavaProject projectB = 
+				this.createJavaProject(
+					"B", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+					
+			Hashtable options = new Hashtable();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.DISABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "8.0");
+			options.put(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, JavaCore.ERROR);
+			JavaCore.setOptions(options);
+	
+			options.clear();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
+			projectA.setOptions(options);
+	
+			// check project A custom options		
+			assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, true));
+			assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOption(JavaCore.COMPILER_COMPLIANCE, true));
+			assertEquals("projA:unexpected inherited value1 for hidden-catch option", JavaCore.ERROR, projectA.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, true));
+			
+			// check project B custom options	(should be none, indicating it sees global ones only)
+			assertEquals("projB:unexpected custom value for deprecation option", JavaCore.DISABLED, projectB.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, true));
+			assertEquals("projB:unexpected custom value for compliance option", "8.0", projectB.getOption(JavaCore.COMPILER_COMPLIANCE, true));
+			assertEquals("projB:unexpected inherited value for hidden-catch option", JavaCore.ERROR, projectB.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, true));
+	
+			// flush custom options - project A should revert to global ones
+			projectA.setOptions(null); 
+			assertEquals("projA:unexpected reverted value for deprecation option", JavaCore.DISABLED, projectA.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, true));
+			assertEquals("projA:unexpected reverted value for compliance option", "8.0", projectA.getOption(JavaCore.COMPILER_COMPLIANCE, true));
+			assertEquals("projA:unexpected inherited value2 for hidden-catch option", JavaCore.ERROR, projectA.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, true));
+	
+		} finally {
+			this.deleteProject("A");
+			this.deleteProject("B");
+		}
+	}
+	
+	/**
+	 * Test custom encoding
+	 */
+	public void test02() throws CoreException {
+		try {
+			IJavaProject projectA = 
+				this.createJavaProject(
+					"A", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+			IJavaProject projectB = 
+				this.createJavaProject(
+					"B", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+					
+			String globalEncoding = JavaCore.getOption(JavaCore.CORE_ENCODING);
+	
+			Hashtable options = new Hashtable();
+			options.put(JavaCore.CORE_ENCODING, "custom");
+			projectA.setOptions(options);
+	
+			// check project A custom options		
+			assertEquals("projA:unexpected custom encoding", "custom", projectA.getOption(JavaCore.CORE_ENCODING, true));
+			
+			// check project B custom options	(should be none, indicating it sees global ones only)
+			assertEquals("projB:unexpected custom encoding", globalEncoding, projectB.getOption(JavaCore.CORE_ENCODING, true));
+	
+			// flush custom options - project A should revert to global ones
+			projectA.setOptions(null); 
+			assertEquals("projA:unexpected reverted encoding", globalEncoding, projectA.getOption(JavaCore.CORE_ENCODING, true));
+	
+		} finally {
+			this.deleteProject("A");
+			this.deleteProject("B");
+		}
+	}
+	
+	/**
+	 * Test custom project option (if not considering JavaCore options)
+	 */
+	public void test03() throws CoreException {
+		try {
+			IJavaProject projectA = 
+				this.createJavaProject(
+					"A", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+			IJavaProject projectB = 
+				this.createJavaProject(
+					"B", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+					
+			Hashtable options = new Hashtable();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.DISABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "8.0");
+			options.put(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, JavaCore.ERROR);
+			JavaCore.setOptions(options);
+	
+			options.clear();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
+			projectA.setOptions(options);
+	
+			// check project A custom options		
+			assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, false));
+			assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOption(JavaCore.COMPILER_COMPLIANCE, false));
+			assertEquals("projA:unexpected inherited value1 for hidden-catch option", null, projectA.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, false));
+			
+			// check project B custom options	(should be none, indicating it sees global ones only)
+			assertEquals("projB:unexpected custom value for deprecation option", null, projectB.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, false));
+			assertEquals("projB:unexpected custom value for compliance option", null, projectB.getOption(JavaCore.COMPILER_COMPLIANCE, false));
+			assertEquals("projB:unexpected inherited value for hidden-catch option", null, projectB.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, false));
+	
+			// flush custom options - project A should revert to global ones
+			projectA.setOptions(null); 
+			assertEquals("projA:unexpected reverted value for deprecation option", null, projectA.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, false));
+			assertEquals("projA:unexpected reverted value for compliance option", null, projectA.getOption(JavaCore.COMPILER_COMPLIANCE, false));
+			assertEquals("projA:unexpected inherited value2 for hidden-catch option", null, projectA.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, false));
+	
+		} finally {
+			this.deleteProject("A");
+			this.deleteProject("B");
+		}
+	}
+	/**
+	 * Test persistence of project custom options - using getOptions()
+	 */
+	public void test04() throws CoreException {
+		try {
+			IJavaProject projectA = 
+				this.createJavaProject(
+					"A", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+			IJavaProject projectB = 
+				this.createJavaProject(
+					"B", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+					
+			Hashtable options = new Hashtable();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.DISABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "8.0");
+			options.put(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, JavaCore.ERROR);
+			JavaCore.setOptions(options);
+	
+			options.clear();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
+			projectA.setOptions(options);
+	
+			// check project A custom options		
+			assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOptions(true).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOptions(true).get(JavaCore.COMPILER_COMPLIANCE));
+			assertEquals("projA:unexpected inherited value1 for hidden-catch option", JavaCore.ERROR, projectA.getOptions(true).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
+			
+			// check project B custom options	(should be none, indicating it sees global ones only)
+			assertEquals("projB:unexpected custom value for deprecation option", JavaCore.DISABLED, projectB.getOptions(true).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projB:unexpected custom value for compliance option", "8.0", projectB.getOptions(true).get(JavaCore.COMPILER_COMPLIANCE));
+			assertEquals("projB:unexpected inherited value for hidden-catch option", JavaCore.ERROR, projectB.getOptions(true).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
+	
+			// flush custom options - project A should revert to global ones
+			projectA.setOptions(null); 
+			assertEquals("projA:unexpected reverted value for deprecation option", JavaCore.DISABLED, projectA.getOptions(true).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projA:unexpected reverted value for compliance option", "8.0", projectA.getOptions(true).get(JavaCore.COMPILER_COMPLIANCE));
+			assertEquals("projA:unexpected inherited value2 for hidden-catch option", JavaCore.ERROR, projectA.getOptions(true).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
+	
+		} finally {
+			this.deleteProject("A");
+			this.deleteProject("B");
+		}
+	}
+	
+	/**
+	 * Test custom encoding - using getOptions()
+	 */
+	public void test05() throws CoreException {
+		try {
+			IJavaProject projectA = 
+				this.createJavaProject(
+					"A", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+			IJavaProject projectB = 
+				this.createJavaProject(
+					"B", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+					
+			String globalEncoding = JavaCore.getOption(JavaCore.CORE_ENCODING);
+	
+			Hashtable options = new Hashtable();
+			options.put(JavaCore.CORE_ENCODING, "custom");
+			projectA.setOptions(options);
+	
+			// check project A custom options		
+			assertEquals("projA:unexpected custom encoding", "custom", projectA.getOptions(true).get(JavaCore.CORE_ENCODING));
+			
+			// check project B custom options	(should be none, indicating it sees global ones only)
+			assertEquals("projB:unexpected custom encoding", globalEncoding, projectB.getOptions(true).get(JavaCore.CORE_ENCODING));
+	
+			// flush custom options - project A should revert to global ones
+			projectA.setOptions(null); 
+			assertEquals("projA:unexpected reverted encoding", globalEncoding, projectA.getOptions(true).get(JavaCore.CORE_ENCODING));
+	
+		} finally {
+			this.deleteProject("A");
+			this.deleteProject("B");
+		}
+	}
+	
+	/**
+	 * Test custom project option (if not considering JavaCore options) - using getOptions()
+	 */
+	public void test06() throws CoreException {
+		try {
+			IJavaProject projectA = 
+				this.createJavaProject(
+					"A", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+			IJavaProject projectB = 
+				this.createJavaProject(
+					"B", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+					
+			Hashtable options = new Hashtable();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.DISABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "8.0");
+			options.put(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, JavaCore.ERROR);
+			JavaCore.setOptions(options);
+	
+			options.clear();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
+			projectA.setOptions(options);
+	
+			// check project A custom options		
+			assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
+			assertEquals("projA:unexpected inherited value1 for hidden-catch option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
+			
+			// check project B custom options	(should be none, indicating it sees global ones only)
+			assertEquals("projB:unexpected custom value for deprecation option", null, projectB.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projB:unexpected custom value for compliance option", null, projectB.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
+			assertEquals("projB:unexpected inherited value for hidden-catch option", null, projectB.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
+	
+			// flush custom options - project A should revert to global ones
+			projectA.setOptions(null); 
+			assertEquals("projA:unexpected reverted value for deprecation option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projA:unexpected reverted value for compliance option", null, projectA.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
+			assertEquals("projA:unexpected inherited value2 for hidden-catch option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
+	
+		} finally {
+			this.deleteProject("A");
+			this.deleteProject("B");
+		}
+	}
+	/**
+	 * Custom options must replace existing ones completely without loosing property listeners
+	 * http://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
+	 * http://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
+	 */
+	public void test07() throws CoreException {
+		try {
+			this.eventCount = 0;
+			JavaProject projectA = (JavaProject)
+				this.createJavaProject(
+					"A", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+	//		Preferences preferences = projectA.getPreferences();
+	//		preferences.addPropertyChangeListener(new TestPropertyListener());
+			IEclipsePreferences eclipsePreferences = projectA.getEclipsePreferences();
+			TestPropertyListener listener = new TestPropertyListener();
+			eclipsePreferences.addPreferenceChangeListener(listener);
 		
-		// check project B custom options	(should be none, indicating it sees global ones only)
-		assertEquals("projB:unexpected custom value for deprecation option", null, projectB.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, false));
-		assertEquals("projB:unexpected custom value for compliance option", null, projectB.getOption(JavaCore.COMPILER_COMPLIANCE, false));
-		assertEquals("projB:unexpected inherited value for hidden-catch option", null, projectB.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, false));
-
-		// flush custom options - project A should revert to global ones
-		projectA.setOptions(null); 
-		assertEquals("projA:unexpected reverted value for deprecation option", null, projectA.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, false));
-		assertEquals("projA:unexpected reverted value for compliance option", null, projectA.getOption(JavaCore.COMPILER_COMPLIANCE, false));
-		assertEquals("projA:unexpected inherited value2 for hidden-catch option", null, projectA.getOption(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, false));
-
-	} finally {
-		this.deleteProject("A");
-		this.deleteProject("B");
-	}
-}
-/**
- * Test persistence of project custom options - using getOptions()
- */
-public void test04() throws CoreException {
-	try {
-		IJavaProject projectA = 
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-		IJavaProject projectB = 
-			this.createJavaProject(
-				"B", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-				
-		Hashtable options = new Hashtable();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.DISABLED);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "8.0");
-		options.put(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, JavaCore.ERROR);
-		JavaCore.setOptions(options);
-
-		options.clear();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
-		projectA.setOptions(options);
-
-		// check project A custom options		
-		assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOptions(true).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
-		assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOptions(true).get(JavaCore.COMPILER_COMPLIANCE));
-		assertEquals("projA:unexpected inherited value1 for hidden-catch option", JavaCore.ERROR, projectA.getOptions(true).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
+			Hashtable options = new Hashtable();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
+			projectA.setOptions(options);
+	
+			// check project A custom options		
+			assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
+			assertEquals("projA:unexpected inherited value1 for hidden-catch option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
+	//		assertTrue("projA:preferences should not be reset", preferences == projectA.getPreferences());
+			assertTrue("projA:preferences should not be reset", eclipsePreferences == projectA.getEclipsePreferences());
+			assertTrue("projA:preferences property listener has been lost", eventCount == 2);
 		
-		// check project B custom options	(should be none, indicating it sees global ones only)
-		assertEquals("projB:unexpected custom value for deprecation option", JavaCore.DISABLED, projectB.getOptions(true).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
-		assertEquals("projB:unexpected custom value for compliance option", "8.0", projectB.getOptions(true).get(JavaCore.COMPILER_COMPLIANCE));
-		assertEquals("projB:unexpected inherited value for hidden-catch option", JavaCore.ERROR, projectB.getOptions(true).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
-
-		// flush custom options - project A should revert to global ones
-		projectA.setOptions(null); 
-		assertEquals("projA:unexpected reverted value for deprecation option", JavaCore.DISABLED, projectA.getOptions(true).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
-		assertEquals("projA:unexpected reverted value for compliance option", "8.0", projectA.getOptions(true).get(JavaCore.COMPILER_COMPLIANCE));
-		assertEquals("projA:unexpected inherited value2 for hidden-catch option", JavaCore.ERROR, projectA.getOptions(true).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
-
-	} finally {
-		this.deleteProject("A");
-		this.deleteProject("B");
+			// change custom options to have one less
+			options.clear();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
+			projectA.setOptions(options);
+			assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projA:unexpected custom value for compliance option", null, projectA.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
+			assertEquals("projA:unexpected inherited value1 for hidden-catch option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
+	//		assertTrue("projA:preferences should not be reset", preferences == projectA.getPreferences());
+			assertTrue("projA:preferences should not be reset", eclipsePreferences == projectA.getEclipsePreferences());
+			assertTrue("projA:preferences property listener has been lost", eventCount == 3);
+		} finally {
+			this.deleteProject("A");
+		}
 	}
-}
-
-/**
- * Test custom encoding - using getOptions()
- */
-public void test05() throws CoreException {
-	try {
-		IJavaProject projectA = 
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-		IJavaProject projectB = 
-			this.createJavaProject(
-				"B", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-				
-		String globalEncoding = JavaCore.getOption(JavaCore.CORE_ENCODING);
-
-		Hashtable options = new Hashtable();
-		options.put(JavaCore.CORE_ENCODING, "custom");
-		projectA.setOptions(options);
-
-		// check project A custom options		
-		assertEquals("projA:unexpected custom encoding", "custom", projectA.getOptions(true).get(JavaCore.CORE_ENCODING));
-		
-		// check project B custom options	(should be none, indicating it sees global ones only)
-		assertEquals("projB:unexpected custom encoding", globalEncoding, projectB.getOptions(true).get(JavaCore.CORE_ENCODING));
-
-		// flush custom options - project A should revert to global ones
-		projectA.setOptions(null); 
-		assertEquals("projA:unexpected reverted encoding", globalEncoding, projectA.getOptions(true).get(JavaCore.CORE_ENCODING));
-
-	} finally {
-		this.deleteProject("A");
-		this.deleteProject("B");
+	/**
+	 * Empty custom option must not be ignored
+	 * http://bugs.eclipse.org/bugs/show_bug.cgi?id=26251
+	 */
+	public void test08() throws CoreException {
+		try {
+			IJavaProject projectA = 
+				this.createJavaProject(
+					"A", 
+					new String[] {}, // source folders
+					new String[] {}, // lib folders
+					new String[] {}, // projects
+					"");
+	
+			Hashtable options = new Hashtable();
+			options.put(JavaCore.COMPILER_TASK_TAGS, "TODO:");
+			JavaCore.setOptions(options);
+			
+	
+			// check project A custom options		
+			assertEquals("1#projA:unexpected custom value for task tags option", null, projectA.getOption(JavaCore.COMPILER_TASK_TAGS, false));
+			assertEquals("1#projA:unexpected custom value for inherited task tags option", "TODO:", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, true));
+			assertEquals("1#workspace:unexpected custom value for task tags option", "TODO:", JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
+			
+			// change custom options to have one less
+			options.clear();
+			options.put(JavaCore.COMPILER_TASK_TAGS, "");
+			projectA.setOptions(options);
+			assertEquals("2#projA:unexpected custom value for task tags option", "", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, false));
+			assertEquals("2#projA:unexpected custom value for inherited task tags option", "", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, true));
+			assertEquals("2#workspace:unexpected custom value for task tags option", "TODO:", JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
+	
+			// change custom options to have one less
+			options.clear();
+			options.put(JavaCore.COMPILER_TASK_TAGS, "@TODO");
+			JavaCore.setOptions(options);
+			assertEquals("3#projA:unexpected custom value for task tags option", "", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, false));
+			assertEquals("3#projA:unexpected custom value for inherited task tags option", "", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, true));
+			assertEquals("3#workspace:unexpected custom value for task tags option", "@TODO", JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
+	
+		} finally {
+			this.deleteProject("A");
+		}
 	}
-}
-
-/**
- * Test custom project option (if not considering JavaCore options) - using getOptions()
- */
-public void test06() throws CoreException {
-	try {
-		IJavaProject projectA = 
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-		IJavaProject projectB = 
-			this.createJavaProject(
-				"B", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-				
-		Hashtable options = new Hashtable();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.DISABLED);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "8.0");
-		options.put(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK, JavaCore.ERROR);
-		JavaCore.setOptions(options);
-
-		options.clear();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
-		projectA.setOptions(options);
-
-		// check project A custom options		
-		assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
-		assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
-		assertEquals("projA:unexpected inherited value1 for hidden-catch option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
-		
-		// check project B custom options	(should be none, indicating it sees global ones only)
-		assertEquals("projB:unexpected custom value for deprecation option", null, projectB.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
-		assertEquals("projB:unexpected custom value for compliance option", null, projectB.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
-		assertEquals("projB:unexpected inherited value for hidden-catch option", null, projectB.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
-
-		// flush custom options - project A should revert to global ones
-		projectA.setOptions(null); 
-		assertEquals("projA:unexpected reverted value for deprecation option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
-		assertEquals("projA:unexpected reverted value for compliance option", null, projectA.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
-		assertEquals("projA:unexpected inherited value2 for hidden-catch option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
-
-	} finally {
-		this.deleteProject("A");
-		this.deleteProject("B");
-	}
-}
-/**
- * Custom options must replace existing ones completely without loosing property listeners
- * http://bugs.eclipse.org/bugs/show_bug.cgi?id=26255
- * http://bugs.eclipse.org/bugs/show_bug.cgi?id=49691
- */
-public void test07() throws CoreException {
-	try {
-		JavaProject projectA = (JavaProject)
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-		Preferences preferences = projectA.getPreferences();
-		preferences.addPropertyChangeListener(new TestPropertyListener());
-	
-		Hashtable options = new Hashtable();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
-		options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
-		projectA.setOptions(options);
-
-		// check project A custom options		
-		assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
-		assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
-		assertEquals("projA:unexpected inherited value1 for hidden-catch option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
-		assertTrue("projA:preferences should not be reset", preferences == projectA.getPreferences());
-		assertTrue("projA:preferences property listener has been lost", eventCount == 2);
-	
-		// change custom options to have one less
-		options.clear();
-		options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
-		projectA.setOptions(options);
-		assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOptions(false).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
-		assertEquals("projA:unexpected custom value for compliance option", null, projectA.getOptions(false).get(JavaCore.COMPILER_COMPLIANCE));
-		assertEquals("projA:unexpected inherited value1 for hidden-catch option", null, projectA.getOptions(false).get(JavaCore.COMPILER_PB_HIDDEN_CATCH_BLOCK));
-		assertTrue("projA:preferences should not be reset", preferences == projectA.getPreferences());
-		assertTrue("projA:preferences property listener has been lost", eventCount == 3);
-	} finally {
-		this.deleteProject("A");
-	}
-}
-/**
- * Empty custom option must not be ignored
- * http://bugs.eclipse.org/bugs/show_bug.cgi?id=26251
- */
-public void test08() throws CoreException {
-	try {
-		IJavaProject projectA = 
-			this.createJavaProject(
-				"A", 
-				new String[] {}, // source folders
-				new String[] {}, // lib folders
-				new String[] {}, // projects
-				"");
-
-		Hashtable options = new Hashtable();
-		options.put(JavaCore.COMPILER_TASK_TAGS, "TODO:");
-		JavaCore.setOptions(options);
+	/**
+	 * Custom options must replace existing ones completely without loosing property listeners
+	 * http://bugs.eclipse.org/bugs/show_bug.cgi?id=59258
+	 * http://bugs.eclipse.org/bugs/show_bug.cgi?id=60896
+	 */
+	public void test09() throws CoreException {
+		try {
+			this.eventCount = 0;
+			JavaProject projectA = (JavaProject) this.createJavaProject("A", new String[] {}, "");
+	//		Preferences preferences = projectA.getPreferences();
+	//		preferences.addPropertyChangeListener(new TestPropertyListener());
+			IEclipsePreferences eclipsePreferences = projectA.getEclipsePreferences();
+			eclipsePreferences.addPreferenceChangeListener(new TestPropertyListener());
 		
-
-		// check project A custom options		
-		assertEquals("1#projA:unexpected custom value for task tags option", null, projectA.getOption(JavaCore.COMPILER_TASK_TAGS, false));
-		assertEquals("1#projA:unexpected custom value for inherited task tags option", "TODO:", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, true));
-		assertEquals("1#workspace:unexpected custom value for task tags option", "TODO:", JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
+			Hashtable options = new Hashtable();
+			options.put(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE, JavaCore.ENABLED);
+			options.put(JavaCore.COMPILER_COMPLIANCE, "10.0");
+			projectA.setOptions(options);
+	
+			// check project A custom options		
+			assertEquals("projA:unexpected custom value for deprecation option", JavaCore.ENABLED, projectA.getOptions(true).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projA:unexpected custom value for compliance option", "10.0", projectA.getOptions(true).get(JavaCore.COMPILER_COMPLIANCE));
+			assertTrue("projA:preferences should not be reset", eclipsePreferences == projectA.getEclipsePreferences());
+			assertEquals("projA:preferences property listener has been lost", 2, eventCount);
 		
-		// change custom options to have one less
-		options.clear();
-		options.put(JavaCore.COMPILER_TASK_TAGS, "");
-		projectA.setOptions(options);
-		assertEquals("2#projA:unexpected custom value for task tags option", "", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, false));
-		assertEquals("2#projA:unexpected custom value for inherited task tags option", "", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, true));
-		assertEquals("2#workspace:unexpected custom value for task tags option", "TODO:", JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
-
-		// change custom options to have one less
-		options.clear();
-		options.put(JavaCore.COMPILER_TASK_TAGS, "@TODO");
-		JavaCore.setOptions(options);
-		assertEquals("3#projA:unexpected custom value for task tags option", "", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, false));
-		assertEquals("3#projA:unexpected custom value for inherited task tags option", "", projectA.getOption(JavaCore.COMPILER_TASK_TAGS, true));
-		assertEquals("3#workspace:unexpected custom value for task tags option", "@TODO", JavaCore.getOption(JavaCore.COMPILER_TASK_TAGS));
-
-	} finally {
-		this.deleteProject("A");
+			// delete/create project A and verify that options are well reset
+			this.deleteProject("A");
+			projectA = (JavaProject) this.createJavaProject("A", new String[] {}, "");
+			assertEquals("projA:unexpected custom value for deprecation option", JavaCore.getOption(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE), projectA.getOptions(true).get(JavaCore.COMPILER_PB_DEPRECATION_IN_DEPRECATED_CODE));
+			assertEquals("projA:unexpected custom value for compliance option", JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE), projectA.getOptions(true).get(JavaCore.COMPILER_COMPLIANCE));
+			assertTrue("projA:preferences should not be reset", eclipsePreferences != projectA.getEclipsePreferences());
+		} finally {
+			this.deleteProject("A");
+		}
 	}
-}
 }