duke-compsci308-fall2015 · wallium · Sep 17, 2015
diff --git a/README.md b/README.md
@@ -1,2 +1,4 @@
 # lab_browser
 A simple GUI example: a web browser
+
+Worked on by William Yang (wzy) and Dennis Xu (dx14)
diff --git a/src/BrowserException.java b/src/BrowserException.java
@@ -0,0 +1,7 @@
+
+public class BrowserException extends Exception {
+
+	public BrowserException() { super(); }
+
+	public BrowserException(String message) { super(message); } 
+}
diff --git a/src/BrowserModel.java b/src/BrowserModel.java
@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 
 /**
@@ -22,6 +23,8 @@ public class BrowserModel {
     private List<URL> myHistory;
     private Map<String, URL> myFavorites;
 
+    public static final String DEFAULT_RESOURCE_PACKAGE = "resources/";
+    private ResourceBundle myResources;
 
     /**
      * Creates an empty model.
@@ -32,34 +35,41 @@ public BrowserModel () {
         myCurrentIndex = -1;
         myHistory = new ArrayList<>();
         myFavorites = new HashMap<>();
+
+        myResources = ResourceBundle.getBundle(DEFAULT_RESOURCE_PACKAGE + "ModelErrors.properties");
+
     }
 
     /**
      * Returns the first page in next history, null if next history is empty.
+     * @throws BrowserException 
      */
-    public URL next () {
+    public URL next () throws BrowserException {
         if (hasNext()) {
             myCurrentIndex++;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+//        return null;
+        throw new BrowserException(myResources.getString("NextError"));
     }
 
     /**
      * Returns the first page in back history, null if back history is empty.
+     * @throws BrowserException 
      */
-    public URL back () {
+    public URL back () throws BrowserException {
         if (hasPrevious()) {
             myCurrentIndex--;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+        throw new BrowserException(myResources.getString("BackError"));
     }
 
     /**
      * Changes current page to given URL, removing next history.
+     * @throws BrowserException 
      */
-    public URL go (String url) {
+    public URL go (String url) throws BrowserException {
         myCurrentURL = completeURL(url);
         if (myCurrentURL != null) {
             if (hasNext()) {
@@ -114,16 +124,17 @@ 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;
+        throw new BrowserException(myResources.getString("FavoriteError"));
     }
 
     // deal with a potentially incomplete URL
-    private URL completeURL (String possible) {
+    private URL completeURL (String possible) throws BrowserException {
         try {
             // try it as is
             return new URL(possible);
@@ -137,7 +148,7 @@ 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("%s is a bad URL", possible));
                 }
             }
         }

diff --git a/src/BrowserView.java b/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;
@@ -75,28 +78,31 @@ public BrowserView (BrowserModel model, String language) {
         myModel = model;
         // use resources for labels
         myResources = ResourceBundle.getBundle(DEFAULT_RESOURCE_PACKAGE + language);
+        myFavorites = new ComboBox<String>();
         BorderPane root = new BorderPane();
         // must be first since other panels may refer to page
         root.setCenter(makePageDisplay());
         root.setTop(makeInputPanel());
         root.setBottom(makeInformationPanel());
         // control the navigation
         enableButtons();
+        // Initialize ComboBox
         // create scene to hold UI
         myScene = new Scene(root, DEFAULT_SIZE.width, DEFAULT_SIZE.height);
-        //myScene.getStylesheets().add(DEFAULT_RESOURCE_PACKAGE + STYLESHEET);
+        myScene.getStylesheets().add(DEFAULT_RESOURCE_PACKAGE + STYLESHEET);
     }
 
     /**
      * Display given URL.
+     * @throws BrowserException 
      */
-    public void showPage (String url) {
+    public void showPage (String url) throws BrowserException {
         URL valid = myModel.go(url);
-        if (url != null) {
+        try {
             update(valid);
         }
-        else {
-            showError("Could not load " + url);
+        catch (BrowserException e) {
+        	System.out.println(String.format("Could not load %s", url));
         }
     }
 
@@ -125,22 +131,22 @@ public void showError (String message) {
     }
 
     // move to the next URL in the history
-    private void next () {
+    private void next () throws BrowserException {
         update(myModel.next());
     }
 
     // move to the previous URL in the history
-    private void back () {
+    private void back () throws BrowserException {
         update(myModel.back());
     }
 
     // change current URL to the home page, if set
-    private void home () {
+    private void home () throws BrowserException {
         showPage(myModel.getHome().toString());
     }
 
     // change page to favorite choice
-    private void showFavorite (String favorite) {
+    private void showFavorite (String favorite) throws BrowserException {
         showPage(myModel.getFavorite(favorite).toString());
     }
 
@@ -180,7 +186,7 @@ private Node makePageDisplay () {
     }
 
     // organize user's options for controlling/giving input to model
-    private Node makeInputPanel () {
+    private Node makeInputPanel () throws BrowserException {
         VBox result = new VBox();
         result.getChildren().addAll(makeNavigationPanel(), makePreferencesPanel());
         return result;
@@ -194,14 +200,19 @@ private Node makeInformationPanel () {
     }
 
     // make user-entered URL/text field and back/next buttons
-    private Node makeNavigationPanel () {
+    private Node makeNavigationPanel () throws BrowserException {
         HBox result = new HBox();
         // create buttons, with their associated actions
         // old style way to do set up callback (anonymous class)
         myBackButton = makeButton("BackCommand", new EventHandler<ActionEvent>() {
             @Override      
             public void handle (ActionEvent event) {       
-                back();        
+                try {
+					back();
+				} catch (BrowserException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}        
             }      
         });
         result.getChildren().add(myBackButton);
@@ -221,6 +232,10 @@ public void handle (ActionEvent event) {
     // make buttons for setting favorites/home URLs
     private Node makePreferencesPanel () {
         HBox result = new HBox();
+        result.getChildren().add(makeButton("AddFavoriteCommand", event -> {
+        	addFavorite();
+        }));
+        result.getChildren().add(myFavorites);
         result.getChildren().add(makeButton("SetHomeCommand", event -> {
             myModel.setHome();
             enableButtons();
@@ -259,7 +274,12 @@ private TextField makeInputField (int width, EventHandler<ActionEvent> handler)
     private class ShowPage implements EventHandler<ActionEvent> {
         @Override      
         public void handle (ActionEvent event) {       
-            showPage(myURLDisplay.getText());      
+            try {
+				showPage(myURLDisplay.getText());
+			} catch (BrowserException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}      
         }      
     }
 

diff --git a/src/resources/ModelErrors.properties b/src/resources/ModelErrors.properties
@@ -0,0 +1,3 @@
+NextError=No Next Page
+BackError=No Previous Page
+FavoriteError=No Favorites
diff --git a/src/resources/default.css b/src/resources/default.css
@@ -1,15 +1,15 @@
 .root {
     -fx-font-size: 14pt;
-    -fx-font-family: "Courier New";
+    -fx-font-family: "Impact";
     -fx-base: rgb(132, 145, 47);
-    -fx-background: rgb(225, 228, 203);
+    -fx-background: "GREEN";
 }
 
 .button {
     -fx-text-fill: #006464;
-    -fx-background-color: #DFB951;
-    -fx-border-radius: 20;
-    -fx-background-radius: 20;
+    -fx-background-color: "RED";
+    -fx-border-radius: 100;
+    -fx-background-radius: 1px;
     -fx-padding: 8;
 }