Bug 547304 - [cleanup] Fix wrong line delimiters

This updates all Java files with wrong or mixed line delimiters to use
Unix style delimiters.
The change includes only whitespace formatting and no code changes.

Change-Id: I09b6208c0faa8727534b66c6554987ac6027b783
diff --git a/bundles/org.eclipse.core.filesystem/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.filesystem/META-INF/MANIFEST.MF
index 41a2671..4cfd545 100644
--- a/bundles/org.eclipse.core.filesystem/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.filesystem; singleton:=true
-Bundle-Version: 1.7.300.qualifier
+Bundle-Version: 1.7.400.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.equinox.registry;bundle-version="[3.2.0,4.0.0)",
diff --git a/bundles/org.eclipse.core.filesystem/pom.xml b/bundles/org.eclipse.core.filesystem/pom.xml
index e36ee13..264e1e1 100644
--- a/bundles/org.eclipse.core.filesystem/pom.xml
+++ b/bundles/org.eclipse.core.filesystem/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.filesystem</artifactId>
-  <version>1.7.300-SNAPSHOT</version>
+  <version>1.7.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileHandler.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileHandler.java
index eb8d709..3cc4e1e 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileHandler.java
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileHandler.java
@@ -1,37 +1,37 @@
-/*******************************************************************************

- * Copyright (c) 2012, 2015 IBM Corporation and others.

+/*******************************************************************************
+ * Copyright (c) 2012, 2015 IBM Corporation and others.
  *
- * This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License 2.0

- * which accompanies this distribution, and is available at

+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
- * SPDX-License-Identifier: EPL-2.0

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.internal.filesystem.local;

-

-import org.eclipse.core.filesystem.IFileInfo;

-import org.eclipse.core.filesystem.provider.FileInfo;

-

-/**

- * Native handler that delegates to the LocalFileNatives.

- */

-public class LocalFileHandler extends NativeHandler {

-	@Override

-	public int getSupportedAttributes() {

-		return LocalFileNatives.attributes();

-	}

-

-	@Override

-	public FileInfo fetchFileInfo(String fileName) {

-		return LocalFileNatives.fetchFileInfo(fileName);

-	}

-

-	@Override

-	public boolean putFileInfo(String fileName, IFileInfo info, int options) {

-		return LocalFileNatives.putFileInfo(fileName, info, options);

-	}

-}

+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.internal.filesystem.local;
+
+import org.eclipse.core.filesystem.IFileInfo;
+import org.eclipse.core.filesystem.provider.FileInfo;
+
+/**
+ * Native handler that delegates to the LocalFileNatives.
+ */
+public class LocalFileHandler extends NativeHandler {
+	@Override
+	public int getSupportedAttributes() {
+		return LocalFileNatives.attributes();
+	}
+
+	@Override
+	public FileInfo fetchFileInfo(String fileName) {
+		return LocalFileNatives.fetchFileInfo(fileName);
+	}
+
+	@Override
+	public boolean putFileInfo(String fileName, IFileInfo info, int options) {
+		return LocalFileNatives.putFileInfo(fileName, info, options);
+	}
+}
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/NativeHandler.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/NativeHandler.java
index e519671..5f875b1 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/NativeHandler.java
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/NativeHandler.java
@@ -1,28 +1,28 @@
-/*******************************************************************************

- * Copyright (c) 2012 IBM Corporation and others.

+/*******************************************************************************
+ * Copyright (c) 2012 IBM Corporation and others.
  *
- * This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License 2.0

- * which accompanies this distribution, and is available at

+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
- * SPDX-License-Identifier: EPL-2.0

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.internal.filesystem.local;

-

-import org.eclipse.core.filesystem.IFileInfo;

-import org.eclipse.core.filesystem.provider.FileInfo;

-

-/**

- * This delegate provides the interface for native file attribute support.

- */

-public abstract class NativeHandler {

-	public abstract int getSupportedAttributes();

-

-	public abstract FileInfo fetchFileInfo(String fileName);

-

-	public abstract boolean putFileInfo(String fileName, IFileInfo info, int options);

-}

+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.internal.filesystem.local;
+
+import org.eclipse.core.filesystem.IFileInfo;
+import org.eclipse.core.filesystem.provider.FileInfo;
+
+/**
+ * This delegate provides the interface for native file attribute support.
+ */
+public abstract class NativeHandler {
+	public abstract int getSupportedAttributes();
+
+	public abstract FileInfo fetchFileInfo(String fileName);
+
+	public abstract boolean putFileInfo(String fileName, IFileInfo info, int options);
+}
diff --git a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileHandler.java b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileHandler.java
index b5f00ed..4d78159 100644
--- a/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileHandler.java
+++ b/bundles/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/unix/UnixFileHandler.java
@@ -1,38 +1,38 @@
-/*******************************************************************************

- * Copyright (c) 2012, 2015 IBM Corporation and others.

+/*******************************************************************************
+ * Copyright (c) 2012, 2015 IBM Corporation and others.
  *
- * This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License 2.0

- * which accompanies this distribution, and is available at

+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
- * SPDX-License-Identifier: EPL-2.0

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.internal.filesystem.local.unix;

-

-import org.eclipse.core.filesystem.IFileInfo;

-import org.eclipse.core.filesystem.provider.FileInfo;

-import org.eclipse.core.internal.filesystem.local.NativeHandler;

-

-/**

- * Native handler that delegates to UnixFileNatives

- */

-public class UnixFileHandler extends NativeHandler {

-	@Override

-	public int getSupportedAttributes() {

-		return UnixFileNatives.getSupportedAttributes();

-	}

-

-	@Override

-	public FileInfo fetchFileInfo(String fileName) {

-		return UnixFileNatives.fetchFileInfo(fileName);

-	}

-

-	@Override

-	public boolean putFileInfo(String fileName, IFileInfo info, int options) {

-		return UnixFileNatives.putFileInfo(fileName, info, options);

-	}

-}

+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.internal.filesystem.local.unix;
+
+import org.eclipse.core.filesystem.IFileInfo;
+import org.eclipse.core.filesystem.provider.FileInfo;
+import org.eclipse.core.internal.filesystem.local.NativeHandler;
+
+/**
+ * Native handler that delegates to UnixFileNatives
+ */
+public class UnixFileHandler extends NativeHandler {
+	@Override
+	public int getSupportedAttributes() {
+		return UnixFileNatives.getSupportedAttributes();
+	}
+
+	@Override
+	public FileInfo fetchFileInfo(String fileName) {
+		return UnixFileNatives.fetchFileInfo(fileName);
+	}
+
+	@Override
+	public boolean putFileInfo(String fileName, IFileInfo info, int options) {
+		return UnixFileNatives.putFileInfo(fileName, info, options);
+	}
+}
diff --git a/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
index 1a944cf..3bba80c 100644
--- a/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse Core Tests Resources
 Bundle-SymbolicName: org.eclipse.core.tests.resources; singleton:=true
-Bundle-Version: 3.10.500.qualifier
+Bundle-Version: 3.10.600.qualifier
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.core.tests.filesystem,
  org.eclipse.core.tests.internal.alias,
diff --git a/tests/org.eclipse.core.tests.resources/pom.xml b/tests/org.eclipse.core.tests.resources/pom.xml
index 03cf272..a3fa786 100644
--- a/tests/org.eclipse.core.tests.resources/pom.xml
+++ b/tests/org.eclipse.core.tests.resources/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.core</groupId>
   <artifactId>org.eclipse.core.tests.resources</artifactId>
-  <version>3.10.500-SNAPSHOT</version>
+  <version>3.10.600-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/bug369177/Bug369177FileStore.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/bug369177/Bug369177FileStore.java
index 3db1ca7..9f7acac 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/bug369177/Bug369177FileStore.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/bug369177/Bug369177FileStore.java
@@ -1,46 +1,46 @@
-/*******************************************************************************

- * Copyright (c) 2012 IBM Corporation and others.

+/*******************************************************************************
+ * Copyright (c) 2012 IBM Corporation and others.
  *
- * This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License 2.0

- * which accompanies this distribution, and is available at

+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
- * SPDX-License-Identifier: EPL-2.0

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.tests.internal.filesystem.bug369177;

-

-import java.net.URI;

-import java.net.URISyntaxException;

-import org.eclipse.core.filesystem.IFileSystem;

-import org.eclipse.core.internal.filesystem.NullFileStore;

-import org.eclipse.core.runtime.IPath;

-

-/**

- * Special file store implementation used by TestBug369177.

- */

-public class Bug369177FileStore extends NullFileStore {

-	private IPath path;

-

-	public Bug369177FileStore(IPath path) {

-		super(path);

-		this.path = path;

-	}

-

-	@Override

-	public IFileSystem getFileSystem() {

-		return Bug369177FileSystem.getInstance();

-	}

-

-	@Override

-	public URI toURI() {

-		try {

-			return new URI(Bug369177FileSystem.SCHEME_BUG_369177, null, path.isEmpty() ? "/" : path.toString(), null);

-		} catch (URISyntaxException e) {

-			throw new Error(e);

-		}

-	}

-}

+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.tests.internal.filesystem.bug369177;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import org.eclipse.core.filesystem.IFileSystem;
+import org.eclipse.core.internal.filesystem.NullFileStore;
+import org.eclipse.core.runtime.IPath;
+
+/**
+ * Special file store implementation used by TestBug369177.
+ */
+public class Bug369177FileStore extends NullFileStore {
+	private IPath path;
+
+	public Bug369177FileStore(IPath path) {
+		super(path);
+		this.path = path;
+	}
+
+	@Override
+	public IFileSystem getFileSystem() {
+		return Bug369177FileSystem.getInstance();
+	}
+
+	@Override
+	public URI toURI() {
+		try {
+			return new URI(Bug369177FileSystem.SCHEME_BUG_369177, null, path.isEmpty() ? "/" : path.toString(), null);
+		} catch (URISyntaxException e) {
+			throw new Error(e);
+		}
+	}
+}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/bug369177/Bug369177FileSystem.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/bug369177/Bug369177FileSystem.java
index cdfda5e..4a8cd62 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/bug369177/Bug369177FileSystem.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/filesystem/bug369177/Bug369177FileSystem.java
@@ -1,62 +1,62 @@
-/*******************************************************************************

- * Copyright (c) 2012 IBM Corporation and others.

+/*******************************************************************************
+ * Copyright (c) 2012 IBM Corporation and others.
  *
- * This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License 2.0

- * which accompanies this distribution, and is available at

+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
- * SPDX-License-Identifier: EPL-2.0

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.tests.internal.filesystem.bug369177;

-

-import java.net.URI;

-import org.eclipse.core.filesystem.IFileStore;

-import org.eclipse.core.filesystem.IFileSystem;

-import org.eclipse.core.internal.filesystem.NullFileSystem;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.*;

-

-/**

- * Special file system implementation used by TestBug369177.

- */

-public class Bug369177FileSystem extends NullFileSystem {

-	static final String SCHEME_BUG_369177 = "bug369177";

-	private static IFileSystem instance;

-

-	public static IFileSystem getInstance() {

-		return instance;

-	}

-

-	public Bug369177FileSystem() {

-		super();

-		instance = this;

-	}

-

-	private void runTestScenario() {

-		try {

-			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("project");

-			project.getPersistentProperties();

-			project.getDefaultCharset();

-			project.getContentTypeMatcher();

-		} catch (CoreException e) {

-			throw new Error(e);

-		}

-	}

-

-	@Override

-	public IFileStore getStore(IPath path) {

-		runTestScenario();

-		return new Bug369177FileStore(path);

-	}

-

-	@Override

-	public IFileStore getStore(URI uri) {

-		runTestScenario();

-		return new Bug369177FileStore(new Path(uri.getPath()));

-	}

-}

+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.tests.internal.filesystem.bug369177;
+
+import java.net.URI;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.core.filesystem.IFileSystem;
+import org.eclipse.core.internal.filesystem.NullFileSystem;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.*;
+
+/**
+ * Special file system implementation used by TestBug369177.
+ */
+public class Bug369177FileSystem extends NullFileSystem {
+	static final String SCHEME_BUG_369177 = "bug369177";
+	private static IFileSystem instance;
+
+	public static IFileSystem getInstance() {
+		return instance;
+	}
+
+	public Bug369177FileSystem() {
+		super();
+		instance = this;
+	}
+
+	private void runTestScenario() {
+		try {
+			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("project");
+			project.getPersistentProperties();
+			project.getDefaultCharset();
+			project.getContentTypeMatcher();
+		} catch (CoreException e) {
+			throw new Error(e);
+		}
+	}
+
+	@Override
+	public IFileStore getStore(IPath path) {
+		runTestScenario();
+		return new Bug369177FileStore(path);
+	}
+
+	@Override
+	public IFileStore getStore(URI uri) {
+		runTestScenario();
+		return new Bug369177FileStore(new Path(uri.getPath()));
+	}
+}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/Bug316182RefreshProvider.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/Bug316182RefreshProvider.java
index 2bfcc8a..efcbcbf 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/Bug316182RefreshProvider.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/Bug316182RefreshProvider.java
@@ -1,37 +1,37 @@
-/*******************************************************************************

- * Copyright (c) 2012 IBM Corporation and others.

+/*******************************************************************************
+ * Copyright (c) 2012 IBM Corporation and others.
  *
- * This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License 2.0

- * which accompanies this distribution, and is available at

+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
- * SPDX-License-Identifier: EPL-2.0

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.tests.resources.refresh;

-

-import org.eclipse.core.resources.*;

-import org.eclipse.core.resources.refresh.*;

-import org.eclipse.core.tests.resources.session.TestBug316182;

-

-/**

- * Refresh provider depicting bug 316182.

- */

-public class Bug316182RefreshProvider extends RefreshProvider {

-	@Override

-	public IRefreshMonitor installMonitor(IResource resource, IRefreshResult result) {

-		try {

-			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("project_TestBug316182");

-			project.getPersistentProperties();

-			project.getDefaultCharset();

-			project.getContentTypeMatcher();

-		} catch (Exception e) {

-			// remember the exception

-			TestBug316182.CAUGHT_EXCEPTION = e;

-		}

-		return null;

-	}

-}

+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.tests.resources.refresh;
+
+import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.refresh.*;
+import org.eclipse.core.tests.resources.session.TestBug316182;
+
+/**
+ * Refresh provider depicting bug 316182.
+ */
+public class Bug316182RefreshProvider extends RefreshProvider {
+	@Override
+	public IRefreshMonitor installMonitor(IResource resource, IRefreshResult result) {
+		try {
+			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("project_TestBug316182");
+			project.getPersistentProperties();
+			project.getDefaultCharset();
+			project.getContentTypeMatcher();
+		} catch (Exception e) {
+			// remember the exception
+			TestBug316182.CAUGHT_EXCEPTION = e;
+		}
+		return null;
+	}
+}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_192631.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_192631.java
index ee0f494..b17b7d4 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_192631.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_192631.java
@@ -1,193 +1,193 @@
-/*******************************************************************************

- * Copyright (c) 2012, 2017 IBM Corporation and others.

+/*******************************************************************************
+ * Copyright (c) 2012, 2017 IBM Corporation and others.
  *
- * This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License 2.0

- * which accompanies this distribution, and is available at

+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
- * SPDX-License-Identifier: EPL-2.0

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.tests.resources.regression;

-

-import java.net.URI;

-import java.net.URISyntaxException;

-import java.util.*;

-import junit.framework.Test;

-import junit.framework.TestSuite;

-import org.eclipse.core.filesystem.EFS;

-import org.eclipse.core.resources.*;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.tests.internal.filesystem.ram.MemoryTree;

-import org.eclipse.core.tests.internal.filesystem.remote.RemoteFileSystem;

-import org.eclipse.core.tests.resources.ResourceTest;

-

-/**

- * Test for bug 192631

- */

-public class Bug_192631 extends ResourceTest {

-	private static final String USER_A = "userA";

-	private static final String USER_B = "userB";

-	private static final String HOST_A = "hostA.example.com";

-	private static final String HOST_B = "hostB.example.com";

-	private static final int PORT_A = 1111;

-	private static final int PORT_B = 2222;

-

-	private static final String COMMON = "/common";

-	private static final String FOLDER_A = "/common/folderA";

-	private static final String FOLDER_B = "/common/folderB";

-

-	public static Test suite() {

-		return new TestSuite(Bug_192631.class);

-	}

-

-	@Override

-	protected void setUp() throws Exception {

-		super.setUp();

-		MemoryTree.TREE.deleteAll();

-	}

-

-	@Override

-	protected void tearDown() throws Exception {

-		MemoryTree.TREE.deleteAll();

-		super.tearDown();

-	}

-

-	public void testCompareHost() throws CoreException, URISyntaxException {

-		URI commonA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, -1, COMMON, null, null);

-		URI commonB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_B, -1, COMMON, null, null);

-		URI folderA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, -1, FOLDER_A, null, null);

-		URI folderB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_B, -1, FOLDER_B, null, null);

-

-		final Set<URI> toVisit = new HashSet<>();

-		final int toVisitCount[] = new int[] {0};

-		IResourceVisitor visitor = resource -> {

-			toVisit.remove(resource.getLocationURI());

-			toVisitCount[0]--;

-			return true;

-		};

-

-		EFS.getStore(folderA).mkdir(EFS.NONE, null);

-		EFS.getStore(folderB).mkdir(EFS.NONE, null);

-

-		IWorkspace workspace = ResourcesPlugin.getWorkspace();

-

-		IProject projectA = workspace.getRoot().getProject("projectA");

-		ensureExistsInWorkspace(projectA, true);

-		IFolder linkA = projectA.getFolder("link_to_commonA");

-		linkA.createLink(commonA, IResource.NONE, getMonitor());

-

-		IProject projectB = workspace.getRoot().getProject("projectB");

-		ensureExistsInWorkspace(projectB, true);

-		IFolder linkB = projectB.getFolder("link_to_commonB");

-		linkB.createLink(commonB, IResource.NONE, getMonitor());

-

-		toVisit.addAll(Arrays.asList(new URI[] {projectA.getLocationURI(), commonA, folderA, projectA.getFile(".project").getLocationURI()}));

-		toVisitCount[0] = 4;

-		projectA.accept(visitor);

-		assertTrue("1.1", toVisit.isEmpty());

-		assertEquals("1.2", 0, toVisitCount[0]);

-

-		toVisit.addAll(Arrays.asList(new URI[] {projectB.getLocationURI(), commonB, folderB, projectB.getFile(".project").getLocationURI()}));

-		toVisitCount[0] = 4;

-		projectB.accept(visitor);

-		assertTrue("2.1", toVisit.isEmpty());

-		assertEquals("2.2", 0, toVisitCount[0]);

-

-		projectA.delete(true, getMonitor());

-		projectB.delete(true, getMonitor());

-	}

-

-	public void testCompareUserInfo() throws CoreException, URISyntaxException {

-		URI commonA = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_A, HOST_A, -1, COMMON, null, null);

-		URI commonB = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_B, HOST_A, -1, COMMON, null, null);

-		URI folderA = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_A, HOST_A, -1, FOLDER_A, null, null);

-		URI folderB = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_B, HOST_A, -1, FOLDER_B, null, null);

-

-		final Set<URI> toVisit = new HashSet<>();

-		final int toVisitCount[] = new int[] {0};

-		IResourceVisitor visitor = resource -> {

-			toVisit.remove(resource.getLocationURI());

-			toVisitCount[0]--;

-			return true;

-		};

-

-		EFS.getStore(folderA).mkdir(EFS.NONE, null);

-		EFS.getStore(folderB).mkdir(EFS.NONE, null);

-

-		IWorkspace workspace = ResourcesPlugin.getWorkspace();

-

-		IProject projectA = workspace.getRoot().getProject("projectA");

-		ensureExistsInWorkspace(projectA, true);

-		IFolder linkA = projectA.getFolder("link_to_commonA");

-		linkA.createLink(commonA, IResource.NONE, getMonitor());

-

-		IProject projectB = workspace.getRoot().getProject("projectB");

-		ensureExistsInWorkspace(projectB, true);

-		IFolder linkB = projectB.getFolder("link_to_commonB");

-		linkB.createLink(commonB, IResource.NONE, getMonitor());

-

-		toVisit.addAll(Arrays.asList(new URI[] {projectA.getLocationURI(), commonA, folderA, projectA.getFile(".project").getLocationURI()}));

-		toVisitCount[0] = 4;

-		projectA.accept(visitor);

-		assertTrue("1.1", toVisit.isEmpty());

-		assertEquals("1.2", 0, toVisitCount[0]);

-

-		toVisit.addAll(Arrays.asList(new URI[] {projectB.getLocationURI(), commonB, folderB, projectB.getFile(".project").getLocationURI()}));

-		toVisitCount[0] = 4;

-		projectB.accept(visitor);

-		assertTrue("2.1", toVisit.isEmpty());

-		assertEquals("2.2", 0, toVisitCount[0]);

-

-		projectA.delete(true, getMonitor());

-		projectB.delete(true, getMonitor());

-	}

-

-	public void testComparePort() throws CoreException, URISyntaxException {

-		URI commonA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_A, COMMON, null, null);

-		URI commonB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_B, COMMON, null, null);

-		URI folderA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_A, FOLDER_A, null, null);

-		URI folderB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_B, FOLDER_B, null, null);

-

-		final Set<URI> toVisit = new HashSet<>();

-		final int toVisitCount[] = new int[] {0};

-		IResourceVisitor visitor = resource -> {

-			toVisit.remove(resource.getLocationURI());

-			toVisitCount[0]--;

-			return true;

-		};

-

-		EFS.getStore(folderA).mkdir(EFS.NONE, null);

-		EFS.getStore(folderB).mkdir(EFS.NONE, null);

-

-		IWorkspace workspace = ResourcesPlugin.getWorkspace();

-

-		IProject projectA = workspace.getRoot().getProject("projectA");

-		ensureExistsInWorkspace(projectA, true);

-		IFolder linkA = projectA.getFolder("link_to_commonA");

-		linkA.createLink(commonA, IResource.NONE, getMonitor());

-

-		IProject projectB = workspace.getRoot().getProject("projectB");

-		ensureExistsInWorkspace(projectB, true);

-		IFolder linkB = projectB.getFolder("link_to_commonB");

-		linkB.createLink(commonB, IResource.NONE, getMonitor());

-

-		toVisit.addAll(Arrays.asList(new URI[] {projectA.getLocationURI(), commonA, folderA, projectA.getFile(".project").getLocationURI()}));

-		toVisitCount[0] = 4;

-		projectA.accept(visitor);

-		assertTrue("1.1", toVisit.isEmpty());

-		assertEquals("1.2", 0, toVisitCount[0]);

-

-		toVisit.addAll(Arrays.asList(new URI[] {projectB.getLocationURI(), commonB, folderB, projectB.getFile(".project").getLocationURI()}));

-		toVisitCount[0] = 4;

-		projectB.accept(visitor);

-		assertTrue("2.1", toVisit.isEmpty());

-		assertEquals("2.2", 0, toVisitCount[0]);

-

-		projectA.delete(true, getMonitor());

-		projectB.delete(true, getMonitor());

-	}

-}

+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.tests.resources.regression;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.*;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.tests.internal.filesystem.ram.MemoryTree;
+import org.eclipse.core.tests.internal.filesystem.remote.RemoteFileSystem;
+import org.eclipse.core.tests.resources.ResourceTest;
+
+/**
+ * Test for bug 192631
+ */
+public class Bug_192631 extends ResourceTest {
+	private static final String USER_A = "userA";
+	private static final String USER_B = "userB";
+	private static final String HOST_A = "hostA.example.com";
+	private static final String HOST_B = "hostB.example.com";
+	private static final int PORT_A = 1111;
+	private static final int PORT_B = 2222;
+
+	private static final String COMMON = "/common";
+	private static final String FOLDER_A = "/common/folderA";
+	private static final String FOLDER_B = "/common/folderB";
+
+	public static Test suite() {
+		return new TestSuite(Bug_192631.class);
+	}
+
+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		MemoryTree.TREE.deleteAll();
+	}
+
+	@Override
+	protected void tearDown() throws Exception {
+		MemoryTree.TREE.deleteAll();
+		super.tearDown();
+	}
+
+	public void testCompareHost() throws CoreException, URISyntaxException {
+		URI commonA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, -1, COMMON, null, null);
+		URI commonB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_B, -1, COMMON, null, null);
+		URI folderA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, -1, FOLDER_A, null, null);
+		URI folderB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_B, -1, FOLDER_B, null, null);
+
+		final Set<URI> toVisit = new HashSet<>();
+		final int toVisitCount[] = new int[] {0};
+		IResourceVisitor visitor = resource -> {
+			toVisit.remove(resource.getLocationURI());
+			toVisitCount[0]--;
+			return true;
+		};
+
+		EFS.getStore(folderA).mkdir(EFS.NONE, null);
+		EFS.getStore(folderB).mkdir(EFS.NONE, null);
+
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+
+		IProject projectA = workspace.getRoot().getProject("projectA");
+		ensureExistsInWorkspace(projectA, true);
+		IFolder linkA = projectA.getFolder("link_to_commonA");
+		linkA.createLink(commonA, IResource.NONE, getMonitor());
+
+		IProject projectB = workspace.getRoot().getProject("projectB");
+		ensureExistsInWorkspace(projectB, true);
+		IFolder linkB = projectB.getFolder("link_to_commonB");
+		linkB.createLink(commonB, IResource.NONE, getMonitor());
+
+		toVisit.addAll(Arrays.asList(new URI[] {projectA.getLocationURI(), commonA, folderA, projectA.getFile(".project").getLocationURI()}));
+		toVisitCount[0] = 4;
+		projectA.accept(visitor);
+		assertTrue("1.1", toVisit.isEmpty());
+		assertEquals("1.2", 0, toVisitCount[0]);
+
+		toVisit.addAll(Arrays.asList(new URI[] {projectB.getLocationURI(), commonB, folderB, projectB.getFile(".project").getLocationURI()}));
+		toVisitCount[0] = 4;
+		projectB.accept(visitor);
+		assertTrue("2.1", toVisit.isEmpty());
+		assertEquals("2.2", 0, toVisitCount[0]);
+
+		projectA.delete(true, getMonitor());
+		projectB.delete(true, getMonitor());
+	}
+
+	public void testCompareUserInfo() throws CoreException, URISyntaxException {
+		URI commonA = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_A, HOST_A, -1, COMMON, null, null);
+		URI commonB = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_B, HOST_A, -1, COMMON, null, null);
+		URI folderA = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_A, HOST_A, -1, FOLDER_A, null, null);
+		URI folderB = new URI(RemoteFileSystem.SCHEME_REMOTE, USER_B, HOST_A, -1, FOLDER_B, null, null);
+
+		final Set<URI> toVisit = new HashSet<>();
+		final int toVisitCount[] = new int[] {0};
+		IResourceVisitor visitor = resource -> {
+			toVisit.remove(resource.getLocationURI());
+			toVisitCount[0]--;
+			return true;
+		};
+
+		EFS.getStore(folderA).mkdir(EFS.NONE, null);
+		EFS.getStore(folderB).mkdir(EFS.NONE, null);
+
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+
+		IProject projectA = workspace.getRoot().getProject("projectA");
+		ensureExistsInWorkspace(projectA, true);
+		IFolder linkA = projectA.getFolder("link_to_commonA");
+		linkA.createLink(commonA, IResource.NONE, getMonitor());
+
+		IProject projectB = workspace.getRoot().getProject("projectB");
+		ensureExistsInWorkspace(projectB, true);
+		IFolder linkB = projectB.getFolder("link_to_commonB");
+		linkB.createLink(commonB, IResource.NONE, getMonitor());
+
+		toVisit.addAll(Arrays.asList(new URI[] {projectA.getLocationURI(), commonA, folderA, projectA.getFile(".project").getLocationURI()}));
+		toVisitCount[0] = 4;
+		projectA.accept(visitor);
+		assertTrue("1.1", toVisit.isEmpty());
+		assertEquals("1.2", 0, toVisitCount[0]);
+
+		toVisit.addAll(Arrays.asList(new URI[] {projectB.getLocationURI(), commonB, folderB, projectB.getFile(".project").getLocationURI()}));
+		toVisitCount[0] = 4;
+		projectB.accept(visitor);
+		assertTrue("2.1", toVisit.isEmpty());
+		assertEquals("2.2", 0, toVisitCount[0]);
+
+		projectA.delete(true, getMonitor());
+		projectB.delete(true, getMonitor());
+	}
+
+	public void testComparePort() throws CoreException, URISyntaxException {
+		URI commonA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_A, COMMON, null, null);
+		URI commonB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_B, COMMON, null, null);
+		URI folderA = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_A, FOLDER_A, null, null);
+		URI folderB = new URI(RemoteFileSystem.SCHEME_REMOTE, null, HOST_A, PORT_B, FOLDER_B, null, null);
+
+		final Set<URI> toVisit = new HashSet<>();
+		final int toVisitCount[] = new int[] {0};
+		IResourceVisitor visitor = resource -> {
+			toVisit.remove(resource.getLocationURI());
+			toVisitCount[0]--;
+			return true;
+		};
+
+		EFS.getStore(folderA).mkdir(EFS.NONE, null);
+		EFS.getStore(folderB).mkdir(EFS.NONE, null);
+
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+
+		IProject projectA = workspace.getRoot().getProject("projectA");
+		ensureExistsInWorkspace(projectA, true);
+		IFolder linkA = projectA.getFolder("link_to_commonA");
+		linkA.createLink(commonA, IResource.NONE, getMonitor());
+
+		IProject projectB = workspace.getRoot().getProject("projectB");
+		ensureExistsInWorkspace(projectB, true);
+		IFolder linkB = projectB.getFolder("link_to_commonB");
+		linkB.createLink(commonB, IResource.NONE, getMonitor());
+
+		toVisit.addAll(Arrays.asList(new URI[] {projectA.getLocationURI(), commonA, folderA, projectA.getFile(".project").getLocationURI()}));
+		toVisitCount[0] = 4;
+		projectA.accept(visitor);
+		assertTrue("1.1", toVisit.isEmpty());
+		assertEquals("1.2", 0, toVisitCount[0]);
+
+		toVisit.addAll(Arrays.asList(new URI[] {projectB.getLocationURI(), commonB, folderB, projectB.getFile(".project").getLocationURI()}));
+		toVisitCount[0] = 4;
+		projectB.accept(visitor);
+		assertTrue("2.1", toVisit.isEmpty());
+		assertEquals("2.2", 0, toVisitCount[0]);
+
+		projectA.delete(true, getMonitor());
+		projectB.delete(true, getMonitor());
+	}
+}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug294854.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug294854.java
index f19b754..2367697 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug294854.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug294854.java
@@ -1,133 +1,133 @@
-/*******************************************************************************

- *  Copyright (c) 2012 IBM Corporation and others.

+/*******************************************************************************
+ *  Copyright (c) 2012 IBM Corporation and others.
  *
- *  This program and the accompanying materials

- *  are made available under the terms of the Eclipse Public License 2.0

- *  which accompanies this distribution, and is available at

+ *  This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License 2.0
+ *  which accompanies this distribution, and is available at
  *  https://www.eclipse.org/legal/epl-2.0/
  *
- *  SPDX-License-Identifier: EPL-2.0

- *

- *  Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.tests.resources.session;

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-import org.eclipse.core.internal.resources.TestingSupport;

-import org.eclipse.core.resources.*;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.tests.resources.AutomatedTests;

-import org.eclipse.core.tests.resources.WorkspaceSessionTest;

-import org.eclipse.core.tests.session.SessionTestSuite;

-import org.eclipse.core.tests.session.WorkspaceSessionTestSuite;

-

-/**

- * Test for bug 294854

- */

