From 0430708fbcbdc5572affb45318eb782adffd13f1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 3 Jul 2014 16:27:25 +0200 Subject: Code Clean-Up based on our Recommended Settings (jogamp-scripting c47bc86ae2ee268a1f38c5580d11f93d7f8d6e74) - Change non static accesses to static members using declaring type - Change indirect accesses to static members to direct accesses (accesses through subtypes) - Add final modifier to private fields - Add final modifier to method parameters - Add final modifier to local variables - Remove unnecessary casts - Remove unnecessary '$NON-NLS$' tags - Remove trailing white spaces on all lines --- src/java/jogamp/openal/ALCImpl.java | 22 +++++++++++----------- .../jogamp/openal/ALDynamicLibraryBundleInfo.java | 8 ++++---- src/java/jogamp/openal/Debug.java | 22 +++++++++++----------- 3 files changed, 26 insertions(+), 26 deletions(-) (limited to 'src/java/jogamp') diff --git a/src/java/jogamp/openal/ALCImpl.java b/src/java/jogamp/openal/ALCImpl.java index c5a9b7b..99494ca 100644 --- a/src/java/jogamp/openal/ALCImpl.java +++ b/src/java/jogamp/openal/ALCImpl.java @@ -16,26 +16,26 @@ import java.util.ArrayList; */ public class ALCImpl extends ALCAbstractImpl { - public String alcGetString(ALCdevice device, int param) { + public String alcGetString(final ALCdevice device, final int param) { if (device == null && param == ALC_DEVICE_SPECIFIER) { throw new ALException("Call alcGetDeviceSpecifiers to fetch all available device names"); } - ByteBuffer buf = alcGetStringImpl(device, param); + final ByteBuffer buf = alcGetStringImpl(device, param); if (buf == null) { return null; } - byte[] res = new byte[buf.capacity()]; + final byte[] res = new byte[buf.capacity()]; buf.get(res); try { return new String(res, "US-ASCII"); - } catch (UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new ALException(e); } } /** Entry point (through function pointer) to C language function:
const ALCchar * alcGetString(ALCdevice * device, ALCenum param); */ - public ByteBuffer alcGetStringImpl(ALCdevice device, int param) { + public ByteBuffer alcGetStringImpl(final ALCdevice device, final int param) { final long __addr_ = getALCProcAddressTable()._addressof_alcGetString; if (__addr_ == 0) { @@ -67,18 +67,18 @@ public class ALCImpl extends ALCAbstractImpl { return getDoubleNullTerminatedString(ALC_CAPTURE_DEVICE_SPECIFIER); } - private String[] getDoubleNullTerminatedString(int which) { - ByteBuffer buf = alcGetStringImpl(null, which); + private String[] getDoubleNullTerminatedString(final int which) { + final ByteBuffer buf = alcGetStringImpl(null, which); if (buf == null) { return null; } - byte[] bytes = new byte[buf.capacity()]; + final byte[] bytes = new byte[buf.capacity()]; buf.get(bytes); try { - ArrayList/**/ res = new ArrayList/**/(); + final ArrayList/**/ res = new ArrayList/**/(); int i = 0; while (i < bytes.length) { - int startIndex = i; + final int startIndex = i; while ((i < bytes.length) && (bytes[i] != 0)) { i++; } @@ -86,7 +86,7 @@ public class ALCImpl extends ALCAbstractImpl { i++; } return (String[]) res.toArray(new String[res.size()]); - } catch (UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new ALException(e); } } diff --git a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java index 0859be1..ca86ed1 100644 --- a/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java +++ b/src/java/jogamp/openal/ALDynamicLibraryBundleInfo.java @@ -87,7 +87,7 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf @Override public final List> getToolLibNames() { - List> libNamesList = new ArrayList>(); + final List> libNamesList = new ArrayList>(); final List alSystemLibNames = new ArrayList(); { @@ -137,18 +137,18 @@ public final class ALDynamicLibraryBundleInfo implements DynamicLibraryBundleInf @Override public final List getToolGetProcAddressFuncNameList() { - List res = new ArrayList(); + final List res = new ArrayList(); res.add("alGetProcAddress"); return res; } @Override - public final long toolGetProcAddress(long toolGetProcAddressHandle, String funcName) { + public final long toolGetProcAddress(final long toolGetProcAddressHandle, final String funcName) { return ALImpl.alGetProcAddress(toolGetProcAddressHandle, funcName); } @Override - public final boolean useToolGetProcAdressFirst(String funcName) { + public final boolean useToolGetProcAdressFirst(final String funcName) { return true; } diff --git a/src/java/jogamp/openal/Debug.java b/src/java/jogamp/openal/Debug.java index 4cc209e..61dcb9d 100644 --- a/src/java/jogamp/openal/Debug.java +++ b/src/java/jogamp/openal/Debug.java @@ -1,22 +1,22 @@ /* * Copyright (c) 2003-2005 Sun Microsystems, Inc. All Rights Reserved. * Copyright (c) 2012 JogAmp Community. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: - * + * * - Redistribution of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * + * * - Redistribution in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * + * * Neither the name of Sun Microsystems, Inc. or the names of * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. - * + * * This software is provided "AS IS," without a warranty of any kind. ALL * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A @@ -29,11 +29,11 @@ * DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, * ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF * SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * + * * You acknowledge that this software is not designed or intended for use * in the design, construction, operation or maintenance of any nuclear * facility. - * + * * Sun gratefully acknowledges that this software was originally authored * and developed by Kenneth Bradley Russell and Christopher John Kline. */ @@ -52,14 +52,14 @@ public class Debug extends PropertyAccess { // Some common properties private static boolean verbose; private static boolean debugAll; - + static { AccessController.doPrivileged(new PrivilegedAction() { public Object run() { PropertyAccess.addTrustedPrefix("joal."); return null; } } ); - + verbose = isPropertyDefined("joal.verbose", true); debugAll = isPropertyDefined("joal.debug", true); } @@ -67,7 +67,7 @@ public class Debug extends PropertyAccess { /** Ensures static init block has been issues, i.e. if calling through to {@link PropertyAccess#isPropertyDefined(String, boolean)}. */ public static final void initSingleton() {} - + public static final boolean verbose() { return verbose; } @@ -76,7 +76,7 @@ public class Debug extends PropertyAccess { return debugAll; } - public static final boolean debug(String subcomponent) { + public static final boolean debug(final String subcomponent) { return debugAll() || isPropertyDefined("joal.debug." + subcomponent, true); } } -- cgit v1.2.3