Daniel McKee (dbm33), Tina Liang (tl150)

.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,2 @@
 # lab_browser
-A simple GUI example: a web browser
+Daniel McKee (dbm33) and Tina Liang (tl150)

src/BrowserException.java

@@ -0,0 +1,29 @@
+
+public class BrowserException extends Exception {
+
+	public BrowserException() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public BrowserException(String message) {
+		super(message);
+		// TODO Auto-generated constructor stub
+	}
+
+	public BrowserException(Throwable cause) {
+		super(cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public BrowserException(String message, Throwable cause) {
+		super(message, cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public BrowserException(String message, Throwable cause,
+			boolean enableSuppression, boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+		// TODO Auto-generated constructor stub
+	}
+
+}

src/BrowserModel.java

@@ -37,23 +37,23 @@ public BrowserModel () {
     /**
      * Returns the first page in next history, null if next history is empty.
      */
-    public URL next () {
+    public URL next () throws BrowserException{
         if (hasNext()) {
             myCurrentIndex++;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+        throw new BrowserException("No next page. ");
     }
 
     /**
      * Returns the first page in back history, null if back history is empty.
      */
-    public URL back () {
+    public URL back () throws BrowserException{
         if (hasPrevious()) {
             myCurrentIndex--;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+        throw new BrowserException("No previous page. ");
     }
 
     /**
@@ -114,12 +114,14 @@ public void addFavorite (String name) {
 
     /**
      * Returns URL from favorites associated with given name, null if none set.
+     * @throws BrowserException 
      */
-    public URL getFavorite (String name) {
+    public URL getFavorite (String name) throws BrowserException {
         if (name != null && !name.equals("") && myFavorites.containsKey(name)) {
             return myFavorites.get(name);
         }
-        return null;
+//        return null;
+        throw new BrowserException("No favorites set.");
     }
 
     // deal with a potentially incomplete URL
@@ -142,4 +144,6 @@ private URL completeURL (String possible) {
             }
         }
     }
+
+
 }

src/BrowserView.java

@@ -2,6 +2,7 @@
 import java.net.URL;
 import java.util.Optional;
 import java.util.ResourceBundle;
+
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker;
@@ -23,7 +24,9 @@
 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;
@@ -126,12 +129,22 @@ public void showError (String message) {
 
     // move to the next URL in the history
     private void next () {
-        update(myModel.next());
+        try {
+			update(myModel.next());
+		} catch (BrowserException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
     }
 
     // move to the previous URL in the history
     private void back () {
-        update(myModel.back());
+        try {
+			update(myModel.back());
+		} catch (BrowserException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
     }
 
     // change current URL to the home page, if set
@@ -141,7 +154,12 @@ private void home () {
 
     // change page to favorite choice
     private void showFavorite (String favorite) {
-        showPage(myModel.getFavorite(favorite).toString());
+        try {
+			showPage(myModel.getFavorite(favorite).toString());
+		} catch (BrowserException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
     }
 
     // update just the view to display given URL
@@ -225,6 +243,21 @@ private Node makePreferencesPanel () {
             myModel.setHome();
             enableButtons();
         }));
+        result.getChildren().add(makeButton("AddFavoriteCommand", event -> {      			
+//        	TextInputDialog info = new TextInputDialog();
+//            info.showAndWait();
+//            String name = info.getResult();
+        	addFavorite();
+
+        	enableButtons();
+        }));
+        myFavorites = new ComboBox<String>();
+        myFavorites.setOnAction(event -> {
+
+        	showFavorite(myFavorites.getValue());
+        });
+        result.getChildren().add(myFavorites);
+
         return result;
     }