duke-compsci308-spring2016 · nicklockett · Feb 4, 2016 · Mar 3, 2016
diff --git a/src/BrowserException.java b/src/BrowserException.java
@@ -0,0 +1,28 @@
+
+public class BrowserException extends RuntimeException {
+
+	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
+	}
+
+}
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;
 
 
 /**
@@ -21,6 +22,9 @@ public class BrowserModel {
     private int myCurrentIndex;
     private List<URL> myHistory;
     private Map<String, URL> myFavorites;
+    private ResourceBundle myResources;
+    public static final String DEFAULT_RESOURCE_PACKAGE = "resources/";
+
 
 
     /**
@@ -32,6 +36,8 @@ public BrowserModel () {
         myCurrentIndex = -1;
         myHistory = new ArrayList<>();
         myFavorites = new HashMap<>();
+        String langauge = "English"; //TODO: FIX THIS ASSUMPTION LATER!
+        myResources = ResourceBundle.getBundle(DEFAULT_RESOURCE_PACKAGE + langauge);
     }
 
     /**
@@ -42,18 +48,21 @@ public URL next () {
             myCurrentIndex++;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+        else{
+        	throw new IndexOutOfBoundsException();
+        }
+
     }
 
     /**
      * Returns the first page in back history, null if back history is empty.
      */
     public URL back () {
-        if (hasPrevious()) {
-            myCurrentIndex--;
-            return myHistory.get(myCurrentIndex);
-        }
-        return null;
+    	if(hasPrevious()){
+    		myCurrentIndex--;
+    		return myHistory.get(myCurrentIndex);
+    	}
+        	throw new IndexOutOfBoundsException();
     }
 
     /**
@@ -76,7 +85,7 @@ public URL go (String url) {
             return myCurrentURL;
         }
         catch (Exception e) {
-            return null;
+        	throw new BrowserException(String.format(myResources.getString("LoadError"), url));
         }
     }
 
@@ -125,10 +134,12 @@ public void addFavorite (String name) {
      * Returns URL from favorites associated with given name, null if none set.
      */
     public URL getFavorite (String name) {
-        if (name != null && !name.equals("") && myFavorites.containsKey(name)) {
-            return myFavorites.get(name);
-        }
-        return null;
+    	if(name != null && !name.equals("") && myFavorites.containsKey(name)) {
+    		return myFavorites.get(name);
+    	}
+    	else{
+    		throw new IndexOutOfBoundsException();
+    	}
     }
 
     // deal with a potentially incomplete URL
@@ -146,7 +157,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(myResources.getString("URLError"), myCurrentURL.toString()),eee.getCause());
                 }
             }
         }

diff --git a/src/BrowserView.java b/src/BrowserView.java
@@ -1,7 +1,14 @@
 import java.awt.Dimension;
+import java.lang.reflect.Method;
 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 javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker;
