From 7fa20cb1be1b8ce722805acdd6ec6baad7793ec1 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Wed, 23 Aug 2017 22:45:06 +0200 Subject: [PATCH] Remove trailing spaces from Android files Android Studio wants to correct these automatically when editing files. --- .../dolphinemu/dolphinemu/NativeLibrary.java | 20 ++++----- .../dolphinemu/overlay/InputOverlay.java | 18 ++++---- .../overlay/InputOverlayDrawableButton.java | 2 +- .../dolphinemu/utils/EGLHelper.java | 42 +++++++++---------- .../app/src/main/res/values/strings.xml | 2 +- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java index de821f105c..614a1076f6 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -206,7 +206,7 @@ public final class NativeLibrary /** * Handles button press events for a gamepad. - * + * * @param Device The input descriptor of the gamepad. * @param Button Key code identifying which button was pressed. * @param Action Mask identifying which action is happening (button pressed down, or button released). @@ -217,7 +217,7 @@ public final class NativeLibrary /** * Handles gamepad movement events. - * + * * @param Device The device ID of the gamepad. * @param Axis The axis ID * @param Value The value of the axis represented by the given ID. @@ -226,19 +226,19 @@ public final class NativeLibrary /** * Gets a value from a key in the given ini-based config file. - * + * * @param configFile The ini-based config file to get the value from. * @param Section The section key that the actual key is in. * @param Key The key to get the value from. * @param Default The value to return in the event the given key doesn't exist. - * + * * @return the value stored at the key, or a default value if it doesn't exist. */ public static native String GetConfig(String configFile, String Section, String Key, String Default); /** * Sets a value to a key in the given ini config file. - * + * * @param configFile The ini-based config file to add the value to. * @param Section The section key for the ini key * @param Key The actual ini key to set. @@ -248,18 +248,18 @@ public final class NativeLibrary /** * Gets the embedded banner within the given ISO/ROM. - * + * * @param filename the file path to the ISO/ROM. - * + * * @return an integer array containing the color data for the banner. */ public static native int[] GetBanner(String filename); /** * Gets the embedded title of the given ISO/ROM. - * + * * @param filename The file path to the ISO/ROM. - * + * * @return the embedded title of the ISO/ROM. */ public static native String GetTitle(String filename); @@ -276,7 +276,7 @@ public final class NativeLibrary /** * Gets the Dolphin version string. - * + * * @return the Dolphin version string. */ public static native String GetVersionString(); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java index bc5dd33558..1957ff7f67 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java @@ -50,11 +50,11 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener /** * Resizes a {@link Bitmap} by a given scale factor - * + * * @param context The current {@link Context} * @param bitmap The {@link Bitmap} to scale. * @param scale The scale factor for the bitmap. - * + * * @return The scaled {@link Bitmap} */ public static Bitmap resizeBitmap(Context context, Bitmap bitmap, float scale) @@ -72,7 +72,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener /** * Constructor - * + * * @param context The current {@link Context}. * @param attrs {@link AttributeSet} for parsing XML attributes. */ @@ -589,7 +589,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener /** * Initializes an InputOverlayDrawableButton, given by resId, with all of the - * parameters set for it to be properly shown on the InputOverlay. + * parameters set for it to be properly shown on the InputOverlay. *

* This works due to the way the X and Y coordinates are stored within * the {@link SharedPreferences}. @@ -610,12 +610,12 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener * Technically no modifications should need to be performed on the returned * InputOverlayDrawableButton. Simply add it to the HashSet of overlay items and wait * for Android to call the onDraw method. - * + * * @param context The current {@link Context}. * @param defaultResId The resource ID of the {@link Drawable} to get the {@link Bitmap} of (Default State). * @param pressedResId The resource ID of the {@link Drawable} to get the {@link Bitmap} of (Pressed State). * @param buttonId Identifier for determining what type of button the initialized InputOverlayDrawableButton represents. - * + * * @return An {@link InputOverlayDrawableButton} with the correct drawing bounds set. * */ @@ -773,14 +773,14 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener } /** - * Initializes an {@link InputOverlayDrawableJoystick} - * + * Initializes an {@link InputOverlayDrawableJoystick} + * * @param context The current {@link Context} * @param resOuter Resource ID for the outer image of the joystick (the static image that shows the circular bounds). * @param defaultResInner Resource ID for the default inner image of the joystick (the one you actually move around). * @param pressedResInner Resource ID for the pressed inner image of the joystick. * @param joystick Identifier for which joystick this is. - * + * * @return the initialized {@link InputOverlayDrawableJoystick}. */ private static InputOverlayDrawableJoystick initializeOverlayJoystick(Context context, int resOuter, int defaultResInner, int pressedResInner, int joystick) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java index 249634df88..9e0fdcb5e5 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java @@ -50,7 +50,7 @@ public final class InputOverlayDrawableButton /** * Gets this InputOverlayDrawableButton's button ID. - * + * * @return this InputOverlayDrawableButton's button ID. */ public int getId() diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java index 30b6b9c9cf..583119f0ea 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java @@ -19,7 +19,7 @@ import javax.microedition.khronos.opengles.GL10; /** * Utility class that abstracts all the stuff about - * EGL initialization out of the way if all that is + * EGL initialization out of the way if all that is * wanted is to query the underlying GL API for information. */ public final class EGLHelper @@ -52,7 +52,7 @@ public final class EGLHelper * Initializes the underlying {@link EGLSurface} with a width and height of 1. * This is useful if all you need to use this class for is to query information * from specific API contexts. - * + * * @param renderableType Bitmask indicating which types of client API contexts * the framebuffer config must support. */ @@ -63,9 +63,9 @@ public final class EGLHelper /** * Constructor - * + * * @param width Width of the underlying {@link EGLSurface}. - * @param height Height of the underlying {@link EGLSurface}. + * @param height Height of the underlying {@link EGLSurface}. * @param renderableType Bitmask indicating which types of client API contexts * the framebuffer config must support. */ @@ -101,7 +101,7 @@ public final class EGLHelper /** * Releases all resources associated with this helper. *

- * This should be called whenever this helper is no longer needed. + * This should be called whenever this helper is no longer needed. */ public void closeHelper() { @@ -115,7 +115,7 @@ public final class EGLHelper * Index 1: Version
* Index 2: Renderer
* Index 3: Extensions
- * + * * @return information retrieved through EGL. */ public String[] getEGLInfo() @@ -130,7 +130,7 @@ public final class EGLHelper /** * Whether or not this device supports OpenGL. - * + * * @return true if this device supports OpenGL; false otherwise. */ public boolean supportsOpenGL() @@ -142,7 +142,7 @@ public final class EGLHelper * Whether or not this device supports OpenGL ES 2. *
* Note that if this returns true, then OpenGL ES 1 is also supported. - * + * * @return true if this device supports OpenGL ES 2; false otherwise. */ public boolean supportsGLES2() @@ -154,7 +154,7 @@ public final class EGLHelper * Whether or not this device supports OpenGL ES 3. *
* Note that if this returns true, then OpenGL ES 1 and 2 are also supported. - * + * * @return true if this device supports OpenGL ES 3; false otherwise. */ public boolean supportsGLES3() @@ -164,7 +164,7 @@ public final class EGLHelper /** * Gets the underlying {@link EGL10} instance. - * + * * @return the underlying {@link EGL10} instance. */ public EGL10 getEGL() @@ -174,7 +174,7 @@ public final class EGLHelper /** * Gets the underlying {@link GL10} instance. - * + * * @return the underlying {@link GL10} instance. */ public GL10 getGL() @@ -184,7 +184,7 @@ public final class EGLHelper /** * Gets the underlying {@link EGLDisplay}. - * + * * @return the underlying {@link EGLDisplay} */ public EGLDisplay getDisplay() @@ -194,7 +194,7 @@ public final class EGLHelper /** * Gets all supported framebuffer configurations for this device. - * + * * @return all supported framebuffer configurations for this device. */ public EGLConfig[] getConfigs() @@ -204,7 +204,7 @@ public final class EGLHelper /** * Gets the underlying {@link EGLContext}. - * + * * @return the underlying {@link EGLContext}. */ public EGLContext getContext() @@ -214,7 +214,7 @@ public final class EGLHelper /** * Gets the underlying {@link EGLSurface}. - * + * * @return the underlying {@link EGLSurface}. */ public EGLSurface getSurface() @@ -319,9 +319,9 @@ public final class EGLHelper *

  • GL_RENDERER - Name of the renderer
    • *
  • GL_SHADING_LANGUAGE_VERSION - Version or release number of the shading language
    • * - * + * * @param glEnum A symbolic constant within {@link GL10}. - * + * * @return the string information represented by {@code glEnum}. */ public String glGetString(int glEnum) @@ -340,10 +340,10 @@ public final class EGLHelper *
  • GL_SHADING_LANGUAGE_VERSION - Version or release number of the shading language
    • *
  • GL_EXTENSIONS - Extension string supported by the implementation at {@code index}.
    • * - * + * * @param glEnum A symbolic GL constant * @param index The index of the string to return. - * + * * @return the string information represented by {@code glEnum} and {@code index}. */ public String glGetStringi(int glEnum, int index) @@ -376,9 +376,9 @@ public final class EGLHelper /** * Simplified call to {@link GL10#glGetIntegerv(int, int[], int) - * + * * @param glEnum A symbolic GL constant. - * + * * @return the integer information represented by {@code glEnum}. */ public int glGetInteger(int glEnum) diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 0996b2515d..12832570e0 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -230,7 +230,7 @@ Adjust Scale Choose Controller You may have to reload the game after changing extensions. - + Enable Vibration Enable the vibration function for this GameCube controller.