From f59b9b9094a4039afe7707a00dffe0d378718806 Mon Sep 17 00:00:00 2001 From: Quinn Date: Sun, 26 Nov 2023 13:55:48 -0500 Subject: [PATCH] Removed map.txt file because it changes too much. --- .gitignore | 4 +++- src/Graph/PointGraphWriter.java | 11 +++++++++-- src/Processing.java | 11 +++-------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index f68d109..6ed4513 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,6 @@ bin/ .vscode/ ### Mac OS ### -.DS_Store \ No newline at end of file +.DS_Store + +map.txt diff --git a/src/Graph/PointGraphWriter.java b/src/Graph/PointGraphWriter.java index 6a895bf..b3c38f6 100644 --- a/src/Graph/PointGraphWriter.java +++ b/src/Graph/PointGraphWriter.java @@ -52,10 +52,17 @@ public class PointGraphWriter { file.close(); } - public PointGraph loadFile(String filename) throws FileNotFoundException, NumberFormatException { + public PointGraph loadFile(String filename) throws NumberFormatException { PointGraph g = new PointGraph(); File file = new File(filename); - Scanner reader = new Scanner(file); + Scanner reader; + try { + reader = new Scanner(file); + } + catch (FileNotFoundException e){ + System.out.println("File not found"); + return g; + } ArrayList vertices = new ArrayList<>(); while(reader.hasNextLine()){ String line = reader.nextLine(); diff --git a/src/Processing.java b/src/Processing.java index 15be76e..baed4b0 100644 --- a/src/Processing.java +++ b/src/Processing.java @@ -79,15 +79,10 @@ public class Processing extends PApplet { } if(key == 'l'){ System.out.println("Attempting to load a map from file"); - try{ - PointGraphWriter writer = new PointGraphWriter(); + PointGraphWriter writer = new PointGraphWriter(); + try { map = writer.loadFile("map.txt"); - } - catch (FileNotFoundException e){ - System.out.println("File not found"); - e.printStackTrace(); - } - catch (NumberFormatException e){ + } catch (NumberFormatException e) { System.out.println("Number format incorrect"); e.printStackTrace(); }