tree d221f28242297b6613231a359f274727693a5517
parent ac35462a94ac60b8320ccf4979113602e3153c36
parent 98a7f0f9cf4f95c639cd25e88a69e200ef0309dd
author Markus Keller <markus_keller@ch.ibm.com> 1394753645 +0100
committer Markus Keller <markus_keller@ch.ibm.com> 1394753645 +0100

Merge remote-tracking branch 'origin/master' into BETA_JAVA8

See this bug for problems in the "Generate 'for' loop" quick fixes:
Bug 430336: [1.8][compiler] Bad additional "cannot be resolved to a
type" error after syntax errors


Conflicts:
	org.eclipse.jdt.junit/META-INF/MANIFEST.MF
	org.eclipse.jdt.junit/pom.xml
	org.eclipse.jdt.text.tests/META-INF/MANIFEST.MF
	org.eclipse.jdt.text.tests/pom.xml
	org.eclipse.jdt.ui.tests.refactoring/test
cases/org/eclipse/jdt/ui/tests/refactoring/ExtractConstantTests.java
	org.eclipse.jdt.ui.tests.refactoring/test
cases/org/eclipse/jdt/ui/tests/refactoring/ExtractMethodTests.java
	org.eclipse.jdt.ui.tests/META-INF/MANIFEST.MF
	org.eclipse.jdt.ui.tests/pom.xml
	org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/core/AddImportTest.java
	org.eclipse.jdt.ui/META-INF/MANIFEST.MF
	org.eclipse.jdt.ui/core
extension/org/eclipse/jdt/internal/corext/codemanipulation/AddImportsOperation.java
	org.eclipse.jdt.ui/core
extension/org/eclipse/jdt/internal/corext/codemanipulation/StubUtility2.java
	org.eclipse.jdt.ui/core
refactoring/org/eclipse/jdt/internal/corext/refactoring/code/ExtractMethodRefactoring.java
	org.eclipse.jdt.ui/core
refactoring/org/eclipse/jdt/internal/corext/refactoring/code/PromoteTempToFieldRefactoring.java
	org.eclipse.jdt.ui/core
refactoring/org/eclipse/jdt/internal/corext/refactoring/surround/SurroundWithTryCatchRefactoring.java
	org.eclipse.jdt.ui/pom.xml
	org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java
	org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/JavaIndenter.java
	org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/QuickFixProcessor.java