Karen Li (kjl32) and Bridget Dou (bd82)

.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: Karen Li (kjl32) and Bridget Dou (bd82)
+

src/BrowserException.java

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

src/BrowserModel.java

@@ -9,6 +9,7 @@
 /**
  * This represents the heart of the browser: the collections
  * that organize all the URLs into useful structures.
+ * Nothing in here is specific to JavaFX
  * 
  * @author Robert C. Duvall
  */
@@ -59,7 +60,13 @@ public URL back () {
     /**
      * Changes current page to given URL, removing next history.
      */
-    public URL go (String url) {
+    public URL go(String url) throws BrowserException{
+    	try{
+    		URL tmp = completeURL(url);
+    		tmp.openStream();
+    		myCurrentURL = tmp;
+    	}
+
         myCurrentURL = completeURL(url);
         if (myCurrentURL != null) {
             if (hasNext()) {
@@ -118,12 +125,14 @@ public void addFavorite (String name) {
     public URL getFavorite (String name) {
         if (name != null && !name.equals("") && myFavorites.containsKey(name)) {
             return myFavorites.get(name);
+        }else{
+        	throw new BrowserException("fdjksl", name);
         }
-        return null;
+
     }
 
     // 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 +146,8 @@ 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;
+                	throw new BrowserException("message");
                 }
             }
         }

src/BrowserView.java

@@ -84,20 +84,33 @@ 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 {
+        	update(myModel.go(url));
+        } catch (BrowserException b) {
+        	try {
+				throw new BrowserException("Could not load %s check your spelling");
+			} catch (BrowserException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+//        	showError(String.format("Could not load %s check your spelling", url));
         }
+
+//        if (url != null) {
+//            update(valid);
+//        }
+//        else {
+//            //showError("Could not load " + url);
+//            showError(String.format("Could not load %s check your spelling", url));
+//        }
     }
 
     /**
@@ -221,10 +234,27 @@ public void handle (ActionEvent event) {
     // make buttons for setting favorites/home URLs
     private Node makePreferencesPanel () {
         HBox result = new HBox();
-        result.getChildren().add(makeButton("SetHomeCommand", event -> {
+        Button mySetHomeCommand = makeButton("SetHomeCommand", event -> {
             myModel.setHome();
             enableButtons();
-        }));
+        });
+        result.getChildren().add(mySetHomeCommand);
+
+        Button myAddFavCommand = makeButton("AddFavoriteCommand", event -> {
+            addFavorite();
+        });
+
+        result.getChildren().add(myAddFavCommand);
+
+        myFavorites = new ComboBox<String>();
+        myFavorites.valueProperty().addListener(new ChangeListener<String>() {
+        	@Override 
+        	public void changed(ObservableValue ov, String t, String t1) {                
+        		showFavorite(t1);               
+        	}    
+        });
+        result.getChildren().add(myFavorites);
+
         return result;
     }
 
@@ -259,7 +289,7 @@ private TextField makeInputField (int width, EventHandler<ActionEvent> handler)
     private class ShowPage implements EventHandler<ActionEvent> {
         @Override      
         public void handle (ActionEvent event) {       
-            showPage(myURLDisplay.getText());      
+            showPage(myURLDisplay.getText());      //calling a function in BrowserView
         }      
     }
 

src/resources/default.css

@@ -1,40 +1,194 @@
-.root {
-    -fx-font-size: 14pt;
-    -fx-font-family: "Courier New";
-    -fx-base: rgb(132, 145, 47);
-    -fx-background: rgb(225, 228, 203);
-}
+/* css Zen Garden default style v1.02 */
+/* css released under Creative Commons License - http://creativecommons.org/licenses/by-nc-sa/1.0/  */
 
-.button {
-    -fx-text-fill: #006464;
-    -fx-background-color: #DFB951;
-    -fx-border-radius: 20;
-    -fx-background-radius: 20;
-    -fx-padding: 8;
-}
+/* This file based on 'Tranquille' by Dave Shea */
+/* You may use this file as a foundation for any new work, but you may find it easier to start from scratch. */
+/* Not all elements are defined in this file, so you'll most likely want to refer to the xhtml as well. */
 
-.button:hover {
-    -fx-background-color: #3a3a3a;
-}
+/* Your images should be linked as if the CSS file sits in the same folder as the images. ie. no paths. */
 
-.combo-box-base {
-    -fx-text-base-color: #006464;
-    -fx-background-color: #DFB951;
-    -fx-border-radius: 20;
-    -fx-background-radius: 20;
-}
-.combo-box-base:hover {
-    -fx-background-color: #3a3a3a;
-}
 
-.label {
-    -fx-font-size: 11pt;
-    -fx-font-family: "Segoe UI Semibold";
-    -fx-text-fill: #006464;
-    -fx-opacity: 0.6;
-}
+/* basic elements */
+html {
+	margin: 0;
+	padding: 0;
+	}
+body { 
+	font: 75% georgia, sans-serif;
+	line-height: 1.88889;
+	color: #555753; 
+	background: #fff url(blossoms.jpg) no-repeat bottom right; 
+	margin: 0; 
+	padding: 0;
+	}
+p { 
+	margin-top: 0; 
+	text-align: justify;
+	}
+h3 { 
+	font: italic normal 1.4em georgia, sans-serif;
+	letter-spacing: 1px; 
+	margin-bottom: 0; 
+	color: #7D775C;
+	}
+a:link { 
+	font-weight: bold; 
+	text-decoration: none; 
+	color: #B7A5DF;
+	}
+a:visited { 
+	font-weight: bold; 
+	text-decoration: none; 
+	color: #D4CDDC;
+	}
+a:hover, a:focus, a:active { 
+	text-decoration: underline; 
+	color: #9685BA;
+	}
+abbr {
+	border-bottom: none;
+	}
+
+
+/* specific divs */
+.page-wrapper { 
+	background: url(zen-bg.jpg) no-repeat top left; 
+	padding: 0 175px 0 110px;  
+	margin: 0; 
+	position: relative;
+	}
+
+.intro { 
+	min-width: 470px;
+	width: 100%;
+	}
+
+header h1 { 
+	background: transparent url(h1.gif) no-repeat top left;
+	margin-top: 10px;
+	display: block;
+	width: 219px;
+	height: 87px;
+	float: left;
+
+	text-indent: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+	}
+header h2 { 
+	background: transparent url(h2.gif) no-repeat top left; 
+	margin-top: 58px; 
+	margin-bottom: 40px; 
+	width: 200px; 
+	height: 18px; 
+	float: right;
 
-.text-field {
-    -fx-font-size: 14pt;
-    -fx-font-family: "Segoe UI Semibold";
+	text-indent: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+	}
+header {
+	padding-top: 20px;
+	height: 87px;
 }
+
+.summary {
+	clear: both; 
+	margin: 20px 20px 20px 10px; 
+	width: 160px; 
+	float: left;
+	}
+.summary p {
+	font: italic 1.1em/2.2 georgia; 
+	text-align: center;
+	}
+
+.preamble {
+	clear: right; 
+	padding: 0px 10px 0 10px;
+	}
+.supporting {	
+	padding-left: 10px; 
+	margin-bottom: 40px;
+	}
+
+footer { 
+	text-align: center; 
+	}
+footer a:link, footer a:visited { 
+	margin-right: 20px; 
+	}
+
+.sidebar {
+	margin-left: 600px; 
+	position: absolute; 
+	top: 0; 
+	right: 0;
+	}
+.sidebar .wrapper { 
+	font: 10px verdana, sans-serif; 
+	background: transparent url(paper-bg.jpg) top left repeat-y; 
+	padding: 10px; 
+	margin-top: 150px; 
+	width: 130px; 
+	}
+.sidebar h3.select { 
+	background: transparent url(h3.gif) no-repeat top left; 
+	margin: 10px 0 5px 0; 
+	width: 97px; 
+	height: 16px; 
+
+	text-indent: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+	}
+.sidebar h3.archives { 
+	background: transparent url(h5.gif) no-repeat top left; 
+	margin: 25px 0 5px 0; 
+	width:57px; 
+	height: 14px; 
+
+	text-indent: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+	}
+.sidebar h3.resources { 
+	background: transparent url(h6.gif) no-repeat top left; 
+	margin: 25px 0 5px 0; 
+	width:63px; 
+	height: 10px; 
+
+	text-indent: 100%;
+	white-space: nowrap;
+	overflow: hidden;
+	}
+
+
+.sidebar ul {
+	margin: 0;
+	padding: 0;
+	}
+.sidebar li {
+	line-height: 1.3em; 
+	background: transparent url(cr1.gif) no-repeat top center; 
+	display: block; 
+	padding-top: 5px; 
+	margin-bottom: 5px;
+	list-style-type: none;
+	}
+.sidebar li a:link {
+	color: #988F5E;
+	}
+.sidebar li a:visited {
+	color: #B3AE94;
+	}
+
+
+.extra1 {
+	background: transparent url(cr2.gif) top left no-repeat; 
+	position: absolute; 
+	top: 40px; 
+	right: 0; 
+	width: 148px; 
+	height: 110px;
+	}