diff options
author | Harvey Harrison <[email protected]> | 2013-10-17 21:06:56 -0700 |
---|---|---|
committer | Harvey Harrison <[email protected]> | 2013-10-17 21:06:56 -0700 |
commit | 791a2749886f02ec7b8db25bf8862e8269b96da5 (patch) | |
tree | c9be31d0bbbe8033b4a6a0cfad91a22b6575ced1 /src/java/com/jogamp/common/util/cache | |
parent | 5b77e15500b7b19d35976603dd71e8b997b2d8ea (diff) |
gluegen: remove trailing whitespace
Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src/java/com/jogamp/common/util/cache')
-rw-r--r-- | src/java/com/jogamp/common/util/cache/TempFileCache.java | 54 | ||||
-rw-r--r-- | src/java/com/jogamp/common/util/cache/TempJarCache.java | 144 |
2 files changed, 99 insertions, 99 deletions
diff --git a/src/java/com/jogamp/common/util/cache/TempFileCache.java b/src/java/com/jogamp/common/util/cache/TempFileCache.java index 32f5c2a..5898d50 100644 --- a/src/java/com/jogamp/common/util/cache/TempFileCache.java +++ b/src/java/com/jogamp/common/util/cache/TempFileCache.java @@ -43,9 +43,9 @@ public class TempFileCache { // Flag indicating that we got a fatal error in the static initializer. private static boolean staticInitError = false; - + private static final String tmpDirPrefix = "file_cache"; - + // Lifecycle: For one user's JVMs, ClassLoader and time. private static final File tmpBaseDir; @@ -71,12 +71,12 @@ public class TempFileCache { static { // Global Lock ! - synchronized (System.out) { + synchronized (System.out) { // Create / initialize the temp root directory, starting the Reaper // thread to reclaim old installations if necessary. If we get an // exception, set an error code. File _tmpBaseDir = null; - try { + try { _tmpBaseDir = new File(IOUtil.getTempDir(true /* executable */), tmpDirPrefix); _tmpBaseDir = IOUtil.testDir(_tmpBaseDir, true /* create */, false /* executable */); // executable already checked } catch (Exception ex) { @@ -85,12 +85,12 @@ public class TempFileCache { staticInitError = true; } tmpBaseDir = _tmpBaseDir; - + if (DEBUG) { System.err.println("TempFileCache: Static Initialization ---------------------------------------------- OK: "+(!staticInitError)); System.err.println("TempFileCache: Thread: "+Thread.currentThread().getName()+", CL 0x"+Integer.toHexString(TempFileCache.class.getClassLoader().hashCode())+", tempBaseDir "+tmpBaseDir.getAbsolutePath()); } - + if(!staticInitError) { try { initTmpRoot(); @@ -105,15 +105,15 @@ public class TempFileCache { } } } - + /** * Documented way to kick off static initialization * @return true is static initialization was successful */ public static boolean initSingleton() { - return !staticInitError; + return !staticInitError; } - + /** * This method is called by the static initializer to create / initialize * the temp root directory that will hold the temp directories for this @@ -197,7 +197,7 @@ public class TempFileCache { System.clearProperty(tmpRootPropName); } } - + if (tmpRootPropValue == null) { // Create ${tmpbase}/jlnNNNN.tmp then lock the file File tmpFile = File.createTempFile("jln", ".tmp", tmpBaseDir); @@ -413,7 +413,7 @@ public class TempFileCache { System.err.println("TempFileCache: new TempFileCache() --------------------- (static ok: "+(!staticInitError)+")"); System.err.println("TempFileCache: Thread: "+Thread.currentThread().getName()+", CL 0x"+Integer.toHexString(TempFileCache.class.getClassLoader().hashCode())+", this 0x"+Integer.toHexString(hashCode())); } - if(!staticInitError) { + if(!staticInitError) { try { createTmpDir(); } catch (Exception ex) { @@ -424,16 +424,16 @@ public class TempFileCache { if (DEBUG) { System.err.println("TempFileCache: tempDir "+individualTmpDir+" (ok: "+(!initError)+")"); System.err.println("----------------------------------------------------------"); - } + } } - + /** Delete the <code>individualTmpDir</code> recursively and remove it's reference. */ public void destroy() { if (DEBUG) { System.err.println("TempFileCache: destroy() --------------------- (static ok: "+(!staticInitError)+")"); System.err.println("TempFileCache: Thread: "+Thread.currentThread().getName()+", CL 0x"+Integer.toHexString(TempFileCache.class.getClassLoader().hashCode())+", this 0x"+Integer.toHexString(hashCode())); } - if(!staticInitError) { + if(!staticInitError) { try { removeAll(individualTmpDir); } catch (Exception ex) { @@ -443,26 +443,26 @@ public class TempFileCache { individualTmpDir = null; if (DEBUG) { System.err.println("TempFileCache: destroy() END"); - } + } } - + /** * @return true is static and object initialization was successful */ public boolean isValid() { return !staticInitError && !initError; } - + /** * Base temp directory used by TempFileCache. - * - * <p> + * + * <p> * Lifecycle: For one user's JVMs, ClassLoader and time. * </p> - * + * * This is set to: * <pre> * ${java.io.tmpdir}/tmpDirPrefix * </pre> - * + * * @return */ public File getBaseDir() { return tmpBaseDir; } @@ -481,18 +481,18 @@ public class TempFileCache { * * <p> * Use Case: Per ClassLoader files, eg. native libraries. - * </p> + * </p> * * <p> * Old temp directories are cleaned up the next time a JVM is launched that * uses TempFileCache. * </p> * - * + * * @return */ public File getRootDir() { return tmpRootDir; } - + /** * Temporary directory for individual files (eg. native libraries of one ClassLoader instance). * The directory name is: @@ -508,12 +508,12 @@ public class TempFileCache { * where jlnMMMMM is the unique filename created by File.createTempFile() * without the ".tmp" extension. * - * + * * @return */ public File getTempDir() { return individualTmpDir; } - - + + /** * Create the temp directory in tmpRootDir. To do this, we create a temp * file with a ".tmp" extension, and then create a directory of the diff --git a/src/java/com/jogamp/common/util/cache/TempJarCache.java b/src/java/com/jogamp/common/util/cache/TempJarCache.java index ecf6e56..48d8081 100644 --- a/src/java/com/jogamp/common/util/cache/TempJarCache.java +++ b/src/java/com/jogamp/common/util/cache/TempJarCache.java @@ -45,7 +45,7 @@ import com.jogamp.common.util.SecurityUtil; public class TempJarCache { private static final boolean DEBUG = Debug.debug("TempJarCache"); - + // A HashMap of native libraries that can be loaded with System.load() // The key is the string name of the library as passed into the loadLibrary // call; it is the file name without the directory or the platform-dependent @@ -55,8 +55,8 @@ public class TempJarCache { public enum LoadState { LOOKED_UP, LOADED; - - public boolean compliesWith(LoadState o2) { + + public boolean compliesWith(LoadState o2) { return null != o2 ? compareTo(o2) >= 0 : false; } } @@ -66,20 +66,20 @@ public class TempJarCache { } return has.compliesWith(exp); } - + // Set of jar files added private static Map<URI, LoadState> nativeLibJars; private static Map<URI, LoadState> classFileJars; private static Map<URI, LoadState> resourceFileJars; private static TempFileCache tmpFileCache; - + private static boolean staticInitError = false; private static volatile boolean isInit = false; - + /** * Documented way to kick off static initialization. - * + * * @return true is static initialization was successful */ public static boolean initSingleton() { @@ -88,12 +88,12 @@ public class TempJarCache { if (!isInit) { isInit = true; staticInitError = !TempFileCache.initSingleton(); - + if(!staticInitError) { tmpFileCache = new TempFileCache(); - staticInitError = !tmpFileCache.isValid(); + staticInitError = !tmpFileCache.isValid(); } - + if(!staticInitError) { // Initialize the collections of resources nativeLibMap = new HashMap<String, String>(); @@ -109,20 +109,20 @@ public class TempJarCache { } return !staticInitError; } - + /** * This is <b>not recommended</b> since the JNI libraries may still be * in use by the ClassLoader they are loaded via {@link System#load(String)}. * </p> * <p> - * In JogAmp, JNI native libraries loaded and registered by {@link JNILibLoaderBase} - * derivations, where the native JARs might be loaded via {@link JNILibLoaderBase#addNativeJarLibs(Class, String) }. + * In JogAmp, JNI native libraries loaded and registered by {@link JNILibLoaderBase} + * derivations, where the native JARs might be loaded via {@link JNILibLoaderBase#addNativeJarLibs(Class, String) }. * </p> * <p> * The only valid use case to shutdown the TempJarCache is at bootstrapping, * i.e. when no native library is guaranteed to be loaded. This could be useful * if bootstrapping needs to find the proper native library type. - * </p> + * </p> * public static void shutdown() { if (isInit) { // volatile: ok @@ -141,7 +141,7 @@ public class TempJarCache { classFileJars = null; resourceFileJars.clear(); resourceFileJars = null; - + tmpFileCache.destroy(); tmpFileCache = null; } @@ -149,32 +149,32 @@ public class TempJarCache { } } } */ - + /** * @return true if this class has been properly initialized, ie. is in use, otherwise false. */ public static boolean isInitialized() { return isInit && !staticInitError; } - + /* package */ static void checkInitialized() { if(!isInit) { throw new RuntimeException("initSingleton() has to be called first."); } } - + public static TempFileCache getTempFileCache() { checkInitialized(); return tmpFileCache; } - + public synchronized static boolean checkNativeLibs(URI jarURI, LoadState exp) throws IOException { checkInitialized(); if(null == jarURI) { throw new IllegalArgumentException("jarURI is null"); } return testLoadState(nativeLibJars.get(jarURI), exp); - } + } public synchronized static boolean checkClasses(URI jarURI, LoadState exp) throws IOException { checkInitialized(); @@ -182,7 +182,7 @@ public class TempJarCache { throw new IllegalArgumentException("jarURI is null"); } return testLoadState(classFileJars.get(jarURI), exp); - } + } public synchronized static boolean checkResources(URI jarURI, LoadState exp) throws IOException { checkInitialized(); @@ -191,29 +191,29 @@ public class TempJarCache { } return testLoadState(resourceFileJars.get(jarURI), exp); } - + /** * Adds native libraries, if not yet added. - * - * @param certClass if class is certified, the JarFile entries needs to have the same certificate + * + * @param certClass if class is certified, the JarFile entries needs to have the same certificate * @param jarURI * @param nativeLibraryPath if not null, only extracts native libraries within this path. * @return true if native libraries were added or previously loaded from given jarURI, otherwise false * @throws IOException if the <code>jarURI</code> could not be loaded or a previous load attempt failed * @throws SecurityException - * @throws URISyntaxException - * @throws IllegalArgumentException + * @throws URISyntaxException + * @throws IllegalArgumentException */ - public synchronized static final boolean addNativeLibs(Class<?> certClass, URI jarURI, String nativeLibraryPath) throws IOException, SecurityException, IllegalArgumentException, URISyntaxException { + public synchronized static final boolean addNativeLibs(Class<?> certClass, URI jarURI, String nativeLibraryPath) throws IOException, SecurityException, IllegalArgumentException, URISyntaxException { final LoadState nativeLibJarsLS = nativeLibJars.get(jarURI); - if( !testLoadState(nativeLibJarsLS, LoadState.LOOKED_UP) ) { + if( !testLoadState(nativeLibJarsLS, LoadState.LOOKED_UP) ) { nativeLibJars.put(jarURI, LoadState.LOOKED_UP); final JarFile jarFile = JarUtil.getJarFile(jarURI); if(DEBUG) { System.err.println("TempJarCache: addNativeLibs: "+jarURI+": nativeJar "+jarFile.getName()+" (NEW)"); } validateCertificates(certClass, jarFile); - final int num = JarUtil.extract(tmpFileCache.getTempDir(), nativeLibMap, jarFile, nativeLibraryPath, true, false, false); + final int num = JarUtil.extract(tmpFileCache.getTempDir(), nativeLibMap, jarFile, nativeLibraryPath, true, false, false); nativeLibJars.put(jarURI, LoadState.LOADED); return num > 0; } else if( testLoadState(nativeLibJarsLS, LoadState.LOADED) ) { @@ -224,78 +224,78 @@ public class TempJarCache { } throw new IOException("TempJarCache: addNativeLibs: "+jarURI+", previous load attempt failed"); } - + /** * Adds native classes, if not yet added. - * + * * TODO class access pending * needs Classloader.defineClass(..) access, ie. own derivation - will do when needed .. - * - * @param certClass if class is certified, the JarFile entries needs to have the same certificate + * + * @param certClass if class is certified, the JarFile entries needs to have the same certificate * @param jarURI * @throws IOException if the <code>jarURI</code> could not be loaded or a previous load attempt failed * @throws SecurityException - * @throws URISyntaxException - * @throws IllegalArgumentException + * @throws URISyntaxException + * @throws IllegalArgumentException */ public synchronized static final void addClasses(Class<?> certClass, URI jarURI) throws IOException, SecurityException, IllegalArgumentException, URISyntaxException { final LoadState classFileJarsLS = classFileJars.get(jarURI); - if( !testLoadState(classFileJarsLS, LoadState.LOOKED_UP) ) { + if( !testLoadState(classFileJarsLS, LoadState.LOOKED_UP) ) { classFileJars.put(jarURI, LoadState.LOOKED_UP); final JarFile jarFile = JarUtil.getJarFile(jarURI); if(DEBUG) { System.err.println("TempJarCache: addClasses: "+jarURI+": nativeJar "+jarFile.getName()); } validateCertificates(certClass, jarFile); - JarUtil.extract(tmpFileCache.getTempDir(), null, jarFile, - null /* nativeLibraryPath */, false, true, false); + JarUtil.extract(tmpFileCache.getTempDir(), null, jarFile, + null /* nativeLibraryPath */, false, true, false); classFileJars.put(jarURI, LoadState.LOADED); } else if( !testLoadState(classFileJarsLS, LoadState.LOADED) ) { throw new IOException("TempJarCache: addClasses: "+jarURI+", previous load attempt failed"); } } - + /** * Adds native resources, if not yet added. - * - * @param certClass if class is certified, the JarFile entries needs to have the same certificate + * + * @param certClass if class is certified, the JarFile entries needs to have the same certificate * @param jarURI * @return * @throws IOException if the <code>jarURI</code> could not be loaded or a previous load attempt failed * @throws SecurityException - * @throws URISyntaxException - * @throws IllegalArgumentException + * @throws URISyntaxException + * @throws IllegalArgumentException */ - public synchronized static final void addResources(Class<?> certClass, URI jarURI) throws IOException, SecurityException, IllegalArgumentException, URISyntaxException { + public synchronized static final void addResources(Class<?> certClass, URI jarURI) throws IOException, SecurityException, IllegalArgumentException, URISyntaxException { final LoadState resourceFileJarsLS = resourceFileJars.get(jarURI); - if( !testLoadState(resourceFileJarsLS, LoadState.LOOKED_UP) ) { + if( !testLoadState(resourceFileJarsLS, LoadState.LOOKED_UP) ) { resourceFileJars.put(jarURI, LoadState.LOOKED_UP); final JarFile jarFile = JarUtil.getJarFile(jarURI); if(DEBUG) { System.err.println("TempJarCache: addResources: "+jarURI+": nativeJar "+jarFile.getName()); } validateCertificates(certClass, jarFile); - JarUtil.extract(tmpFileCache.getTempDir(), null, jarFile, - null /* nativeLibraryPath */, false, false, true); + JarUtil.extract(tmpFileCache.getTempDir(), null, jarFile, + null /* nativeLibraryPath */, false, false, true); resourceFileJars.put(jarURI, LoadState.LOADED); } else if( !testLoadState(resourceFileJarsLS, LoadState.LOADED) ) { throw new IOException("TempJarCache: addResources: "+jarURI+", previous load attempt failed"); } } - + /** * Adds all types, native libraries, class files and other files (resources) * if not yet added. - * + * * TODO class access pending * needs Classloader.defineClass(..) access, ie. own derivation - will do when needed .. - * - * @param certClass if class is certified, the JarFile entries needs to have the same certificate + * + * @param certClass if class is certified, the JarFile entries needs to have the same certificate * @param jarURI * @throws IOException if the <code>jarURI</code> could not be loaded or a previous load attempt failed * @throws SecurityException - * @throws URISyntaxException - * @throws IllegalArgumentException + * @throws URISyntaxException + * @throws IllegalArgumentException */ public synchronized static final void addAll(Class<?> certClass, URI jarURI) throws IOException, SecurityException, IllegalArgumentException, URISyntaxException { checkInitialized(); @@ -305,14 +305,14 @@ public class TempJarCache { final LoadState nativeLibJarsLS = nativeLibJars.get(jarURI); final LoadState classFileJarsLS = classFileJars.get(jarURI); final LoadState resourceFileJarsLS = resourceFileJars.get(jarURI); - if( !testLoadState(nativeLibJarsLS, LoadState.LOOKED_UP) || - !testLoadState(classFileJarsLS, LoadState.LOOKED_UP) || + if( !testLoadState(nativeLibJarsLS, LoadState.LOOKED_UP) || + !testLoadState(classFileJarsLS, LoadState.LOOKED_UP) || !testLoadState(resourceFileJarsLS, LoadState.LOOKED_UP) ) { - + final boolean extractNativeLibraries = !testLoadState(nativeLibJarsLS, LoadState.LOADED); final boolean extractClassFiles = !testLoadState(classFileJarsLS, LoadState.LOADED); final boolean extractOtherFiles = !testLoadState(resourceFileJarsLS, LoadState.LOOKED_UP); - + // mark looked-up (those who are not loaded) if(extractNativeLibraries) { nativeLibJars.put(jarURI, LoadState.LOOKED_UP); @@ -323,15 +323,15 @@ public class TempJarCache { if(extractOtherFiles) { resourceFileJars.put(jarURI, LoadState.LOOKED_UP); } - + final JarFile jarFile = JarUtil.getJarFile(jarURI); if(DEBUG) { System.err.println("TempJarCache: addAll: "+jarURI+": nativeJar "+jarFile.getName()); } validateCertificates(certClass, jarFile); - JarUtil.extract(tmpFileCache.getTempDir(), nativeLibMap, jarFile, + JarUtil.extract(tmpFileCache.getTempDir(), nativeLibMap, jarFile, null /* nativeLibraryPath */, extractNativeLibraries, extractClassFiles, extractOtherFiles); - + // mark loaded (those were just loaded) if(extractNativeLibraries) { nativeLibJars.put(jarURI, LoadState.LOADED); @@ -342,20 +342,20 @@ public class TempJarCache { if(extractOtherFiles) { resourceFileJars.put(jarURI, LoadState.LOADED); } - } else if( !testLoadState(nativeLibJarsLS, LoadState.LOADED) || - !testLoadState(classFileJarsLS, LoadState.LOADED) || + } else if( !testLoadState(nativeLibJarsLS, LoadState.LOADED) || + !testLoadState(classFileJarsLS, LoadState.LOADED) || !testLoadState(resourceFileJarsLS, LoadState.LOADED) ) { - throw new IOException("TempJarCache: addAll: "+jarURI+", previous load attempt failed"); + throw new IOException("TempJarCache: addAll: "+jarURI+", previous load attempt failed"); } } - + public synchronized static final String findLibrary(String libName) { checkInitialized(); // try with mapped library basename first String path = nativeLibMap.get(libName); if(null == path) { // if valid library name, try absolute path in temp-dir - if(null != NativeLibrary.isValidNativeLibraryName(libName, false)) { + if(null != NativeLibrary.isValidNativeLibraryName(libName, false)) { final File f = new File(tmpFileCache.getTempDir(), libName); if(f.exists()) { path = f.getAbsolutePath(); @@ -364,9 +364,9 @@ public class TempJarCache { } return path; } - + /** TODO class access pending - * needs Classloader.defineClass(..) access, ie. own derivation - will do when needed .. + * needs Classloader.defineClass(..) access, ie. own derivation - will do when needed .. public static Class<?> findClass(String name, ClassLoader cl) throws IOException, ClassFormatError { checkInitialized(); final File f = new File(nativeTmpFileCache.getTempDir(), IOUtil.getClassFileName(name)); @@ -379,7 +379,7 @@ public class TempJarCache { } return null; } */ - + public synchronized static final String findResource(String name) { checkInitialized(); final File f = new File(tmpFileCache.getTempDir(), name); @@ -388,7 +388,7 @@ public class TempJarCache { } return null; } - + public synchronized static final URI getResource(String name) throws URISyntaxException { checkInitialized(); final File f = new File(tmpFileCache.getTempDir(), name); @@ -397,7 +397,7 @@ public class TempJarCache { } return null; } - + private static void validateCertificates(Class<?> certClass, JarFile jarFile) throws IOException, SecurityException { if(null == certClass) { throw new IllegalArgumentException("certClass is null"); @@ -411,9 +411,9 @@ public class TempJarCache { JarUtil.validateCertificates(rootCerts, jarFile); if(DEBUG) { System.err.println("TempJarCache: validateCertificates: OK - Matching rootCerts in given class "+certClass.getName()+", nativeJar "+jarFile.getName()); - } + } } else if(DEBUG) { System.err.println("TempJarCache: validateCertificates: OK - No rootCerts in given class "+certClass.getName()+", nativeJar "+jarFile.getName()); } - } + } } |