merge error fixing

Pi-Day-Project/src/gui/AccuracyChecker.java

@@ -2,8 +2,15 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
 import java.util.Scanner;
 
+import main.Main;
+
 import performance.UserAttempt;
 
 public class AccuracyChecker {
@@ -206,4 +213,28 @@ public static boolean checkNextDigit(String userText) {
 		return isRight;
 
 	}
+
+	public static void getFile() {
+		try {
+
+		File piData = new File("Pi.txt");
+		if (!piData.exists()) {
+			URL website = new URL("https://dl.dropboxusercontent.com/u/44791770/Pi.txt");
+			ReadableByteChannel rbc = Channels.newChannel(website.openStream());
+			piData.createNewFile();
+			FileOutputStream fos = new FileOutputStream(piData);
+
+			fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+			fos.flush();
+			fos.close();
+
+		}
+
+		Main.PI_FILE = piData;
+
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
 }

Pi-Day-Project/src/gui/PiInputField.java

@@ -10,6 +10,7 @@
 import javax.swing.JTextField;
 
 import main.Config;
+import main.Main;
 import performance.AttemptLogger;
 import performance.UserAttempt;
 
@@ -20,9 +21,14 @@ public class PiInputField extends JTextField implements KeyListener {
 	 * later.
 	 */
 	//public static final String PI_FILE = "W:\\Staff_Student\\jjmiller\\Writeable\\Pi.txt";
+<<<<<<< HEAD
 
 	public static final String PI_FILE = "Pi.txt";
 
+=======
+	public static final String PI_FILE = "https://dl.dropboxusercontent.com/u/44791770/Pi.txt";
+
+>>>>>>> Download digits file as needed
 	private static boolean hasFailed = false;
 
 	private AccuracyChecker ac;
@@ -39,7 +45,7 @@ public class PiInputField extends JTextField implements KeyListener {
 	 */
 	public PiInputField() {
 		super();
-		this.ac = new AccuracyChecker(this, new File(PiInputField.PI_FILE));
+		this.ac = new AccuracyChecker(this, Main.PI_FILE);
 		this.addKeyListener(this);
 		this.setFont(Config.INPUT_FONT);
 		this.setBackground(Config.INPUT_FIELD_IN_PROGRESS_COLOR);

Pi-Day-Project/src/main/Main.java

@@ -1,10 +1,16 @@
 package main;
 
+import gui.AccuracyChecker;
 import gui.UserInterface;
 
+import java.io.File;
+
 public class Main {
 
+	public static File PI_FILE;
+
 	public static void main(String[] args) {
+		AccuracyChecker.getFile();
 		new UserInterface();
 	}
 }