From 4547ef1137d937410966ca63cb0eeb3c1277d19e Mon Sep 17 00:00:00 2001 From: Jann Date: Thu, 28 May 2015 19:32:40 -0400 Subject: [PATCH 1/3] start time 7:20 pm --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c02997c..996ad3d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ 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:00pm EST start time 7:20pm My End time: `` From 5cf174107a4778e3d7d0df4918bec6adf9e833f0 Mon Sep 17 00:00:00 2001 From: Sea Date: Thu, 28 May 2015 21:02:11 -0400 Subject: [PATCH 2/3] add --- .idea/.name | 1 + .idea/compiler.xml | 23 + .idea/copyright/profiles_settings.xml | 3 + .idea/encodings.xml | 4 + .idea/libraries/lib.xml | 10 + .idea/misc.xml | 418 +++++++++++ .idea/modules.xml | 8 + .idea/scopes/scope_settings.xml | 5 + .idea/uiDesigner.xml | 124 ++++ .idea/vcs.xml | 6 + .idea/workspace.xml | 651 ++++++++++++++++++ .../Exercises$Child.class | Bin 0 -> 572 bytes .../Exercises$Parent.class | Bin 0 -> 425 bytes .../Exercises.class | Bin 0 -> 355 bytes .../unit-1-bootcamp-assessment/MyNode.class | Bin 0 -> 1063 bytes .../unit-1-bootcamp-assessment/MyObject.class | Bin 0 -> 1167 bytes .../MyObjectNode.class | Bin 0 -> 496 bytes .../unit-1-bootcamp-assessment/Tests.class | Bin 0 -> 3888 bytes src/Exercises.java | 20 +- src/MyNode.java | 12 +- src/MyObject.java | 59 ++ src/MyObjectNode.java | 36 + src/Tests.java | 5 +- unit-1-bootcamp-assessment.iml | 12 + 24 files changed, 1389 insertions(+), 8 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/libraries/lib.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 out/production/unit-1-bootcamp-assessment/Exercises$Child.class create mode 100644 out/production/unit-1-bootcamp-assessment/Exercises$Parent.class create mode 100644 out/production/unit-1-bootcamp-assessment/Exercises.class create mode 100644 out/production/unit-1-bootcamp-assessment/MyNode.class create mode 100644 out/production/unit-1-bootcamp-assessment/MyObject.class create mode 100644 out/production/unit-1-bootcamp-assessment/MyObjectNode.class create mode 100644 out/production/unit-1-bootcamp-assessment/Tests.class create mode 100644 src/MyObject.java create mode 100644 src/MyObjectNode.java create mode 100644 unit-1-bootcamp-assessment.iml 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..3df2b40 --- /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..9d5ffbf --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Abstraction issues + + + Android Lint + + + Assignment issuesGroovy + + + Class structure + + + Code style issues + + + Cucumber + + + Data flow issues + + + Data flow issuesJavaScript + + + Declaration redundancy + + + Error handling + + + FreeMarker inspections + + + GPath inspectionsGroovy + + + General + + + Google Web Toolkit issues + + + GrailsGroovy + + + Groovy + + + Internationalization issues + + + JPA issues + + + JavaScript + + + JavaScript validity issuesJavaScript + + + Memory issues + + + Performance issues + + + Play + + + Plugin DevKit + + + Probable bugs + + + Properties Files + + + Resource management issues + + + Spring + + + Spring WebSocketSpring + + + Threading issues + + + Threading issuesGroovy + + + Thymeleaf + + + UI Form Problems + + + Visibility issues + + + WebSocket issues + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + 1.7 + + + + + + + + s3a + + + + + + + + + + + + + + + \ 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..3ad6a20 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,651 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1432855533807 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 0000000000000000000000000000000000000000..84a5df60399c721a733a02196457a526a9f67456 GIT binary patch literal 572 zcmZutO-sW-5Ph4ZOjgAjY`WND$X`e$<4Xp+)$TJm-DoHns=id> zcJ??B`koI$LOeeTc-ZG!nmPlWcp|3^x$Z=ULx%E=QbKn_KAj4J>;BcV(1E04KVh6R zxWlLy&qgDLMyu^V@F(60xf*wRv6gB~goD;H`Y(~u1aFzkQ0hf99f)gbY**$MPRy_} za>$e6z!-M1Lz~VCsYiy|FLKAVP%%ByPg0!sum_u-(tI}kbS-E*$~qL8K@Q)*UMaCq zpwqO0RTSwgrv#L!2IUo0=``YFiiT%<)(eG2X?;OzFGy>d^o*iqG)I4x%|zKuyP4A5 aU5A%w){;pLvIRmc+GhhRWZI#)jlwrI$!9SD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a4b57519f18843aa351e722f6ce69347c62a399c GIT binary patch literal 425 zcmYjNO-sW-5Ph4(riszkSU-*)JhX!L;8F2X6ojBcr1wp_ty|(oHi`JN^dxxj2l%7J z*)*gs?0md=^JbWz->+`~=Q#A?Anan-#h#0OhR&r_vb!ok~iMSCk6|cb3Ox zHJ>vKhNEc7U->xWYB7#WE!Bbuew4BD_XiT0NL5u|*kehaOqed`jN% f?9h5AXJOsy{cE+cYPHa>Svw>N!sz@MU=!UxJRDDi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8c4a521a9d19b60deec35ae215c14d8bf16cfd42 GIT binary patch literal 355 zcmYLFO-sW-5Pj1o-879&j9+KLgL<$BkBXO|AOsbZ-Z$xDx5N!>Qt@wj5iz2+^%E%4U^p8r2Bw6GjixD${as zsf}*02*cx(Il;^7g(AecHtKHuQYiZ*i;9^vuS;3YrPVIqkY2mg4PlaBzbRX4Zhk=s zAM3R()s1$~rhVmXC0}KPF+#$)X9pteO6P*il zHf}I+;Sv)6jeBD}Z{AdcwTpM}J@3rD=iJxtzrKD0u!Kh`BycAM8;d%t>g=vQ?&;&c zjU^io1Z3NL8we!o>xUcN9q)-itmn6O3CSH5D1lskPkm6;w(7L1FSqx+WuBvIiHukr-pS4O&wNclutB z#?$VwrFJqgtjur?C7Rt%phy=exT7sguSw~5_dPRKu*_@*s`+kR9YluXE=L;PImzY= zcct-ov~6t^5=d=!2fe2E!q>Y^n>Sq4CLK&*(!mU79X!N!2NyBz;F``ZVVdt{xb*k$ zN_gkJAEUeqFA$%ZSh&D5 z9)c2i=8hqt5Vk9xL#8-KXuV;i+Av;@A|3HtGkA`?E4ccno@Yjjl%!?+V3dq+$|o2* zL$Y#)n02g+Q{*eBn9ynE1lAE^QseRzSsjSQK0#VfS;P$%A7ZtckFaNtU`x$7W_uZ$ zo8zv)EKPeE6e(f~3zWRfb+7XowCS>u6Pczk+z7Y0OwmcQ$H>gG!vYtkS5hRRSq1je tKg}Pf#hc9YNM@!cSH(}{ggz6(S{<(C7T4lN>nd?w`i;!O%BY0Z?cW77zR3Up literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3c113bddf55c7b1325d73fb4d625a014119a58f4 GIT binary patch literal 1167 zcmZ`%+int36kUgb89EL!(iW|)^-{INfS^^QQPadUF`E$@}Dx{^65ysWxyA%n7o1(+5tz_PH0YgDr<0|ONc_whg= zeUc$ypH3*!$5=--Wa1$j9j~IAtL>oI_jcrf+*8%ZBQ6}^CU+#w#Yym^5?UxRv<4^` z7iqKf-ZDbtKkFVtxT{AM#`i^fDnikS@T7$m*`0i5H&M*}?%`yN7qd!aI=FA0tQU_!93@+V2?L@JZx9De43;!Ws7Kyx3W_Y*me`eSLY&e9V-r!@ZQT8z`zR^4zd=ngw zZh1U$1~@10pf^q|cpQEHfff@xXmS=*B6Lkn|G;}{(I)pR^?u~S@#EH0!M5B literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0e399e8ef28ec6713ecd6200c592581d2febc192 GIT binary patch literal 3888 zcmbVPX?q*h89if3p3!(59C-uU61<#0N&nmd0;5h})D|kV{H)MP>iErWC zV*7Vwd{@DXD#zbb@qPS2#t$X5A2BV{JtiTR89FB+K2N(vu#W>L0V+3=0M9@ zmSIm-b;mKdKb4zaGVGGc!Jr?)RO<9n$yjvFy5-3Dk%aWwhUJC2U?F!L_*MWk^Mq{5k^GS{j!Zn^g8hqPa4Yq)fTY{@poFateP~eC zuoxs|d3sZHJZV}C6kXf27MQI&nkJl;YhE>O>hOC7y(ZM{^=mdK=oyd3mGNVGTgEBg2^nX2G>@oznnaz{9Z`PLDo-v@O{Eq{ zOaw>116 z|B$gFPI{gEcp5j)=-uV;X`wsUmGf`7gk(rMftTw=w=q92p(hi#)=LvwzpG`ONj_;d zY0$*mX1mjmHuNel!QM>7*uiUX^Ne_bdqu8_UMtzO=2%{LOMFY2K{YMMdr?ml$51q# zN7LaU&zS2s(v7N*WTv7M)<|??6URms4+|_YzOfSaXEsiK%ZhuVMFNsGeNnpP5#@tmPUDhRrv9X7^A{NHj!7^d*6h&`ZC#QcuA`ALI< z3b7x+Ar}4&cf{F#7N28JoMVEmgu@}A#|caTI(P#~0_w=6v|9sGQk^6JLNe94f=z_n z!q(5+AR-0Zh;2K2JFpvf5XH_2zJnpYQ5^YDd`Clk&kqfWFmw*xTH1H`J^y5M4o5@m0o84B=|MonI>p=iKS4&^ zBV#||gQgRs4pPv?qo--eaeg0VJB52-QH3S8PtqZRq$}v;Y6tGaNl(kY$l?@zH-J0w zMdYaRAXUw?$NvkUqJYzkdw^7DafWf{8R^G8LI?P9q$DK$v5<5(B)yI=u||y8=5ZE9 z;uZ7@M|bdli+dsH_t$2)_GPY(ApQY?C^F8;xL?KtGG=8w$lnq#=6l%jKDNntNRr;8 z6>p{7S3>3fL*PQWYrb+j0*iernPM+4j_(A6vfB#5>qE8|y}z8Q#WV zaRs|MwTEul%bBk6Rb)6fG?8ctJx;HJ7b;F!JLqZQ=QJHXPB$NAJ4Ff|oWK)opQTV& zNw*ODMZQ)aS8OK~`+O+&Tqw2?5&K#w_M4&DuZLp48jAf=Aof+>v-8B5h{!JDec46S tCy;&MBV>=^t2}rc9`@eDPL_UzKe~ZAlz0uq^D5qF0|#mAB-=Wa{{sQTeFy*m literal 0 HcmV?d00001 diff --git a/src/Exercises.java b/src/Exercises.java index ac85d45..a85bcfc 100644 --- a/src/Exercises.java +++ b/src/Exercises.java @@ -1,11 +1,25 @@ 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 s; } } diff --git a/src/MyNode.java b/src/MyNode.java index 54f3213..33cb126 100644 --- a/src/MyNode.java +++ b/src/MyNode.java @@ -2,14 +2,16 @@ * 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(); public abstract MyNode getRight(); + public abstract MyNode setLeft(); + public abstract T getData(); public abstract void insert(MyNode newNode); @@ -25,4 +27,8 @@ public boolean contains(T someData){ return left || right; } + + public abstract MyNode setRight(); + + public abstract Object setData(); } diff --git a/src/MyObject.java b/src/MyObject.java new file mode 100644 index 0000000..ffba269 --- /dev/null +++ b/src/MyObject.java @@ -0,0 +1,59 @@ +/** + * Created by s3a on 5/28/15. + * + * Janneisy Vidals + * + * Due: + * Task: + */ +public class MyObject +{ + int age; + String name; + + public MyObject (int age, String name) + { + this.age = age; + this.name = name; + + } + + + + public void setName(String name) + { + this.name = name; + } + + public void setAge(int age) + { + this.age = age; + } + + public int getAge() + { + return age; + } + + public String getName() + { + return name; + } + + @Override + public boolean equals(Object obj) + { + return super.equals(obj); + } + + + public boolean equals(String name, String name2){ + + name= "Jan"; + name2= "Jan"; + + if(name.equalsIgnoreCase(name2)); + return true; + + } +} diff --git a/src/MyObjectNode.java b/src/MyObjectNode.java new file mode 100644 index 0000000..79af36a --- /dev/null +++ b/src/MyObjectNode.java @@ -0,0 +1,36 @@ +import java.util.ArrayList; +import java.util.HashMap; + +/** + * Created by s3a on 5/28/15. + * + * Janneisy Vidals + * + */ +public abstract class MyObjectNode extends MyNode +{ + public MyObjectNode() + { + + } + + @Override + public MyNode setLeft() + { + return null; + } + + @Override + public MyNode setRight() + { + return null; + } + + @Override + public Object setData() + { + return null; + } + + +} diff --git a/src/Tests.java b/src/Tests.java index 377c274..fbe4e32 100644 --- a/src/Tests.java +++ b/src/Tests.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Arrays; + import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -44,7 +45,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 +61,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 From 02e1448556822de168a20157621156b2d799c457 Mon Sep 17 00:00:00 2001 From: Sea Date: Thu, 28 May 2015 22:02:51 -0400 Subject: [PATCH 3/3] add --- .idea/workspace.xml | 152 +++++++++--------- .../unit-1-bootcamp-assessment/MyObject.class | Bin 1167 -> 695 bytes .../MyObjectNode.class | Bin 496 -> 812 bytes src/MyObject.java | 38 +---- src/MyObjectNode.java | 51 +++++- 5 files changed, 132 insertions(+), 109 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3ad6a20..d755d0b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,14 +2,10 @@ - - - - - - - - + + + + @@ -35,10 +31,10 @@ - + - + @@ -52,16 +48,22 @@ - - + + - - - - - - + + + + + + + + + + + + @@ -80,7 +82,7 @@ - + @@ -97,22 +99,20 @@ - + - - + + - - - - - - - - - - + + + + + + + + @@ -128,9 +128,9 @@ @@ -138,8 +138,8 @@ true - @@ -511,15 +511,15 @@ 1432855533807