move implementation from Platform to Library

1 files changed, 5 insertions, 36 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java
index d0d35b454e..cfb461e926 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java
@@ -15,43 +15,12 @@ import java.net.*;
 import java.util.jar.*;
 
 public class Platform {
-	
-public static final String PLATFORM = "cocoa"; //$NON-NLS-1$
-public static final Lock lock = new Lock ();
 
-public static boolean IsLoadable () {
-	URL url = Platform.class.getClassLoader ().getResource ("org/eclipse/swt/SWT.class"); //$NON-NLS-1$
-	if (!url.getProtocol ().equals ("jar")) { //$NON-NLS-1$
-		/* SWT is presumably running in a development environment */
-		return true;
-	}
+	public static final String PLATFORM = "cocoa"; //$NON-NLS-1$
+	public static final Lock lock = new Lock ();
 
-	try {
-		url = new URL (url.getPath ());
-	} catch (MalformedURLException e) {
-		/* should never happen since url's initial path value must be valid */
-	}
-	String path = url.getPath ();
-	int index = path.indexOf ('!');
-	File file = new File (path.substring (0, index));
-
-	try {
-		JarFile jar = new JarFile (file);
-		Manifest manifest = jar.getManifest ();
-		Attributes attributes = manifest.getMainAttributes ();
-
-		/*
-		* Cocoa has a special case since SWT's 32-bit library contains natives for both the
-		* x86 and PPC architectures.
-		*/
-		if (!Library.os ().equals (attributes.getValue ("SWT-OS"))) return false; //$NON-NLS-1$
-		String libraryArch = Library.arch ();
-		String manifestArch = attributes.getValue ("SWT-Arch"); //$NON-NLS-1$
-		return libraryArch.equals (manifestArch) || (manifestArch.equals ("x86") && libraryArch.equals ("ppc")); //$NON-NLS-1$ //$NON-NLS-2$ 
-	} catch (IOException e) {
-		/* should never happen for a valid SWT jar with the expected manifest values */
-	}
-
-	return false;	
+public static boolean isLoadable () {
+	return Library.isLoadable ();	
 }
+
 }