### Eclipse Workspace Patch 1.0
#P org.eclipse.jdt.core
Index: model/org/eclipse/jdt/core/JavaCore.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java,v
retrieving revision 1.527
diff -u -r1.527 JavaCore.java
--- model/org/eclipse/jdt/core/JavaCore.java	3 Feb 2006 15:29:44 -0000	1.527
+++ model/org/eclipse/jdt/core/JavaCore.java	6 Feb 2006 10:27:13 -0000
@@ -58,6 +58,7 @@
  *                                 TIMEOUT_FOR_PARAMETER_NAME_FROM_ATTACHED_JAVADOC
  *     IBM Corporation - added the following constants:
  *                                 COMPILER_PB_PARAMETER_ASSIGNMENT
+ *                                 COMPILER_PB_NULL_REFERENCE
  *******************************************************************************/
 package org.eclipse.jdt.core;
 
@@ -482,8 +483,8 @@
 	public static final String COMPILER_PB_INCOMPLETE_ENUM_SWITCH = PLUGIN_ID + ".compiler.problem.incompleteEnumSwitch"; //$NON-NLS-1$
 	/**
 	 * Possible  configurable option ID.
-	 * @see #getDefaultOptions()
 	 * @since 3.1
+	 * @deprecated use {@link #COMPILER_PB_NULL_REFERENCE} instead
 	 */
 	public static final String COMPILER_PB_INCONSISTENT_NULL_CHECK = PLUGIN_ID + ".compiler.problem.inconsistentNullCheck"; //$NON-NLS-1$
 	/**
@@ -657,6 +658,12 @@
 	/**
 	 * Possible  configurable option ID.
 	 * @see #getDefaultOptions()
+	 * @since 3.2
+	 */
+	public static final String COMPILER_PB_NULL_REFERENCE = PLUGIN_ID + ".compiler.problem.nullReference"; //$NON-NLS-1$
+	/**
+	 * Possible  configurable option ID.
+	 * @see #getDefaultOptions()
 	 */
 	public static final String CORE_JAVA_BUILD_ORDER = PLUGIN_ID + ".computeJavaBuildOrder"; //$NON-NLS-1$
 	/**
@@ -2048,7 +2055,7 @@
 	 *     - default:           "warning"
 	 * 
 	 * COMPILER / Reporting Null Reference or Dereference
-	 *    When enabled, the compiler will issue an error or a warning whenever assumption were made on a variable
+	 *    When enabled, the compiler will issue an error or a warning whenever an assumption is made on a variable
 	 *    with respect to holding null/non-null values, but the assumption is not followed in a consistent manner.
 	 *    Situations include:
 	 *         - if variable was assumed to be null and further used to access field or methods
@@ -2056,7 +2063,7 @@
 	 *         
 	 *     - option id:         "org.eclipse.jdt.core.compiler.problem.nullReference"
 	 *     - possible values:   { "error", "warning", "ignore" }
-	 *     - default:           "warning"
+	 *     - default:           "ignore"
 	 * 
 	 * COMPILER / Reporting Use of Annotation Type as Super Interface
 	 *    When enabled, the compiler will issue an error or a warning whenever an annotation type is used
Index: compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java,v
retrieving revision 1.158
diff -u -r1.158 CompilerOptions.java
--- compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	2 Feb 2006 10:11:08 -0000	1.158
+++ compiler/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java	6 Feb 2006 10:27:12 -0000
@@ -216,7 +216,7 @@
 		| UnusedLocalVariable
 		| UnusedPrivateMember
 		| UnusedLabel
-		/*| NullReference*/;
+		/*| NullReference -- keep JavaCore#getDefaultOptions comment in sync */;
 
 	// By default only lines and source attributes are generated.
 	public int produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES;