diff --git a/Product.java b/Product.java deleted file mode 100644 index 44a5ca94056cb55601a62c832a710201b30e1aca..0000000000000000000000000000000000000000 --- a/Product.java +++ /dev/null @@ -1,39 +0,0 @@ -public class Product { - public String name; - public String description; - public String picture; - public String altText; - public double price; - - public Product(String name, String description, String picture, String altText, double price) { - this.name = name; - this.description = description; - this.picture = picture; - this.altText = altText; - this.price = price; - } - - public String getName() { - return this.name; - } - - public String getAltText() { - return this.altText; - } - - public String getDescription() { - return this.description; - } - - public String getPicture() { - return this.picture; - } - - public double getPrice() { - return this.price; - } - - public String toString() { - return "Product"; - } -} diff --git a/Products.java b/Products.java index 1a9c441f8e7da5deed04e609134494cd14adc538..2d54d752c48a28db2209d2c60a15000dc58f02b7 100644 --- a/Products.java +++ b/Products.java @@ -1,6 +1,14 @@ /* check out these products! */ public class Products { /* a good class, but not as good as cse391 */ - + public Product boschenProduct() { + return new Product( + "sleepCoke", + "It will help you a nice sleep", + "sleepCoke.jpg", + "really good, has sleepy coffine", + 9.98 + ); + } public Product kevinh33Product() { return new Product( "Duolingo owl", diff --git a/Staff.java b/Staff.java index 32c52c9841f01bf05b55f02227588faae93effb1..86cbdb222ac18d0874065088cd5a0e005b962ca3 100644 --- a/Staff.java +++ b/Staff.java @@ -1,5 +1,13 @@ public class Staff { - + public Employee boschen() { + return new Employee( + "Boshan Chen", + "Sleeper", + "Sleep and stare blankly", + "White.jpg", + "umm.." + ); + } public Employee cuperido() { return new Employee( "Young You", diff --git a/images/products/sleepCoke.jpg b/images/products/sleepCoke.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d5d63588eaae1e81df9d51c6f3bcf63ce5ac7cbf Binary files /dev/null and b/images/products/sleepCoke.jpg differ diff --git a/images/staff/White.jpg b/images/staff/White.jpg new file mode 100644 index 0000000000000000000000000000000000000000..02311af9a72dfe8655879816d283bafbd0aa2dad Binary files /dev/null and b/images/staff/White.jpg differ