-public class TestBug294854 extends WorkspaceSessionTest {

-	private static final String PROJECT_OLD_NAME = "project_old_name";

-	private static final String PROJECT_NEW_NAME = "project_new_name";

-

-	public static Test suite() {

-		TestSuite suite = new TestSuite(TestBug294854.class.getName());

-		//		suite.addTest(new TestBug294854("testRenameUsingResourcePath_01"));

-

-		SessionTestSuite scenario1 = new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, "renameUsingProjectDescription");

-		scenario1.addCrashTest(new TestBug294854("testRenameUsingProjectDescription_01"));

-		scenario1.addTest(new TestBug294854("testRenameUsingProjectDescription_02"));

-

-		SessionTestSuite scenario2 = new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, "renameUsingResourcePath");

-		scenario2.addCrashTest(new TestBug294854("testRenameUsingResourcePath_01"));

-		scenario2.addTest(new TestBug294854("testRenameUsingResourcePath_02"));

-

-		SessionTestSuite scenario3 = new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, "delete");

-		scenario3.addCrashTest(new TestBug294854("testDelete_01"));

-		scenario3.addTest(new TestBug294854("testDelete_02"));

-

-		suite.addTest(scenario1);

-		suite.addTest(scenario2);

-		suite.addTest(scenario3);

-

-		return suite;

-	}

-

-	public TestBug294854() {

-		super();

-	}

-

-	public TestBug294854(String name) {

-		super(name);

-	}

-

-	private IProject createProject() throws CoreException {

-		IWorkspace workspace = getWorkspace();

-		IProject project = workspace.getRoot().getProject(PROJECT_OLD_NAME);

-		ensureExistsInWorkspace(project, true);

-		assertTrue("1.0", project.exists());

-

-		// make sure we do not have .snap file

-		TestingSupport.waitForSnapshot();

-		workspace.save(true, getMonitor());

-

-		return project;

-	}

-

-	private boolean checkProjectExists(String name) {

-		IProject project = getWorkspace().getRoot().getProject(name);

-		return project.exists();

-	}

-

-	public void testRenameUsingProjectDescription_01() throws CoreException, InterruptedException {

-		IProject project = createProject();

-

-		// move project using IProjectDescription

-		IProjectDescription description = project.getDescription();

-		description.setName(PROJECT_NEW_NAME);

-		project.move(description, true, getMonitor());

-

-		// give a moment for the snapshot to run

-		Thread.sleep(1000);

-

-		// simulate process kill

-		System.exit(1);

-	}

-

-	public void testRenameUsingProjectDescription_02() {

-		assertFalse("1.0", checkProjectExists(PROJECT_OLD_NAME));

-		assertTrue("2.0", checkProjectExists(PROJECT_NEW_NAME));

-	}

-

-	public void testRenameUsingResourcePath_01() throws CoreException, InterruptedException {

-		IProject project = createProject();

-

-		// move project using IPath

-		project.move(project.getFullPath().removeLastSegments(1).append(PROJECT_NEW_NAME), true, getMonitor());

-

-		// give a moment for the snapshot to run

-		Thread.sleep(1000);

-

-		// simulate process kill

-		System.exit(1);

-	}

-

-	public void testRenameUsingResourcePath_02() {

-		assertFalse("1.0", checkProjectExists(PROJECT_OLD_NAME));

-		assertTrue("2.0", checkProjectExists(PROJECT_NEW_NAME));

-	}

-

-	public void testDelete_01() throws CoreException {

-		IProject project = createProject();

-

-		// delete project

-		project.delete(true, getMonitor());

-

-		// simulate process kill

-		System.exit(1);

-	}

-

-	public void testDelete_02() {

-		assertFalse("1.0", checkProjectExists(PROJECT_OLD_NAME));

-	}

-}

+ *  SPDX-License-Identifier: EPL-2.0
+ *
+ *  Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.tests.resources.session;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.eclipse.core.internal.resources.TestingSupport;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.tests.resources.AutomatedTests;
+import org.eclipse.core.tests.resources.WorkspaceSessionTest;
+import org.eclipse.core.tests.session.SessionTestSuite;
+import org.eclipse.core.tests.session.WorkspaceSessionTestSuite;
+
+/**
+ * Test for bug 294854
+ */
+public class TestBug294854 extends WorkspaceSessionTest {
+	private static final String PROJECT_OLD_NAME = "project_old_name";
+	private static final String PROJECT_NEW_NAME = "project_new_name";
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(TestBug294854.class.getName());
+		//		suite.addTest(new TestBug294854("testRenameUsingResourcePath_01"));
+
+		SessionTestSuite scenario1 = new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, "renameUsingProjectDescription");
+		scenario1.addCrashTest(new TestBug294854("testRenameUsingProjectDescription_01"));
+		scenario1.addTest(new TestBug294854("testRenameUsingProjectDescription_02"));
+
+		SessionTestSuite scenario2 = new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, "renameUsingResourcePath");
+		scenario2.addCrashTest(new TestBug294854("testRenameUsingResourcePath_01"));
+		scenario2.addTest(new TestBug294854("testRenameUsingResourcePath_02"));
+
+		SessionTestSuite scenario3 = new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, "delete");
+		scenario3.addCrashTest(new TestBug294854("testDelete_01"));
+		scenario3.addTest(new TestBug294854("testDelete_02"));
+
+		suite.addTest(scenario1);
+		suite.addTest(scenario2);
+		suite.addTest(scenario3);
+
+		return suite;
+	}
+
+	public TestBug294854() {
+		super();
+	}
+
+	public TestBug294854(String name) {
+		super(name);
+	}
+
+	private IProject createProject() throws CoreException {
+		IWorkspace workspace = getWorkspace();
+		IProject project = workspace.getRoot().getProject(PROJECT_OLD_NAME);
+		ensureExistsInWorkspace(project, true);
+		assertTrue("1.0", project.exists());
+
+		// make sure we do not have .snap file
+		TestingSupport.waitForSnapshot();
+		workspace.save(true, getMonitor());
+
+		return project;
+	}
+
+	private boolean checkProjectExists(String name) {
+		IProject project = getWorkspace().getRoot().getProject(name);
+		return project.exists();
+	}
+
+	public void testRenameUsingProjectDescription_01() throws CoreException, InterruptedException {
+		IProject project = createProject();
+
+		// move project using IProjectDescription
+		IProjectDescription description = project.getDescription();
+		description.setName(PROJECT_NEW_NAME);
+		project.move(description, true, getMonitor());
+
+		// give a moment for the snapshot to run
+		Thread.sleep(1000);
+
+		// simulate process kill
+		System.exit(1);
+	}
+
+	public void testRenameUsingProjectDescription_02() {
+		assertFalse("1.0", checkProjectExists(PROJECT_OLD_NAME));
+		assertTrue("2.0", checkProjectExists(PROJECT_NEW_NAME));
+	}
+
+	public void testRenameUsingResourcePath_01() throws CoreException, InterruptedException {
+		IProject project = createProject();
+
+		// move project using IPath
+		project.move(project.getFullPath().removeLastSegments(1).append(PROJECT_NEW_NAME), true, getMonitor());
+
+		// give a moment for the snapshot to run
+		Thread.sleep(1000);
+
+		// simulate process kill
+		System.exit(1);
+	}
+
+	public void testRenameUsingResourcePath_02() {
+		assertFalse("1.0", checkProjectExists(PROJECT_OLD_NAME));
+		assertTrue("2.0", checkProjectExists(PROJECT_NEW_NAME));
+	}
+
+	public void testDelete_01() throws CoreException {
+		IProject project = createProject();
+
+		// delete project
+		project.delete(true, getMonitor());
+
+		// simulate process kill
+		System.exit(1);
+	}
+
+	public void testDelete_02() {
+		assertFalse("1.0", checkProjectExists(PROJECT_OLD_NAME));
+	}
+}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug316182.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug316182.java
index 3115d90..9c63a2d 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug316182.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug316182.java
@@ -1,58 +1,58 @@
-/*******************************************************************************

- * Copyright (c) 2012 IBM Corporation and others.

+/*******************************************************************************
+ * Copyright (c) 2012 IBM Corporation and others.
  *
- * This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License 2.0

- * which accompanies this distribution, and is available at

+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
- * SPDX-License-Identifier: EPL-2.0

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.tests.resources.session;

-

-import junit.framework.Test;

-import org.eclipse.core.resources.*;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.preferences.InstanceScope;

-import org.eclipse.core.tests.resources.AutomatedTests;

-import org.eclipse.core.tests.resources.WorkspaceSessionTest;

-import org.eclipse.core.tests.session.WorkspaceSessionTestSuite;

-

-/**

- * Test for bug 316182

- */

