Changes from Group 1 - Case Study 2 & 3

common.gradle

@@ -206,7 +206,7 @@ tasks.withType(Sign) {
 }
 
 checkstyle {
-    toolVersion '9.3'
+    toolVersion '10.20.1'
     configFile file("${gradle.rootProject.rootDir}/config/checkstyle/checkstyle.xml")
 }
 

jme3-android-examples/src/main/AndroidManifest.xml

@@ -42,7 +42,7 @@
             android:normalScreens="true"
             android:smallScreens="true"/>
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.VIBRATE"/>

jme3-android/src/main/java/com/jme3/asset/plugins/AndroidLocator.java

@@ -99,46 +99,44 @@ public class AndroidAssetInfo extends AssetInfo {
             this.resourceId = resourceId;
         }
 
+        private android.content.res.Resources getAndroidResources() {
+            return JmeAndroidSystem.getView().getContext().getResources();
+        }
+
+        private InputStream getResourceAsStream(String assetPath, int resourceId) throws AssetLoadException {
+            android.content.res.Resources androidResources = getAndroidResources();
+            try {
+                if (resourceId == 0) {
+                    return androidResources.getAssets().open(assetPath);
+                } else {
+                    return androidResources.openRawResource(resourceId);
+                }
+            } catch (IOException | Resources.NotFoundException ex) {
+                throw new AssetLoadException("Failed to open asset " + assetPath, ex);
+            }
+        }
+
         @Override
         public InputStream openStream() {
-            if (in != null){
-                // Reuse the already existing stream (only once)
+            if (in != null) {
                 InputStream in2 = in;
                 in = null;
                 return in2;
-            }else{
-                // Create a new stream for subsequent invocations.
-                android.content.res.Resources androidResources = JmeAndroidSystem.getView().getContext().getResources();
-                if (resourceId == 0) {
-                    try {
-                        return androidResources.getAssets().open(assetPath);
-                    } catch (IOException ex) {
-                        throw new AssetLoadException(AssetOpenError + assetPath, ex);
-                    }
-                } else {
-                    try {
-                        return androidResources.openRawResource(resourceId);
-                    } catch (Resources.NotFoundException ex) {
-                        throw new AssetLoadException(AssetOpenError + assetPath, ex);
-                    }
-                }
+            } else {
+                return getResourceAsStream(assetPath, resourceId);
             }
         }
 
         public AssetFileDescriptor openFileDescriptor() {
-            android.content.res.Resources androidResources = JmeAndroidSystem.getView().getContext().getResources();
-            if (resourceId == 0) {
-                try {
+            android.content.res.Resources androidResources = getAndroidResources();
+            try {
+                if (resourceId == 0) {
                     return androidResources.getAssets().openFd(assetPath);
-                } catch (IOException ex) {
-                    throw new AssetLoadException(AssetOpenError + assetPath, ex);
-                }
-            } else {
-                try {
+                } else {
                     return androidResources.openRawResourceFd(resourceId);
-                } catch (Resources.NotFoundException ex) {
-                    throw new AssetLoadException(AssetOpenError + assetPath, ex);
                 }
+            } catch (IOException | Resources.NotFoundException ex) {
+                throw new AssetLoadException("Failed to open asset " + assetPath, ex);
             }
         }
     }

jme3-android/src/main/java/com/jme3/input/android/AndroidGestureProcessor.java

@@ -84,13 +84,15 @@ public boolean onSingleTapUp(MotionEvent event) {
 
     @Override
     public void onShowPress(MotionEvent event) {
-        float jmeX = touchInput.getJmeX(event.getX());
-        float jmeY = touchInput.invertY(touchInput.getJmeY(event.getY()));
-        prepareTouchEvent(TouchEvent.Type.SHOWPRESS, event, jmeX, jmeY);
+        pressEventHandler(event, TouchEvent.Type.SHOWPRESS);
     }
 
     @Override
     public void onLongPress(MotionEvent event) {
+        pressEventHandler(event, TouchEvent.Type.LONGPRESSED);
+    }
+
+    private void pressEventHandler(MotionEvent event, TouchEvent.Type eventType) {
         float jmeX = touchInput.getJmeX(event.getX());
         float jmeY = touchInput.invertY(touchInput.getJmeY(event.getY()));
         prepareTouchEvent(TouchEvent.Type.LONGPRESSED, event, jmeX, jmeY);

jme3-android/src/main/java/com/jme3/input/android/AndroidJoystickJoyInput14.java

@@ -252,7 +252,11 @@ public boolean onKey(KeyEvent event) {
 
         return consumed;
     }
-
+    private void logRemap(String original, String logicalId) {
+        if (logger.isLoggable(Level.FINE) && !Objects.equals(logicalId, original)) {
+            logger.log(Level.FINE, "Remapped: {0} to: {1}", new Object[]{original, logicalId});
+        }
+    }
     protected class AndroidJoystick extends AbstractJoystick {
 
         private JoystickAxis nullAxis;
@@ -335,13 +339,8 @@ protected JoystickButton addButton( int keyCode ) {
                 original = JoystickButton.BUTTON_11;
             }
 
-//            String logicalId = JoystickCompatibilityMappings.remapButton( getName(), original );
-//            if (logger.isLoggable(Level.FINE) && !Objects.equals(logicalId, original)) {
-//                logger.log(Level.FINE, "Remapped: {0} to: {1}",
-//                        new Object[]{original, logicalId});
-//            }
-            String logicalId = JoystickCompatibilityMappings.remapButton(getName(), original);
-            logRemappingIfNeeded(original, logicalId, logger);
+            String logicalId = JoystickCompatibilityMappings.remapButton( getName(), original );
+            logRemap(original, logicalId);
 
             JoystickButton button = new DefaultJoystickButton( getInputManager(), this, getButtonCount(),
                     name, logicalId );
@@ -350,6 +349,7 @@ protected JoystickButton addButton( int keyCode ) {
             return button;
         }
 
+
         protected JoystickAxis addAxis(MotionRange motionRange) {
 
             String name = MotionEvent.axisToString(motionRange.getAxis());
@@ -368,10 +368,8 @@ protected JoystickAxis addAxis(MotionRange motionRange) {
             } else if (motionRange.getAxis() == MotionEvent.AXIS_HAT_Y) {
                 original = JoystickAxis.POV_Y;
             }
-
-            String logicalId = JoystickCompatibilityMappings.remapAxis(getName(), original);
-            logRemappingIfNeeded(original, logicalId, logger);
-
+            String logicalId = JoystickCompatibilityMappings.remapAxis( getName(), original );
+            logRemap(original, logicalId);
             JoystickAxis axis = new DefaultJoystickAxis(getInputManager(),
                     this,
                     getAxisCount(),

jme3-android/src/main/java/com/jme3/renderer/android/RendererUtil.java

@@ -157,6 +157,6 @@ public static void checkGLError() {
         if (!ENABLE_ERROR_CHECKING) {
             return;
         }
-        checkAndThrowGLError();
+        checkGLErrorForced();
     }
 }

jme3-android/src/main/java/com/jme3/system/android/AndroidConfigChooser.java

@@ -164,18 +164,12 @@ private EGLConfig[] getConfigs(EGL10 egl, EGLDisplay display) {
         {
             // Get back to openGL ES 2
             configSpec[1]=EGL_OPENGL_ES2_BIT;
-            if (!egl.eglChooseConfig(display, configSpec, null, 0, num_config)) {
-                RendererUtil.checkEGLError(egl);
-                throw new AssertionError();
-            }
+            checkEGL(egl.eglChooseConfig(display, configSpec, null, 0, num_config), egl);
         }
 
         int numConfigs = num_config[0];
         EGLConfig[] configs = new EGLConfig[numConfigs];
-        if (!egl.eglChooseConfig(display, configSpec, configs, numConfigs, num_config)) {
-            RendererUtil.checkEGLError(egl);
-            throw new AssertionError();
-        }
+        checkEGL(egl.eglChooseConfig(display, configSpec, configs, numConfigs, num_config), egl);
 
         logger.fine("--------------Display Configurations---------------");
         for (EGLConfig eGLConfig : configs) {
@@ -186,6 +180,13 @@ private EGLConfig[] getConfigs(EGL10 egl, EGLDisplay display) {
         return configs;
     }
 
+    private static void checkEGL(boolean isEGL, EGL10 egl10) {
+        if (!isEGL) {
+            RendererUtil.checkEGLError(egl10);
+            throw new AssertionError();
+        }
+    }
+
     private EGLConfig chooseConfig(
             EGL10 egl, EGLDisplay display, EGLConfig[] configs, Config requestedConfig,
             boolean higherRGB, boolean higherAlpha,

jme3-desktop/src/main/java/com/jme3/app/AppletHarness.java

@@ -47,6 +47,7 @@
 import java.util.HashMap;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
+import java.util.logging.*;
 
 /**
  * @author Kirill Vainer
@@ -71,6 +72,7 @@ public static Applet getApplet(Application app){
     @SuppressWarnings("unchecked")
     private void createCanvas(){
         AppSettings settings = new AppSettings(true);
+        Logger logger = Logger.getLogger(this.getClass().getName());
 
         // load app cfg
         if (appCfg != null){
@@ -80,14 +82,16 @@ private void createCanvas(){
                 settings.load(in);
                 in.close();
             } catch (IOException ex){
+                // Log the exception securely
+                logger.log(Level.SEVERE, "Error loading applet configuration", ex);
+
                 // Called before application has been created ....
                 // Display error message through AWT
                 JOptionPane.showMessageDialog(this, "An error has occurred while "
                                                   + "loading applet configuration"
                                                   + ex.getMessage(),
                                               "jME3 Applet",
                                               JOptionPane.ERROR_MESSAGE);
-                ex.printStackTrace();
             } finally {
                 if (in != null)
                     try {