Mercurial > hg > ccmieditor
diff java/src/uk/ac/qmul/eecs/ccmi/haptics/OmniHaptics.java @ 6:1c5af356bb99
added 64 bit native narrator
allow hapitic native dll to load only on 32 bit JVM
refactored DiagramEditorApp for better inheritance
fixed Java 7 bug: NullPointerException when typing
minor bug fixes
added splashscreen
| author | Fiore Martin <fiore@eecs.qmul.ac.uk> |
|---|---|
| date | Mon, 17 Dec 2012 18:39:40 +0000 |
| parents | d66dd5880081 |
| children |
line wrap: on
line diff
--- a/java/src/uk/ac/qmul/eecs/ccmi/haptics/OmniHaptics.java Tue Jul 10 22:39:37 2012 +0100 +++ b/java/src/uk/ac/qmul/eecs/ccmi/haptics/OmniHaptics.java Mon Dec 17 18:39:40 2012 +0000 @@ -45,6 +45,10 @@ if(listener == null) throw new IllegalArgumentException("listener cannot be null"); + if(OsDetector.has64BitJVM()){ + return null;// no 64 native library supported yet + } + if(OsDetector.isWindows()){ /* try to load .dll. First copy it in the home/ccmi_editor_data/lib directory */ URL url = OmniHaptics.class.getResource("OmniHaptics.dll");