From e9c034df5b379e4222812455b2b26bc52f6630cf Mon Sep 17 00:00:00 2001 From: Ramona Harrison Date: Thu, 28 May 2015 19:34:53 -0400 Subject: [PATCH 1/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c02997c..838368a 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 (05/28/15 7:35 PM) My End time: `` From 94265f18c8989bf498a43bd47e010fb80e119bf6 Mon Sep 17 00:00:00 2001 From: ramonaharrison Date: Thu, 28 May 2015 19:53:49 -0400 Subject: [PATCH 2/5] finished --- .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 | 243 ++++++++ .idea/modules.xml | 8 + .idea/scopes/scope_settings.xml | 5 + .idea/vcs.xml | 6 + .idea/workspace.xml | 571 ++++++++++++++++++ .../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 -> 1008 bytes .../unit-1-bootcamp-assessment/MyObject.class | Bin 0 -> 762 bytes .../MyObjectNode.class | Bin 0 -> 992 bytes .../unit-1-bootcamp-assessment/Tests.class | Bin 0 -> 3739 bytes src/Exercises.java | 6 +- src/MyObject.java | 52 ++ src/MyObjectNode.java | 43 ++ src/Tests.java | 4 +- unit-1-bootcamp-assessment.iml | 12 + 22 files changed, 986 insertions(+), 5 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/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..e3886df --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + 1.8 + + + + + + + + + + + + + + + \ 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/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..cd5ce71 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,571 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1432856253783 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..810b8414cb32c9adc1c152aaa27043ae32e4a067 GIT binary patch literal 572 zcmZut%TB^T6g|@xS`Y;);&b7`n4(cO#*M}e(Zr-NCK&cZ8DL1ACPOiPmaa@(_yK;D z@lHV`Vw2v-x#!G1GoN4Y9{|pHN4|Nw?F18u+mr}{}iop&V9R{bB^aMjWluF!9 z9=k$6@NP_qA0`oxJ6ucC&p;;~$}vN(HI#9Wp>(U1(5;w{$AaK$c>OGNB&j*b7#9p~ zFKMTfexIQhG{O;o;?0<=L9?A|sRl$i43^PY=4k)iU7+;c5dN{{qY6y`JR!=|S+pG`j<3%VUuP0Gw5M{i)SR9NsR znz4xmilr$5MXXXsCQ+tn#3z&u&-SesN{do=L255ZD>LaiWy@%e|0=yqS)Wd4N^^D< Yex_N^Hr2=$2(josn^+;!4&@zq-zw&36951J 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..ca6a73b96c4ba39b3a66023c375b1d92c0898ff5 GIT binary patch literal 425 zcmYjNO;5r=6r61lw^L+pjv7pPonql+s6zug%K1igHu1R9Ap>Tdo# zRQ6F0Ga_-4r!pHzt6jYWgW^fg=))-}bnViiO@i@7DQ#REsju(^*fpC=f zi}`pg&}w&*seF~)OqxlzUs!D>B-Hx(+@|VAyRq9Vhcid5V*?cqd?^QpI1p&A7|R)i z)~@%%sYS5dJ1jx@j7l82`?K2lZeN^=9!B6ojCH()%V|?3TEJO)9>YC&7ac(1#Ky zwZvU^=KGl)X4XGn-vBOg6rhJhU{7FQ;DF$z3ti3$;hizcrlqWFRSO&v`j65o(=eE7 zqnm3&@APa&aMNn82vMeux?jEK%0A1yWF^U}LY6aWb<4M++bncV7-l!`$`+cNUlD?* zYGn&`tJ`m*&be61HyL7pfH3G(Lfq=(Qks|XL%vi6&lGj`$##MGU-=sx$8dPr_7Gq0 z%5lhSvf+St{t5bE!9mC|;M|tF=wpXb$e4>TLd4lYyotN)0ts`Mp9dd;vk(6lEcHh0 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..331b516e80871673259231c54163c6606399eb37 GIT binary patch literal 1008 zcmZuvO>YuW6g`ibfdPinB2cSswQ6+$ZT;F*E2+`Af|^*;g{~fSq*EzW7)<(8>K|~^ zjhmXda7h#YjeBD}cLp@I&f?vB&pUJPId|s!udm+#Jj8<(Y?M<-pd#6A$?nLpBFAb1 zcN4g$V0OH>fr4GDA8z(`yvGVw-*4{{GIw;K6>_yb{XwsGbho|wvbpEA0&p zk?5bERMAL*>{hQEXwnr5?)jFb*Q5-3`(89wvCM1*y7jKE55_j*E=LN_U2i-(-=TUQ zQb=v}hW(cJ!k6WxqmQ&AejH3=#=&LGJGhT)4lZKO!IET`FvkxPacSjW_q_Ao4|Qi? zF7Z#W`L`H|A&C^T7}DeDAOnS|5X&OYob!0*h&*Lfj8^#z)Mq9JF7Ol*U?R`ci3li! z?TTlRS(23K4I|ZtkxuwdG;o3Ui@5TqzRHZ&C{M=!U^E%ulur;lMY3`V%Q%)|gnVU$ zX-O+5FpglEf}0~uNg!r@f@wTq5s$F=1gp+}L}K9x2~!xyY;T697P%wPd77g$w051A zmNAPp8mM#CVzwN~8JndrvSfQ}l$^v3%B|B_nwbGvMUjZG3hX0~@U!GEGtVQLnVs2C ZKao>%+RE6NtmP)(ixzYXF1az3egnvcw66dF 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..953804d93ab164faab76b51918aed1b60c4431b1 GIT binary patch literal 762 zcmZ{g+e!ja6o&sjqoYn^nyH=aU=Zj;Nzq*)L=Xg47lqK}XoHQ|2sQ@2Qx^qE&_xf> zLq-4Iqn#{@qjH@(2i;2+r)r+>p7gI9ZtvV_bd++p>2&H& z&y)Tz7zwVt8v(O+e0SPtyUl>pVl6i~Q83w3d3*{BZbk*UKPV)GL5Y3Ite47?nhna0 zloX?R*6sJ2?x82SlB3a^^5qsxtXMD*vk*r@AU;Y9q`y`Z!YchbirizA%hmX?QQg?f zGYY;96SNk+3+8p6Df=11ULQcS3j^qnsv$|6p%Ac4yTbM&Cb7yN^i&&CNYkT$8Y9$A z4$?SairwLu3Qw7f+E36Pc+num4HaBdf>u~C6cm_7mJ!KVWwj=&72g+{siI}R$W{vZ wu<8@Z7$OPekRNJ&2hs0;fo%K literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4486cf72e9fce80903520fda606b1fa994ce4b5d GIT binary patch literal 992 zcmZ{iPfy!G5XIjnPMjDANSXvn|4>@mCP5+>I8kw->dB>2TXA>7HW;OjVXfyheEtrJ53bK!Lz%gdB1%#>)X43HvsnV-a!#tWfbsQ!W#+OHs0EJr(g~Bk65AP zeg1PiI@JdXg(w)DF=d_lv9D0`&i!A0cj$+M?w8)V?#HYteh9)KK2*rJ+9xbMqEunU z3qpN7`PtLacfU7ersj?M{_w<)0y(EiD?SUx3d_7Q0j3w*V;y_O%~ES>N9ZNyzb2lf zsmnoPZtb-{MWd`8JwFef=qrrmFM4 zcLm_WMa6}Ul8dqg2TKa>d>v<&Oc+}ne~}N9=SKx2L}XU#xRyXMDvZlKb-608h0b57 zOKx&lVJw=YjaBa5qySaacv5(RI-`gWS)G&W&dxP*Gqq!~F0E7yp_x>r1fh#Hxww(d z$}h53$*MlWlJv)>7W&^rH?t;zE4`?HEKpUCj{Gxa> tQ~V6iGj6sP#oL+U7yrk(Z=CYEX5A-m+L`N|f17zzdDWNc6gQ3V)ji*qe@y@Y 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..f2b5234f2416123b3fb66f2e97675cc4078bc360 GIT binary patch literal 3739 zcmbVO`F9)D75>JSJmb-rI1}3-XKywyNel|4t+TYkafqp;q>%}AXd5Qd*qTHdnVC^y zLs<$bElXP{l&*A17q+A=w8!`~2Tp(P-_iaL`~>~pn~^kj9BAuvtoP>K`|kbjcfa>$ z{`v9WKLl_${-$F$&Z)3;bl{wZ^I|OND8tqdbQrml`U<~2Mb zMo-5M_$mT1HdI{F(T{UFE@MH=7F9f|;V}*0((t$l_JoEfH9V!^+ZvwM@QjKp-S`fk z72Ch7;(HpN)A{_oju-Hvitj7vI_$Vka8yC((C`@riHUmIRRnJ(SBc7whL{M>j1!`{E_5=Trg4+X5?!0Ttt=OIuSZ>KaWqGz6C{X5^tNCC| zxvuR^R4w1Px!=r9F4$hl;ls|*g`xDxg_1oVICYox|3E?dbi)mtntjIc9U{oOZauK1 zSwU~E?#+!|Xt0to0fpNKB$7-F$wbAemItmZ=Vp z9HsvbiS+IjNNe*|yGBy|q8$XbM-)m;!C)+aXU|qy*I3>TD)lnMD3axNF~z`h+&LQ5 znslLg<3pboAQk!*teR+8f9To>oa$KC^Q^_3BS{}#YyEI6Zj@J4)>90u(#5N6B7N2^XXn@;trm5UQYqFOUdcZ02%+lJLW}!Ft%8)c zFpfJ5As;8bsE3!VYJ)qr$DF)|P^KR-SFC%2V4}UPkj+n?%N8dl3&*Ak_Zb+)UKKA> zdaI>Nna@kj8~71kQSqvQALBI@KQZuA{LH}5@e7`>_O3{lNjVz$C0?hxN}*PhC+e5W ziz3jk$c}+u<2MS7CLuzo27ZgH27ZU%GjFI}1Ao9D6>N~*UfCiQZy0zQuNZg}ZxQ=y zK~N9A9pvm;9$1aD)6QIlQ?Yo=3M>O};~iR>078ps3X{`E_C=kugJ_8}xwNjGM@n18 zH3Qd?HSj0=c?FE{oRFWqQ>s{Yb=&>ah+lUN`~~l-cu!RNSMno!+^kU^&(>{0b*@Sm z9$I?G72Y}l-K|!zoN~PwG-hWN^bJK?mcd)jy=^&Vd3Sjv#}Jp87fe3Vu&O*7dxm0i zkBjU#V|gnm@zP`j-En<+b)F=S;dnSn-l1VB*VP-TQ9VR5U9kvj zG`_KkW37yb1eQ)-rV92CtsVN78F$B%L?o@rTOXxRT=WCGCTnPRB)x*=n2FVNS9#aU zB?Y@aBTq<-f|P4to{HF8-NV)utP@Lk5s>W7L&I@Z+;nl?(bm#R8#%Mee4X^ip+z}{ z&r(Vi%b#Ms3P#rQSet0RPulsW+`yi*J-$z-XHHG>3L@?az6}GfQ3~o@KQI)B9&!+8 zzX>?DiM*=v))U$q7@CT^NBQWoxea2C7((Om#Lc2_Rynp~gdalUuM3nU_VRZhpT;;U z9FrsOLwT2z4(yMdfF7CwBXq!>xQkB;GThuLH(#W82iNx8K*!Ac=**dk(Iq68(KTvz zEJIy}HfnauiOzXD`~Z^NwjLTx{%*h^`iO2orW*)DM(H$c#Q_{-+Rt-Gg5wwPMb1PO z;~W(nYQcGwumqgU4RjMuDrXwEf}@!|qyIp+*|UV(2)B)FkdZ+=8a5KyCeAkVgKY~- z-x@=gX`vgz;ZH?(q=oJZu_Z+8Wq#9*n!QU{pWnL#v#`(H5OO6@bV~X|es<7*CsNpj zUb2(M9*JNij1nP8khP=u5_w2r9lne#v-Cp8y_jIEV~i-;7uqIiyA_Man>dxTjNi?D zPp-t-SGa+GvN|xH*f*X`CqF#c)p=0uSNprJVq-eluV%)zbRw-S;r1om@!%CzdE=9R zb$x*JOs6?moJp7)i!(`cQ*rg)!PwqqY^F@))_)5!5|WJlgb%_?P;)7+^pb`&%g?YW zM>tOKGvCEMSm5{s3ly3?0hRU??&D0ORmT+W=Zs~whT+kw}j;|m`;?n$r&!fPc zf9?_pWBFMbsOKnH>pVQdJ{L~!&Iimwmyst(EbBn3TeFn literal 0 HcmV?d00001 diff --git a/src/Exercises.java b/src/Exercises.java index ac85d45..8f7bf67 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 s; } } diff --git a/src/MyObject.java b/src/MyObject.java new file mode 100644 index 0000000..1f4d967 --- /dev/null +++ b/src/MyObject.java @@ -0,0 +1,52 @@ +/** + * Access Code 2.1 + * Ramona Harrison + * MyObject.java + + + Create a new class, MyObject. A MyObject has a name (String) and an age (int). + + Two MyObjects are equal when the names and the ages are equal. + + Create a MyObjectNode class which extends MyNode. + + Add setter methods, that is setLeft and setRight and setData. + + Implement the abstract methods. + + Run the tests in src/Tests.java. + + Write a main method to test your code. + + Update your README with your end time, and the total amount of time you think you spent on this assessment. + + Submit a pull request with all your code. + + */ + +public class MyObject { + + private String name; + private 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; + } +} diff --git a/src/MyObjectNode.java b/src/MyObjectNode.java new file mode 100644 index 0000000..ce1c7f3 --- /dev/null +++ b/src/MyObjectNode.java @@ -0,0 +1,43 @@ +/** + * Access Code 2.1 + * Ramona Harrison + * MyObjectNode.java + */ + +public class MyObjectNode extends MyNode{ + MyNode left, right; + 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 From 4ee63b643be0886af1d8c52e9dc5fab2527aaf88 Mon Sep 17 00:00:00 2001 From: ramonaharrison Date: Thu, 28 May 2015 19:55:08 -0400 Subject: [PATCH 3/5] Revert "finished" This reverts commit 94265f18c8989bf498a43bd47e010fb80e119bf6. --- .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 | 243 -------- .idea/modules.xml | 8 - .idea/scopes/scope_settings.xml | 5 - .idea/vcs.xml | 6 - .idea/workspace.xml | 571 ------------------ .../Exercises$Child.class | Bin 572 -> 0 bytes .../Exercises$Parent.class | Bin 425 -> 0 bytes .../Exercises.class | Bin 355 -> 0 bytes .../unit-1-bootcamp-assessment/MyNode.class | Bin 1008 -> 0 bytes .../unit-1-bootcamp-assessment/MyObject.class | Bin 762 -> 0 bytes .../MyObjectNode.class | Bin 992 -> 0 bytes .../unit-1-bootcamp-assessment/Tests.class | Bin 3739 -> 0 bytes src/Exercises.java | 6 +- src/MyObject.java | 52 -- src/MyObjectNode.java | 43 -- src/Tests.java | 4 +- unit-1-bootcamp-assessment.iml | 12 - 22 files changed, 5 insertions(+), 986 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/libraries/lib.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml delete mode 100644 out/production/unit-1-bootcamp-assessment/Exercises$Child.class delete mode 100644 out/production/unit-1-bootcamp-assessment/Exercises$Parent.class delete mode 100644 out/production/unit-1-bootcamp-assessment/Exercises.class delete mode 100644 out/production/unit-1-bootcamp-assessment/MyNode.class delete mode 100644 out/production/unit-1-bootcamp-assessment/MyObject.class delete mode 100644 out/production/unit-1-bootcamp-assessment/MyObjectNode.class delete mode 100644 out/production/unit-1-bootcamp-assessment/Tests.class delete mode 100644 src/MyObject.java delete mode 100644 src/MyObjectNode.java delete mode 100644 unit-1-bootcamp-assessment.iml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 540cdbc..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -unit-1-bootcamp-assessment \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index a852314..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index d821048..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml deleted file mode 100644 index 3df2b40..0000000 --- a/.idea/libraries/lib.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index e3886df..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.7 - - - - - - - - 1.8 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 8928d91..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index cd5ce71..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,571 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1432856253783 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 deleted file mode 100644 index 810b8414cb32c9adc1c152aaa27043ae32e4a067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 572 zcmZut%TB^T6g|@xS`Y;);&b7`n4(cO#*M}e(Zr-NCK&cZ8DL1ACPOiPmaa@(_yK;D z@lHV`Vw2v-x#!G1GoN4Y9{|pHN4|Nw?F18u+mr}{}iop&V9R{bB^aMjWluF!9 z9=k$6@NP_qA0`oxJ6ucC&p;;~$}vN(HI#9Wp>(U1(5;w{$AaK$c>OGNB&j*b7#9p~ zFKMTfexIQhG{O;o;?0<=L9?A|sRl$i43^PY=4k)iU7+;c5dN{{qY6y`JR!=|S+pG`j<3%VUuP0Gw5M{i)SR9NsR znz4xmilr$5MXXXsCQ+tn#3z&u&-SesN{do=L255ZD>LaiWy@%e|0=yqS)Wd4N^^D< Yex_N^Hr2=$2(josn^+;!4&@zq-zw&36951J diff --git a/out/production/unit-1-bootcamp-assessment/Exercises$Parent.class b/out/production/unit-1-bootcamp-assessment/Exercises$Parent.class deleted file mode 100644 index ca6a73b96c4ba39b3a66023c375b1d92c0898ff5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmYjNO;5r=6r61lw^L+pjv7pPonql+s6zug%K1igHu1R9Ap>Tdo# zRQ6F0Ga_-4r!pHzt6jYWgW^fg=))-}bnViiO@i@7DQ#REsju(^*fpC=f zi}`pg&}w&*seF~)OqxlzUs!D>B-Hx(+@|VAyRq9Vhcid5V*?cqd?^QpI1p&A7|R)i z)~@%%sYS5dJ1jx@j7l82`?K2lZeN^=9!B6ojCH()%V|?3TEJO)9>YC&7ac(1#Ky zwZvU^=KGl)X4XGn-vBOg6rhJhU{7FQ;DF$z3ti3$;hizcrlqWFRSO&v`j65o(=eE7 zqnm3&@APa&aMNn82vMeux?jEK%0A1yWF^U}LY6aWb<4M++bncV7-l!`$`+cNUlD?* zYGn&`tJ`m*&be61HyL7pfH3G(Lfq=(Qks|XL%vi6&lGj`$##MGU-=sx$8dPr_7Gq0 z%5lhSvf+St{t5bE!9mC|;M|tF=wpXb$e4>TLd4lYyotN)0ts`Mp9dd;vk(6lEcHh0 diff --git a/out/production/unit-1-bootcamp-assessment/MyNode.class b/out/production/unit-1-bootcamp-assessment/MyNode.class deleted file mode 100644 index 331b516e80871673259231c54163c6606399eb37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1008 zcmZuvO>YuW6g`ibfdPinB2cSswQ6+$ZT;F*E2+`Af|^*;g{~fSq*EzW7)<(8>K|~^ zjhmXda7h#YjeBD}cLp@I&f?vB&pUJPId|s!udm+#Jj8<(Y?M<-pd#6A$?nLpBFAb1 zcN4g$V0OH>fr4GDA8z(`yvGVw-*4{{GIw;K6>_yb{XwsGbho|wvbpEA0&p zk?5bERMAL*>{hQEXwnr5?)jFb*Q5-3`(89wvCM1*y7jKE55_j*E=LN_U2i-(-=TUQ zQb=v}hW(cJ!k6WxqmQ&AejH3=#=&LGJGhT)4lZKO!IET`FvkxPacSjW_q_Ao4|Qi? zF7Z#W`L`H|A&C^T7}DeDAOnS|5X&OYob!0*h&*Lfj8^#z)Mq9JF7Ol*U?R`ci3li! z?TTlRS(23K4I|ZtkxuwdG;o3Ui@5TqzRHZ&C{M=!U^E%ulur;lMY3`V%Q%)|gnVU$ zX-O+5FpglEf}0~uNg!r@f@wTq5s$F=1gp+}L}K9x2~!xyY;T697P%wPd77g$w051A zmNAPp8mM#CVzwN~8JndrvSfQ}l$^v3%B|B_nwbGvMUjZG3hX0~@U!GEGtVQLnVs2C ZKao>%+RE6NtmP)(ixzYXF1az3egnvcw66dF diff --git a/out/production/unit-1-bootcamp-assessment/MyObject.class b/out/production/unit-1-bootcamp-assessment/MyObject.class deleted file mode 100644 index 953804d93ab164faab76b51918aed1b60c4431b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmZ{g+e!ja6o&sjqoYn^nyH=aU=Zj;Nzq*)L=Xg47lqK}XoHQ|2sQ@2Qx^qE&_xf> zLq-4Iqn#{@qjH@(2i;2+r)r+>p7gI9ZtvV_bd++p>2&H& z&y)Tz7zwVt8v(O+e0SPtyUl>pVl6i~Q83w3d3*{BZbk*UKPV)GL5Y3Ite47?nhna0 zloX?R*6sJ2?x82SlB3a^^5qsxtXMD*vk*r@AU;Y9q`y`Z!YchbirizA%hmX?QQg?f zGYY;96SNk+3+8p6Df=11ULQcS3j^qnsv$|6p%Ac4yTbM&Cb7yN^i&&CNYkT$8Y9$A z4$?SairwLu3Qw7f+E36Pc+num4HaBdf>u~C6cm_7mJ!KVWwj=&72g+{siI}R$W{vZ wu<8@Z7$OPekRNJ&2hs0;fo%K diff --git a/out/production/unit-1-bootcamp-assessment/MyObjectNode.class b/out/production/unit-1-bootcamp-assessment/MyObjectNode.class deleted file mode 100644 index 4486cf72e9fce80903520fda606b1fa994ce4b5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 992 zcmZ{iPfy!G5XIjnPMjDANSXvn|4>@mCP5+>I8kw->dB>2TXA>7HW;OjVXfyheEtrJ53bK!Lz%gdB1%#>)X43HvsnV-a!#tWfbsQ!W#+OHs0EJr(g~Bk65AP zeg1PiI@JdXg(w)DF=d_lv9D0`&i!A0cj$+M?w8)V?#HYteh9)KK2*rJ+9xbMqEunU z3qpN7`PtLacfU7ersj?M{_w<)0y(EiD?SUx3d_7Q0j3w*V;y_O%~ES>N9ZNyzb2lf zsmnoPZtb-{MWd`8JwFef=qrrmFM4 zcLm_WMa6}Ul8dqg2TKa>d>v<&Oc+}ne~}N9=SKx2L}XU#xRyXMDvZlKb-608h0b57 zOKx&lVJw=YjaBa5qySaacv5(RI-`gWS)G&W&dxP*Gqq!~F0E7yp_x>r1fh#Hxww(d z$}h53$*MlWlJv)>7W&^rH?t;zE4`?HEKpUCj{Gxa> tQ~V6iGj6sP#oL+U7yrk(Z=CYEX5A-m+L`N|f17zzdDWNc6gQ3V)ji*qe@y@Y diff --git a/out/production/unit-1-bootcamp-assessment/Tests.class b/out/production/unit-1-bootcamp-assessment/Tests.class deleted file mode 100644 index f2b5234f2416123b3fb66f2e97675cc4078bc360..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3739 zcmbVO`F9)D75>JSJmb-rI1}3-XKywyNel|4t+TYkafqp;q>%}AXd5Qd*qTHdnVC^y zLs<$bElXP{l&*A17q+A=w8!`~2Tp(P-_iaL`~>~pn~^kj9BAuvtoP>K`|kbjcfa>$ z{`v9WKLl_${-$F$&Z)3;bl{wZ^I|OND8tqdbQrml`U<~2Mb zMo-5M_$mT1HdI{F(T{UFE@MH=7F9f|;V}*0((t$l_JoEfH9V!^+ZvwM@QjKp-S`fk z72Ch7;(HpN)A{_oju-Hvitj7vI_$Vka8yC((C`@riHUmIRRnJ(SBc7whL{M>j1!`{E_5=Trg4+X5?!0Ttt=OIuSZ>KaWqGz6C{X5^tNCC| zxvuR^R4w1Px!=r9F4$hl;ls|*g`xDxg_1oVICYox|3E?dbi)mtntjIc9U{oOZauK1 zSwU~E?#+!|Xt0to0fpNKB$7-F$wbAemItmZ=Vp z9HsvbiS+IjNNe*|yGBy|q8$XbM-)m;!C)+aXU|qy*I3>TD)lnMD3axNF~z`h+&LQ5 znslLg<3pboAQk!*teR+8f9To>oa$KC^Q^_3BS{}#YyEI6Zj@J4)>90u(#5N6B7N2^XXn@;trm5UQYqFOUdcZ02%+lJLW}!Ft%8)c zFpfJ5As;8bsE3!VYJ)qr$DF)|P^KR-SFC%2V4}UPkj+n?%N8dl3&*Ak_Zb+)UKKA> zdaI>Nna@kj8~71kQSqvQALBI@KQZuA{LH}5@e7`>_O3{lNjVz$C0?hxN}*PhC+e5W ziz3jk$c}+u<2MS7CLuzo27ZgH27ZU%GjFI}1Ao9D6>N~*UfCiQZy0zQuNZg}ZxQ=y zK~N9A9pvm;9$1aD)6QIlQ?Yo=3M>O};~iR>078ps3X{`E_C=kugJ_8}xwNjGM@n18 zH3Qd?HSj0=c?FE{oRFWqQ>s{Yb=&>ah+lUN`~~l-cu!RNSMno!+^kU^&(>{0b*@Sm z9$I?G72Y}l-K|!zoN~PwG-hWN^bJK?mcd)jy=^&Vd3Sjv#}Jp87fe3Vu&O*7dxm0i zkBjU#V|gnm@zP`j-En<+b)F=S;dnSn-l1VB*VP-TQ9VR5U9kvj zG`_KkW37yb1eQ)-rV92CtsVN78F$B%L?o@rTOXxRT=WCGCTnPRB)x*=n2FVNS9#aU zB?Y@aBTq<-f|P4to{HF8-NV)utP@Lk5s>W7L&I@Z+;nl?(bm#R8#%Mee4X^ip+z}{ z&r(Vi%b#Ms3P#rQSet0RPulsW+`yi*J-$z-XHHG>3L@?az6}GfQ3~o@KQI)B9&!+8 zzX>?DiM*=v))U$q7@CT^NBQWoxea2C7((Om#Lc2_Rynp~gdalUuM3nU_VRZhpT;;U z9FrsOLwT2z4(yMdfF7CwBXq!>xQkB;GThuLH(#W82iNx8K*!Ac=**dk(Iq68(KTvz zEJIy}HfnauiOzXD`~Z^NwjLTx{%*h^`iO2orW*)DM(H$c#Q_{-+Rt-Gg5wwPMb1PO z;~W(nYQcGwumqgU4RjMuDrXwEf}@!|qyIp+*|UV(2)B)FkdZ+=8a5KyCeAkVgKY~- z-x@=gX`vgz;ZH?(q=oJZu_Z+8Wq#9*n!QU{pWnL#v#`(H5OO6@bV~X|es<7*CsNpj zUb2(M9*JNij1nP8khP=u5_w2r9lne#v-Cp8y_jIEV~i-;7uqIiyA_Man>dxTjNi?D zPp-t-SGa+GvN|xH*f*X`CqF#c)p=0uSNprJVq-eluV%)zbRw-S;r1om@!%CzdE=9R zb$x*JOs6?moJp7)i!(`cQ*rg)!PwqqY^F@))_)5!5|WJlgb%_?P;)7+^pb`&%g?YW zM>tOKGvCEMSm5{s3ly3?0hRU??&D0ORmT+W=Zs~whT+kw}j;|m`;?n$r&!fPc zf9?_pWBFMbsOKnH>pVQdJ{L~!&Iimwmyst(EbBn3TeFn diff --git a/src/Exercises.java b/src/Exercises.java index 8f7bf67..ac85d45 100644 --- a/src/Exercises.java +++ b/src/Exercises.java @@ -1,11 +1,11 @@ public class Exercises { static class Parent { - public String doStuff() { return "parent"; } + public String doStuff() { return ""; } } static class Child extends Parent { - public String doStuff() { return "child"; } - public String doStuff(String s) { return s; } + public String doStuff() { return ""; } + public String doStuff(String s) { return ""; } } diff --git a/src/MyObject.java b/src/MyObject.java deleted file mode 100644 index 1f4d967..0000000 --- a/src/MyObject.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Access Code 2.1 - * Ramona Harrison - * MyObject.java - - - Create a new class, MyObject. A MyObject has a name (String) and an age (int). - - Two MyObjects are equal when the names and the ages are equal. - - Create a MyObjectNode class which extends MyNode. - - Add setter methods, that is setLeft and setRight and setData. - - Implement the abstract methods. - - Run the tests in src/Tests.java. - - Write a main method to test your code. - - Update your README with your end time, and the total amount of time you think you spent on this assessment. - - Submit a pull request with all your code. - - */ - -public class MyObject { - - private String name; - private 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; - } -} diff --git a/src/MyObjectNode.java b/src/MyObjectNode.java deleted file mode 100644 index ce1c7f3..0000000 --- a/src/MyObjectNode.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Access Code 2.1 - * Ramona Harrison - * MyObjectNode.java - */ - -public class MyObjectNode extends MyNode{ - MyNode left, right; - 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 7311397..377c274 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 deleted file mode 100644 index fb8e866..0000000 --- a/unit-1-bootcamp-assessment.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file From a03e8084e7768d136a8ae2a4517b38c853c1e42a Mon Sep 17 00:00:00 2001 From: ramonaharrison Date: Thu, 28 May 2015 19:56:03 -0400 Subject: [PATCH 4/5] finished --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9484b58 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.DS_Store +*.class +/out From 630664f670cdaba7654969538eb9832dc6cbedae Mon Sep 17 00:00:00 2001 From: Ramona Harrison Date: Thu, 28 May 2015 19:57:11 -0400 Subject: [PATCH 5/5] Update README.md --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 838368a..5252d07 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,9 @@ 10. Submit a pull request with all your code. -Test Start time: Thu May 28, 7:00pm EST (05/28/15 7:35 PM) +Test Start time: 05/28/15 7:35 PM + +My End time: 05/28/15 7:57 PM -My End time: `` -Test End time: Fri May 29, 10:00pm EST -Total time: 27 hours