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/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..253bc07 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/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..a8b8ab7 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,547 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1432855469006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index c02997c..e2efe92 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,10 @@ 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:20pm EST -My End time: `` +My End time: 8:00pm EST Test End time: Fri May 29, 10:00pm EST -Total time: 27 hours +Total time: 30 minutes(10 minutes for procrastination) 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..543daef 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..6986b3e 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..b87f405 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/MyObject.java b/src/MyObject.java new file mode 100644 index 0000000..e0a74a5 --- /dev/null +++ b/src/MyObject.java @@ -0,0 +1,44 @@ +/** + * Created by c4q-anthony-mcbride on 5/28/15. + */ +public class MyObject +{ + private String name; + private int age; + + public MyObject() + { + } + + public MyObject(String name, int age) + { + this.name = name; + this.age = age; + } + + public void setName(String name) + { + this.name = name; + } + + public void setAge(int age) + { + this.age = age; + } + + public String getName() + { + return this.name; + } + + public int getAge() + { + return this.age; + } + + public boolean isEqual(MyObject o) + { + return (this.name.equals(o.getName()) && this.age == o.getAge()); + } + +} diff --git a/src/MyObjectNode.java b/src/MyObjectNode.java new file mode 100644 index 0000000..d03dffe --- /dev/null +++ b/src/MyObjectNode.java @@ -0,0 +1,63 @@ +/** + * Created by c4q-anthony-mcbride on 5/28/15. + */ +public class MyObjectNode extends MyNode +{ + public static void main(String[] args) + { + MyObject o = new MyObject(); + MyObject oTwo = new MyObject(); + MyObject oThree = new MyObject(); + + o.setName("Object"); + o.setAge(1); + + oTwo.setName("Object"); + oTwo.setAge(1); + + oThree.setName("Object"); + oThree.setAge(2); + + + System.out.println(o.isEqual(oTwo)); + System.out.println(oTwo.isEqual(oThree)); + + } + private MyNode left; + private MyNode right; + private Object data; + + public void setLeft(MyNode left){ + this.left = left; + } + public void setRight(MyNode right){ + this.right = right; + } + public void setData(Object data){ + this.data = data; + } + @Override + public MyNode getLeft() + { + return this.left; + } + + @Override + public MyNode getRight() + { + return this.right; + } + + @Override + public Object getData() + { + return this.data; + } + + @Override + public void insert(MyNode newNode) + { + + } +} + diff --git a/src/Tests.java b/src/Tests.java index 377c274..7311397 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()); } @@ -60,7 +60,7 @@ public void test05MyObjectHasNameAndAge() throws Exception { Class klass = cl.loadClass("MyObject"); Method[] methods = klass.getMethods(); - ArrayList methodNames = new ArrayList<>(); + ArrayList methodNames = new ArrayList(); for (Method m : methods){ methodNames.add(m.getName()); } 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