aboutsummaryrefslogtreecommitdiffstats
path: root/coreAPI/src/java/net
diff options
context:
space:
mode:
authorendolf <[email protected]>2006-05-14 09:14:52 +0000
committerendolf <[email protected]>2006-05-14 09:14:52 +0000
commit0815136a5f054f0da0343d46e85982a60bfa0b18 (patch)
tree82a0410e1a8323130c295bcbc28ce4adf7717cf0 /coreAPI/src/java/net
parent986c6106aa165d4168f6b8e1216eceb5353fce14 (diff)
Merge revision 12 of oddlabs svn repo.
Mac OS X: build.xml fix Windows: Fixed crash when Raw plugin fails to load Mac OS X: Tweak native libraries so only one library, libjinput-osx.jnilib contains both gcc 3 ppc code and gcc 4 i386 code. That way, we'll cover all releases and architectures with one native library instead of two git-svn-id: file:///home/sven/projects/JOGL/git-svn/svn-server-sync/jinput/trunk@140 e343933a-64c8-49c5-92b1-88f2ce3e89e8
Diffstat (limited to 'coreAPI/src/java/net')
-rw-r--r--coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java b/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java
index 39db61a..da1305e 100644
--- a/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java
+++ b/coreAPI/src/java/net/java/games/input/DefaultControllerEnvironment.java
@@ -144,11 +144,7 @@ class DefaultControllerEnvironment extends ControllerEnvironment {
ControllerEnvironment ce = (ControllerEnvironment) ceClass.newInstance();
addControllers(ce.getControllers());
}
- } catch (InstantiationException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (ClassNotFoundException e) {
+ } catch (Throwable e) {
e.printStackTrace();
}
}