piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Some minor formatting styling.

Browse Source 
Remove unnecessary this statements.
This commit is contained in:
Lioncash
2013-08-28 20:31:37 -04:00
parent ea671d639c
commit c5a886100c
8 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
View File

@ -33,7 +33,7 @@ public final class AboutFragment extends Fragment
{ {
View rootView = inflater.inflate(R.layout.gamelist_listview, container, false); View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
mMainList = (ListView) rootView.findViewById(R.id.gamelist); mMainList = (ListView) rootView.findViewById(R.id.gamelist);
String yes = getString(R.string.yes); String yes = getString(R.string.yes);
String no = getString(R.string.no); String no = getString(R.string.no);
@ -46,7 +46,7 @@ public final class AboutFragment extends Fragment
return mMainList; return mMainList;
} }
@Override @Override
public void onAttach(Activity activity) public void onAttach(Activity activity)
{ {

17
Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
View File

@ -128,10 +128,10 @@ public final class DolphinEmulator<MainActivity> extends Activity
CopyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin"); CopyAsset("dsp_rom.bin", GCDir + File.separator + "dsp_rom.bin");
CopyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin"); CopyAsset("font_ansi.bin", GCDir + File.separator + "font_ansi.bin");
CopyAsset("font_sjis.bin", GCDir + File.separator + "font_sjis.bin"); CopyAsset("font_sjis.bin", GCDir + File.separator + "font_sjis.bin");
CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt"); CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt");
CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt"); CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt");
CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt"); CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt");
CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt"); CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt");
} }
// Load the configuration keys set in the Dolphin ini and gfx ini files // Load the configuration keys set in the Dolphin ini and gfx ini files
@ -188,10 +188,9 @@ public final class DolphinEmulator<MainActivity> extends Activity
// Special catch for the back key // Special catch for the back key
// Currently disabled because stopping and starting emulation is broken. // Currently disabled because stopping and starting emulation is broken.
/* /*
if ( event.getSource() == InputDevice.SOURCE_KEYBOARD if (event.getSource() == InputDevice.SOURCE_KEYBOARD
&& event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getKeyCode() == KeyEvent.KEYCODE_BACK
&& event.getAction() == KeyEvent.ACTION_UP && event.getAction() == KeyEvent.ACTION_UP)
)
{ {
if (Running) if (Running)
NativeLibrary.StopEmulation(); NativeLibrary.StopEmulation();
@ -232,7 +231,7 @@ public final class DolphinEmulator<MainActivity> extends Activity
InputDevice input = event.getDevice(); InputDevice input = event.getDevice();
List<InputDevice.MotionRange> motions = input.getMotionRanges(); List<InputDevice.MotionRange> motions = input.getMotionRanges();
for (InputDevice.MotionRange range : motions) for (InputDevice.MotionRange range : motions)
{ {
NativeLibrary.onGamePadMoveEvent(InputConfigFragment.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis())); NativeLibrary.onGamePadMoveEvent(InputConfigFragment.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis()));

4
Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowserItem.java
View File

@ -101,8 +101,8 @@ public final class FolderBrowserItem implements Comparable<FolderBrowserItem>
public int compareTo(FolderBrowserItem other) public int compareTo(FolderBrowserItem other)
{ {
if(this.name != null) if(name != null)
return this.name.toLowerCase().compareTo(other.getName().toLowerCase()); return name.toLowerCase().compareTo(other.getName().toLowerCase());
else else
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }

2
Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
View File

@ -45,8 +45,6 @@ public final class GameListActivity extends Activity
private DrawerLayout mDrawerLayout; private DrawerLayout mDrawerLayout;
private SideMenuAdapter mDrawerAdapter; private SideMenuAdapter mDrawerAdapter;
private ListView mDrawerList; private ListView mDrawerList;
/** /**
* Called from the {@link GameListFragment}. * Called from the {@link GameListFragment}.

8
Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListItem.java
View File

@ -51,10 +51,10 @@ public final class GameListItem implements Comparable<GameListItem>
{ {
// Open the no banner icon. // Open the no banner icon.
InputStream noBannerPath = ctx.getAssets().open("NoBanner.png"); InputStream noBannerPath = ctx.getAssets().open("NoBanner.png");
// Decode the bitmap. // Decode the bitmap.
image = BitmapFactory.decodeStream(noBannerPath); image = BitmapFactory.decodeStream(noBannerPath);
// Scale the bitmap to match other banners. // Scale the bitmap to match other banners.
image = Bitmap.createScaledBitmap(image, 96, 32, false); image = Bitmap.createScaledBitmap(image, 96, 32, false);
} }
@ -114,8 +114,8 @@ public final class GameListItem implements Comparable<GameListItem>
public int compareTo(GameListItem o) public int compareTo(GameListItem o)
{ {
if (this.name != null) if (name != null)
return this.name.toLowerCase().compareTo(o.getName().toLowerCase()); return name.toLowerCase().compareTo(o.getName().toLowerCase());
else else
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }

4
Source/Android/src/org/dolphinemu/dolphinemu/settings/CPUSettingsFragment.java
View File

@ -47,8 +47,8 @@ public final class CPUSettingsFragment extends PreferenceFragment
} }
else else
{ {
cpuCores.setEntries(R.array.emuCoreEntriesOther); cpuCores.setEntries(R.array.emuCoreEntriesOther);
cpuCores.setEntryValues(R.array.emuCoreValuesOther); cpuCores.setEntryValues(R.array.emuCoreValuesOther);
} }
} }

5
Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java
View File

@ -91,7 +91,7 @@ public final class InputConfigFragment extends PreferenceFragment
pref.setSummary(binding); pref.setSummary(binding);
} }
} }
@Override @Override
public boolean onPreferenceTreeClick(final PreferenceScreen screen, final Preference pref) public boolean onPreferenceTreeClick(final PreferenceScreen screen, final Preference pref)
{ {
@ -204,7 +204,6 @@ public final class InputConfigFragment extends PreferenceFragment
m_activity = activity; m_activity = activity;
} }
/** /**
* {@link AlertDialog} class derivative that allows the motion listener * {@link AlertDialog} class derivative that allows the motion listener
* to be set anonymously, so the creation of an explicit class for * 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)) if (motionListener.onMotion(event))
return true; return true;
return super.dispatchGenericMotionEvent(event); return super.dispatchGenericMotionEvent(event);
} }
} }

2
Source/Android/src/org/dolphinemu/dolphinemu/sidemenu/SideMenuItem.java
View File

@ -50,7 +50,7 @@ public final class SideMenuItem implements Comparable<SideMenuItem>
public int compareTo(SideMenuItem o) public int compareTo(SideMenuItem o)
{ {
if (name != null) if (name != null)
return this.name.toLowerCase().compareTo(o.getName().toLowerCase()); return name.toLowerCase().compareTo(o.getName().toLowerCase());
else else
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }