diff --git a/.Staff.java.swp b/.Staff.java.swp deleted file mode 100644 index a412f1d9c38f6778b2adbc5c7500664e8be80ae9..0000000000000000000000000000000000000000 Binary files a/.Staff.java.swp and /dev/null differ diff --git a/Products.java b/Products.java index e67e40d44628760eef51f20feefeec728fa808d6..9b199058950f2af9963acb23f50dd945094b9493 100644 --- a/Products.java +++ b/Products.java @@ -403,4 +403,13 @@ public class Products { /* a good class, but not as good as cse391 */ 183.41 ); } + public Product janelleProduct() { + return new Product( + "Keyboard cover", + "Protects keyboard", + "keyboard_protecc.png", + "A keyboard cover, slick design", + 5.55 + ); + } } diff --git a/Staff.java b/Staff.java index c596030ddc6ce6174ddc32909b0fd151afe74907..46ed28f2d9eca685bbc6b7f09a36d0e884e457d6 100644 --- a/Staff.java +++ b/Staff.java @@ -434,4 +434,13 @@ public class Staff { "a sleeping monkey" ); } + public Employee jc383() { + return new Employee( + "Janelle", + "Student", + "Loves pets", + "ski.png", + "Person skiing" + ); + } } diff --git a/images/staff/keyboard_protecc.png b/images/staff/keyboard_protecc.png new file mode 100644 index 0000000000000000000000000000000000000000..19feae1fcb4aeab60a95f68e16ca6ebb04ccdcd8 Binary files /dev/null and b/images/staff/keyboard_protecc.png differ diff --git a/images/staff/ski.png b/images/staff/ski.png new file mode 100644 index 0000000000000000000000000000000000000000..856d8b9d07d1e2a64cc5c03b0a54addd3e7cc0cc Binary files /dev/null and b/images/staff/ski.png differ