diff options
author | Sven Gothel <[email protected]> | 2014-07-03 16:27:25 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-07-03 16:27:25 +0200 |
commit | 0430708fbcbdc5572affb45318eb782adffd13f1 (patch) | |
tree | 61ac401ea90e07ae0a7ac639da1e6a240f1b87cd /src/java/com/jogamp/openal/eax | |
parent | 21cd5206625aaa8914e53bdfaab8e7ae4e497a08 (diff) |
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
Diffstat (limited to 'src/java/com/jogamp/openal/eax')
-rw-r--r-- | src/java/com/jogamp/openal/eax/EAX.java | 30 | ||||
-rw-r--r-- | src/java/com/jogamp/openal/eax/EAXConstants.java | 38 | ||||
-rw-r--r-- | src/java/com/jogamp/openal/eax/EAXFactory.java | 4 |
3 files changed, 36 insertions, 36 deletions
diff --git a/src/java/com/jogamp/openal/eax/EAX.java b/src/java/com/jogamp/openal/eax/EAX.java index 45bdfe3..b64e04c 100644 --- a/src/java/com/jogamp/openal/eax/EAX.java +++ b/src/java/com/jogamp/openal/eax/EAX.java @@ -39,10 +39,10 @@ import java.nio.Buffer; * */ public class EAX implements EAXConstants { - + public static final int SOURCE = 0; public static final int LISTENER = 1; - + private final int sourceGUID; private final int listenerGUID; @@ -50,7 +50,7 @@ public class EAX implements EAXConstants { * @param sourceGUID * @param listenerGUID */ - EAX(int sourceGUID, int listenerGUID) { + EAX(final int sourceGUID, final int listenerGUID) { this.sourceGUID = sourceGUID; this.listenerGUID = listenerGUID; } @@ -60,9 +60,9 @@ public class EAX implements EAXConstants { * <br> * <b>Interface to C Language function:</b> * <pre>ALenum EAXSet(const struct _GUID *propertySetID, ALuint property, ALuint source, ALvoid *value, ALuint size)</pre> - * + * * @param objectFlag a flag indicating a LISTENER or a SOURCE - * @param pname the property being set + * @param pname the property being set * @param source the ID of the source, or 0 for Listener properties * @param value a direct Buffer to hold the value retrieved * @param size the size of the Buffer @@ -74,9 +74,9 @@ public class EAX implements EAXConstants { * <br> * <b>Interface to C Language function:</b> * <pre>ALenum EAXGet(const struct _GUID *propertySetID, ALuint property, ALuint source, ALvoid *value, ALuint size)</pre> - * + * * @param objectFlag a flag indicating a LISTENER or a SOURCE - * @param pname the property being queried + * @param pname the property being queried * @param source the ID of the source, or 0 for Listener properties * @param value a direct Buffer to hold the value retrieved * @param size the size of the Buffer @@ -84,40 +84,40 @@ public class EAX implements EAXConstants { public native void EAXGet(int objectFlag, int pname, int source, Buffer value, int size); /** - * This method sets a source property. + * This method sets a source property. * @param sourceID the ID of the source whose property is being set. * @param pname the name of the property being set * @param value a direct Buffer containing the value to be set */ - public void setSourceProperty(int sourceID, int pname, Buffer value) { + public void setSourceProperty(final int sourceID, final int pname, final Buffer value) { EAXSet(sourceGUID, pname, sourceID, value, value.capacity()); } /** - * This method retrieves a source property. + * This method retrieves a source property. * @param sourceID the ID of the source whose property is being retrieved. * @param pname the name of the property being retrieved * @param value a direct Buffer to hold the value to be retrieved */ - public void getSourceProperty(int pname, int sourceID, Buffer value) { + public void getSourceProperty(final int pname, final int sourceID, final Buffer value) { EAXGet(sourceGUID, pname, sourceID, value, value.capacity()); } /** - * This method sets a Listener property. + * This method sets a Listener property. * @param pname the name of the property being set * @param value a direct Buffer containing the value to be set */ - public void setListenerProperty(int pname, Buffer value) { + public void setListenerProperty(final int pname, final Buffer value) { EAXSet(listenerGUID, pname, 0, value, value.capacity()); } /** - * This method retrieves a Listener property. + * This method retrieves a Listener property. * @param pname the name of the property being retrieved * @param value a direct Buffer to hold the value to be retrieved */ - public void getListenerProperty(int pname, Buffer value) { + public void getListenerProperty(final int pname, final Buffer value) { EAXGet(listenerGUID, pname, 0, value, value.capacity()); } } diff --git a/src/java/com/jogamp/openal/eax/EAXConstants.java b/src/java/com/jogamp/openal/eax/EAXConstants.java index 106932d..fae7bd2 100644 --- a/src/java/com/jogamp/openal/eax/EAXConstants.java +++ b/src/java/com/jogamp/openal/eax/EAXConstants.java @@ -4,17 +4,17 @@ * 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, +* -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, +* -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 +* 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 PARTICULAR PURPOSE OR @@ -56,15 +56,15 @@ public interface EAXConstants { public final static int DSPROPERTY_EAXLISTENER_ENVIRONMENTDIFFUSION = 13; public final static int DSPROPERTY_EAXLISTENER_AIRABSORPTIONHF = 14; public final static int DSPROPERTY_EAXLISTENER_FLAGS = 15; - -// OR these flags with property id // + +// OR these flags with property id // /** changes take effect immediately */ public static final int DSPROPERTY_EAXLISTENER_IMMEDIATE = 0x00000000; /** changes take effect later */ public static final int DSPROPERTY_EAXLISTENER_DEFERRED = 0x80000000; - public static final int DSPROPERTY_EAXLISTENER_COMMITDEFERREDSETTINGS = + public static final int DSPROPERTY_EAXLISTENER_COMMITDEFERREDSETTINGS = DSPROPERTY_EAXLISTENER_NONE | DSPROPERTY_EAXLISTENER_IMMEDIATE; @@ -125,15 +125,15 @@ public interface EAXConstants { // These flags determine what properties are affected by environment size. /** reverberation decay time */ - public final static int EAXLISTENERFLAGS_DECAYTIMESCALE = 0x00000001; + public final static int EAXLISTENERFLAGS_DECAYTIMESCALE = 0x00000001; /** reflection level */ public final static int EAXLISTENERFLAGS_REFLECTIONSSCALE = 0x00000002; /** initial reflection delay time */ - public final static int EAXLISTENERFLAGS_REFLECTIONSDELAYSCALE = 0x00000004; + public final static int EAXLISTENERFLAGS_REFLECTIONSDELAYSCALE = 0x00000004; /** reflections level */ - public final static int EAXLISTENERFLAGS_REVERBSCALE = 0x00000008; + public final static int EAXLISTENERFLAGS_REVERBSCALE = 0x00000008; /** late reverberation delay time */ - public final static int EAXLISTENERFLAGS_REVERBDELAYSCALE = 0x00000010; + public final static int EAXLISTENERFLAGS_REVERBDELAYSCALE = 0x00000010; /** This flag limits high-frequency decay time according to air absorption.*/ public final static int EAXLISTENERFLAGS_DECAYHFLIMIT = 0x00000020; @@ -194,9 +194,9 @@ public interface EAXConstants { public final static float EAXLISTENER_MAXAIRABSORPTIONHF = 0.0f; public final static float EAXLISTENER_DEFAULTAIRABSORPTIONHF = -5.0f; - public final static int EAXLISTENER_DEFAULTFLAGS = - EAXLISTENERFLAGS_DECAYTIMESCALE | - EAXLISTENERFLAGS_REFLECTIONSSCALE | + public final static int EAXLISTENER_DEFAULTFLAGS = + EAXLISTENERFLAGS_DECAYTIMESCALE | + EAXLISTENERFLAGS_REFLECTIONSSCALE | EAXLISTENERFLAGS_REFLECTIONSDELAYSCALE | EAXLISTENERFLAGS_REVERBSCALE | EAXLISTENERFLAGS_REVERBDELAYSCALE | @@ -221,9 +221,9 @@ public interface EAXConstants { // OR these flags with property id /** changes take effect immediately */ public final static int DSPROPERTY_EAXBUFFER_IMMEDIATE = 0x00000000; - /** changes take effect later */ + /** changes take effect later */ public final static int DSPROPERTY_EAXBUFFER_DEFERRED = 0x80000000; - public final static int DSPROPERTY_EAXBUFFER_COMMITDEFERREDSETTINGS = + public final static int DSPROPERTY_EAXBUFFER_COMMITDEFERREDSETTINGS = DSPROPERTY_EAXBUFFER_NONE | DSPROPERTY_EAXBUFFER_IMMEDIATE; @@ -239,7 +239,7 @@ public interface EAXConstants { // myFlags = 0x00000003; // /** affects DSPROPERTY_EAXBUFFER_DIRECTHF */ - public final static int EAXBUFFERFLAGS_DIRECTHFAUTO = 0x00000001; + public final static int EAXBUFFERFLAGS_DIRECTHFAUTO = 0x00000001; /** affects DSPROPERTY_EAXBUFFER_ROOM */ public final static int EAXBUFFERFLAGS_ROOMAUTO = 0x00000002; /** affects DSPROPERTY_EAXBUFFER_ROOMHF */ @@ -297,7 +297,7 @@ public interface EAXConstants { public final static float EAXBUFFER_MAXAIRABSORPTIONFACTOR = 10.0f; public final static float EAXBUFFER_DEFAULTAIRABSORPTIONFACTOR = 1.0f; - public final static int EAXBUFFER_DEFAULTFLAGS = + public final static int EAXBUFFER_DEFAULTFLAGS = EAXBUFFERFLAGS_DIRECTHFAUTO | EAXBUFFERFLAGS_ROOMAUTO | EAXBUFFERFLAGS_ROOMHFAUTO; diff --git a/src/java/com/jogamp/openal/eax/EAXFactory.java b/src/java/com/jogamp/openal/eax/EAXFactory.java index 01d336c..fb81739 100644 --- a/src/java/com/jogamp/openal/eax/EAXFactory.java +++ b/src/java/com/jogamp/openal/eax/EAXFactory.java @@ -46,7 +46,7 @@ public final class EAXFactory { ALFactory.getAL(); DEBUG = ALFactory.DEBUG; } - + private static EAX eax = null; private static boolean eaxTried = false; @@ -62,7 +62,7 @@ public final class EAXFactory { System.err.println("EAX initialized"); } } - } catch (UnsatisfiedLinkError e) { + } catch (final UnsatisfiedLinkError e) { if(DEBUG) { e.printStackTrace(); } |