Modifications on Lab from class- cgu4 & cds33

README.md

@@ -1,2 +1,4 @@
 # lab_browser
 A simple GUI example: a web browser
+
+Names: Connor Usry (cgu4) and Chris Streiffer (cds33)

src/BrowserException.java

@@ -0,0 +1,14 @@
+ public class BrowserException extends RuntimeException{
+    	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+		public BrowserException() {}
+
+    	//Constructor that accepts a message
+    	public BrowserException(String message)
+    	{
+    		super(message);
+    	}
+ }

src/BrowserModel.java

@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 
 /**
@@ -15,6 +16,8 @@
 public class BrowserModel {
     // constants
     public static final String PROTOCOL_PREFIX = "http://";
+    public static final String DEFAULT_RESOURCE_PACKAGE = "resources/";
+    private ResourceBundle myErrors;
     // state
     private URL myHome;
     private URL myCurrentURL;
@@ -26,7 +29,8 @@ public class BrowserModel {
     /**
      * Creates an empty model.
      */
-    public BrowserModel () {
+    public BrowserModel (String s) {
+    	myErrors = ResourceBundle.getBundle(DEFAULT_RESOURCE_PACKAGE + s);
         myHome = null;
         myCurrentURL = null;
         myCurrentIndex = -1;
@@ -115,11 +119,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;
+    public URL getFavorite (String name) throws BrowserException {
+    		if( name != null && !name.equals("") && myFavorites.containsKey(name)) {
+    			return myFavorites.get(name);
+    		} else {
+    			throw new BrowserException(myErrors.getString("BrowserException"));
+    		}
     }
 
     // deal with a potentially incomplete URL

src/BrowserView.java

@@ -31,6 +31,7 @@
 import org.w3c.dom.events.EventTarget;
 
 
+
 /**
  * A class used to display the viewer for a simple HTML browser.
  * 
@@ -65,6 +66,7 @@ public class BrowserView {
     private ComboBox<String> myFavorites;
     // get strings from resource file
     private ResourceBundle myResources;
+
     // the data
     private BrowserModel myModel;
 
@@ -75,16 +77,20 @@ 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();
+
+
         // 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);
     }
 
     /**
@@ -141,7 +147,12 @@ private void home () {
 
     // change page to favorite choice
     private void showFavorite (String favorite) {
-        showPage(myModel.getFavorite(favorite).toString());
+    	try {
+    		showPage(myModel.getFavorite(favorite).toString());
+    	} catch (BrowserException e) {
+    	    throw e;
+    	}
+
     }
 
     // update just the view to display given URL
@@ -225,6 +236,16 @@ private Node makePreferencesPanel () {
             myModel.setHome();
             enableButtons();
         }));
+        result.getChildren().add(makeButton("SetFavoriteCommand", event -> {
+        	addFavorite();
+        })); 
+        result.getChildren().add(myFavorites);
+        myFavorites.valueProperty().addListener(new ChangeListener<String>() {
+        	@Override
+        	public void changed(ObservableValue ov, String t, String t1){
+        		showFavorite(t1);
+        	}
+        });
         return result;
     }
 

src/Main.java

@@ -16,7 +16,7 @@ public class Main extends Application {
     @Override
     public void start (Stage stage) {
         // create program specific components
-        BrowserModel model = new BrowserModel();
+        BrowserModel model = new BrowserModel("Errors");
         BrowserView display = new BrowserView(model, "English");
         // give the window a title
         stage.setTitle(TITLE);

src/resources/English.properties

@@ -8,3 +8,4 @@ ErrorTitle=Browser Error
 FavoritePromptTitle=Add Favorite
 FavoriteFirstItem=All Favorites
 SetHomeCommand=Set Home
+SetFavoriteCommand=Set Favorite

src/resources/Errors.properties

@@ -0,0 +1 @@
+BrowserException="You Messed Up"