summaryrefslogtreecommitdiff
path: root/Source/Android/src
diff options
context:
space:
mode:
authorlioncash <mathew1900@hotmail.com>2013-07-15 09:16:20 -0400
committerlioncash <mathew1900@hotmail.com>2013-07-15 09:16:20 -0400
commit4e8c3b2f1277ed5e3e9640b29dd7e3f5da7af2a6 (patch)
treee55104261c72671b39029db4d884b852d578f990 /Source/Android/src
parentc86480d08288a7fc3299b3de08d14c6aa13ccf58 (diff)
[Android] Make FolderBrowser.Fill look slightly nicer. Improve readability a bit.
- Added a basic function description. - Modified the main parameter to be more informative of what should be passed. Helps people who read the codebase for the first time. - Made a variable for storing the entry name so getName() isn't called a bunch of times. - Added some comments to explain some parts. - Rename the exception catch variable to ignored, since it currently isn't being used.
Diffstat (limited to 'Source/Android/src')
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java71
1 files changed, 41 insertions, 30 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
index 471278e50c..3b9fe9a0e5 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java
@@ -19,48 +19,59 @@ import java.util.List;
public class FolderBrowser extends ListActivity {
private FolderBrowserAdapter adapter;
private static File currentDir = null;
- private void Fill(File f)
+
+ // Populates the FolderView with the given currDir's contents.
+ private void Fill(File currDir)
{
- File[]dirs = f.listFiles();
- this.setTitle("Current Dir: " + f.getName());
+ this.setTitle("Current Dir: " + currDir.getName());
+ File[] dirs = currDir.listFiles();
List<GameListItem>dir = new ArrayList<GameListItem>();
List<GameListItem>fls = new ArrayList<GameListItem>();
-
+
+ // Search for any directories or supported files within the current dir.
try
{
- for(File ff: dirs)
+ for(File entry : dirs)
{
- if (ff.getName().charAt(0) != '.')
- if(ff.isDirectory())
- dir.add(new GameListItem(getApplicationContext(), ff.getName(),"Folder",ff.getAbsolutePath(), true));
+ String entryName = entry.getName();
+
+ if (entryName.charAt(0) != '.')
+ {
+ if(entry.isDirectory())
+ {
+ dir.add(new GameListItem(getApplicationContext(), entryName,"Folder",entry.getAbsolutePath(), true));
+ }
else
{
- if (ff.getName().toLowerCase().contains(".gcm") ||
- ff.getName().toLowerCase().contains(".iso") ||
- ff.getName().toLowerCase().contains(".wbfs") ||
- ff.getName().toLowerCase().contains(".gcz") ||
- ff.getName().toLowerCase().contains(".dol") ||
- ff.getName().toLowerCase().contains(".elf"))
- fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), true));
- else if (ff.getName().toLowerCase().contains(".zip") ||
- ff.getName().toLowerCase().contains(".rar") ||
- ff.getName().toLowerCase().contains(".7z"))
- fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), false));
+ if (entryName.toLowerCase().contains(".gcm") ||
+ entryName.toLowerCase().contains(".iso") ||
+ entryName.toLowerCase().contains(".wbfs") ||
+ entryName.toLowerCase().contains(".gcz") ||
+ entryName.toLowerCase().contains(".dol") ||
+ entryName.toLowerCase().contains(".elf"))
+ fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), true));
+ else if (entryName.toLowerCase().contains(".zip") ||
+ entryName.toLowerCase().contains(".rar") ||
+ entryName.toLowerCase().contains(".7z"))
+ fls.add(new GameListItem(getApplicationContext(), entryName,"File Size: "+entry.length(),entry.getAbsolutePath(), false));
}
+ }
}
- }
- catch(Exception e)
- {
- }
-
+ }
+ catch(Exception ignored)
+ {
+ }
+
Collections.sort(dir);
- Collections.sort(fls);
- dir.addAll(fls);
- if (!f.getPath().equalsIgnoreCase("/"))
- dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent(), true));
+ Collections.sort(fls);
+ dir.addAll(fls);
+
+ // Check for a parent directory to the one we're currently in.
+ if (!currDir.getPath().equalsIgnoreCase("/"))
+ dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", currDir.getParent(), true));
- adapter = new FolderBrowserAdapter(this,R.layout.folderbrowser,dir);
- this.setListAdapter(adapter);
+ adapter = new FolderBrowserAdapter(this,R.layout.folderbrowser,dir);
+ this.setListAdapter(adapter);
}
@Override