Browser (ssm33 Sharrin Manor, csh36 Chris Hong)

.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
+
+Worked on by Sharrin Manor (ssm33) and Chris Hong (csh36).
+Added flower behind buttons (doesnt quite fit), added exceptions, added favorites function

src/BrowserException.java

@@ -0,0 +1,16 @@
+
+
+public class BrowserException extends RuntimeException {
+
+	public BrowserException(String error){
+		super(error);
+		System.out.println("throwing error");
+	}
+
+
+//replace for four nulls with throwing browser exceptons
+	//change show page to do a try catch in view 
+
+	//make it take from resources
+	//String.format("dfdsfkajd %s dfsd", url));
+}

src/BrowserModel.java

@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 
 /**
@@ -15,12 +16,14 @@
 public class BrowserModel {
     // constants
     public static final String PROTOCOL_PREFIX = "http://";
+    public static final String ERRORS_RESOURCE_PACKAGE = "resources/Errors";
     // state
     private URL myHome;
     private URL myCurrentURL;
     private int myCurrentIndex;
     private List<URL> myHistory;
     private Map<String, URL> myFavorites;
+    private ResourceBundle myErrorResources;
 
 
     /**
@@ -32,6 +35,7 @@ public BrowserModel () {
         myCurrentIndex = -1;
         myHistory = new ArrayList<>();
         myFavorites = new HashMap<>();
+        myErrorResources = ResourceBundle.getBundle(ERRORS_RESOURCE_PACKAGE);
     }
 
     /**
@@ -42,7 +46,7 @@ public URL next () {
             myCurrentIndex++;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+        throw new BrowserException(myErrorResources.getString("NextError"));
     }
 
     /**
@@ -53,7 +57,7 @@ public URL back () {
             myCurrentIndex--;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+        throw new BrowserException(myErrorResources.getString("BackError"));
     }
 
     /**
@@ -119,7 +123,7 @@ public URL getFavorite (String name) {
         if (name != null && !name.equals("") && myFavorites.containsKey(name)) {
             return myFavorites.get(name);
         }
-        return null;
+        throw new BrowserException(myErrorResources.getString("NextError"));
     }
 
     // deal with a potentially incomplete URL
@@ -137,7 +141,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(myErrorResources.getString("BadURL"));
                 }
             }
         }

src/BrowserView.java

@@ -84,20 +84,20 @@ 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 (url != null) {
-            update(valid);
-        }
-        else {
-            showError("Could not load " + url);
-        }
+    	try {
+    		URL valid = myModel.go(url);
+    		update(valid);
+    	} catch (BrowserException e){
+    		showError(e.getMessage());
+    	}
+
     }
 
     /**
@@ -204,6 +204,7 @@ public void handle (ActionEvent event) {
                 back();        
             }      
         });
+
         result.getChildren().add(myBackButton);
         // new style way to do set up callback (lambdas)
         myNextButton = makeButton("NextCommand", event -> next());
@@ -221,6 +222,12 @@ 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()));
+        myFavorites = new ComboBox<String>();
+        myFavorites.setPromptText("Fave lists");
+        myFavorites.valueProperty().addListener((o, s1, s2) -> showFavorite(s2));
+        result.getChildren().add(myFavorites);
         result.getChildren().add(makeButton("SetHomeCommand", event -> {
             myModel.setHome();
             enableButtons();

src/resources/Errors.properties

@@ -0,0 +1,4 @@
+NextError = There is no next History
+FaveError = No associated favorite
+PrevError = There is no prev history
+BadURLError = Invalid url

src/resources/default.css

@@ -7,7 +7,7 @@
 
 .button {
     -fx-text-fill: #006464;
-    -fx-background-color: #DFB951;
+    -fx-background-image: url("flower.png");
     -fx-border-radius: 20;
     -fx-background-radius: 20;
     -fx-padding: 8;