make/gluegen-cpptasks-base.xml | 8 +- make/jogamp-env.xml | 8 +- .../resources/android/AndroidManifest-Launcher.xml | 2 +- make/resources/android/AndroidManifest-Runtime.xml | 2 +- make/resources/android/AndroidManifest-Test.xml | 2 +- make/scripts/java-win32.bat | 4 +- make/scripts/java-win64.bat | 9 +- make/scripts/make.gluegen.all.win32.bat | 4 +- make/scripts/make.gluegen.all.win64.bat | 4 +- make/scripts/runtest-x64.bat | 8 +- make/scripts/runtest.sh | 9 +- src/java/com/jogamp/common/GlueGenVersion.java | 10 +- .../com/jogamp/common/JogampRuntimeException.java | 10 +- .../com/jogamp/common/jvm/JNILibLoaderBase.java | 99 ++-- .../com/jogamp/common/net/AssetURLConnection.java | 42 +- .../com/jogamp/common/net/AssetURLContext.java | 60 +-- .../jogamp/common/net/AssetURLStreamHandler.java | 16 +- .../common/net/GenericURLStreamHandlerFactory.java | 13 +- .../jogamp/common/net/PiggybackURLConnection.java | 26 +- .../com/jogamp/common/net/PiggybackURLContext.java | 10 +- src/java/com/jogamp/common/net/asset/Handler.java | 12 +- src/java/com/jogamp/common/nio/AbstractBuffer.java | 33 +- src/java/com/jogamp/common/nio/Buffers.java | 180 ++++---- .../com/jogamp/common/nio/CachedBufferFactory.java | 54 +-- src/java/com/jogamp/common/nio/NativeBuffer.java | 16 +- src/java/com/jogamp/common/nio/PointerBuffer.java | 49 +- src/java/com/jogamp/common/nio/StructAccessor.java | 50 +- src/java/com/jogamp/common/os/AndroidVersion.java | 28 +- .../com/jogamp/common/os/DynamicLibraryBundle.java | 59 +-- .../jogamp/common/os/DynamicLibraryBundleInfo.java | 40 +- src/java/com/jogamp/common/os/DynamicLinker.java | 36 +- .../com/jogamp/common/os/DynamicLookupHelper.java | 20 +- .../com/jogamp/common/os/MachineDescription.java | 83 ++-- src/java/com/jogamp/common/os/NativeLibrary.java | 63 +-- src/java/com/jogamp/common/os/Platform.java | 149 +++--- src/java/com/jogamp/common/util/ArrayHashSet.java | 55 ++- src/java/com/jogamp/common/util/FloatStack.java | 61 +-- src/java/com/jogamp/common/util/Function.java | 12 +- src/java/com/jogamp/common/util/FunctionTask.java | 28 +- src/java/com/jogamp/common/util/HashUtil.java | 20 +- src/java/com/jogamp/common/util/IOUtil.java | 476 ++++++++++++-------- src/java/com/jogamp/common/util/IntBitfield.java | 42 +- src/java/com/jogamp/common/util/IntIntHashMap.java | 92 ++-- src/java/com/jogamp/common/util/JarUtil.java | 183 ++++---- src/java/com/jogamp/common/util/JogampVersion.java | 18 +- src/java/com/jogamp/common/util/LFRingbuffer.java | 102 +++-- .../com/jogamp/common/util/PrimitiveStack.java | 28 +- .../com/jogamp/common/util/PropertyAccess.java | 47 +- .../com/jogamp/common/util/ReflectionUtil.java | 54 +-- src/java/com/jogamp/common/util/Ringbuffer.java | 59 +-- .../com/jogamp/common/util/RunnableExecutor.java | 22 +- src/java/com/jogamp/common/util/RunnableTask.java | 30 +- src/java/com/jogamp/common/util/SecurityUtil.java | 46 +- .../com/jogamp/common/util/SyncedRingbuffer.java | 94 ++-- src/java/com/jogamp/common/util/TaskBase.java | 50 +- src/java/com/jogamp/common/util/ValueConv.java | 36 +- src/java/com/jogamp/common/util/VersionNumber.java | 76 ++-- .../jogamp/common/util/VersionNumberString.java | 20 +- src/java/com/jogamp/common/util/VersionUtil.java | 18 +- .../com/jogamp/common/util/awt/AWTEDTExecutor.java | 20 +- .../jogamp/common/util/cache/TempFileCache.java | 57 +-- .../com/jogamp/common/util/cache/TempJarCache.java | 144 +++--- src/java/com/jogamp/common/util/locks/Lock.java | 6 +- .../com/jogamp/common/util/locks/LockFactory.java | 14 +- .../jogamp/common/util/locks/RecursiveLock.java | 2 +- .../util/locks/RecursiveThreadGroupLock.java | 66 +-- .../common/util/locks/SingletonInstance.java | 20 +- .../com/jogamp/common/util/locks/ThreadLock.java | 14 +- src/java/com/jogamp/gluegen/ArrayTypes.java | 14 +- .../com/jogamp/gluegen/CMethodBindingEmitter.java | 136 +++--- src/java/com/jogamp/gluegen/CodeGenUtils.java | 14 +- src/java/com/jogamp/gluegen/CommentEmitter.java | 16 +- .../com/jogamp/gluegen/ConstantDefinition.java | 22 +- src/java/com/jogamp/gluegen/DebugEmitter.java | 35 +- src/java/com/jogamp/gluegen/FunctionEmitter.java | 38 +- src/java/com/jogamp/gluegen/GlueEmitter.java | 16 +- .../com/jogamp/gluegen/GlueEmitterControls.java | 14 +- src/java/com/jogamp/gluegen/GlueGen.java | 27 +- src/java/com/jogamp/gluegen/JavaConfiguration.java | 62 +-- src/java/com/jogamp/gluegen/JavaEmitter.java | 69 ++- .../jogamp/gluegen/JavaMethodBindingEmitter.java | 8 +- src/java/com/jogamp/gluegen/JavaType.java | 36 +- src/java/com/jogamp/gluegen/Logging.java | 14 +- src/java/com/jogamp/gluegen/ReferencedStructs.java | 17 +- src/java/com/jogamp/gluegen/SymbolFilter.java | 12 +- src/java/com/jogamp/gluegen/TypeInfo.java | 14 +- src/java/com/jogamp/gluegen/ant/GlueGenTask.java | 1 + .../com/jogamp/gluegen/cgram/CSymbolTable.java | 13 +- src/java/com/jogamp/gluegen/cgram/CToken.java | 13 +- src/java/com/jogamp/gluegen/cgram/Define.java | 14 +- src/java/com/jogamp/gluegen/cgram/LineObject.java | 31 +- .../gluegen/cgram/PreprocessorInfoChannel.java | 5 +- src/java/com/jogamp/gluegen/cgram/TNode.java | 111 ++--- .../com/jogamp/gluegen/cgram/TNodeFactory.java | 9 +- .../com/jogamp/gluegen/cgram/types/ArrayType.java | 17 +- .../com/jogamp/gluegen/cgram/types/BitType.java | 16 +- .../jogamp/gluegen/cgram/types/CVAttributes.java | 14 +- .../jogamp/gluegen/cgram/types/CompoundType.java | 21 +- .../gluegen/cgram/types/CompoundTypeKind.java | 12 +- .../com/jogamp/gluegen/cgram/types/DoubleType.java | 15 +- .../com/jogamp/gluegen/cgram/types/EnumType.java | 15 +- src/java/com/jogamp/gluegen/cgram/types/Field.java | 14 +- .../com/jogamp/gluegen/cgram/types/FloatType.java | 15 +- .../jogamp/gluegen/cgram/types/FunctionSymbol.java | 20 +- .../jogamp/gluegen/cgram/types/FunctionType.java | 16 +- .../com/jogamp/gluegen/cgram/types/IntType.java | 15 +- .../gluegen/cgram/types/MemoryLayoutType.java | 12 +- .../jogamp/gluegen/cgram/types/PointerType.java | 15 +- .../jogamp/gluegen/cgram/types/PrimitiveType.java | 14 +- .../com/jogamp/gluegen/cgram/types/SizeThunk.java | 67 ++- .../jogamp/gluegen/cgram/types/StructLayout.java | 20 +- .../com/jogamp/gluegen/cgram/types/StructType.java | 17 +- src/java/com/jogamp/gluegen/cgram/types/Type.java | 1 + .../jogamp/gluegen/cgram/types/TypeDictionary.java | 18 +- .../jogamp/gluegen/cgram/types/TypeVisitor.java | 14 +- .../com/jogamp/gluegen/cgram/types/UnionType.java | 19 +- .../com/jogamp/gluegen/cgram/types/VoidType.java | 15 +- src/java/com/jogamp/gluegen/jgram/Test.java | 6 +- .../jogamp/gluegen/pcpp/ConcatenatingReader.java | 14 +- .../ProcAddressCMethodBindingEmitter.java | 16 +- .../procaddress/ProcAddressConfiguration.java | 18 +- .../gluegen/procaddress/ProcAddressEmitter.java | 30 +- .../ProcAddressJavaMethodBindingEmitter.java | 16 +- .../gluegen/runtime/FunctionAddressResolver.java | 10 +- .../jogamp/gluegen/runtime/ProcAddressTable.java | 39 +- .../structgen/CStructAnnotationProcessor.java | 22 +- src/java/jogamp/common/Debug.java | 17 +- src/java/jogamp/common/jvm/JVMUtil.java | 14 +- src/java/jogamp/common/os/AndroidUtils.java | 28 +- .../jogamp/common/os/BionicDynamicLinkerImpl.java | 8 +- src/java/jogamp/common/os/DynamicLinkerImpl.java | 15 +- .../jogamp/common/os/MacOSXDynamicLinkerImpl.java | 6 +- .../common/os/MachineDescriptionRuntime.java | 46 +- src/java/jogamp/common/os/PlatformPropsImpl.java | 106 ++--- .../jogamp/common/os/PosixDynamicLinkerImpl.java | 4 +- .../jogamp/common/os/UnixDynamicLinkerImpl.java | 12 +- .../jogamp/common/os/WindowsDynamicLinkerImpl.java | 8 +- src/java/jogamp/common/os/elf/ElfHeader.java | 149 +++--- src/java/jogamp/common/os/elf/IOUtils.java | 54 +-- src/java/jogamp/common/os/elf/Section.java | 7 +- .../jogamp/common/os/elf/SectionArmAttributes.java | 103 +++-- src/java/jogamp/common/os/elf/SectionHeader.java | 33 +- .../jogamp/common/util/locks/LockDebugUtil.java | 4 +- .../locks/RecursiveLockImpl01CompleteFair.java | 54 +-- .../util/locks/RecursiveLockImpl01Unfairish.java | 54 +-- .../common/util/locks/RecursiveLockImplJava5.java | 6 +- .../RecursiveThreadGroupLockImpl01Unfairish.java | 66 +-- .../util/locks/SingletonInstanceFileLock.java | 14 +- .../util/locks/SingletonInstanceServerSocket.java | 76 ++-- .../net/highteq/nativetaglet/NativeTaglet.java | 10 + .../com/jogamp/common/net/TestURIQueryProps.java | 50 ++ .../common/net/TestUrisWithAssetHandler.java | 50 ++ src/junit/com/jogamp/common/net/URIDumpUtil.java | 49 ++ .../com/jogamp/common/net/URLCompositionTest.java | 241 ---------- .../jogamp/common/util/TestIOUtilURICompose.java | 92 ++++ .../jogamp/common/util/TestIOUtilURIHandling.java | 150 ++++++ 156 files changed, 3278 insertions(+), 2812 deletions(-) create mode 100644 src/junit/com/jogamp/common/net/TestURIQueryProps.java create mode 100644 src/junit/com/jogamp/common/net/TestUrisWithAssetHandler.java create mode 100644 src/junit/com/jogamp/common/net/URIDumpUtil.java delete mode 100644 src/junit/com/jogamp/common/net/URLCompositionTest.java create mode 100644 src/junit/com/jogamp/common/util/TestIOUtilURICompose.java create mode 100644 src/junit/com/jogamp/common/util/TestIOUtilURIHandling.java