Updates to reflect configuring project for Apache Tomcat

arc12012 · Dec 4, 2016 · 8a68ec6 · 8a68ec6
1 parent 4d48735
commit 8a68ec6
Show file tree

Hide file tree

Showing 39 changed files with 20 additions and 25 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.project b/.project
@@ -10,8 +10,22 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
diff --git a/html/css/stylesheet.css → WebContent/html/css/stylesheet.css b/html/css/stylesheet.css → WebContent/html/css/stylesheet.css
diff --git a/html/frameworks/Admin Page Returns 2.png → .../html/frameworks/Admin Page Returns 2.png b/html/frameworks/Admin Page Returns 2.png → .../html/frameworks/Admin Page Returns 2.png
diff --git a/html/frameworks/Admin Page Returns.png → ...nt/html/frameworks/Admin Page Returns.png b/html/frameworks/Admin Page Returns.png → ...nt/html/frameworks/Admin Page Returns.png
diff --git a/html/frameworks/All Items.png → WebContent/html/frameworks/All Items.png b/html/frameworks/All Items.png → WebContent/html/frameworks/All Items.png
diff --git a/html/frameworks/Data Page.png → WebContent/html/frameworks/Data Page.png b/html/frameworks/Data Page.png → WebContent/html/frameworks/Data Page.png
diff --git a/html/frameworks/Header Example.png → ...ontent/html/frameworks/Header Example.png b/html/frameworks/Header Example.png → ...ontent/html/frameworks/Header Example.png
diff --git a/html/frameworks/Main Page.png → WebContent/html/frameworks/Main Page.png b/html/frameworks/Main Page.png → WebContent/html/frameworks/Main Page.png
diff --git a/html/frameworks/Order Page.png → WebContent/html/frameworks/Order Page.png b/html/frameworks/Order Page.png → WebContent/html/frameworks/Order Page.png
diff --git a/html/frameworks/Return 1.png → WebContent/html/frameworks/Return 1.png b/html/frameworks/Return 1.png → WebContent/html/frameworks/Return 1.png
diff --git a/html/frameworks/Return 2.png → WebContent/html/frameworks/Return 2.png b/html/frameworks/Return 2.png → WebContent/html/frameworks/Return 2.png
diff --git a/html/frameworks/Shopping List.png → WebContent/html/frameworks/Shopping List.png b/html/frameworks/Shopping List.png → WebContent/html/frameworks/Shopping List.png
diff --git a/html/imgs/computerStick.png → WebContent/html/imgs/computerStick.png b/html/imgs/computerStick.png → WebContent/html/imgs/computerStick.png
diff --git a/html/imgs/ipad.png → WebContent/html/imgs/ipad.png b/html/imgs/ipad.png → WebContent/html/imgs/ipad.png
diff --git a/html/imgs/iphone.png → WebContent/html/imgs/iphone.png b/html/imgs/iphone.png → WebContent/html/imgs/iphone.png
diff --git a/html/imgs/synchrony-financial-logo-dlpx.png → ...ml/imgs/synchrony-financial-logo-dlpx.png b/html/imgs/synchrony-financial-logo-dlpx.png → ...ml/imgs/synchrony-financial-logo-dlpx.png
diff --git a/.../imgs/synchrony-financial-logo-dlpx_1.ico → .../imgs/synchrony-financial-logo-dlpx_1.ico b/.../imgs/synchrony-financial-logo-dlpx_1.ico → .../imgs/synchrony-financial-logo-dlpx_1.ico
diff --git a/.../imgs/synchrony-financial-logo-dlpx_1.png → .../imgs/synchrony-financial-logo-dlpx_1.png b/.../imgs/synchrony-financial-logo-dlpx_1.png → .../imgs/synchrony-financial-logo-dlpx_1.png
diff --git a/html/imgs/ticket.png → WebContent/html/imgs/ticket.png b/html/imgs/ticket.png → WebContent/html/imgs/ticket.png
diff --git a/html/imgs/user_icon.png → WebContent/html/imgs/user_icon.png b/html/imgs/user_icon.png → WebContent/html/imgs/user_icon.png
diff --git a/html/javascript/listing.js → WebContent/html/javascript/listing.js b/html/javascript/listing.js → WebContent/html/javascript/listing.js
@@ -112,7 +112,7 @@ function show(){
 function getUnavailableItems(){
 	var unavailable = new Array;
 	var unavailable_str = localStorage.getItem('unavailable');
-	if(unavailable_str !== ""){
+	if(unavailable_str !== "" && unavailable_str !== null){
 		unavailable = JSON.parse(unavailable_str);
 	}
 	return unavailable;

diff --git a/WebContent/html/javascript/navbar.js b/WebContent/html/javascript/navbar.js
diff --git a/html/javascript/nhpup_1.1.js → WebContent/html/javascript/nhpup_1.1.js b/html/javascript/nhpup_1.1.js → WebContent/html/javascript/nhpup_1.1.js
diff --git a/html/javascript/request.js → WebContent/html/javascript/request.js b/html/javascript/request.js → WebContent/html/javascript/request.js
@@ -119,7 +119,7 @@ function getCartItems(){
 	//get them from local storage
     var cart_str = localStorage.getItem('cart');
 	//if there is at least one object already we need to convert it from JSON to string
-    if (cart_str !== null) {
+    if (cart_str !== null && cart_str !== "") {
         cart = JSON.parse(cart_str);
     }
     return cart;
@@ -128,7 +128,7 @@ function getCartItems(){
 function getUnavailableItems(){
 	var unavailable = new Array;
 	var unavailable_str = localStorage.getItem('unavailable');
-	if(unavailable_str !== ""){
+	if(unavailable_str !== "" && unavailable_str !== null){
 		unavailable = JSON.parse(unavailable_str);
 	}
 	return unavailable;

diff --git a/html/javascript/return.js → WebContent/html/javascript/return.js b/html/javascript/return.js → WebContent/html/javascript/return.js
@@ -204,7 +204,7 @@ function getUnavailableIDs()
 {
 	var unavailable = new Array;
 	var unavailable_str = localStorage.getItem('unavailable');
-	if(unavailable_str !== ""){
+	if(unavailable_str !== "" && unavailable_str !== null){
 		unavailable = JSON.parse(unavailable_str);
 	}
 	return unavailable;

diff --git a/html/javascript/shoppingCart.js → WebContent/html/javascript/shoppingCart.js b/html/javascript/shoppingCart.js → WebContent/html/javascript/shoppingCart.js
@@ -224,7 +224,7 @@ This function gets unavailable items from local storage.
 function getUnavailableItems(){
 	var unavailable = new Array;								//make new array
 	var unavailable_str = localStorage.getItem('unavailable');	//get the string from local storage
-	if(unavailable_str !== ''){								//as long as its not null
+	if(unavailable_str !== '' && unavailable_str !== null){								//as long as its not null
 		unavailable = JSON.parse(unavailable_str);				//make into array
 	}
 	return unavailable;											//return value is an array

diff --git a/html/table.css → WebContent/html/table.css b/html/table.css → WebContent/html/table.css
diff --git a/html/webpages/homePage.html → WebContent/html/webpages/index.html b/html/webpages/homePage.html → WebContent/html/webpages/index.html
diff --git a/html/webpages/listingPage.html → WebContent/html/webpages/listingPage.html b/html/webpages/listingPage.html → WebContent/html/webpages/listingPage.html
diff --git a/html/webpages/map.html → WebContent/html/webpages/map.html b/html/webpages/map.html → WebContent/html/webpages/map.html
diff --git a/html/webpages/requestPage.html → WebContent/html/webpages/requestPage.html b/html/webpages/requestPage.html → WebContent/html/webpages/requestPage.html
diff --git a/html/webpages/returnPage.html → WebContent/html/webpages/returnPage.html b/html/webpages/returnPage.html → WebContent/html/webpages/returnPage.html
diff --git a/html/webpages/shoppingCart.html → WebContent/html/webpages/shoppingCart.html b/html/webpages/shoppingCart.html → WebContent/html/webpages/shoppingCart.html
diff --git a/db/Workbench Schema.mwb b/db/Workbench Schema.mwb
diff --git a/db/Workbench Schema.mwb.bak b/db/Workbench Schema.mwb.bak
diff --git a/html/javascript/navbar.js b/html/javascript/navbar.js
diff --git a/src/features/ReturnHandler.java b/src/features/ReturnHandler.java
@@ -17,8 +17,6 @@ public boolean changeAvailability(String type, Device[] db)
 		return true;
 
 	}
-
-	public
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,8 +17,6 @@ public boolean changeAvailability(String type, Device[] db)
		return true;

		}

		public



Expand Down