From 62757eb1b55ad43971e65b1585bce3f005d893f4 Mon Sep 17 00:00:00 2001 From: Allison Bojarski Date: Fri, 29 May 2015 21:53:07 -0400 Subject: [PATCH 1/2] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c02997c..d88d905 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +I spent approximately 4 hours on this. + + # unit-1-bootcamp 1. Fork this repository. In your README, mark down your start time. From 1e5ee0eec565999fcb860df57f16902dce2eafbc Mon Sep 17 00:00:00 2001 From: Allison Bojarski Date: Fri, 29 May 2015 21:55:23 -0400 Subject: [PATCH 2/2] turning in bootcamp assessment --- .idea/.name | 1 + .idea/compiler.xml | 23 + .idea/copyright/profiles_settings.xml | 3 + .idea/libraries/lib.xml | 10 + .idea/misc.xml | 114 ++++ .idea/modules.xml | 8 + .idea/uiDesigner.xml | 124 ++++ .idea/vcs.xml | 6 + .idea/workspace.xml | 558 ++++++++++++++++++ .../Exercises$Child.class | Bin 0 -> 584 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$1.class | Bin 0 -> 744 bytes .../MyObjectNode.class | Bin 0 -> 691 bytes .../unit-1-bootcamp-assessment/Tests.class | Bin 0 -> 3888 bytes src/Exercises.java | 6 +- src/MyNode.java | 7 +- src/MyObject.java | 36 ++ src/MyObjectNode.java | 55 ++ src/Tests.java | 4 +- unit-1-bootcamp-assessment.iml | 12 + 23 files changed, 959 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/libraries/lib.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.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$1.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/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..b33daf4 --- /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/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..f852cc3 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,558 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1432855872288 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..a39226f197f54a5195ff0c040a32dc8854544146 GIT binary patch literal 584 zcmZutO;5r=6r80kEr>n`)2p^>-_`35w?pkP`9vZVa>$4i4BJQsSIUu#-KUPE`#2Ve8I5f z%1~U7?|UM?<-LFy+l@RPba^aQKOyyGC`SxNdnf~+p>!37B5ntKG!jHt-Sa0Ady<;n zRB^&!`cWqt_xlVrr|I7D2i^*JIB0c}ScU@<>^bx7zd}Y6?0GFiu@jABPh3b9yF86> zsD_o0he?6GEUp$UKU)mNEerP^OMDphBxM9}p^?X6IfAX07IoRhzL^C)Q)aTx!++ kTCLPt&$cI472C#gYO1B9Rlw^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)~@%%sY#BK|R<*kBXO|AOsbZ-Z$xDx5N!>(&FFpBzW)#_@j!m zX^Fe+e7yH&nAzXW_YZ(6P6G6icsTHI=;4UqrVCZh3E_j*(xj!RYgv0ZCJdg1k-FjF zMrqaD68h&CGlG*=b4iFYrRC%5J(uQHTetUbh+ zyRsd%zhHB~z5D`wa?nG_Hehe14hGocDBOxLM$~HJ*6uS4B&>D#x$xn!_u>BmE15>? 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..48deb4252ebbcd2957d1607db2d93e76a2cd8d49 GIT binary patch literal 1008 zcmZuvO>YuW6g`g_zK24Q536mpYIOiDYFAYxH5yk?6Cqvb>On_3l|qHVq(7zp0XN;a zsfi1hH1XfKH^y@r&{UkoyZ4@V=H7Ge%=cekzX909W(*M&V+f-p*{3c-Qf*(YS~X-_MpYX|y+E_ZdWQ-0YxaM~U@(T3aUX>T-e z6pUt*NT}lWT(8Q~F6{EpCRKv4uW>U*X{O(&VY8~_NQU z(H{-k&I?zT7xzEXhWN3N!lH$%ShnyGH!NJnl7%(Nu3(8D#OKn=zwUYGydUZA&|Kr6 z5aHiqz(f==W+vj(XdwZG1!4gt5n|4HJkvy;GAhPk@e9;vCI&9?6q2;a@U(mavXgeX z3rLMnth4-tt_NTtijMgYc#{Xb68Q&Do5I9G)bdI2LD#aL?(ika8 zOJ^`n5Htlh$5@a+Ecgkg@q|Ul$3io#y8IF0l@o+bVVttPIWe`$9f8i{9G#%Go3yl! zJho_{&Q*)qqAzD^mcq!A?QKzV6t^h1PGfOq24odEBErhDk37OplE2P8gJ>eZxUGI7 Xt>la-V|%ui+kDSo&>h(122l77&cn2{ 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..5e47d2a3b725e35c1820e033d4ec755cb8c71259 GIT binary patch literal 762 zcmZ`#%TB^T6g|_HR%&^Oh!0R<2bjphrG~_qn2?|@FeEMuHduls!D8Y+xzI#n;=&K` zql{;!;0s;!cIM7`-TU_b@(N%NB^xp1<1kQ=Wz)izg>3;NaIZaqOtbIay0w8D^lGhe z&7MyCYxT zr%fZg@^1v}=E>bzr|)$`x>-FhJXK+`<;uJZLlAH%6Y1p&Gg&t?{K_ApWG0gcMKH=L zqum;gM_upOm$?!%>s>jy0~aM7(^ux~r_#8Wd4!dRQh znM$VNMFk#qE6Afj&9eCB0nf`O1ahtR5WCderTn5=wJdsh{yh{aM~U7c9R2{mv-bm{ z^ApZ@Mh<-10x`fNlxZue@AF+{MD0*pba=_v;vDhK+6=RnVLE@A_5WaQEM-2%+COJD ymNK7UeZf3RcjN^R&upf|^;8T>nVxA6-M}Vo4qGYlDYp5#_8Z0uJwL6{0qy{7U2=>7 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..a8780f65fc58ac97493472abe11359e8bdb25807 GIT binary patch literal 691 zcmZvZT}uK%7=_QQt83e;*@u093#mn4UUX4(V+6%kP$6`=+LSAs!ny_itRM*r`T_l@ z=*%i*;V!)I%$awd^UloY*V_kxBC;mpm^CnGLc{zJ3@oUysKSzgWdkb$5U@@f4e6IW zr`3`z0o{{#fk4teYhP6AvKpK>Z{@x~)OYV|T+nZwz!8WYxD7Wr6o};VWvV4s38ZYd zA7pDjtelkHTU<_`Le#u+luo( zBfKe6I1&mJX0n)dDzs)yb9Tx~jX7C(g?NW{!yK`nsc0BgI@dvx&bd@c+X3NO$*(0`HYeSvkhxe?;jRu=Yf0+WLw(GH^jAzOrO4}?q& dhQvCE{fF!lQXBx$FwMR+%)n$e*`?~6-!}wkWFi0n 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..a94d975c3dac474c575d1c2c6ac1845059ae467d GIT binary patch literal 3888 zcmbVPTX!2*8Qo(^p7D5`I`SozouqN&B=RM3>!bmk3l)yjC`d|(Oj@^ub}WspNu-fG zGfHfFg{G8ixwhq6palwr1X{rHBCB0I^U7a<|InwFeP%|ZvE#G_uVtOvcfN0*z4tk? z|M~vk-vw|GYby4lEMq}M8_Eh6MO#r};-ZR6sES@qh9w3|Dmp~W;|gribyT=$D7Y-z zD=KzlS;mTJza--c6@4hHcoI*E-qSLkQShvSFDv+pNcNn9s|uc1@KpsbDEOL;uXo@Z z_@>zYEg9cd@S@7`cT{{A-;?ou3GGKs%XE)Rh^0r)ONdX`%Z7wIa;9Yz8nt=Dp4I28 zoJr>DCB1rHw@on)CgX0!bR@{RS;KLiBNDc`?A&v2)~Xn`>FQR=IIG)+geck#_#r!9$JUAwp2B0B-JSzu4~vtA=M-dL=xD>LY3#5$Qy2@UKWsa+a8uM_{fI_ zRSk2?adZKBLpxD_XJS8#{5TexI0Ep33VblJN%(FW?mof5bIn-)IEhd&h8d#sY7*!rnP^vBIvHJfXX~hU@qfSDFC) z6(I_XGse?JUNqcbial@Yj#eG-9?1B!hPRN>@HYOk4u*fJ$WPuZRdl1e>oh&$)GZBv z#ouJCij&?TKc2?TGkSM9d|K$v4dwhBE}4`;PKHmK zO&T=uw%P8?;|;yaORz5;F?R48+&Uv(;69P7qSs0`tvQj`-4fqYW>8Jb@m|z3#4!?0 z=h1Xz#53l`jdY{xBblw}gf$l3*u=3}#UlbsjBl)j1L@6E-?rl3Xpw-VO?m63=*1Ps zHEP}&n%t+>u^d_AX*#NWg1spTdp@F$PYmB9%eaya*xRUK_%f@+;$L}^y(2vmedBI< zPw#BGX8jsD)5~S57=;$p7H{)$R_eCd+(d@R)0Dh4G-!uWJe3cCOL%1qlKG?zSZRz z!YKbf58(KDLU)8rsKt(6$D74GMc5UQgwqRiGaUZrln5Nq+WV5WPsF-z(VfCk+ZJ z#C{NmS@;v&5oh~Je2P7Bjw!Yhj)Z`oBrpN!&`op@P-iZw-5!vV>>B$AI+9(h*h0uH zYy-><3=rEOv2Ew)4(!2BqPQ!9?@)+u97jJC-?0$i^F$YC?!h(wxi^;VUd7h@_$rcx z{XOXM`4TWw)$bZlaIG_D{w4PbE@`cMrG64$FOVU;AqqOeOl{ z$tfijPbsU|wu(C+yedm?eDLq~caWNkB?pRg@#J7}E|J_`+_-ljvUd$T=oD}3e*_tE zkBkF^55kMnc%7W-CJiYbf0Cv=#&#NqVBtP2vwfNe6vn+u15Yyg0i2?i+euv(r|G*P z+>Os7N0o=EXr4X(UjP*aoMGHUq&bVTjJv={KkhNA@5hmnkn|@)(%q2sIzGo5F=AW5 zITVRk&@UX_$^R|xhoIkIo8{W)xi*IQ2Lz(XI4|Qt84t;rlkqS=C0@+;u=9Ovm+^=s zy+<3~PPs3H%KeMLg>u(@<#q-Z`@fWvedX>F%Iy-$4Hf6wlXrh?`Nk9PVE0_C2PtNF z8^gs_?BUd2x?vw@x+m9==G@3sq9ybsy$W9GI4@Nv3GSw^QzUMZu0F!H|hhGM@Siv4OR_Dg}-*Lcq^5Mv@DyNLH? w7g7I%>_Z { - private MyNode left; - private MyNode right; - private T data; + protected MyNode left; + protected MyNode right; + protected T data; public abstract MyNode getLeft(); @@ -25,4 +25,5 @@ public boolean contains(T someData){ return left || right; } + } diff --git a/src/MyObject.java b/src/MyObject.java new file mode 100644 index 0000000..45e979a --- /dev/null +++ b/src/MyObject.java @@ -0,0 +1,36 @@ +/** + * Created by c4q-Allison 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 int getAge() + { + return age; + } + + public void setName(String name) + { + this.name = name; + } + + public void setAge(int age) + { + this.age = age; + } + + +} diff --git a/src/MyObjectNode.java b/src/MyObjectNode.java new file mode 100644 index 0000000..c96d271 --- /dev/null +++ b/src/MyObjectNode.java @@ -0,0 +1,55 @@ +/** + * Created by c4q-Allison on 5/28/15. + */ +public abstract class MyObjectNode extends MyNode +{ + public MyObjectNode left; + public MyObjectNode right; + public MyObjectNode data; + + public MyObjectNode() + { + MyObjectNode myObjectNode = new MyObjectNode() + { + @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 setLeft() { + this.left = left; + } + + public void setRight() { + this.right = right; + } + public void setData() { + this.data = data; + } + + + +} 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