From: <eli...@us...> - 2007-01-17 12:58:41
|
Revision: 2730 http://svn.sourceforge.net/java-game-lib/?rev=2730&view=rev Author: elias_naur Date: 2007-01-17 04:58:38 -0800 (Wed, 17 Jan 2007) Log Message: ----------- Remove the rest of the implementation reflection Modified Paths: -------------- trunk/LWJGL/src/java/org/lwjgl/Sys.java trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2007-01-17 12:49:20 UTC (rev 2729) +++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2007-01-17 12:58:38 UTC (rev 2730) @@ -108,7 +108,6 @@ } private static SysImplementation createImplementation() { - String class_name; switch (LWJGLUtil.getPlatform()) { case LWJGLUtil.PLATFORM_LINUX: return new LinuxSysImplementation(); Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2007-01-17 12:49:20 UTC (rev 2729) +++ trunk/LWJGL/src/java/org/lwjgl/opengl/AWTGLCanvas.java 2007-01-17 12:58:38 UTC (rev 2730) @@ -86,30 +86,20 @@ static { Sys.initialize(); - String class_name; + implementation = createImplementation(); + } + + private static AWTCanvasImplementation createImplementation() { switch (LWJGLUtil.getPlatform()) { case LWJGLUtil.PLATFORM_LINUX: - class_name = "org.lwjgl.opengl.LinuxCanvasImplementation"; - break; + return new LinuxCanvasImplementation(); case LWJGLUtil.PLATFORM_WINDOWS: - class_name = "org.lwjgl.opengl.WindowsCanvasImplementation"; - break; + return new WindowsCanvasImplementation(); case LWJGLUtil.PLATFORM_MACOSX: - class_name = "org.lwjgl.opengl.MacOSXCanvasImplementation"; - break; + return new MacOSXCanvasImplementation(); default: throw new IllegalStateException("Unsupported platform"); } - try { - Class impl_class = Class.forName(class_name); - implementation = (AWTCanvasImplementation)impl_class.newInstance(); - } catch (ClassNotFoundException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } } /** Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java 2007-01-17 12:49:20 UTC (rev 2729) +++ trunk/LWJGL/src/java/org/lwjgl/opengl/Context.java 2007-01-17 12:58:38 UTC (rev 2730) @@ -73,30 +73,20 @@ static { Sys.initialize(); - String class_name; + implementation = createImplementation(); + } + + private static ContextImplementation createImplementation() { switch (LWJGLUtil.getPlatform()) { case LWJGLUtil.PLATFORM_LINUX: - class_name = "org.lwjgl.opengl.LinuxContextImplementation"; - break; + return new LinuxContextImplementation(); case LWJGLUtil.PLATFORM_WINDOWS: - class_name = "org.lwjgl.opengl.WindowsContextImplementation"; - break; + return new WindowsContextImplementation(); case LWJGLUtil.PLATFORM_MACOSX: - class_name = "org.lwjgl.opengl.MacOSXContextImplementation"; - break; + return new MacOSXContextImplementation(); default: throw new IllegalStateException("Unsupported platform"); } - try { - Class impl_class = Class.forName(class_name); - implementation = (ContextImplementation)impl_class.newInstance(); - } catch (ClassNotFoundException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } } PeerInfo getPeerInfo() { Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java =================================================================== --- trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2007-01-17 12:49:20 UTC (rev 2729) +++ trunk/LWJGL/src/java/org/lwjgl/opengl/Display.java 2007-01-17 12:58:38 UTC (rev 2730) @@ -133,30 +133,16 @@ } private static DisplayImplementation createDisplayImplementation() { - String class_name; switch (LWJGLUtil.getPlatform()) { case LWJGLUtil.PLATFORM_LINUX: - class_name = "org.lwjgl.opengl.LinuxDisplay"; - break; + return new LinuxDisplay(); case LWJGLUtil.PLATFORM_WINDOWS: - class_name = "org.lwjgl.opengl.WindowsDisplay"; - break; + return new WindowsDisplay(); case LWJGLUtil.PLATFORM_MACOSX: - class_name = "org.lwjgl.opengl.MacOSXDisplay"; - break; + return new MacOSXDisplay(); default: throw new IllegalStateException("Unsupported platform"); } - try { - Class display_class = Class.forName(class_name); - return (DisplayImplementation)display_class.newInstance(); - } catch (ClassNotFoundException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |