Comment and bugfix:

-Commented PagesConcurrentHashMap
-Fixed openShow() in DS2MenuBar to correctly handle cancellation and errors

DrillSweet 2/src/main/java/com/evanbelcher/DrillSweet2/Main.java

@@ -21,7 +21,6 @@
 @SuppressWarnings("SynchronizeOnNonFinalField") public class Main {
 
 	private static final String stateFileName = "STATE";
-	//private static ConcurrentHashMap<Integer, Page> pageMap;
 	private static PagesConcurrentHashMap pageMap;
 	private static State state;
 	private static GraphicsRunner graphicsRunner;

DrillSweet 2/src/main/java/com/evanbelcher/DrillSweet2/data/PagesConcurrentHashMap.java

@@ -5,6 +5,11 @@
 import java.awt.*;
 import java.util.concurrent.ConcurrentHashMap;
 
+/**
+ * Holds the pages as well as the field in order to scale properly among different screen sizes
+ *
+ * @author Evan Belcher
+ */
 public class PagesConcurrentHashMap {
 
 	private ConcurrentHashMap<Integer, Page> pages;
@@ -49,6 +54,9 @@ public void fixPoints(Rectangle newField) {
 		}
 	}
 
+	/**
+	 * Returns the pages map
+	 */
 	public ConcurrentHashMap<Integer, Page> getPages() {
 		return pages;
 	}

DrillSweet 2/src/main/java/com/evanbelcher/DrillSweet2/display/DS2MenuBar.java

@@ -446,12 +446,11 @@ private void openShow() throws InterruptedException {
 			do {
 				returnVal = fc.showOpenDialog(this);
 				file = fc.getSelectedFile();
-			} while (!file.exists());
-
-			String name, path;
-
+			}
+			while (returnVal != JFileChooser.CANCEL_OPTION && returnVal != JFileChooser.ERROR_OPTION && !file.exists());
 			if (returnVal == JFileChooser.APPROVE_OPTION) {
 				try {
+					String name, path;
 					path = file.getCanonicalPath();
 					path = path.substring(0, path.lastIndexOf('\\') + 1);
 					name = file.getName().toLowerCase().endsWith(".ds2") ? file.getName() : file.getName() + ".ds2";