diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..540cdbc --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +unit-1-bootcamp-assessment \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..a852314 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..d821048 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml new file mode 100644 index 0000000..85d6a10 --- /dev/null +++ b/.idea/libraries/lib.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..878be69 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + 1.7 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..8928d91 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..6dfd582 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,539 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1432855527278 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index c02997c..142afb9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # unit-1-bootcamp - +Start: 7:23 +End: 1. Fork this repository. In your README, mark down your start time. 2. Create a new class, `MyObject`. A `MyObject` has a name (`String`) and an age (`int`). @@ -21,9 +22,9 @@ 10. Submit a pull request with all your code. -Test Start time: Thu May 28, 7:00pm EST +Test Start time: Thu May 28, 7:25pm EST -My End time: `` +My End time: `<8:25>` Test End time: Fri May 29, 10:00pm EST diff --git a/out/production/unit-1-bootcamp-assessment/Exercises$Child.class b/out/production/unit-1-bootcamp-assessment/Exercises$Child.class new file mode 100644 index 0000000..a39226f Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/Exercises$Child.class differ diff --git a/out/production/unit-1-bootcamp-assessment/Exercises$Parent.class b/out/production/unit-1-bootcamp-assessment/Exercises$Parent.class new file mode 100644 index 0000000..c49127c Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/Exercises$Parent.class differ diff --git a/out/production/unit-1-bootcamp-assessment/Exercises.class b/out/production/unit-1-bootcamp-assessment/Exercises.class new file mode 100644 index 0000000..ca26735 Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/Exercises.class differ diff --git a/out/production/unit-1-bootcamp-assessment/MyNode.class b/out/production/unit-1-bootcamp-assessment/MyNode.class new file mode 100644 index 0000000..48deb42 Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/MyNode.class differ diff --git a/out/production/unit-1-bootcamp-assessment/MyObject.class b/out/production/unit-1-bootcamp-assessment/MyObject.class new file mode 100644 index 0000000..96726e9 Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/MyObject.class differ diff --git a/out/production/unit-1-bootcamp-assessment/MyObjectNode.class b/out/production/unit-1-bootcamp-assessment/MyObjectNode.class new file mode 100644 index 0000000..a8702c9 Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/MyObjectNode.class differ diff --git a/out/production/unit-1-bootcamp-assessment/Tests.class b/out/production/unit-1-bootcamp-assessment/Tests.class new file mode 100644 index 0000000..a94d975 Binary files /dev/null and b/out/production/unit-1-bootcamp-assessment/Tests.class differ diff --git a/src/Exercises.java b/src/Exercises.java index ac85d45..fd8eadf 100644 --- a/src/Exercises.java +++ b/src/Exercises.java @@ -1,11 +1,11 @@ public class Exercises { static class Parent { - public String doStuff() { return ""; } + public String doStuff() { return "parent"; } } static class Child extends Parent { - public String doStuff() { return ""; } - public String doStuff(String s) { return ""; } + public String doStuff() { return "child"; } + public String doStuff(String s) { return "Howdy"; } } diff --git a/src/MyNode.java b/src/MyNode.java index 54f3213..3795de3 100644 --- a/src/MyNode.java +++ b/src/MyNode.java @@ -2,9 +2,9 @@ * Created by amyquispe on 5/28/15. */ public abstract class MyNode { - private MyNode left; - private MyNode right; - private T data; + protected MyNode left; + protected MyNode right; + protected T data; public abstract MyNode getLeft(); diff --git a/src/MyObject.java b/src/MyObject.java new file mode 100644 index 0000000..ec27572 --- /dev/null +++ b/src/MyObject.java @@ -0,0 +1,62 @@ +/** + * Created by c4q-madelyntavarez on 5/28/15. + */ +public class MyObject +{ + String name; + int age; + + public MyObject(String name, int age) + { + this.name=name; + this.age=age; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + + this.name = name; + } + + public int getAge() + { + return age; + } + + public void setAge(int age) + { + + this.age = age; + } + + @Override + public boolean equals(Object obj) + { + if(obj==null){return false;} + + if (obj instanceof MyObject) { + MyObject object = (MyObject) obj; + if (this.name.equalsIgnoreCase(object.name) && this.age == object.age) + { + return true;} + } + return false; + } + + + public static void main(String[] args) + { + + MyObject object3=new MyObject("Larry",20); + + MyObject object4=new MyObject("Larry",20); + + System.out.println((object3.equals(object4))); + + } +} \ No newline at end of file diff --git a/src/Tests.java b/src/Tests.java index 377c274..14e003b 100644 --- a/src/Tests.java +++ b/src/Tests.java @@ -44,7 +44,7 @@ public void test04MyObjectNodeImplementsSetters() throws Exception { ClassLoader cl = ClassLoader.getSystemClassLoader(); Class klass = cl.loadClass("MyObjectNode"); Method[] methods = klass.getMethods(); - ArrayList methodNames = new ArrayList<>(); + ArrayList methodNames = new ArrayList(); for (Method m : methods){ methodNames.add(m.getName()); } diff --git a/src/myObjectNode.java b/src/myObjectNode.java new file mode 100644 index 0000000..d39f137 --- /dev/null +++ b/src/myObjectNode.java @@ -0,0 +1,40 @@ +/** + * Created by c4q-madelyntavarez on 5/28/15. + */ +public class MyObjectNode extends MyNode +{ + @Override + public MyNode getLeft() + { + return null; + } + + @Override + public MyNode getRight() + { + return null; + } + + @Override + public Object getData() + { + return null; + } + + @Override + public void insert(MyNode newNode) + { + } + + public void setRight(){} + + public void setLeft(){} + + public void setData(){} + + public static void main(String[] args) + { + + } +} + diff --git a/unit-1-bootcamp-assessment.iml b/unit-1-bootcamp-assessment.iml new file mode 100644 index 0000000..fb8e866 --- /dev/null +++ b/unit-1-bootcamp-assessment.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file