Add methods to identify the current OS to the class Platform

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/BasicAliasTest.java

@@ -41,6 +41,7 @@
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.tests.internal.filesystem.wrapper.WrapperFileSystem;
 import org.eclipse.core.tests.resources.ResourceTest;
 import org.junit.Assume;
@@ -263,7 +264,7 @@ public void testBug156082() throws CoreException {
 	 */
 	@Test
 	public void testBug198571() {
-		Assume.assumeTrue(isWindows());
+		Assume.assumeTrue(OS.isWindows());
 
 		/* look for the adequate environment */
 		String[] devices = findAvailableDevices();

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java

@@ -27,6 +27,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.runtime.QualifiedName;
 import org.junit.Assume;
 import org.junit.Test;
@@ -49,7 +50,7 @@ public String[] defineHierarchy() {
 	 */
 	@Test
 	public void testMoveFileAcrossVolumes() {
-		Assume.assumeTrue(isWindows());
+		Assume.assumeTrue(OS.isWindows());
 
 		/* look for the adequate environment */
 		String[] devices = findAvailableDevices();
@@ -171,7 +172,7 @@ public void testMoveFileBetweenProjects() throws Exception {
 	 */
 	@Test
 	public void testMoveFolderAcrossVolumes() {
-		Assume.assumeTrue(isWindows());
+		Assume.assumeTrue(OS.isWindows());
 
 		/* look for the adequate environment */
 		String[] devices = findAvailableDevices();

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java

@@ -43,13 +43,14 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.tests.resources.ResourceTest;
 import org.xml.sax.InputSource;
 
 public class ModelObjectReaderWriterTest extends ResourceTest {
-	static final IPath LONG_LOCATION = IPath.fromOSString("/eclipse/dev/i0218/eclipse/pffds/fds//fds///fdsfsdfsd///fdsfdsf/fsdfsdfsd/lugi/dsds/fsd//f/ffdsfdsf/fsdfdsfsd/fds//fdsfdsfdsf/fdsfdsfds/fdsfdsfdsf/fdsfdsfdsds/ns/org.eclipse.help.ui_2.1.0/contexts.xml").setDevice(isWindows() ? "D:" : null);
+	static final IPath LONG_LOCATION = IPath.fromOSString("/eclipse/dev/i0218/eclipse/pffds/fds//fds///fdsfsdfsd///fdsfdsf/fsdfsdfsd/lugi/dsds/fsd//f/ffdsfdsf/fsdfdsfsd/fds//fdsfdsfdsf/fdsfdsfds/fdsfdsfdsf/fdsfdsfdsds/ns/org.eclipse.help.ui_2.1.0/contexts.xml").setDevice(OS.isWindows() ? "D:" : null);
 	static final URI LONG_LOCATION_URI = LONG_LOCATION.toFile().toURI();
-	private static final String PATH_STRING = IPath.fromOSString("/abc/def").setDevice(isWindows() ? "D:" : null).toString();
+	private static final String PATH_STRING = IPath.fromOSString("/abc/def").setDevice(OS.isWindows() ? "D:" : null).toString();
 
 	private HashMap<String, ProjectDescription> buildBaselineDescriptors() {
 		HashMap<String, ProjectDescription> result = new HashMap<>();

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java

@@ -31,6 +31,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.tests.harness.FussyProgressMonitor;
 import org.junit.Test;
@@ -1019,7 +1020,7 @@ public void testInvalidFileNames() {
 
 		//do some tests with invalid names
 		names = new String[0];
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			//invalid windows names
 			names = new String[] {"a  ", "foo::bar", "prn", "nul", "con", "aux", "clock$", "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9", "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9", "AUX", "con.foo", "LPT4.txt", "*", "?", "\"", "<", ">", "|"};
 		} else {
@@ -1041,7 +1042,7 @@ public void testInvalidFileNames() {
 		}
 
 		//do some tests with valid names that are *almost* invalid
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			//these names are valid on windows
 			names = new String[] {"  a", "hello.prn.txt", "null", "con3", "foo.aux", "lpt0", "com0", "com10", "lpt10", ",", "'", ";", "clock$.class"};
 		} else {

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFolderTest.java

@@ -21,6 +21,7 @@
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.runtime.QualifiedName;
 
 public class IFolderTest extends ResourceTest {
@@ -315,7 +316,7 @@ public void testInvalidFolderNames() {
 
 		//do some tests with invalid names
 		String[] names = new String[0];
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			//invalid windows names
 			names = new String[] {"prn", "nul", "con", "aux", "clock$", "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9", "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9", "AUX", "con.foo", "LPT4.txt", "*", "?", "\"", "<", ">", "|"};
 		} else {
@@ -336,7 +337,7 @@ public void testInvalidFolderNames() {
 		}
 
 		//do some tests with valid names that are *almost* invalid
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			//these names are valid on windows
 			names = new String[] {"hello.prn.txt", "null", "con3", "foo.aux", "lpt0", "com0", "com10", "lpt10", ",", "'", ";"};
 		} else {

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java

@@ -40,6 +40,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.core.tests.harness.FussyProgressMonitor;
@@ -198,7 +199,7 @@ public void testInvalidProjectNames() {
 		}
 		//do some tests with invalid names
 		names = new String[0];
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			//invalid windows names
 			names = new String[] {"foo:bar", "prn", "nul", "con", "aux", "clock$", "com1", "com2", "com3", "com4", "com5", "com6", "com7", "com8", "com9", "lpt1", "lpt2", "lpt3", "lpt4", "lpt5", "lpt6", "lpt7", "lpt8", "lpt9", "AUX", "con.foo", "LPT4.txt", "*", "?", "\"", "<", ">", "|", "::"};
 		}
@@ -221,7 +222,7 @@ public void testInvalidProjectNames() {
 		}
 
 		//do some tests with valid names that are *almost* invalid
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			//these names are valid on windows
 			names = new String[] {"hello.prn.txt", "null", "con3", "foo.aux", "lpt0", "com0", "com10", "lpt10", ",", "'", ";"};
 		} else {
@@ -615,7 +616,7 @@ public void testProjectCreationInvalidLocation() {
 	 * Tests creating a project whose location already exists with different case
 	 */
 	public void testProjectCreationLocationExistsWithDifferentCase() {
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			String projectName = getUniqueString() + "a";
 			IProject project = getWorkspace().getRoot().getProject(projectName);
 

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceRootTest.java

@@ -30,6 +30,7 @@
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.tests.internal.filesystem.wrapper.WrapperFileSystem;
 import org.junit.Assume;
@@ -46,7 +47,7 @@ public class IWorkspaceRootTest extends ResourceTest {
 	@Test
 	public void testFindFilesNonCanonicalPath() {
 		// this test is for windows only
-		Assume.assumeTrue(isWindows());
+		Assume.assumeTrue(OS.isWindows());
 
 		IProject project = getWorkspace().getRoot().getProject("testFindFilesNonCanonicalPath");
 		ensureExistsInWorkspace(project, true);

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java

@@ -38,6 +38,7 @@
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Platform.OS;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
@@ -822,7 +823,7 @@ public void testValidateName() {
 		/* normal name */
 		assertTrue("1.1", getWorkspace().validateName("abcdef", IResource.FILE).isOK());
 		/* invalid characters (windows only) */
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			assertFalse("2.1", getWorkspace().validateName("dsa:sf", IResource.FILE).isOK());
 			assertFalse("2.2", getWorkspace().validateName("*dsasf", IResource.FILE).isOK());
 			assertFalse("2.3", getWorkspace().validateName("?dsasf", IResource.FILE).isOK());
@@ -903,7 +904,7 @@ public void testValidatePath() {
 		assertTrue("1.1", getWorkspace().validatePath("/one/two/three/four/", IResource.FILE | IResource.FOLDER).isOK());
 
 		/* invalid characters (windows only) */
-		final boolean WINDOWS = isWindows();
+		final boolean WINDOWS = OS.isWindows();
 		if (WINDOWS) {
 			assertFalse("2.1", (getWorkspace().validatePath("\\dsa:sf", IResource.FILE).isOK()));
 			assertFalse("2.2", (getWorkspace().validatePath("/abc/*dsasf", IResource.FILE).isOK()));
@@ -963,7 +964,7 @@ public void testValidateProjectLocation() {
 		assertTrue("1.1", workspace.validateProjectLocation(project, IPath.fromOSString("/one/two/three/four/")).isOK());
 
 		/* invalid characters (windows only) */
-		final boolean WINDOWS = isWindows();
+		final boolean WINDOWS = OS.isWindows();
 		if (WINDOWS) {
 			assertFalse("2.1", workspace.validateProjectLocation(project, IPath.fromOSString("d:\\dsa:sf")).isOK());
 			assertFalse("2.2", workspace.validateProjectLocation(project, IPath.fromOSString("/abc/*dsasf")).isOK());

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java

@@ -42,6 +42,7 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.tests.harness.CancelingProgressMonitor;
 import org.eclipse.core.tests.harness.FussyProgressMonitor;
 
@@ -203,7 +204,7 @@ public void testAllowMissingLocal() {
 		}
 
 		//try to create with local path that can never exist
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			location = IPath.fromOSString("b:\\does\\not\\exist");
 		} else {
 			location = IPath.fromOSString("/dev/null/does/not/exist");
@@ -1022,7 +1023,7 @@ public void testDeleteFolderWithLinks() {
 	 */
 	public void testFindFilesForLocationCaseVariant() {
 		//this test only applies to file systems with a device in the path
-		if (!isWindows()) {
+		if (!OS.isWindows()) {
 			return;
 		}
 		IFolder link = nonExistingFolderInExistingProject;
@@ -1455,7 +1456,7 @@ public void testValidateEmptyLinkLocation() {
 	 */
 	public void testLocationWithColon() {
 		//windows does not allow a location with colon in the name
-		if (isWindows()) {
+		if (OS.isWindows()) {
 			return;
 		}
 		IFolder folder = nonExistingFolderInExistingProject;

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java

@@ -159,35 +159,6 @@ protected static boolean isCaseSensitive(IResource resource) {
 		return ((Resource) resource).getStore().getFileSystem().isCaseSensitive();
 	}
 
-	/**
-	 * Returns whether the current platform is windows.
-	 * @return <code>true</code> if this platform is windows, and
-	 * <code>false</code> otherwise.
-	 */
-	protected static boolean isWindows() {
-		return Platform.getOS().equals(Platform.OS_WIN32);
-	}
-
-	/**
-	 * Returns whether the current platform is linux.
-	 *
-	 * @return <code>true</code> if this platform is linux, and <code>false</code>
-	 *         otherwise.
-	 */
-	protected static boolean isLinux() {
-		return Platform.getOS().equals(Platform.OS_LINUX);
-	}
-
-	/**
-	 * Returns whether the current platform is mac OSX.
-	 *
-	 * @return <code>true</code> if this platform is mac OSX, and <code>false</code>
-	 *         otherwise.
-	 */
-	protected static boolean isMacOSX() {
-		return Platform.getOS().equals(Platform.OS_MACOSX);
-	}
-
 	/**
 	 * Convenience method to copy contents from one stream to another.
 	 */

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java

@@ -17,6 +17,7 @@
 import java.io.InputStream;
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.tests.resources.ResourceTest;
 
 /**
@@ -31,7 +32,7 @@ public class Bug_025457 extends ResourceTest {
 
 	public void testFile() {
 		//this test only works on windows
-		if (!isWindows()) {
+		if (!OS.isWindows()) {
 			return;
 		}
 		IProject source = getWorkspace().getRoot().getProject("project");
@@ -77,7 +78,7 @@ public void testFile() {
 	public void testFolder() {
 		//this test only works on windows
 		//native code must also be present so move can detect the case change
-		if (!isWindows() || !isReadOnlySupported()) {
+		if (!OS.isWindows() || !isReadOnlySupported()) {
 			return;
 		}
 		IProject source = getWorkspace().getRoot().getProject("SourceProject");
@@ -120,7 +121,7 @@ public void testFolder() {
 
 	public void testProject() {
 		//this test only works on windows
-		if (!isWindows()) {
+		if (!OS.isWindows()) {
 			return;
 		}
 		IProject source = getWorkspace().getRoot().getProject("project");

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java

@@ -23,6 +23,7 @@
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.tests.resources.ResourceTest;
 
 /**
@@ -37,7 +38,7 @@ public class Bug_026294 extends ResourceTest {
 	 * Works only for Windows.
 	 */
 	public void testDeleteOpenProjectWindows() {
-		if (!(isWindows())) {
+		if (!(OS.isWindows())) {
 			return;
 		}
 
@@ -138,7 +139,7 @@ public void testDeleteOpenProjectWindows() {
 	 * Works only for Linux with natives.
 	 */
 	public void testDeleteOpenProjectLinux() {
-		if (!(isLinux() && isReadOnlySupported())) {
+		if (!(OS.isLinux() && isReadOnlySupported())) {
 			return;
 		}
 
@@ -206,7 +207,7 @@ public void testDeleteOpenProjectLinux() {
 	 * Works only for Windows.
 	 */
 	public void testDeleteClosedProjectWindows() {
-		if (!isWindows()) {
+		if (!OS.isWindows()) {
 			return;
 		}
 
@@ -286,7 +287,7 @@ public void testDeleteClosedProjectWindows() {
 	 * TODO: enable this test once bug 48321 is fixed.
 	 */
 	public void testDeleteClosedProjectLinux() {
-		if (!isLinux()) {
+		if (!OS.isLinux()) {
 			return;
 		}
 
@@ -358,7 +359,7 @@ public void testDeleteClosedProjectLinux() {
 	 * Works only for Windows.
 	 */
 	public void testDeleteFolderWindows() {
-		if (!isWindows()) {
+		if (!OS.isWindows()) {
 			return;
 		}
 
@@ -423,7 +424,7 @@ public void testDeleteFolderWindows() {
 	 * Works only for Linux with natives.
 	 */
 	public void testDeleteFolderLinux() {
-		if (!isLinux()) {
+		if (!OS.isLinux()) {
 			return;
 		}
 

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_027271.java

@@ -16,6 +16,7 @@
 import org.eclipse.core.resources.IPathVariableManager;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.core.runtime.Preferences;
 import org.eclipse.core.tests.resources.ResourceTest;
 
@@ -55,7 +56,7 @@ private void clearPathVariablesProperties() {
 
 	public void testBug() {
 		//this bug is only relevant on Windows
-		if (!isWindows()) {
+		if (!OS.isWindows()) {
 			return;
 		}
 		IPathVariableManager pvm = getWorkspace().getPathVariableManager();