From df9ff7f340a5ab4e07efc613f5f264eeae63d4c7 Mon Sep 17 00:00:00 2001
From: Sven Gothel
Date: Thu, 3 Jul 2014 16:06:47 +0200
Subject: Code Clean-Up based on our Recommended Settings (jogamp-scripting
c47bc86ae2ee268a1f38c5580d11f93d7f8d6e74)
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/com/jogamp/common/os/AndroidVersion.java | 24 +++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
(limited to 'src/java/com/jogamp/common/os/AndroidVersion.java')
diff --git a/src/java/com/jogamp/common/os/AndroidVersion.java b/src/java/com/jogamp/common/os/AndroidVersion.java
index edf2229..adfb1ef 100644
--- a/src/java/com/jogamp/common/os/AndroidVersion.java
+++ b/src/java/com/jogamp/common/os/AndroidVersion.java
@@ -82,7 +82,7 @@ public class AndroidVersion {
*
*
*/
- private static final CPUType getCPUTypeImpl(String cpuABI) {
+ private static final CPUType getCPUTypeImpl(final String cpuABI) {
if( null == cpuABI ) {
return null;
} else if( cpuABI.equals("armeabi-v7a") ) {
@@ -98,7 +98,7 @@ public class AndroidVersion {
return null;
}
}
- private static final ABIType getABITypeImpl(final CPUType cpuType, String cpuABI) {
+ private static final ABIType getABITypeImpl(final CPUType cpuType, final String cpuABI) {
if( null == cpuType || null == cpuABI ) {
return null;
} else if( CPUFamily.ARM != cpuType.family ) {
@@ -122,7 +122,7 @@ public class AndroidVersion {
abvObject = abvClass.newInstance();
abvcClass = ReflectionUtil.getClass(androidBuildVersionCodes, true, cl);
abvcObject = abvcClass.newInstance();
- } catch (Exception e) { /* n/a */ }
+ } catch (final Exception e) { /* n/a */ }
isAvailable = null != abObject && null != abvObject && null != abvcObject;
if(isAvailable) {
CPU_ABI = getString(abClass, abObject, "CPU_ABI", true);
@@ -149,38 +149,38 @@ public class AndroidVersion {
ABI_TYPE2 = getABITypeImpl(CPU_TYPE2, CPU_ABI2);
}
- private static final IntObjectHashMap getVersionCodes(Class> cls, Object obj) {
+ private static final IntObjectHashMap getVersionCodes(final Class> cls, final Object obj) {
final Field[] fields = cls.getFields();
- IntObjectHashMap map = new IntObjectHashMap( 3 * fields.length / 2, 0.75f );
+ final IntObjectHashMap map = new IntObjectHashMap( 3 * fields.length / 2, 0.75f );
for(int i=0; i cls, Object obj, String name, boolean lowerCase) {
+ private static final String getString(final Class> cls, final Object obj, final String name, final boolean lowerCase) {
try {
- Field f = cls.getField(name);
+ final Field f = cls.getField(name);
final String s = (String) f.get(obj);
if( lowerCase && null != s ) {
return s.toLowerCase();
} else {
return s;
}
- } catch (Exception e) { e.printStackTrace(); /* n/a */ }
+ } catch (final Exception e) { e.printStackTrace(); /* n/a */ }
return null;
}
- private static final int getInt(Class> cls, Object obj, String name) {
+ private static final int getInt(final Class> cls, final Object obj, final String name) {
try {
- Field f = cls.getField(name);
+ final Field f = cls.getField(name);
return f.getInt(obj);
- } catch (Exception e) { e.printStackTrace(); /* n/a */ }
+ } catch (final Exception e) { e.printStackTrace(); /* n/a */ }
return -1;
}
--
cgit v1.2.3