Lab exercise written by Mike Ma & Ying Qi

README.md

@@ -1,2 +1,4 @@
 # lab_browser
 A simple GUI example: a web browser
+
+Author: Mike Ma, Ying Qi

src/BrowserException.java

@@ -0,0 +1,9 @@
+
+
+public class BrowserException extends Exception {
+	private static final long serialVersionUID = 1L;
+
+	public BrowserException(String message) {
+		super(message);
+	}
+}

src/BrowserModel.java

@@ -59,7 +59,7 @@ public URL back () {
     /**
      * 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()) {
@@ -123,7 +123,7 @@ public URL getFavorite (String name) {
     }
 
     // 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 +137,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("message");
                 }
             }
         }

src/BrowserView.java

@@ -23,6 +23,7 @@
 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;
@@ -91,13 +92,16 @@ public BrowserView (BrowserModel model, String language) {
      * Display given URL.
      */
     public void showPage (String url) {
-        URL valid = myModel.go(url);
-        if (url != null) {
-            update(valid);
-        }
-        else {
-            showError("Could not load " + url);
-        }
+        URL valid;
+		try {
+			update(myModel.go(url));
+		} catch (BrowserException e) {
+			try {
+				throw new BrowserException("Could not load %s check your spelling");
+			} catch (BrowserException e1) {
+				e1.printStackTrace();
+			}
+		}
     }
 
     /**
@@ -219,12 +223,21 @@ public void handle (ActionEvent event) {
     }
 
     // make buttons for setting favorites/home URLs
-    private Node makePreferencesPanel () {
+    private HBox makePreferencesPanel () {
         HBox result = new HBox();
         result.getChildren().add(makeButton("SetHomeCommand", event -> {
             myModel.setHome();
             enableButtons();
         }));
+        result.getChildren().add(makeButton("AddFavoriteCommand", event -> {
+        	addFavorite();
+            enableButtons();
+        }));
+        myFavorites = new ComboBox<>();
+        myFavorites.setPromptText(myResources.getString("FavoriteFirstItem"));
+        myFavorites.valueProperty().addListener((observable, oldValue, newValue) -> {
+        	showFavorite(newValue);});
+        result.getChildren().add(myFavorites);
         return result;
     }