Attachment 208926 Details for Bug 346175 – Improved Patch

[patch] Improved Patch

patch.txt (text/plain), 25.62 KB, created by Satyam Kandula

on 2012-01-03 04:48:58 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Satyam Kandula

Created: 2012-01-03 04:48:58 EST

Size: 25.62 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NonFatalErrorTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NonFatalErrorTest.java
>index 1d28367..2db03cf 100644
>--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NonFatalErrorTest.java
>+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NonFatalErrorTest.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -12,6 +12,7 @@
> 
> import java.util.Map;
> 
>+import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
> import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
> 
> import junit.framework.Test;
>@@ -24,7 +25,7 @@
> 	// All specified tests which does not belong to the class are skipped...
> 	static {
> //		TESTS_NAMES = new String[] { "test127" };
>-//		TESTS_NUMBERS = new int[] { 5 };
>+//		TESTS_NUMBERS = new int[] { 7 };
> //		TESTS_RANGE = new int[] { 169, 180 };
> 	}
> 
>@@ -258,4 +259,41 @@
> 			// javac options
> 			JavacTestOptions.Excuse.EclipseWarningConfiguredAsError /* javac test options */);
> 	}
>+	public void test007() {
>+		if (this.complianceLevel < ClassFileConstants.JDK1_5) {
>+			return;
>+		}
>+		Map customOptions = getCompilerOptions();
>+		customOptions.put(CompilerOptions.OPTION_FatalOptionalError,
>+				CompilerOptions.ENABLED);
>+		customOptions.put(CompilerOptions.OPTION_ReportUnusedLocal,
>+				CompilerOptions.ERROR);
>+		customOptions.put(CompilerOptions.OPTION_SuppressWarnings,
>+				CompilerOptions.ENABLED);
>+		customOptions.put(CompilerOptions.OPTION_SuppressOptionalErrors,
>+				CompilerOptions.ENABLED);
>+		customOptions.put(CompilerOptions.OPTION_ReportUnusedWarningToken,
>+				CompilerOptions.ERROR);
>+		runConformTest(
>+				new String[] { /* test files */
>+						"X.java",
>+						"public class X {\n" +
>+								"        @SuppressWarnings(\"unused\")\n" +
>+								"        static void foo() {\n" +
>+								"            String s = null;\n" +
>+								"            System.out.println(\"SUCCESS\");\n" +
>+								"        }\n" +
>+								"        public static void main(String argv[]) {\n" +
>+								"            foo();\n" +
>+								"        }\n" +
>+								"}"
>+				},
>+				"SUCCESS" /* expected output string */,
>+				null /* no class libraries */,
>+				true,
>+				null,
>+				customOptions /* custom options */,
>+				// compiler results
>+				null /* do not check error string */);
>+	}
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveElementsTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveElementsTests.java
>index eec97ac..8ecb0b9 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveElementsTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveElementsTests.java
>@@ -2452,7 +2452,7 @@
> 	try {
> 		TestProgressMonitor monitor = TestProgressMonitor.getInstance();
> 		monitor.setCancelledCounter(1);
>-		movePositive(typeSource.getMethods(), new IJavaElement[] {typeDest}, null, null, false, monitor);
>+		movePositive(typeSource.getMethods(), new IJavaElement[] {typeDest}, null, null, false, true, monitor);
> 	} catch (OperationCanceledException e) {
> 		isCanceled = true;
> 	}
>@@ -2488,7 +2488,7 @@
> 		try {
> 			TestProgressMonitor monitor = TestProgressMonitor.getInstance();
> 			monitor.setCancelledCounter(1);
>-			movePositive(typeSource.getMethods(), new IJavaElement[] {typeDest}, null, null, false, monitor);
>+			movePositive(typeSource.getMethods(), new IJavaElement[] {typeDest}, null, null, false, true, monitor);
> 		} catch (OperationCanceledException e) {
> 			isCanceled = true;
> 		}
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveResourcesTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveResourcesTests.java
>index 3d4d1ec..2b68fd0 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveResourcesTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveResourcesTests.java
>@@ -80,7 +80,13 @@
> 		}
> 		IJavaElementDelta destDelta = this.deltaListener.getDeltaFor(container, true);
> 		assertTrue("Destination container not changed", destDelta != null && destDelta.getKind() == IJavaElementDelta.CHANGED);
>-		IJavaElementDelta[] deltas = destDelta.getAddedChildren();
>+		IJavaElementDelta[] deltas = null;
>+		if (force) {
>+			deltas = destDelta.getChangedChildren();
>+		}
>+		else {
>+			deltas = destDelta.getAddedChildren();
>+		}
> 		// FIXME: not strong enough
> 		boolean found = false;
> 		for (int i = 0; i < deltas.length; i++) {
>@@ -809,25 +815,38 @@
>  * existing CU.
>  */
> public void testMoveCU03() throws CoreException {
>-	this.createFolder("/P/src/p1");
>-	this.createFile(
>-		"/P/src/p1/X.java",
>-		"package p1;\n" +
>-		"public class X {\n" +
>-		"}"
>-	);
>-	ICompilationUnit cuSource = getCompilationUnit("/P/src/p1/X.java");
>+	try {
>+		this.createFolder("/P/src/p1");
>+		this.createFile(
>+			"/P/src/p1/X.java",
>+			"package p1;\n" +
>+			"public class X {\n" +
>+			"}"
>+		);
>+		ICompilationUnit cuSource = getCompilationUnit("/P/src/p1/X.java");
> 
>-	this.createFolder("/P/src/p2");
>-	this.createFile(
>-		"/P/src/p2/X.java",
>-		"package p2;\n" +
>-		"public class X {\n" +
>-		"}"
>-	);
>-	IPackageFragment pkgDest = getPackage("/P/src/p2");
>-
>-	movePositive(cuSource, pkgDest, null, null, true);
>+		this.createFolder("/P/src/p2");
>+		this.createFile(
>+			"/P/src/p2/X.java",
>+			"package p2;\n" +
>+			"public class X {\n" +
>+			"}"
>+		);
>+		IPackageFragment pkgDest = getPackage("/P/src/p2");
>+		startDeltas();
>+		movePositive(new IJavaElement[] {cuSource}, new IJavaElement[] {pkgDest}, null, null, true, false, null);
>+			assertDeltas(
>+					"Incorrect delta",
>+					"P[*]: {CHILDREN}\n"
>+							+ "	src[*]: {CHILDREN}\n"
>+							+ "		p1[*]: {CHILDREN}\n"
>+							+ "			X.java[-]: {MOVED_TO(X.java [in p2 [in src [in P]]])}\n"
>+							+ "		p2[*]: {CHILDREN}\n"
>+							+ "			X.java[*]: {CONTENT | PRIMARY RESOURCE}");
>+	}
>+	finally {
>+		stopDeltas();
>+	}
> }
> /**
>  * Ensures that a CU can be moved to a different package,
>@@ -853,25 +872,39 @@
>  * be renamed, overwriting an existing resource.
>  */
> public void testMoveCU05() throws CoreException {
>-	this.createFolder("/P/src/p1");
>-	this.createFile(
>-		"/P/src/p1/X.java",
>-		"package p1;\n" +
>-		"public class X {\n" +
>-		"}"
>-	);
>-	ICompilationUnit cuSource = getCompilationUnit("/P/src/p1/X.java");
>+	try {
>+		this.createFolder("/P/src/p1");
>+		this.createFile(
>+			"/P/src/p1/X.java",
>+			"package p1;\n" +
>+			"public class X {\n" +
>+			"}"
>+		);
>+		ICompilationUnit cuSource = getCompilationUnit("/P/src/p1/X.java");
> 
>-	this.createFolder("/P/src/p2");
>-	this.createFile(
>-		"/P/src/p2/Y.java",
>-		"package p2;\n" +
>-		"public class Y {\n" +
>-		"}"
>-	);
>-	IPackageFragment pkgDest = getPackage("/P/src/p2");
>-
>-	movePositive(cuSource, pkgDest, null, "Y.java", true);
>+		this.createFolder("/P/src/p2");
>+		this.createFile(
>+			"/P/src/p2/Y.java",
>+			"package p2;\n" +
>+			"public class Y {\n" +
>+			"}"
>+		);
>+		IPackageFragment pkgDest = getPackage("/P/src/p2");
>+		startDeltas();
>+		movePositive(new IJavaElement[] {cuSource}, new IJavaElement[] {pkgDest}, null, new String[]{"Y.java"}, true, false, null);
>+		assertDeltas(
>+					"Incorrect delta",
>+					"P[*]: {CHILDREN}\n"
>+							+ "	src[*]: {CHILDREN}\n"
>+							+ "		p1[*]: {CHILDREN}\n"
>+							+ "			X.java[-]: {MOVED_TO(Y.java [in p2 [in src [in P]]])}\n"
>+							+ "		p2[*]: {CHILDREN}\n"
>+							+ "			Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n"
>+							+ "				Y[+]: {MOVED_FROM(X [in X.java [in p1 [in src [in P]]]])}");
>+	}
>+	finally {
>+		stopDeltas();
>+	}
> }
> /**
>  * Ensures that a CU cannot be moved to a different package, replacing an
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveTests.java
>index b1066ae..c03e393 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CopyMoveTests.java
>@@ -253,12 +253,15 @@
> public void movePositive(IJavaElement[] elements, IJavaElement[] destinations, IJavaElement[] siblings, String[] names, boolean force) throws JavaModelException {
> 	movePositive(elements, destinations, siblings, names, force, null);
> }
>+public void movePositive(IJavaElement[] elements, IJavaElement[] destinations, IJavaElement[] siblings, String[] names, boolean force, IProgressMonitor monitor) throws JavaModelException {
>+	movePositive(elements, destinations, siblings, names, force, true, null);
>+}
> /**
>  * Moves the elements to the containers with optional renaming
>  * and forcing. The operation should succeed, so any exceptions
>  * encountered are thrown.
>  */
>-public void movePositive(IJavaElement[] elements, IJavaElement[] destinations, IJavaElement[] siblings, String[] names, boolean force, IProgressMonitor monitor) throws JavaModelException {
>+public void movePositive(IJavaElement[] elements, IJavaElement[] destinations, IJavaElement[] siblings, String[] names, boolean force, boolean checkDelta, IProgressMonitor monitor) throws JavaModelException {
> 	// if forcing, ensure that a name collision exists
> 	int i;
> 	if (force) {
>@@ -275,7 +278,7 @@
> 	}
> 
> 	try {
>-		startDeltas();
>+		if(checkDelta)	startDeltas();
> 
> 		// move
> 		getJavaModel().move(elements, destinations, siblings, names, force, monitor);
>@@ -341,24 +344,26 @@
> 					}
> 				}
> 			}
>-			IJavaElementDelta destDelta = null;
>-			if (isMainType(element, destinations[i]) && names != null && names[i] != null) { //moved/renamed main type to same cu
>-				destDelta = this.deltaListener.getDeltaFor(moved.getParent());
>-				assertTrue("Renamed compilation unit as result of main type not added", destDelta != null && destDelta.getKind() == IJavaElementDelta.ADDED);
>-				assertTrue("flag should be F_MOVED_FROM", (destDelta.getFlags() & IJavaElementDelta.F_MOVED_FROM) > 0);
>-				assertTrue("moved from handle should be original", destDelta.getMovedFromElement().equals(element.getParent()));
>-			} else {
>-				destDelta = this.deltaListener.getDeltaFor(destinations[i], true);
>-				assertTrue("Destination container not changed", destDelta != null && destDelta.getKind() == IJavaElementDelta.CHANGED);
>-				IJavaElementDelta[] deltas = destDelta.getAddedChildren();
>-				assertTrue("Added children not correct for element copy", deltas[i].getElement().equals(moved));
>-				assertTrue("should be K_ADDED", deltas[i].getKind() == IJavaElementDelta.ADDED);
>-				IJavaElementDelta sourceDelta= this.deltaListener.getDeltaFor(element, false);
>-				assertTrue("should be K_REMOVED", sourceDelta.getKind() == IJavaElementDelta.REMOVED);
>+			if(checkDelta) {
>+				IJavaElementDelta destDelta = null;
>+				if (isMainType(element, destinations[i]) && names != null && names[i] != null) { //moved/renamed main type to same cu
>+					destDelta = this.deltaListener.getDeltaFor(moved.getParent());
>+					assertTrue("Renamed compilation unit as result of main type not added", destDelta != null && destDelta.getKind() == IJavaElementDelta.ADDED);
>+					assertTrue("flag should be F_MOVED_FROM", (destDelta.getFlags() & IJavaElementDelta.F_MOVED_FROM) > 0);
>+					assertTrue("moved from handle should be original", destDelta.getMovedFromElement().equals(element.getParent()));
>+				} else {
>+					destDelta = this.deltaListener.getDeltaFor(destinations[i], true);
>+					assertTrue("Destination container not changed", destDelta != null && destDelta.getKind() == IJavaElementDelta.CHANGED);
>+					IJavaElementDelta[] deltas = destDelta.getAddedChildren();
>+					assertTrue("Added children not correct for element copy", deltas[i].getElement().equals(moved));
>+					assertTrue("should be K_ADDED", deltas[i].getKind() == IJavaElementDelta.ADDED);
>+					IJavaElementDelta sourceDelta= this.deltaListener.getDeltaFor(element, false);
>+					assertTrue("should be K_REMOVED", sourceDelta.getKind() == IJavaElementDelta.REMOVED);
>+				}
> 			}
> 		}
> 	} finally {
>-		stopDeltas();
>+		if(checkDelta)	stopDeltas();
> 	}
> }
> }
>diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java
>index f08ed7a..92b80fa 100644
>--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java
>+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/RenameTests.java
>@@ -115,9 +115,9 @@
> 			assertTrue("moved from handle should be original", destDelta.getMovedFromElement().equals(e.getParent()));
> 		} else {
> 			assertTrue("Destination container not changed", destDelta != null && deltaChildrenChanged(destDelta));
>-			IJavaElementDelta[] deltas = destDelta.getAddedChildren();
>+			IJavaElementDelta[] deltas = force ? destDelta.getChangedChildren() : destDelta.getAddedChildren();
> 			assertTrue("Added children not correct for element rename", deltas.length > i && deltas[i].getElement().equals(renamed));
>-			assertTrue("kind should be K_ADDED", deltas[i].getKind() == IJavaElementDelta.ADDED);
>+			assertTrue("kind should be K_ADDED", deltas[i].getKind() == (force? IJavaElementDelta.CHANGED : IJavaElementDelta.ADDED));
> 			deltas = destDelta.getRemovedChildren();
> 			assertTrue("Removed children not correct for element rename", deltas.length > i && deltas[i].getElement().equals(e));
> 			assertTrue("kind should be K_REMOVED", deltas[i].getKind() == IJavaElementDelta.REMOVED);
>@@ -364,11 +364,12 @@
> 
> 	assertDeltas(
> 		"Unexpected deltas",
>-		"P[*]: {CHILDREN}\n" +
>-		"	src[*]: {CHILDREN}\n" +
>-		"		<default>[*]: {CHILDREN}\n" +
>-		"			X.java[-]: {MOVED_TO(Y.java [in <default> [in src [in P]]])}\n" +
>-		"			Y.java[+]: {MOVED_FROM(X.java [in <default> [in src [in P]]])}"
>+		"P[*]: {CHILDREN}\n" + 
>+				"	src[*]: {CHILDREN}\n" + 
>+				"		<default>[*]: {CHILDREN}\n" + 
>+				"			X.java[-]: {MOVED_TO(Y.java [in <default> [in src [in P]]])}\n" + 
>+				"			Y.java[*]: {CHILDREN | FINE GRAINED | PRIMARY RESOURCE}\n" + 
>+				"				Y[+]: {MOVED_FROM(X [in X.java [in <default> [in src [in P]]]])}"
> 	);
> }
> /*
>diff --git a/org.eclipse.jdt.core/buildnotes_jdt-core.html b/org.eclipse.jdt.core/buildnotes_jdt-core.html
>index 93443ec..0e46cc5 100644
>--- a/org.eclipse.jdt.core/buildnotes_jdt-core.html
>+++ b/org.eclipse.jdt.core/buildnotes_jdt-core.html
>@@ -46,13 +46,13 @@
> <hr><h1>
> Eclipse Platform Build Notes<br>
> Java development tools core</h1>
>-Eclipse SDK 3.8.0 - %date% - December 2, 2011
>-<br>Project org.eclipse.jdt.core v_C26
>-(<a href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.jdt.core/?only_with_tag=v_C26">cvs</a>).
>+Eclipse SDK 3.8.0 - December 20, 2011 - December 2, 2011
> <h2>What's new in this drop</h2>
> 
> <h3>Problem Reports Fixed</h3>
>-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=365835">365835</a>
>+<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=362711">362711</a>
>+possibly incorrect JDT POST_CHANGE event fired when a file is replaced
>+<br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=365835">365835</a>
> [compiler][null] inconsistent error reporting.
> <br><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=365836">365836</a>
> [compiler][null] Incomplete propagation of null defaults.
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java
>index f6d98fd..1232834 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AbstractMethodDeclaration.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -361,6 +361,13 @@
> 		}
> 	}
> 
>+	public CompilationUnitDeclaration getCompilationUnitDeclaration() {
>+		if (this.scope != null) {
>+			return this.scope.compilationUnitScope().referenceContext;
>+		}
>+		return null;
>+	}
>+
> 	public boolean hasErrors() {
> 		return this.ignoreFurtherInvestigation;
> 	}
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
>index eb6f64a..754305e 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -364,6 +364,10 @@
> 	}
> }
> 
>+public CompilationUnitDeclaration getCompilationUnitDeclaration() {
>+	return this;
>+}
>+
> public char[] getFileName() {
> 	return this.compilationResult.getFileName();
> }
>@@ -394,6 +398,24 @@
> 	return CharOperation.equals(getMainTypeName(), TypeConstants.PACKAGE_INFO_NAME);
> }
> 
>+public boolean isSuppressed(CategorizedProblem problem) {
>+	if (this.suppressWarningsCount == 0) return false;
>+	int irritant = ProblemReporter.getIrritant(problem.getID());
>+	if (irritant == 0) return false;
>+	int start = problem.getSourceStart();
>+	int end = problem.getSourceEnd();
>+	nextSuppress: for (int iSuppress = 0, suppressCount = this.suppressWarningsCount; iSuppress < suppressCount; iSuppress++) {
>+		long position = this.suppressWarningScopePositions[iSuppress];
>+		int startSuppress = (int) (position >>> 32);
>+		int endSuppress = (int) position;
>+		if (start < startSuppress) continue nextSuppress;
>+		if (end > endSuppress) continue nextSuppress;
>+		if (this.suppressWarningIrritants[iSuppress].isSet(irritant))
>+			return true;
>+	}
>+	return false;
>+}
>+
> public boolean hasErrors() {
> 	return this.ignoreFurtherInvestigation;
> }
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
>index f5d41ea..4b32c61 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -490,6 +490,13 @@
> 		if (typeDecl != null) {
> 			return typeDecl;
> 		}
>+	}
>+	return null;
>+}
>+
>+public CompilationUnitDeclaration getCompilationUnitDeclaration() {
>+	if (this.scope != null) {
>+		return this.scope.compilationUnitScope().referenceContext;
> 	}
> 	return null;
> }
>@@ -1464,4 +1471,5 @@
> public boolean isSecondary() {
> 	return (this.bits & ASTNode.IsSecondaryType) != 0;
> }
>+
> }
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ReferenceContext.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ReferenceContext.java
>index ec3f72b..6c93b26 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ReferenceContext.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/impl/ReferenceContext.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -18,6 +18,7 @@
> 
> import org.eclipse.jdt.core.compiler.CategorizedProblem;
> import org.eclipse.jdt.internal.compiler.CompilationResult;
>+import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
> 
> public interface ReferenceContext {
> 
>@@ -25,7 +26,10 @@
> 
> 	CompilationResult compilationResult();
> 
>+	CompilationUnitDeclaration getCompilationUnitDeclaration();
>+
> 	boolean hasErrors();
> 
> 	void tagAsHavingErrors();
>+
> }
>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemHandler.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemHandler.java
>index 6baad99..3765f69 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemHandler.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemHandler.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2009 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -15,6 +15,7 @@
> import org.eclipse.jdt.internal.compiler.CompilationResult;
> import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy;
> import org.eclipse.jdt.internal.compiler.IProblemFactory;
>+import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
> import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
> import org.eclipse.jdt.internal.compiler.impl.ReferenceContext;
> import org.eclipse.jdt.internal.compiler.util.Util;
>@@ -150,6 +151,13 @@
> 		case ProblemSeverities.Error :
> 			record(problem, unitResult, referenceContext);
> 			if ((severity & ProblemSeverities.Fatal) != 0) {
>+				// don't abort or tag as error if the error is suppressed
>+				if (!referenceContext.hasErrors() && (severity & ProblemSeverities.Optional) != 0 && this.options.suppressOptionalErrors) {
>+					CompilationUnitDeclaration unitDecl = referenceContext.getCompilationUnitDeclaration();
>+					if (unitDecl != null && unitDecl.isSuppressed(problem)) {
>+						return;
>+					}
>+				}
> 				referenceContext.tagAsHavingErrors();
> 				// should abort ?
> 				int abortLevel;
>diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java
>index 291378c..426d41e 100644
>--- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java
>+++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java
>@@ -266,20 +266,29 @@
> 	 * <li>On a copy, the delta should be rooted in the dest project
> 	 * <li>On a move, two deltas are generated<ul>
> 	 * 			<li>one rooted in the source project
>-	 *			<li>one rooted in the destination project</ul></ul>
>+	 *			<li>one rooted in the destination project
>+	 * <li> When a CU is being overwritten, the delta on the destination will be of type F_CONTENT </ul></ul>
> 	 * If the operation is rooted in a single project, the delta is rooted in that project
> 	 *
> 	 */
>-	protected void prepareDeltas(IJavaElement sourceElement, IJavaElement destinationElement, boolean isMove) {
>+	protected void prepareDeltas(IJavaElement sourceElement, IJavaElement destinationElement, boolean isMove, boolean overWriteCU) {
> 		if (Util.isExcluded(sourceElement) || Util.isExcluded(destinationElement)) return;
>+		
> 		IJavaProject destProject = destinationElement.getJavaProject();
> 		if (isMove) {
> 			IJavaProject sourceProject = sourceElement.getJavaProject();
> 			getDeltaFor(sourceProject).movedFrom(sourceElement, destinationElement);
>-			getDeltaFor(destProject).movedTo(destinationElement, sourceElement);
>+			if (!overWriteCU) {
>+				getDeltaFor(destProject).movedTo(destinationElement, sourceElement);
>+				return;
>+			}
> 		} else {
>-			getDeltaFor(destProject).added(destinationElement);
>+			if (!overWriteCU) {
>+				getDeltaFor(destProject).added(destinationElement);
>+				return;
>+			}
> 		}
>+		getDeltaFor(destinationElement.getJavaProject()).changed(destinationElement, IJavaElementDelta.F_CONTENT);
> 	}
> 	/**
> 	 * Copies/moves a compilation unit with the name <code>newCUName</code>
>@@ -357,12 +366,14 @@
> 			}
> 
> 			// register the correct change deltas
>-			prepareDeltas(source, destCU, isMove());
>+			boolean contentChanged = this.force && destFile.exists();
>+			prepareDeltas(source, destCU, isMove(), contentChanged);
>+			
> 			if (newCUName != null) {
> 				//the main type has been renamed
> 				String oldName = Util.getNameWithoutJavaLikeExtension(source.getElementName());
> 				String newName = Util.getNameWithoutJavaLikeExtension(newCUName);
>-				prepareDeltas(source.getType(oldName), destCU.getType(newName), isMove());
>+				prepareDeltas(source.getType(oldName), destCU.getType(newName), isMove(), false);
> 			}
> 		} else {
> 			if (!this.force) {

Actions: View | Diff

Attachments on bug 346175: 208905 | 208926 | 208984