diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/java/com/jogamp/common/os/DynamicLibraryBundle.java | 14 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/util/MiscUtils.java | 57 |
2 files changed, 6 insertions, 65 deletions
diff --git a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java index 8e138ef..6c00afe 100755 --- a/src/java/com/jogamp/common/os/DynamicLibraryBundle.java +++ b/src/java/com/jogamp/common/os/DynamicLibraryBundle.java @@ -28,10 +28,8 @@ package com.jogamp.common.os; import java.util.*; -import java.security.*; import com.jogamp.common.jvm.JNILibLoaderBase; -import com.jogamp.common.util.MiscUtils; /** * Provides bundling of:<br> @@ -87,10 +85,10 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { } if(DEBUG) { System.out.println("DynamicLibraryBundle.init Summary: "+info.getClass().getName()); - System.out.println(" toolGetProcAddressFuncNameList: "+MiscUtils.toString(toolGetProcAddressFuncNameList)); - System.out.println(" Tool Lib Names : "+MiscUtils.toString(toolLibNames)); + System.out.println(" toolGetProcAddressFuncNameList: "+toolGetProcAddressFuncNameList); + System.out.println(" Tool Lib Names : "+toolLibNames); System.out.println(" Tool Lib Loaded: "+getToolLibLoadedNumber()+"/"+getToolLibNumber()+", complete "+isToolLibComplete()); - System.out.println(" Glue Lib Names : "+MiscUtils.toString(glueLibNames)); + System.out.println(" Glue Lib Names : "+glueLibNames); System.out.println(" Glue Lib Loaded: "+getGlueLibLoadedNumber()+"/"+getGlueLibNumber()+", complete "+isGlueLibComplete()); System.out.println(" All Complete: "+isLibComplete()); } @@ -209,13 +207,13 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { libNames = new ArrayList(); libNames.add((String)listObj); } else { - throw new RuntimeException("List element "+i+" must be either a List or String: "+MiscUtils.toString(toolLibNames)); + throw new RuntimeException("List element "+i+" must be either a List or String: "+toolLibNames); } if( null != libNames && libNames.size() > 0 ) { lib = loadFirstAvailable(libNames, loader, info.shallLinkGlobal()); if ( null == lib ) { if(DEBUG) { - System.out.println("Unable to load any Tool library of: "+MiscUtils.toString(libNames)); + System.out.println("Unable to load any Tool library of: "+libNames); } } else { nativeLibraries.add(lib); @@ -283,7 +281,7 @@ public class DynamicLibraryBundle implements DynamicLookupHelper { if(0!=addr) { System.err.println("Lookup-Native: <" + funcName + "> 0x" + Long.toHexString(addr) + " in lib " + libName ); } else { - System.err.println("Lookup-Native: <" + funcName + "> ** FAILED ** in libs " + MiscUtils.toString(nativeLibraries)); + System.err.println("Lookup-Native: <" + funcName + "> ** FAILED ** in libs " + nativeLibraries); } } return addr; diff --git a/src/java/com/jogamp/common/util/MiscUtils.java b/src/java/com/jogamp/common/util/MiscUtils.java deleted file mode 100644 index dd32951..0000000 --- a/src/java/com/jogamp/common/util/MiscUtils.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2010, Sven Gothel - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Sven Gothel nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Sven Gothel BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package com.jogamp.common.util; - -import java.util.*; - -public class MiscUtils { - - public static StringBuffer append(StringBuffer sb, List list) { - sb.append("["); - if(null!=list&&list.size()>0) { - boolean comma = false; - for(Iterator iter=list.iterator(); iter.hasNext(); ) { - if(comma) { sb.append(", "); } - Object o = iter.next(); - if(o instanceof List) { - sb = append(sb, (List)o); - } else { - sb.append(o); - } - comma = true; - } - } - sb.append("]"); - return sb; - } - - public static String toString(List list) { - return append(new StringBuffer(), list).toString(); - } -} - |