From 0916d0797c0d6e2da6e9b59f2ac92cfc99b569c4 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 13 Aug 2013 09:13:46 -0400
Subject: [PATCH] Simplify asset copying code a little bit in
 DolphinEmulator.java

Since the directories are already cached (with smaller variable names), use these instead so we can shorten the length of each line.
---
 .../dolphinemu/DolphinEmulator.java           | 44 +++++--------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index cf2ad33e4f..40e5b6e98a 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -92,41 +92,19 @@ public class DolphinEmulator<MainActivity> extends Activity
 			directory.mkdirs();
 
 			// Copy assets if needed
-			java.io.File file = new java.io.File(
-					Environment.getExternalStorageDirectory()+File.separator+
-							"dolphin-emu" + File.separator + "GC" + File.separator + "dsp_coef.bin");
+			File file = new File(GCDir + File.separator + "dsp_coef.bin");
 			if(!file.exists())
 			{
-				CopyAsset("ButtonA.png", 
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "ButtonA.png");
-				CopyAsset("ButtonB.png", 
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "ButtonB.png");
-				CopyAsset("ButtonStart.png", 
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "ButtonStart.png");
-				CopyAsset("NoBanner.png", 
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "NoBanner.png");
-				CopyAsset("GCPadNew.ini", 
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "Config" + File.separator + "GCPadNew.ini");
-				CopyAsset("Dolphin.ini",
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "Config" + File.separator + "Dolphin.ini");
-				CopyAsset("dsp_coef.bin",
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "GC" + File.separator + "dsp_coef.bin");
-				CopyAsset("dsp_rom.bin",
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "GC" + File.separator + "dsp_rom.bin");
-				CopyAsset("font_ansi.bin",
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "GC" + File.separator + "font_ansi.bin");
-				CopyAsset("font_sjis.bin",
-						Environment.getExternalStorageDirectory()+File.separator+
-						"dolphin-emu" + File.separator + "GC" + File.separator + "font_sjis.bin");
+				CopyAsset("ButtonA.png",     BaseDir + File.separator + "ButtonA.png");
+				CopyAsset("ButtonB.png",     BaseDir + File.separator + "ButtonB.png");
+				CopyAsset("ButtonStart.png", BaseDir + File.separator + "ButtonStart.png");
+				CopyAsset("NoBanner.png",    BaseDir + File.separator + "NoBanner.png");
+				CopyAsset("GCPadNew.ini",    ConfigDir + File.separator + "GCPadNew.ini");
+				CopyAsset("Dolphin.ini",     ConfigDir + File.separator + "Dolphin.ini");
+				CopyAsset("dsp_coef.bin",    GCDir + File.separator + "dsp_coef.bin");
+				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");
 
 				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 				SharedPreferences.Editor editor = prefs.edit();