From 9149b302377f77d282cebdd8a5546472b3e3c584 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 17 Aug 2013 10:55:13 -0400 Subject: [PATCH] [Android] Shorten FolderBrowserItem's method 'isValidItem()' into 'isValid()' makes more sense and less redundancy in terms of 'item.isValidItem()' -> 'item.isValid()' --- .../src/org/dolphinemu/dolphinemu/FolderBrowser.java | 8 ++++---- .../org/dolphinemu/dolphinemu/FolderBrowserAdapter.java | 2 +- .../src/org/dolphinemu/dolphinemu/FolderBrowserItem.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java index 46cf586f83..93502a81a3 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java @@ -95,15 +95,15 @@ public final class FolderBrowser extends Fragment { public void onItemClick(AdapterView parent, View view, int position, long id) { - FolderBrowserItem o = adapter.getItem(position); - if(o.isDirectory() || o.getSubtitle().equalsIgnoreCase(getString(R.string.parent_directory))) + FolderBrowserItem item = adapter.getItem(position); + if(item.isDirectory() || item.getSubtitle().equalsIgnoreCase(getString(R.string.parent_directory))) { - currentDir = new File(o.getPath()); + currentDir = new File(item.getPath()); Fill(currentDir); } else { - if (o.isValidItem()) + if (item.isValid()) FolderSelected(); else Toast.makeText(m_activity, getString(R.string.cant_use_compressed_filetypes), Toast.LENGTH_LONG).show(); diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java index c2c2849b26..f7596600b7 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java @@ -50,7 +50,7 @@ public final class FolderBrowserAdapter extends ArrayAdapter { mainText.setText(item.getName()); - if (!item.isValidItem()) + if (!item.isValid()) { mainText.setTextColor(0xFFFF0000); } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserItem.java index 3d0b0ba621..5fd9bd5ad1 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserItem.java @@ -86,7 +86,7 @@ public final class FolderBrowserItem implements Comparable * by this FolderBrowserItem is supported * and can be handled correctly. */ - public boolean isValidItem() + public boolean isValid() { return isValid; }