Ankit Kayastha (ak308), Jiadong Yin (jy114) Lab Browser

.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,5 @@
 # lab_browser
 A simple GUI example: a web browser
+
+Names: Ankit Kayastha (ak308), Jiadong Yin (jy114)
+

src/BrowserException.java

@@ -0,0 +1,6 @@
+
+public class BrowserException extends Exception {
+	public BrowserException (String string) {
+		super(string);
+	}
+}

src/BrowserModel.java

@@ -36,30 +36,31 @@ public BrowserModel () {
 
     /**
      * 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;
+        throw new BrowserException("Invalid URL");
     }
 
     /**
      * 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("Invalid URL");
     }
 
     /**
      * Changes current page to given URL, removing next history.
      */
-    public URL go (String url) {
+    public URL go (String url) throws BrowserException {
         myCurrentURL = completeURL(url);
         if (myCurrentURL != null) {
             if (hasNext()) {
@@ -115,15 +116,15 @@ public void addFavorite (String name) {
     /**
      * Returns URL from favorites associated with given name, null if none set.
      */
-    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("Invalid URL");
     }
 
     // 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 +138,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("Invalid URL");
                 }
             }
         }

src/BrowserView.java

@@ -61,6 +61,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
@@ -91,12 +92,22 @@ public BrowserView (BrowserModel model, String language) {
      * Display given URL.
      */
     public void showPage (String url) {
-        URL valid = myModel.go(url);
-        if (url != null) {
+
+/*        if (url != null) {
             update(valid);
         }
         else {
             showError("Could not load " + url);
+        }*/
+
+        try {
+            URL valid = myModel.go(url);
+        	update(valid);
+        }
+
+        catch (BrowserException be) {
+        	System.out.println("URL is not valid");
+        	showError(String.format("The URL %s is not a valid URL", url));
         }
     }
 
@@ -126,12 +137,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
@@ -140,7 +161,7 @@ private void home () {
     }
 
     // change page to favorite choice
-    private void showFavorite (String favorite) {
+    private void showFavorite (String favorite) throws BrowserException {
         showPage(myModel.getFavorite(favorite).toString());
     }
 
@@ -221,10 +242,18 @@ public void handle (ActionEvent event) {
     // make buttons for setting favorites/home URLs
     private Node makePreferencesPanel () {
         HBox result = new HBox();
+        myFavorites = new ComboBox<String>();
+        myFavorites.setPromptText("My Favorites");
         result.getChildren().add(makeButton("SetHomeCommand", event -> {
             myModel.setHome();
             enableButtons();
         }));
+        result.getChildren().add(makeButton("AddFavoriteCommand", event -> {
+            addFavorite();
+            enableButtons();
+        }));
+        result.getChildren().add(myFavorites);
+       // myFavorites.
         return result;
     }
 

src/resources/default.css

@@ -1,5 +1,5 @@
 .root {
-    -fx-font-size: 14pt;
+    -fx-font-size: 24pt;
     -fx-font-family: "Courier New";
     -fx-base: rgb(132, 145, 47);
     -fx-background: rgb(225, 228, 203);