summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/java/com/jogamp/common/jvm/JNILibLoaderBase.java4
-rw-r--r--src/java/com/jogamp/common/os/NativeLibrary.java2
-rw-r--r--src/java/com/jogamp/common/os/Platform.java2
-rw-r--r--src/java/com/jogamp/common/util/IOUtil.java16
-rw-r--r--src/java/com/jogamp/common/util/TaskBase.java4
-rw-r--r--src/java/com/jogamp/common/util/cache/TempFileCache.java4
-rw-r--r--src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java2
-rw-r--r--src/java/jogamp/common/os/PlatformPropsImpl.java2
-rw-r--r--src/junit/com/jogamp/common/os/TestElfReader01.java2
9 files changed, 19 insertions, 19 deletions
diff --git a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
index 201fc59..673300d 100644
--- a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
+++ b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java
@@ -232,7 +232,7 @@ public class JNILibLoaderBase {
return addNativeJarLibsImpl(classFromJavaJar, classJarURI, jarName, nativeJarBasename+"-natives-"+PlatformPropsImpl.os_and_arch+".jar", msg);
} catch (Exception e0) {
// IllegalArgumentException, IOException
- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while "+msg.toString());
+ System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while "+msg.toString());
if(DEBUG) {
e0.printStackTrace();
}
@@ -374,7 +374,7 @@ public class JNILibLoaderBase {
}
} catch (Exception e0) {
// IllegalArgumentException, IOException
- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while "+msg.toString());
+ System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while "+msg.toString());
if(DEBUG) {
e0.printStackTrace();
}
diff --git a/src/java/com/jogamp/common/os/NativeLibrary.java b/src/java/com/jogamp/common/os/NativeLibrary.java
index 794d712..b6ed7ad 100644
--- a/src/java/com/jogamp/common/os/NativeLibrary.java
+++ b/src/java/com/jogamp/common/os/NativeLibrary.java
@@ -209,7 +209,7 @@ public final class NativeLibrary implements DynamicLookupHelper {
return new NativeLibrary(res, path, global);
} else if( DEBUG ) {
if( null != t ) {
- System.err.println("NativeLibrary.open: Catched "+t.getClass().getSimpleName()+": "+t.getMessage());
+ System.err.println("NativeLibrary.open: Caught "+t.getClass().getSimpleName()+": "+t.getMessage());
}
String errstr;
try {
diff --git a/src/java/com/jogamp/common/os/Platform.java b/src/java/com/jogamp/common/os/Platform.java
index e410e81..518c772 100644
--- a/src/java/com/jogamp/common/os/Platform.java
+++ b/src/java/com/jogamp/common/os/Platform.java
@@ -203,7 +203,7 @@ public class Platform extends PlatformPropsImpl {
JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { Platform.class }, null, null );
} catch (Exception e0) {
// IllegalArgumentException, IOException
- System.err.println("Catched "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)");
+ System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)");
}
}
DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
diff --git a/src/java/com/jogamp/common/util/IOUtil.java b/src/java/com/jogamp/common/util/IOUtil.java
index fe482d9..c70fa92 100644
--- a/src/java/com/jogamp/common/util/IOUtil.java
+++ b/src/java/com/jogamp/common/util/IOUtil.java
@@ -558,7 +558,7 @@ public class IOUtil {
f = new File( decodeFromURI( specificURI.getPath() ) ); // validates uri, uses decoded uri.getPath() and normalizes it
} catch(Exception iae) {
if( DEBUG ) {
- System.err.println("Catched "+iae.getClass().getSimpleName()+": new File("+decodeFromURI( specificURI.getPath() )+") failed: "+iae.getMessage());
+ System.err.println("Caught "+iae.getClass().getSimpleName()+": new File("+decodeFromURI( specificURI.getPath() )+") failed: "+iae.getMessage());
iae.printStackTrace();
}
f = null;
@@ -585,7 +585,7 @@ public class IOUtil {
System.err.println("IOUtil.toURL.1b: fUri "+fUri+PlatformPropsImpl.NEWLINE+
"\t, fUrl "+fUrl);
} catch (Exception ee) {
- System.err.println("Catched "+ee.getClass().getSimpleName()+": f.toURI().toURL() failed: "+ee.getMessage());
+ System.err.println("Caught "+ee.getClass().getSimpleName()+": f.toURI().toURL() failed: "+ee.getMessage());
ee.printStackTrace();
}
}
@@ -614,7 +614,7 @@ public class IOUtil {
}
} catch (Exception mue) {
if( DEBUG ) {
- System.err.println("Catched "+mue.getClass().getSimpleName()+": new URL("+urlS+") failed: "+mue.getMessage());
+ System.err.println("Caught "+mue.getClass().getSimpleName()+": new URL("+urlS+") failed: "+mue.getMessage());
mue.printStackTrace();
}
}
@@ -626,7 +626,7 @@ public class IOUtil {
mode = 3;
} catch (Exception e) {
if( DEBUG ) {
- System.err.println("Catched "+e.getClass().getSimpleName()+": "+uri+".toURL() failed: "+e.getMessage());
+ System.err.println("Caught "+e.getClass().getSimpleName()+": "+uri+".toURL() failed: "+e.getMessage());
e.printStackTrace();
}
}
@@ -750,7 +750,7 @@ public class IOUtil {
return AssetURLContext.createURL(resourcePath, cl).openConnection();
} catch (IOException ioe) {
if(DEBUG) {
- System.err.println("IOUtil: Catched Exception:");
+ System.err.println("IOUtil: Caught Exception:");
ioe.printStackTrace();
}
return null;
@@ -760,7 +760,7 @@ public class IOUtil {
return AssetURLContext.resolve(resourcePath, cl);
} catch (IOException ioe) {
if(DEBUG) {
- System.err.println("IOUtil: Catched Exception:");
+ System.err.println("IOUtil: Caught Exception:");
ioe.printStackTrace();
}
}
@@ -1164,7 +1164,7 @@ public class IOUtil {
} catch (Throwable t) {
res = -2;
if(DEBUG) {
- System.err.println("IOUtil.testDirExec: <"+exetst.getAbsolutePath()+">: Catched "+t.getClass().getSimpleName()+": "+t.getMessage());
+ System.err.println("IOUtil.testDirExec: <"+exetst.getAbsolutePath()+">: Caught "+t.getClass().getSimpleName()+": "+t.getMessage());
// t.printStackTrace();
}
}
@@ -1425,7 +1425,7 @@ public class IOUtil {
if(throwRuntimeException) {
throw new RuntimeException(e);
} else if(DEBUG) {
- System.err.println("Catched Exception: ");
+ System.err.println("Caught Exception: ");
e.printStackTrace();
}
}
diff --git a/src/java/com/jogamp/common/util/TaskBase.java b/src/java/com/jogamp/common/util/TaskBase.java
index f305bb1..db437f8 100644
--- a/src/java/com/jogamp/common/util/TaskBase.java
+++ b/src/java/com/jogamp/common/util/TaskBase.java
@@ -68,7 +68,7 @@ public abstract class TaskBase implements Runnable {
}
protected final String getExceptionOutIntro() {
- return catchExceptions ? "A catched" : "An uncatched";
+ return catchExceptions ? "A caught" : "An uncaught";
}
protected final void printSourceTrace() {
if( null != sourceStack && null != exceptionOut ) {
@@ -151,7 +151,7 @@ public abstract class TaskBase implements Runnable {
public final boolean hasWaiter() { return null != syncObject; }
/**
- * @return A thrown exception while execution of the user action, if any and if catched
+ * @return A thrown exception while execution of the user action, if any and if caught
* @see #RunnableTask(Runnable, Object, boolean)
*/
public final Throwable getThrowable() { return runnableException; }
diff --git a/src/java/com/jogamp/common/util/cache/TempFileCache.java b/src/java/com/jogamp/common/util/cache/TempFileCache.java
index 3fd0a59..e1b1aab 100644
--- a/src/java/com/jogamp/common/util/cache/TempFileCache.java
+++ b/src/java/com/jogamp/common/util/cache/TempFileCache.java
@@ -80,7 +80,7 @@ public class TempFileCache {
_tmpBaseDir = new File(IOUtil.getTempDir(true /* executable */), tmpDirPrefix);
_tmpBaseDir = IOUtil.testDir(_tmpBaseDir, true /* create */, false /* executable */); // executable already checked
} catch (Exception ex) {
- System.err.println("Warning: Catched Exception while retrieving executable temp base directory:");
+ System.err.println("Warning: Caught Exception while retrieving executable temp base directory:");
ex.printStackTrace();
staticInitError = true;
}
@@ -95,7 +95,7 @@ public class TempFileCache {
try {
initTmpRoot();
} catch (Exception ex) {
- System.err.println("Warning: Catched Exception due to initializing TmpRoot:");
+ System.err.println("Warning: Caught Exception due to initializing TmpRoot:");
ex.printStackTrace();
staticInitError = true;
}
diff --git a/src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java b/src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java
index 7b24967..0e5ef85 100644
--- a/src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java
+++ b/src/java/com/jogamp/gluegen/structgen/CStructAnnotationProcessor.java
@@ -131,7 +131,7 @@ public class CStructAnnotationProcessor extends AbstractProcessor {
if( f.exists() ) {
return f;
}
- } catch (IOException e) { if(DEBUG) { System.err.println("Catched "+e.getClass().getSimpleName()+": "+e.getMessage()); /* e.printStackTrace(); */ } }
+ } catch (IOException e) { if(DEBUG) { System.err.println("Caught "+e.getClass().getSimpleName()+": "+e.getMessage()); /* e.printStackTrace(); */ } }
return null;
}
diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java
index 0965185..1b9128d 100644
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -410,7 +410,7 @@ public abstract class PlatformPropsImpl {
res = eh;
} catch(Throwable t) {
if(DEBUG) {
- System.err.println("Catched: "+t.getMessage());
+ System.err.println("Caught: "+t.getMessage());
t.printStackTrace();
}
} finally {
diff --git a/src/junit/com/jogamp/common/os/TestElfReader01.java b/src/junit/com/jogamp/common/os/TestElfReader01.java
index b058a0f..9e0c939 100644
--- a/src/junit/com/jogamp/common/os/TestElfReader01.java
+++ b/src/junit/com/jogamp/common/os/TestElfReader01.java
@@ -77,7 +77,7 @@ public class TestElfReader01 extends JunitTracer {
try {
eh = ElfHeader.read(in);
} catch (Exception e) {
- System.err.println("Probably not an ELF file - or not in current format: (catched) "+e.getMessage());
+ System.err.println("Probably not an ELF file - or not in current format: (caught) "+e.getMessage());
e.printStackTrace();
return;
}