diff options
author | Sven Gothel <[email protected]> | 2011-08-31 03:25:48 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-08-31 03:25:48 +0200 |
commit | c75785dcc4758b3d865c5ccf6677389ab112d2fb (patch) | |
tree | d3c035106df01c6116c6c70f1479f8c352d74a07 /src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java | |
parent | 490a6ebf64d767f5395554da78dda96ebb59b0fc (diff) |
DynamicLibraryBundle*: Use generics for better spec - following gluegen commit cfb9e118e020707842e6b5136b07f5ab149540c1
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java index 137599650..33154b089 100644 --- a/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java +++ b/src/jogl/classes/jogamp/opengl/egl/EGLDynamicLibraryBundleInfo.java @@ -48,9 +48,9 @@ import java.security.*; * Currently two implementations exist, one for ES1 and one for ES2. */ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundleInfo { - static List/*<String>*/ glueLibNames; + static List<String> glueLibNames; static { - glueLibNames = new ArrayList(); + glueLibNames = new ArrayList<String>(); glueLibNames.addAll(GLDynamicLibraryBundleInfo.getGlueLibNamesPreload()); glueLibNames.add("jogl_mobile"); } @@ -71,8 +71,8 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle return false; } - public final List getToolGetProcAddressFuncNameList() { - List res = new ArrayList(); + public final List<String> getToolGetProcAddressFuncNameList() { + List<String> res = new ArrayList<String>(); res.add("eglGetProcAddress"); return res; } @@ -85,21 +85,21 @@ public abstract class EGLDynamicLibraryBundleInfo extends GLDynamicLibraryBundle return false; // JAU / FIXME funcName.startsWith("egl"); } - protected List/*<String>*/ getEGLLibNamesList() { - List/*<String>*/ eglLibNames = new ArrayList(); + protected List<String> getEGLLibNamesList() { + List<String> eglLibNames = new ArrayList<String>(); // try default generic names first - eglLibNames.add("EGL"); - + eglLibNames.add("EGL"); // for windows distributions using the 'unlike' lib prefix, // where our tool does not add it. eglLibNames.add("libEGL"); // this is the default EGL lib name, according to the spec eglLibNames.add("libEGL.so.1"); + return eglLibNames; } - public final List/*<String>*/ getGlueLibNames() { + public final List<String> getGlueLibNames() { return glueLibNames; } } |