diff options
author | Billy Biggs | 2005-09-14 20:49:03 +0000 |
---|---|---|
committer | Billy Biggs | 2005-09-14 20:49:03 +0000 |
commit | 461bbe3bacbad35dca1e9b918ce2ba5104de6626 (patch) | |
tree | 6ae3997285a6595adde768a032eb4bb88db8b14f /bundles/org.eclipse.swt.opengl/common | |
parent | 961e4f6e8c3de44ff7fddaed62e29351cbe923cb (diff) | |
download | eclipse.platform.swt-461bbe3bacbad35dca1e9b918ce2ba5104de6626.tar.gz eclipse.platform.swt-461bbe3bacbad35dca1e9b918ce2ba5104de6626.tar.xz eclipse.platform.swt-461bbe3bacbad35dca1e9b918ce2ba5104de6626.zip |
Cleanup.
Diffstat (limited to 'bundles/org.eclipse.swt.opengl/common')
-rw-r--r-- | bundles/org.eclipse.swt.opengl/common/org/eclipse/swt/opengl/GLYPHMETRICSFLOAT.java | 22 | ||||
-rw-r--r-- | bundles/org.eclipse.swt.opengl/common/org/eclipse/swt/opengl/Library.java | 39 |
2 files changed, 3 insertions, 58 deletions
diff --git a/bundles/org.eclipse.swt.opengl/common/org/eclipse/swt/opengl/GLYPHMETRICSFLOAT.java b/bundles/org.eclipse.swt.opengl/common/org/eclipse/swt/opengl/GLYPHMETRICSFLOAT.java deleted file mode 100644 index 991e62b5bb..0000000000 --- a/bundles/org.eclipse.swt.opengl/common/org/eclipse/swt/opengl/GLYPHMETRICSFLOAT.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 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 - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.swt.opengl; - - -public class GLYPHMETRICSFLOAT { - public float gmfBlackBoxX; - public float gmfBlackBoxY; - public float gmfptGlyphOrigin_x; - public float gmfptGlyphOrigin_y; - public float gmfCellIncX; - public float gmfCellIncY; - public static final int sizeof = 24; -} diff --git a/bundles/org.eclipse.swt.opengl/common/org/eclipse/swt/opengl/Library.java b/bundles/org.eclipse.swt.opengl/common/org/eclipse/swt/opengl/Library.java index 8d121f0810..26467bcb54 100644 --- a/bundles/org.eclipse.swt.opengl/common/org/eclipse/swt/opengl/Library.java +++ b/bundles/org.eclipse.swt.opengl/common/org/eclipse/swt/opengl/Library.java @@ -10,51 +10,18 @@ *******************************************************************************/ package org.eclipse.swt.opengl; +import org.eclipse.swt.*; public class Library { -/** - * Returns the platform name. - * - * @return the platform name of the currently running SWT - */ -static String getPlatform () { - String [] names = new String [] {"motif", "gtk", "win32", "photon", "carbon"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ - for (int i = 0; i < names.length; i++) { - try { - Class.forName("org.eclipse.swt.internal."+names[i]+".OS"); //$NON-NLS-1$ //$NON-NLS-2$ - return names[i]; - } catch (ClassNotFoundException e) { - } - } - return "unknown"; //$NON-NLS-1$ -} - -/** - * Loads the shared library that matches the version of the - * Java code which is currently running. SWT shared libraries - * follow an encoding scheme where the major, minor and revision - * numbers are embedded in the library name and this along with - * <code>name</code> is used to load the library. If this fails, - * <code>name</code> is used in another attempt to load the library, - * this time ignoring the SWT version encoding scheme. - * - * @param name the name of the library to load - */ public static void loadLibrary (String name) { - /* - * Include platform name to support different windowing systems - * on same operating system. - */ - String platform = getPlatform (); - + String platform = SWT.getPlatform (); try { - String newName = name + "-" + platform; //$NON-NLS-1$ //$NON-NLS-2$ + String newName = name + '-' + platform; System.loadLibrary (newName); return; } catch (UnsatisfiedLinkError e1) { throw e1; } } - } |