diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java index a5ef71c750..c65cd6135a 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java @@ -33,7 +33,7 @@ public final class AboutFragment extends Fragment { View rootView = inflater.inflate(R.layout.gamelist_listview, container, false); mMainList = (ListView) rootView.findViewById(R.id.gamelist); - + String yes = getString(R.string.yes); String no = getString(R.string.no); @@ -46,7 +46,7 @@ public final class AboutFragment extends Fragment return mMainList; } - + @Override public void onAttach(Activity activity) { diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java index b7bf23afe3..a4b24391fb 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java @@ -128,10 +128,10 @@ public final class DolphinEmulator extends Activity CopyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin"); CopyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin"); CopyAsset("font_sjis.bin", GCDir + File.separator + "font_sjis.bin"); - CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt"); - CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt"); - CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt"); - CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt"); + CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt"); + CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt"); + CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt"); + CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt"); } // Load the configuration keys set in the Dolphin ini and gfx ini files @@ -188,10 +188,9 @@ public final class DolphinEmulator extends Activity // Special catch for the back key // Currently disabled because stopping and starting emulation is broken. /* - if ( event.getSource() == InputDevice.SOURCE_KEYBOARD - && event.getKeyCode() == KeyEvent.KEYCODE_BACK - && event.getAction() == KeyEvent.ACTION_UP - ) + if (event.getSource() == InputDevice.SOURCE_KEYBOARD + && event.getKeyCode() == KeyEvent.KEYCODE_BACK + && event.getAction() == KeyEvent.ACTION_UP) { if (Running) NativeLibrary.StopEmulation(); @@ -232,7 +231,7 @@ public final class DolphinEmulator extends Activity InputDevice input = event.getDevice(); List motions = input.getMotionRanges(); - + for (InputDevice.MotionRange range : motions) { NativeLibrary.onGamePadMoveEvent(InputConfigFragment.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis())); diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java index eb0d27dcca..e081c061fe 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java @@ -101,8 +101,8 @@ public final class FolderBrowserItem implements Comparable public int compareTo(FolderBrowserItem other) { - if(this.name != null) - return this.name.toLowerCase().compareTo(other.getName().toLowerCase()); + if(name != null) + return name.toLowerCase().compareTo(other.getName().toLowerCase()); else throw new IllegalArgumentException(); } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java index 503d32ae66..86deafdeb6 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java @@ -45,8 +45,6 @@ public final class GameListActivity extends Activity private DrawerLayout mDrawerLayout; private SideMenuAdapter mDrawerAdapter; private ListView mDrawerList; - - /** * Called from the {@link GameListFragment}. diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java index 5e5b71da67..a84b901bdd 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java @@ -51,10 +51,10 @@ public final class GameListItem implements Comparable { // Open the no banner icon. InputStream noBannerPath = ctx.getAssets().open("NoBanner.png"); - + // Decode the bitmap. image = BitmapFactory.decodeStream(noBannerPath); - + // Scale the bitmap to match other banners. image = Bitmap.createScaledBitmap(image, 96, 32, false); } @@ -114,8 +114,8 @@ public final class GameListItem implements Comparable public int compareTo(GameListItem o) { - if (this.name != null) - return this.name.toLowerCase().compareTo(o.getName().toLowerCase()); + if (name != null) + return name.toLowerCase().compareTo(o.getName().toLowerCase()); else throw new IllegalArgumentException(); } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java index e93cbce384..eb81e53fc3 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java @@ -47,8 +47,8 @@ public final class CPUSettingsFragment extends PreferenceFragment } else { - cpuCores.setEntries(R.array.emuCoreEntriesOther); - cpuCores.setEntryValues(R.array.emuCoreValuesOther); + cpuCores.setEntries(R.array.emuCoreEntriesOther); + cpuCores.setEntryValues(R.array.emuCoreValuesOther); } } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java index cbdb78567c..132db39ce0 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java @@ -91,7 +91,7 @@ public final class InputConfigFragment extends PreferenceFragment pref.setSummary(binding); } } - + @Override public boolean onPreferenceTreeClick(final PreferenceScreen screen, final Preference pref) { @@ -204,7 +204,6 @@ public final class InputConfigFragment extends PreferenceFragment m_activity = activity; } - /** * {@link AlertDialog} class derivative that allows the motion listener * to be set anonymously, so the creation of an explicit class for @@ -258,7 +257,7 @@ public final class InputConfigFragment extends PreferenceFragment { if (motionListener.onMotion(event)) return true; - + return super.dispatchGenericMotionEvent(event); } } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java index a3393ef211..334e1058a6 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java @@ -50,7 +50,7 @@ public final class SideMenuItem implements Comparable public int compareTo(SideMenuItem o) { if (name != null) - return this.name.toLowerCase().compareTo(o.getName().toLowerCase()); + return name.toLowerCase().compareTo(o.getName().toLowerCase()); else throw new IllegalArgumentException(); }