Update file reading algorithm.

.classpath

@@ -2,5 +2,6 @@
 <classpath>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path=""/>
+	<classpathentry kind="lib" path="Notepad.jar" sourcepath="C:/Users/Home PC/OneDrive - Knights - University of Central Florida/Trent School/Principles of Computer Programming/jdk1.8.0_241/demo/jfc/Notepad/src.zip"/>
 	<classpathentry kind="output" path=""/>
 </classpath>

filereader/.gitignore

@@ -6,3 +6,6 @@
 /Utils.class
 /package-info.class
 /GUI$1.class
+/TextFilePane$1.class
+/TextFileUtils.class
+/TextFileContentsLoader.class

filereader/GUI.java

@@ -5,19 +5,21 @@
 import javafx.stage.Stage;
 
 public class GUI extends Application {
-	public static Stage newPrimaryStage;
+	private static Stage newPrimaryStage;
+	private static Scene scene;
+	private static MainPane pane;
+
+	public static void main(String[] args) {
+		launch();
+	}
 
 	@Override
 	public void start(Stage primaryStage) {
 		newPrimaryStage = new Stage();
-		MainPane pane = new MainPane();
-		Scene scene = new Scene(pane);
+		pane = new MainPane();
+		scene = new Scene(pane);
 		newPrimaryStage.setScene(scene);
 		newPrimaryStage.setMaximized(true);
 		newPrimaryStage.show();
 	}
-
-	public static void main(String[] args) {
-		launch();
-	}
 }

filereader/MainPane.java

@@ -1,21 +1,15 @@
 package filereader;
 
-import javafx.scene.layout.GridPane;
+import javafx.scene.layout.BorderPane;
 
-public class MainPane extends GridPane {
-	TextFilePane textPane;
+public class MainPane extends BorderPane {
+	private static TextFilePane textPane;
+	private static MainToolbar mainToolbar;
 
 	MainPane() {
-		MainToolbar mainToolbar = new MainToolbar();
+		mainToolbar = new MainToolbar();
 		textPane = new TextFilePane();
-		add(mainToolbar, 0, 0);
-		add(textPane, 0, 1);
-	}
-
-	/**
-	 * @param textPane the textPane to set
-	 */
-	public void setTextPane(TextFilePane textPane) {
-		this.textPane = textPane;
+		setTop(mainToolbar);
+		setCenter(textPane);
 	}
 }

filereader/MainToolbar.java

@@ -12,9 +12,10 @@
 
 public class MainToolbar extends HBox {
 	private TextField pathField;
+	private static Button openButton;
 
 	MainToolbar() {
-		Button openButton = new Button("Open");
+		openButton = new Button("Open");
 		openButton.setOnAction(new OpenFileHandler());
 
 		pathField = new TextField();
@@ -26,12 +27,11 @@ class OpenFileHandler implements EventHandler<ActionEvent> {
 		@Override
 		public void handle(ActionEvent event) {
 			FileChooser fileChooser = new FileChooser();
-			Utils.currentFile = fileChooser.showOpenDialog(new Stage());
-			pathField.setText(Utils.currentFile.toString());
+			TextFileUtils.setCurrentFile(fileChooser.showOpenDialog(new Stage()));
+			pathField.setText(TextFileUtils.getCurrentFile().toString());
 			try {
-				TextFilePane.getOutputArea().setText(Utils.readFileLines(Utils.currentFile, (int) (GUI.newPrimaryStage.getHeight() / 17)));
+				TextFileUtils.readFileLines(TextFileUtils.getCurrentFile());
 			} catch (IOException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}

filereader/TextFilePane.java

@@ -1,21 +1,21 @@
 package filereader;
 
+import javafx.scene.control.TextArea;
 import javafx.scene.layout.BorderPane;
-import javafx.scene.text.Text;
 
 public class TextFilePane extends BorderPane {
-	private static Text outputArea;
+	private static TextArea outputArea;
 
 	TextFilePane() {
-		outputArea = new Text();
-		outputArea.setFont(Utils.font);
+		outputArea = new TextArea();
+
 		setCenter(outputArea);
 	}
-
+	
 	/**
 	 * @return the output TextArea
 	 */
-	public static Text getOutputArea() {
+	public static TextArea getOutputArea() {
 		return outputArea;
 	}
 }

filereader/TextFileUtils.java

@@ -0,0 +1,39 @@
+package filereader;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Scanner;
+
+import javafx.scene.text.Font;
+
+public class TextFileUtils {
+	private static File currentFile;
+
+	private TextFileUtils() {}
+
+	public static String readFile(File file, int length) throws IOException {
+		char[] contents = new char[length];
+		FileReader reader = new FileReader(file);
+		reader.read(contents);
+		reader.close();
+		return new String(contents);
+	}
+
+	public static void readFileLines(File file) throws IOException {
+		TextFilePane.getOutputArea().setText("");
+		Scanner reader = new Scanner(file);
+		while (reader.hasNext()) {
+			TextFilePane.getOutputArea().setText(TextFilePane.getOutputArea().getText() + reader.nextLine() + "\n");
+		}
+		reader.close();
+	}
+
+	public static File getCurrentFile() {
+		return currentFile;
+	}
+
+	public static void setCurrentFile(File file) {
+		currentFile = file;
+	}
+}