Recitation changes

.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

README.md

@@ -1,2 +1,3 @@
 # lab_browser
 A simple GUI example: a web browser
+Names: Matt Elgart (mje21), Nick Groszewski (nrg12)

src/BrowserModel.java

@@ -42,7 +42,7 @@ public URL next () {
             myCurrentIndex++;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+        throw new BrowserException(String.format("NextError", myCurrentURL));
     }
 
     /**
@@ -53,7 +53,7 @@ public URL back () {
             myCurrentIndex--;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+        throw new BrowserException(String.format("BackError", myCurrentURL));
     }
 
     /**
@@ -119,7 +119,7 @@ public URL getFavorite (String name) {
         if (name != null && !name.equals("") && myFavorites.containsKey(name)) {
             return myFavorites.get(name);
         }
-        return null;
+        throw new BrowserException(String.format("FavoriteError", myCurrentURL));
     }
 
     // deal with a potentially incomplete URL
@@ -137,9 +137,15 @@ private URL completeURL (String possible) {
                     // e.g., let user leave off initial protocol
                     return new URL(PROTOCOL_PREFIX + possible);
                 } catch (MalformedURLException eee) {
-                    return null;
+                    throw new BrowserException(String.format("IncorrectURL", myCurrentURL));
                 }
             }
         }
     }
+
+    public class BrowserException extends RuntimeException {
+    	public BrowserException(String message) {
+    		super(message);
+    	}
+    }
 }

src/BrowserView.java

@@ -2,6 +2,16 @@
 import java.net.URL;
 import java.util.Optional;
 import java.util.ResourceBundle;
+
+import javax.imageio.ImageIO;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.events.EventListener;
+import org.w3c.dom.events.EventTarget;
+
+//import BrowserModel.BrowserException;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker;
@@ -23,12 +33,6 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.web.WebView;
-import javax.imageio.ImageIO;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.events.EventListener;
-import org.w3c.dom.events.EventTarget;
 
 
 /**
@@ -61,6 +65,7 @@ public class BrowserView {
     private Button myBackButton;
     private Button myNextButton;
     private Button myHomeButton;
+    private Button myFavoritesButton;
     // favorites
     private ComboBox<String> myFavorites;
     // get strings from resource file
@@ -92,14 +97,20 @@ public BrowserView (BrowserModel model, String language) {
      */
     public void showPage (String url) {
         URL valid = myModel.go(url);
-        if (url != null) {
+        try {
             update(valid);
         }
-        else {
-            showError("Could not load " + url);
+        catch (BrowserException e) {
+        	showError(String.format("Could not load %s check your spelling", url));
         }
     }
 
+    public class BrowserException extends RuntimeException {
+    	public BrowserException(String message) {
+    		super(message);
+    	}
+    }
+
     /**
      * Returns scene for this view so it can be added to stage.
      */
@@ -169,6 +180,7 @@ private void enableButtons () {
         myBackButton.setDisable(! myModel.hasPrevious());
         myNextButton.setDisable(! myModel.hasNext());
         myHomeButton.setDisable(myModel.getHome() == null);
+        myFavorites.setDisable(false);
     }
 
     // convenience method to create HTML page display
@@ -225,6 +237,10 @@ private Node makePreferencesPanel () {
             myModel.setHome();
             enableButtons();
         }));
+        myFavoritesButton = makeButton("AddFavoriteCommand", event -> addFavorite());
+        result.getChildren().add(myFavoritesButton);
+        myFavorites = makeComboBox("FavoriteFirstItem", event -> showFavorite(myFavorites.getValue()));
+        result.getChildren().add(myFavorites);
         return result;
     }
 
@@ -245,6 +261,25 @@ private Button makeButton (String property, EventHandler<ActionEvent> handler) {
         result.setOnAction(handler);
         return result;
     }
+
+    // makes a comboBox
+    private ComboBox<String> makeComboBox (String property, EventHandler<ActionEvent> handler) {
+        // represent all supported image suffixes
+        final String IMAGEFILE_SUFFIXES = 
+            String.format(".*\\.(%s)", String.join("|", ImageIO.getReaderFileSuffixes()));
+
+        ComboBox<String> result = new ComboBox<String>();
+        String label = myResources.getString(property);
+        /*if (label.matches(IMAGEFILE_SUFFIXES)) {
+            result.setGraphic(new ImageView(
+                new Image(getClass().getResourceAsStream(DEFAULT_RESOURCE_PACKAGE + label))));
+        } else {*/
+        //result.setAccessibleText(label);
+        result.setPromptText(label);
+        //}
+        result.setOnAction(handler);
+        return result;
+    }
 
     // make text field for input
     private TextField makeInputField (int width, EventHandler<ActionEvent> handler) {

src/resources/ErrorsEnglish.properties

@@ -0,0 +1,4 @@
+BackError=Could not load %s, no back found
+NextError=Could not load %s, no next found
+FavoriteError=Could not load %s, no favorite found
+IncorrectURL=Could not load %s, incorrect URL