-public class TestBug316182 extends WorkspaceSessionTest {

-	public static Exception CAUGHT_EXCEPTION = null;

-

-	public TestBug316182() {

-		super();

-	}

-

-	public TestBug316182(String name) {

-		super(name);

-	}

-

-	public void test01_prepareWorkspace() throws CoreException {

-		InstanceScope.INSTANCE.getNode(ResourcesPlugin.PI_RESOURCES).putBoolean(ResourcesPlugin.PREF_AUTO_REFRESH, true);

-		IWorkspace workspace = ResourcesPlugin.getWorkspace();

-		IProject project = workspace.getRoot().getProject("project_TestBug316182");

-		ensureExistsInWorkspace(project, true);

-		workspace.save(true, getMonitor());

-		// reset last caught exception

-		CAUGHT_EXCEPTION = null;

-	}

-

-	public void test02_startWorkspace() {

-		InstanceScope.INSTANCE.getNode(ResourcesPlugin.PI_RESOURCES).putBoolean(ResourcesPlugin.PREF_AUTO_REFRESH, false);

-		if (CAUGHT_EXCEPTION != null) {

-			fail("Test failed", CAUGHT_EXCEPTION);

-		}

-	}

-

-	public static Test suite() {

-		return new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, TestBug316182.class);

-	}

-}

+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.tests.resources.session;
+
+import junit.framework.Test;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.core.tests.resources.AutomatedTests;
+import org.eclipse.core.tests.resources.WorkspaceSessionTest;
+import org.eclipse.core.tests.session.WorkspaceSessionTestSuite;
+
+/**
+ * Test for bug 316182
+ */
+public class TestBug316182 extends WorkspaceSessionTest {
+	public static Exception CAUGHT_EXCEPTION = null;
+
+	public TestBug316182() {
+		super();
+	}
+
+	public TestBug316182(String name) {
+		super(name);
+	}
+
+	public void test01_prepareWorkspace() throws CoreException {
+		InstanceScope.INSTANCE.getNode(ResourcesPlugin.PI_RESOURCES).putBoolean(ResourcesPlugin.PREF_AUTO_REFRESH, true);
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		IProject project = workspace.getRoot().getProject("project_TestBug316182");
+		ensureExistsInWorkspace(project, true);
+		workspace.save(true, getMonitor());
+		// reset last caught exception
+		CAUGHT_EXCEPTION = null;
+	}
+
+	public void test02_startWorkspace() {
+		InstanceScope.INSTANCE.getNode(ResourcesPlugin.PI_RESOURCES).putBoolean(ResourcesPlugin.PREF_AUTO_REFRESH, false);
+		if (CAUGHT_EXCEPTION != null) {
+			fail("Test failed", CAUGHT_EXCEPTION);
+		}
+	}
+
+	public static Test suite() {
+		return new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, TestBug316182.class);
+	}
+}
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug369177.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug369177.java
index 27c5daf..f8cf3c8 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug369177.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug369177.java
@@ -1,55 +1,55 @@
-/*******************************************************************************

- * Copyright (c) 2012 IBM Corporation and others.

+/*******************************************************************************
+ * Copyright (c) 2012 IBM Corporation and others.
  *
- * This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License 2.0

- * which accompanies this distribution, and is available at

+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
  *
- * SPDX-License-Identifier: EPL-2.0

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.core.tests.resources.session;

-

-import java.net.URI;

-import java.net.URISyntaxException;

-import junit.framework.Test;

-import org.eclipse.core.resources.*;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.tests.resources.AutomatedTests;

-import org.eclipse.core.tests.resources.WorkspaceSessionTest;

-import org.eclipse.core.tests.session.WorkspaceSessionTestSuite;

-

-/**

- * Test for bug 369177

- */

-public class TestBug369177 extends WorkspaceSessionTest {

-	public TestBug369177() {

-		super();

-	}

-

-	public TestBug369177(String name) {

-		super(name);

-	}

-

-	public void test01_prepareWorkspace() throws CoreException, URISyntaxException {

-		IWorkspace workspace = ResourcesPlugin.getWorkspace();

-		IProject project = workspace.getRoot().getProject("project");

-		ensureExistsInWorkspace(project, true);

-

-		IFile link = project.getFile("link_to_file");

-		link.createLink(new URI("bug369177:/dummy_path.txt"), IResource.ALLOW_MISSING_LOCAL, getMonitor());

-

-		workspace.save(true, getMonitor());

-	}

-

-	public void test02_startWorkspace() {

-		// nothing to do, if we get this far without an error then we have already passed the test

-	}

-

-	public static Test suite() {

-		return new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, TestBug369177.class);

-	}

-}

+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.tests.resources.session;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import junit.framework.Test;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.tests.resources.AutomatedTests;
+import org.eclipse.core.tests.resources.WorkspaceSessionTest;
+import org.eclipse.core.tests.session.WorkspaceSessionTestSuite;
+
+/**
+ * Test for bug 369177
+ */
+public class TestBug369177 extends WorkspaceSessionTest {
+	public TestBug369177() {
+		super();
+	}
+
+	public TestBug369177(String name) {
+		super(name);
+	}
+
+	public void test01_prepareWorkspace() throws CoreException, URISyntaxException {
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
+		IProject project = workspace.getRoot().getProject("project");
+		ensureExistsInWorkspace(project, true);
+
+		IFile link = project.getFile("link_to_file");
+		link.createLink(new URI("bug369177:/dummy_path.txt"), IResource.ALLOW_MISSING_LOCAL, getMonitor());
+
+		workspace.save(true, getMonitor());
+	}
+
+	public void test02_startWorkspace() {
+		// nothing to do, if we get this far without an error then we have already passed the test
+	}
+
+	public static Test suite() {
+		return new WorkspaceSessionTestSuite(AutomatedTests.PI_RESOURCES_TESTS, TestBug369177.class);
+	}
+}