@@ -23,12 +30,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 +62,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
@@ -84,19 +86,29 @@ public BrowserView (BrowserModel model, String language) {
         enableButtons();
         // 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.
      */
     public void showPage (String url) {
-        URL valid = myModel.go(url);
-        if (valid != null) {
-            update(valid);
+    	try{
+    		URL valid = myModel.go(url);
+         	update(valid);
         }
-        else {
-            showError("Could not load " + url);
+        catch(BrowserException e) {
+            showError(e.getMessage());
+        }
+    }
+
+    public void showPage() {
+        try {
+            String url = myURLDisplay.getText();
+            URL valid = myModel.go(url);
+            update(valid);
+        } catch (BrowserException e) {
+            showError(e.getMessage());
         }
     }
 
@@ -125,25 +137,29 @@ public void showError (String message) {
     }
 
     // move to the next URL in the history
-    private void next () {
+    private void next() {
+    	try{
         update(myModel.next());
+    	}
+    	catch(IndexOutOfBoundsException e){
+    	}
     }
 
     // move to the previous URL in the history
-    private void back () {
+    private void back() {
         update(myModel.back());
     }
 
     // change current URL to the home page, if set
     private void home () {
         showPage(myModel.getHome().toString());
     }
-
+    
     // change page to favorite choice
     private void showFavorite (String favorite) {
         showPage(myModel.getFavorite(favorite).toString());
         // reset favorites ComboBox so the same choice can be made again
-        myFavorites.setValue(null);
+       // myFavorites.setValue(null);
     }
 
     // update just the view to display given URL
@@ -201,21 +217,18 @@ private Node makeNavigationPanel () {
         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();        
-            }      
-        });
+        myBackButton = makeButton("BackCommand", "back");
         result.getChildren().add(myBackButton);
         // new style way to do set up callback (lambdas)
-        myNextButton = makeButton("NextCommand", event -> next());
+        myNextButton = makeButton("NextCommand", "next");
         result.getChildren().add(myNextButton);
-        myHomeButton = makeButton("HomeCommand", event -> home());
+        myHomeButton = makeButton("HomeCommand", "home");
         result.getChildren().add(myHomeButton);
+        myFavoritesButton = makeButton("AddFavoriteCommand", "addFavorite");
+        result.getChildren().add(myFavoritesButton);
         // if user presses button or enter in text field, load/show the URL
         EventHandler<ActionEvent> showHandler = new ShowPage();
-        result.getChildren().add(makeButton("GoCommand", showHandler));
+        result.getChildren().add(makeButton("GoCommand", "showPage"));
         myURLDisplay = makeInputField(40, showHandler);
         result.getChildren().add(myURLDisplay);
         return result;
@@ -226,15 +239,40 @@ private Node makePreferencesPanel () {
         HBox result = new HBox();
         myFavorites = new ComboBox<String>();
         // ADD REST OF CODE HERE
-        result.getChildren().add(makeButton("SetHomeCommand", event -> {
-            myModel.setHome();
-            enableButtons();
-        }));
+        result.getChildren().add(myFavorites);
+        myFavorites.setOnAction(event -> {showFavorite(myFavorites.getSelectionModel().getSelectedItem().toString()); });
+
+
+
+        result.getChildren().add(makeButton("SetHomeCommand","makeModelAndButton"));
         return result;
     }
-
-    // makes a button using either an image or a label
-    private Button makeButton (String property, EventHandler<ActionEvent> handler) {
+
+    private void makeModelAndButton() {
+        myModel.setHome();
+        enableButtons();
+    }
+
+//    // makes a button using either an image or a label
+//    private Button makeButton (String property, EventHandler<ActionEvent> handler) {
+//        // represent all supported image suffixes
+//        final String IMAGEFILE_SUFFIXES = 
+//            String.format(".*\\.(%s)", String.join("|", ImageIO.getReaderFileSuffixes()));
+//
+//        Button result = new Button();
+//        String label = myResources.getString(property);
+//        if (label.matches(IMAGEFILE_SUFFIXES)) {
+//            result.setGraphic(new ImageView(
+//                new Image(getClass().getResourceAsStream(DEFAULT_RESOURCE_PACKAGE + label))));
+//        } else {
+//            result.setText(label);
+//        }
+//        result.setOnAction(handler);
+//        return result;
+//    }
+
+ // makes a button using either an image or a label
+    private Button makeButton (String property, String methodName, Object... args) {
         // represent all supported image suffixes
         final String IMAGEFILE_SUFFIXES = 
             String.format(".*\\.(%s)", String.join("|", ImageIO.getReaderFileSuffixes()));
@@ -247,7 +285,24 @@ private Button makeButton (String property, EventHandler<ActionEvent> handler) {
         } else {
             result.setText(label);
         }
-        result.setOnAction(handler);
+        Class c = this.getClass();
+        try {
+            Method method = c.getDeclaredMethod(methodName);
+            result.setOnAction((ActionEvent e) -> {
+                try {
+                    method.invoke(c, args);
+                }
+                catch (Exception exc) {
+                    exc.printStackTrace();
+                }
+            });
+        }
+        catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
+
         return result;
     }
 

diff --git a/src/resources/English.properties b/src/resources/English.properties
@@ -8,3 +8,5 @@ ErrorTitle=Browser Error
 FavoritePromptTitle=Add Favorite
 FavoriteFirstItem=All Favorites
 SetHomeCommand=Set Home
+LoadError=Could not load %s 
+URLError=Incomplete URL. %s is not Valid
diff --git a/src/resources/default.css b/src/resources/default.css
@@ -2,12 +2,12 @@
     -fx-font-size: 14pt;
     -fx-font-family: "Courier New";
     -fx-base: rgb(132, 145, 47);
-    -fx-background: rgb(225, 228, 203);
+    -fx-background: #FFFF00;
 }
 
 .button {
     -fx-text-fill: #006464;
-    -fx-background-color: #DFB951;
+    -fx-background-color: #FAAFBE;
     -fx-border-radius: 20;
     -fx-background-radius: 20;
     -fx-padding: 8;