9/17 work

.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
+
+
+Partners: Vanessa Wu (vsw3) and Steve Mazzari (sam98)

src/BrowserException.java

@@ -0,0 +1,14 @@
+
+public class BrowserException extends Exception{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public BrowserException(String string) {
+		// TODO Auto-generated constructor stub
+		super(string);
+	}
+
+}

src/BrowserModel.java

@@ -4,6 +4,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 
 /**
@@ -19,9 +20,10 @@ public class BrowserModel {
     private URL myHome;
     private URL myCurrentURL;
     private int myCurrentIndex;
+    public static final String DEFAULT_RESOURCE_PACKAGE = "resources/";
     private List<URL> myHistory;
     private Map<String, URL> myFavorites;
-
+    private ResourceBundle myResources;
 
     /**
      * Creates an empty model.
@@ -32,34 +34,38 @@ public BrowserModel () {
         myCurrentIndex = -1;
         myHistory = new ArrayList<>();
         myFavorites = new HashMap<>();
+        myResources = ResourceBundle.getBundle(DEFAULT_RESOURCE_PACKAGE + "Errors");
     }
 
     /**
      * 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(myResources.getString("URL"));
     }
 
     /**
      * Returns the first page in back history, null if back history is empty.
+     * @throws BrowserException 
      */
-    public URL back () {
+    public URL back () throws BrowserException {
         if (hasPrevious()) {
             myCurrentIndex--;
             return myHistory.get(myCurrentIndex);
         }
-        return null;
+        throw new BrowserException(myResources.getString("URL"));
     }
 
     /**
      * Changes current page to given URL, removing next history.
+     * @throws BrowserException 
      */
-    public URL go (String url) {
+    public URL go (String url) throws BrowserException {
         myCurrentURL = completeURL(url);
         if (myCurrentURL != null) {
             if (hasNext()) {
@@ -114,16 +120,18 @@ public void addFavorite (String name) {
 
     /**
      * Returns URL from favorites associated with given name, null if none set.
+     * @throws BrowserException 
      */
-    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(myResources.getString("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 +145,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(myResources.getString("URL"));
                 }
             }
         }

src/BrowserView.java

@@ -61,6 +61,7 @@ public class BrowserView {
     private Button myBackButton;
     private Button myNextButton;
     private Button myHomeButton;
+    private Button addToFavorites;
     // favorites
     private ComboBox<String> myFavorites;
     // get strings from resource file
@@ -75,6 +76,7 @@ public BrowserView (BrowserModel model, String language) {
         myModel = model;
         // use resources for labels
         myResources = ResourceBundle.getBundle(DEFAULT_RESOURCE_PACKAGE + language);
+
         BorderPane root = new BorderPane();
         // must be first since other panels may refer to page
         root.setCenter(makePageDisplay());
@@ -84,20 +86,22 @@ 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);
-        }
+        URL valid;
+		try {
+			valid = myModel.go(url);
+			update(valid);
+		} catch (BrowserException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			showError("Could not load " + url);
+		}
     }
 
     /**
@@ -126,22 +130,39 @@ 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
     private void home () {
         showPage(myModel.getHome().toString());
     }
+
+
 
     // change page to favorite choice
     private void showFavorite (String favorite) {
-        showPage(myModel.getFavorite(favorite).toString());
+        try {
+			showPage(myModel.getFavorite(favorite).toString());
+		} catch (BrowserException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
     }
 
     // update just the view to display given URL
@@ -225,6 +246,11 @@ private Node makePreferencesPanel () {
             myModel.setHome();
             enableButtons();
         }));
+        myFavorites = new ComboBox<String>();
+        myFavorites.setPromptText(myResources.getString("FavoriteFirstItem"));
+        myFavorites.valueProperty().addListener((o, s1, s2) -> showFavorite(s2));
+        result.getChildren().add(makeButton("AddFavoriteCommand", event -> addFavorite()));
+        result.getChildren().add(myFavorites);
         return result;
     }
 
@@ -235,6 +261,7 @@ private Button makeButton (String property, EventHandler<ActionEvent> handler) {
             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(

src/resources/Errors.properties

@@ -0,0 +1 @@
+URL=Invalid URL

src/resources/default.css

@@ -1,27 +1,38 @@
 .root {
     -fx-font-size: 14pt;
     -fx-font-family: "Courier New";
-    -fx-base: rgb(132, 145, 47);
-    -fx-background: rgb(225, 228, 203);
+    -fx-base: #000000;
+    -fx-background: #ffffff;
 }
 
 .button {
-    -fx-text-fill: #006464;
-    -fx-background-color: #DFB951;
-    -fx-border-radius: 20;
-    -fx-background-radius: 20;
-    -fx-padding: 8;
+    -fx-background-color: #090a0c, linear-gradient(#38424b 0%, #1f2429 20%, #191d22 100%),linear-gradient(#20262b, #191d22),radial-gradient(center 50% 0%, radius 100%, rgba(114,131,148,0.9),rgba(255,255,255,0));
+     -fx-background-radius: 5,4,3,5;
+     -fx-background-insets: 0,1,2,0;
+     -fx-text-fill: white;
+     -fx-text-size: 12px;
+     -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 5, 0.0 , 0 , 1 );
+     -fx-font-family: Arial;
+     -fx-text-fill: linear-gradient(white, #d0d0d0);
+     -fx-font-size: 12px;
+     -fx-padding: 1 20 1 20;
 }
 
 .button:hover {
     -fx-background-color: #3a3a3a;
 }
 
 .combo-box-base {
-    -fx-text-base-color: #006464;
-    -fx-background-color: #DFB951;
-    -fx-border-radius: 20;
-    -fx-background-radius: 20;
+        -fx-background-color: #090a0c, linear-gradient(#38424b 0%, #1f2429 20%, #191d22 100%),linear-gradient(#20262b, #191d22),radial-gradient(center 50% 0%, radius 100%, rgba(114,131,148,0.9),rgba(255,255,255,0));
+     -fx-background-radius: 5,4,3,5;
+     -fx-background-insets: 0,1,2,0;
+     -fx-text-fill: white;
+     -fx-text-size: 11px;
+     -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 5, 0.0 , 0 , 1 );
+     -fx-font-family: Arial;
+     -fx-text-fill: linear-gradient(white, #d0d0d0);
+     -fx-font-size: 12px;
+     -fx-padding: 1 20 1 20;
 }
 .combo-box-base:hover {
     -fx-background-color: #3a3a3a;
@@ -30,11 +41,19 @@
 .label {
     -fx-font-size: 11pt;
     -fx-font-family: "Segoe UI Semibold";
-    -fx-text-fill: #006464;
+    -fx-text-fill: #000000;
     -fx-opacity: 0.6;
 }
 
 .text-field {
-    -fx-font-size: 14pt;
-    -fx-font-family: "Segoe UI Semibold";
+       -fx-background-color: #000000;
+     -fx-background-radius: 5,4,3,5;
+     -fx-background-insets: 0,1,2,0;
+     -fx-text-fill: white;
+     -fx-text-size: 12px;
+     -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 5, 0.0 , 0 , 1 );
+     -fx-font-family: Arial;
+     -fx-text-fill: linear-gradient(white, #d0d0d0);
+     -fx-font-size: 12px;
+     -fx-padding: 1 20 1 20;
 }