From 7abf999c31b07eab3a6a6159e65c8ef53e8aa0de Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 11:46:52 -0800 Subject: [PATCH 01/18] Completed 01_06 --- .idea/.gitignore | 2 ++ .idea/.name | 1 + .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ learning-java-2825378.iml | 11 +++++++++++ 6 files changed, 34 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 learning-java-2825378.iml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..e7e9d11d --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..dd2f277f --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +LearningJava \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..5217e29a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..b6f11837 --- /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 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/learning-java-2825378.iml b/learning-java-2825378.iml new file mode 100644 index 00000000..c90834f2 --- /dev/null +++ b/learning-java-2825378.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From f6d1e3ff81b50debfba699db2f54f07e4abb1d71 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 11:57:26 -0800 Subject: [PATCH 02/18] Updating git --- .idea/vcs.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddf..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 7e990ca74399834604572705b30dd9e08880c65a Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 12:15:50 -0800 Subject: [PATCH 03/18] Completed 01_07 --- out/production/learning-java-2825378/Main.class | Bin 0 -> 538 bytes src/Main.java | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 out/production/learning-java-2825378/Main.class create mode 100644 src/Main.java diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..59d56041118bd8e4901ca672ff950de4d04cb92e GIT binary patch literal 538 zcmZuu%TB^T6g>ll(pm*U@U4XvxUfrOFm8NAOnoF6T(}xwgdu&HQcV0TU1;LM5AdUm zcZ!LcFv;ATd+xdC%;WRx{R6;0Y9>-h>(DG@kYy;0_#<~b9t@nT?nv}vhU|e1WPHew zt~WXcaxiq57Up36qqm>NvG9o%PH3p?CPFfFt|J-5?Kl$LZ|1PTP&*Tz7uvUB@kDC|}c6D-f|*6~TzL;;IBiWW*(VkphfV$dIyvKNq9ed?ARo2+CoXf`@JDh%2M zm&DMH!oFb0yD|`$6Td5>8{YK@DY{{gdmSE0RsVomJd|U)xT}VnH0>uMmHOQ*AL{dH zK>X5-HiOv?Cs9wFN@Zs##a(qBR8gj3~XVWa0Z)V3e|6(ziy2H literal 0 HcmV?d00001 diff --git a/src/Main.java b/src/Main.java new file mode 100644 index 00000000..43f25a91 --- /dev/null +++ b/src/Main.java @@ -0,0 +1,6 @@ +public class Main { + + public static void main(String[] args) { + System.out.println("Hello World from the IntelliJ IDE!"); + } +} From 86dbc388cfe55464bd0b6f76f581749352aee982 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 13:41:07 -0800 Subject: [PATCH 04/18] Starting 02_02 --- src/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Main.java b/src/Main.java index 43f25a91..7b17a933 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,6 +1,6 @@ public class Main { public static void main(String[] args) { - System.out.println("Hello World from the IntelliJ IDE!"); + } } From 7ebb22eba4c41e23d2a49387d141bc30b2b9620e Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 14:00:14 -0800 Subject: [PATCH 05/18] Completed 02_02 --- out/production/learning-java-2825378/Main.class | Bin 538 -> 783 bytes src/Main.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index 59d56041118bd8e4901ca672ff950de4d04cb92e..00e5d328f8b6cc9c464cc4adec1c1d20f6c1fd69 100644 GIT binary patch literal 783 zcmZuv+int36kP{~8M#=HOSRSu^$Ms^t06WtjfAF^h)ROtp*|g8q^E(w41WaF{E(GK{|m9vI?1VY80Fgq8ND!R-sw!ie_B|mjyUj0viHc6`-*Mt_g5mfa7A< z!A*X>(ndTQlYy&{Y#GmeJsbC2|E=zgh@@MSz8-b8ZzNxVR&ZjboV_LD8r9>4$$H`4 za-PKwaTwzbYsD^k?GIU>Ifqt=O@rCM^@944zf;XK;HX_Ea6sLv;?VfhpvmnvdPJtd z?p91o|3hR?^tA2z?|DA;AaK2b_WELdOzX~M=J(x0Bcny7`?72wo%|++r}E6 zk&(vsStpnHJ{eG1MG+;o=3oa8@Q{llff$?3=9mG3`!HZ^m#cMI2btD8Mt^DxEXjR`WtF+Fz_)lD0!sjmh^y%aoMToora=u3)f_+%xPCF Date: Tue, 28 Jan 2020 14:27:14 -0800 Subject: [PATCH 06/18] Completed 02_03 --- out/production/learning-java-2825378/Main.class | Bin 783 -> 958 bytes src/Main.java | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index 00e5d328f8b6cc9c464cc4adec1c1d20f6c1fd69..4696e412c8747e9e2b89eb231b5412e85c53e18d 100644 GIT binary patch delta 570 zcmZXS+fEZv6o$XSId$4P)&lY|~ofm6hTr?dGIWsk7}r#UnDRPB_g7=OaTP99Y|0VU2F;+!Ft zhr|U#Oc~H*0$5$X6Z#H`Um93rK z{(9Qou!#ScTZG5DwR9-^^23_kyUd7ILsm=S%3f7e6Iw!N<}23zQ96+|Y4lZP3qt`j zTvL?eIyc0a!@oJ97@kMrdkTpuvmv|Vl zZsLlC-M)$^J`q(z)C_UCBsLAPWr+KD;;}PpS>Lm}Ozml#j5Z-};o!%vC?zqrZ=Bo}>L7Nj|I=aN8&k@HG a7SQEHW^1A&X Date: Tue, 28 Jan 2020 14:29:39 -0800 Subject: [PATCH 07/18] Starting 02_04 --- src/Main.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Main.java b/src/Main.java index 74d4139f..d546f950 100644 --- a/src/Main.java +++ b/src/Main.java @@ -3,18 +3,20 @@ public class Main { public static void main(String[] args) { int studentAge = 15; double studentGPA = 3.45; - char studentFirstInitial = 'K'; - char studentLastInitial = 'H'; boolean hasPerfectAttendance = true; + String studentFirstName = "Kayla"; String studentLastName = "Hammon"; + char studentFirstInitial = 'K'; + char studentLastInitial = 'H'; System.out.println(studentAge); System.out.println(studentGPA); - System.out.println(studentFirstInitial); - System.out.println(studentLastInitial); System.out.println(hasPerfectAttendance); + System.out.println(studentFirstName); System.out.println(studentLastName); + System.out.println(studentFirstInitial); + System.out.println(studentLastInitial); } } From fb7ab6aece4a9f26303ae6efc1eb25e7f02d9bc9 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 14:42:42 -0800 Subject: [PATCH 08/18] Completed 02_04 --- .../learning-java-2825378/Main.class | Bin 958 -> 1014 bytes src/Main.java | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index 4696e412c8747e9e2b89eb231b5412e85c53e18d..5b355cbd4aaa9b60286ae4a56dfdb71597e62b25 100644 GIT binary patch delta 533 zcmYL`%}*0i6vcn9otf88%ZDwacJQ+ZcJO0Rv|>R7OCm%K24bV^CMKfBupq=Oe?!xM z!MK;jn7ClCe~@uyJg;4t$=q}Ax#zxf-^{7~ZNp!Gf1Cmj+31JcChYIU&7;E)2m6NL z?fdL-{m9_8wvuj{DI&|+D(5)gf45kPnYLW0a*<2@FG(-vip#G$`9{(UiJ5W4HAn1? zh&e}GH$<)HAG6O{`YAiuPj`oQ%OgeN6!UJRoAfL<2Q%jD;E#DV_-WF?i$Z*SgMzk2 z(clv(-cpqcjnJR}j`=oh-&S;O^rni{k$?s6s48=pMKKyShN5bCGdZy`h28SnUaj2m zYn4vW@QXQPZQBTjSUNeTKAqDzq29{5EQq|Erm*4X%sLE47}=bb>z9Q8H(F&vPM#cn zto92jF)sI-vX}}@#z@30NVmip*3{Xg&P#p$*FTwut<+K4|Ex;&XWFQ pL5FSAVOd7wJY$7Nva9iwRb_#U9_v|?zNxu&WhG5N(OCt${{SdmMD+jw delta 490 zcmYLG$xZ@66s*A+npH+NWpG192V8JP1w^C9;1XPjBy!_KG=_sQ-VEPB_yyx#4rAhh z5Af`_m~b&xgNcWJ^lo`IRUK zVMsr!Ks65&Wfy`Nlf<|r4*JBTBw~`N^oeOn%qR$%XLr@7YU;jPucbj&opH3`jamq_(eRoUA`C;Sg;9yxAKEQU zFpdZdQxYA-|4H)jv4hG^8U*KZ)B50mpPj>S!Qgx`cwu4?%gk&+#~y}IpyC37-Ue6H z-*8MUabK`hk Date: Tue, 28 Jan 2020 14:44:41 -0800 Subject: [PATCH 09/18] Starting 02_05b --- src/Main.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/Main.java b/src/Main.java index 676a506c..ca739234 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,22 +1,8 @@ public class Main { public static void main(String[] args) { - int studentAge = 15; double studentGPA = 3.45; - boolean hasPerfectAttendance = true; - String studentFirstName = "Kayla"; String studentLastName = "Hammon"; - char studentFirstInitial = studentFirstName.charAt(0); - char studentLastInitial = studentLastName.charAt(0); - - System.out.println(studentAge); - System.out.println(studentGPA); - System.out.println(hasPerfectAttendance); - - System.out.println(studentFirstName); - System.out.println(studentLastName); - System.out.println(studentFirstInitial); - System.out.println(studentLastInitial); } } From d4a099c742842bdd5e97c5197a67d85ef83dfad7 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 14:54:04 -0800 Subject: [PATCH 10/18] Completed 02_05 --- .../learning-java-2825378/Main.class | Bin 1014 -> 1148 bytes src/Main.java | 1 + 2 files changed, 1 insertion(+) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index 5b355cbd4aaa9b60286ae4a56dfdb71597e62b25..65894425dc2315c826be6b5c081bc6b7142659ca 100644 GIT binary patch literal 1148 zcmaJ=T~8B16g>mmZd+Et@+F|SC`gM!{Z=R%wFEI1Bq^y6J`L?i2X<$g-6=``iTW?} zK@%SQ0sbiC-E9peZQNw%&fGco+%xyi{Qh(H3&1*FWH5wb8z8v`yeP2_^FeKjbw#QR&2(`m~U#m1OW7Ni&gDc2hpsTb) zBYa}fEh3#P$BCpa><3briU|bwi&@e%;b0O|4AVY85hbl^+vpS21H_*1;UEF^mt;z+g8cMV=y&0}|z{Hs%?uT`mb>m2_P&jFzPm zdoBM^1PA=kBTu%hYuu~yKt}7X(=rW7`jh1-xJc1{Ofr@G*e^9-rF|Y85q^BYHbW*f zt-4U=&HgI}wneq>I<{pHnmz8vD$d*4Efk6E;>!FVEK|{~peD9uq&yvoTZ`g|^0n3` zGy!k!3e(W_a5Rbg89cy48;_zsJ!V)uPa)N*J`sgZrcUd&dClmc&G5OmmR(?nbcd_D zC&IbNe+yv~MY8ad=CiH!-Y;0}ffJ%+n9vuM6bm?5l@ Wc2GRSJ^G*E8LcujTSpPkG4mJWNF5mf delta 594 zcmX|8O>fgc6r4?Luj3|daqNIopwxUNK%oU1+K|$QRL}^dRy{`7xXjVm3j@+Bfgbd$Y4o{%!w~&W}G|zX907-o!Z&&ZJ)r)o7TU z3Rr`)Xw+5$My*@#6yU*^s1$J#mnJ9cB?nb3Nn9@C3a+Mx2siXxPt(^lx1xo6Gvc}? zZfK%EBW`Kpwt!ztKMK#&qPnK;=$THvCvh*`5g%mxG!_uu^t&hr-dQw0j7KN&K(&>M zljA5E=x#s#DO#)Lv3h?TC+fv;G*;bYsD{xyHai0Dzs~FEe9CE-th@$ga^a+(OfI=bBbv<};KU zGO(s-e?fUELqMoySSI*JhL9MT8E$H{X6T>G3^hGq6F>9z9Q2ExVS&-0qY26PIj}KL zcb8cea|lsFoy;2NHgN&F?ChhAL;kuq@TZ#`QN!2bF*b;K^w7W)?jmtS%@&;;9BiVA kr!<fy0m*vp;3!>*(N&o-= diff --git a/src/Main.java b/src/Main.java index ca739234..12c0999c 100644 --- a/src/Main.java +++ b/src/Main.java @@ -4,5 +4,6 @@ public static void main(String[] args) { double studentGPA = 3.45; String studentFirstName = "Kayla"; String studentLastName = "Hammon"; + System.out.println(studentFirstName + " " + studentLastName + " has a GPA of " + studentGPA); } } From ccc5f33d1268480f4a78554e0b9e619082246753 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 16:05:33 -0800 Subject: [PATCH 11/18] Completed 02_06 --- .../learning-java-2825378/Main.class | Bin 1148 -> 1451 bytes src/Main.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index 65894425dc2315c826be6b5c081bc6b7142659ca..f698aa92e325fe116114708cb7933aaff724509f 100644 GIT binary patch delta 609 zcmYjPT~E_s6n;)W?ADb9x-pzldHLSdQN;PRsRNm^Ap%Mw;m%hmp$1!mt?1Q$ME`*I zCMIx!2_{~7<&A&H7*A_LNR#KB=k$5bIdA*^$$ZI~zy6;70B|2KkIY%>WpI@+vau^e zu^os{K_m{PABr##(f+m!UEw99Wk3)H-pUWsi9&DBS>KYr?;d24$Ebxdj1v^kCk!s9 z8ZU6V{(cm$hX<~F*EBJVNeeor2p22oB{OH5>Z?RmwQvpB38wFU4BJ8UX3r(4m1^4t zp=e+_Zqe_{x|cL36#ln5zfm)`6equ6qKzj8o>~~hV%$}Jj&%t(2@<>Vy^vyYZC(UB zf--nUC?$12IE;&`&{hZ&@mFOiURC>PEq<-m3Nh6{{N{8=saX1JCxK*dc) zE6sJx;ufbRX~IX_8#K)VQ|V`o?FTthoXU#+Z7ouZJuA7W}>;rJcHo5vXWhKYt= z)=yCBoC$BF!XxgdfM@qG$wQJAG#LD3kYj#{aTI-+=3i4sKNeu8%hh=WUI2G+m!pO` z+~Z3??0bj?ntX&D^9P)1>@9Ki5j#}0(s6T`=a}cgkJ-~nabO9{Tr|1x9IJSN@;^|1 BX%YYc delta 313 zcmYL@IZgvn5JX?kpP6sQ7DBAT2r~wTWxy43C^C!ln zt65n;f^MYL<&Y|B&5P6O}k4cJwCl8+)o_PBmrfI-GOK{4Wo;ARGVy diff --git a/src/Main.java b/src/Main.java index 12c0999c..aac917e8 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,9 +1,19 @@ +import java.util.Scanner; + public class Main { public static void main(String[] args) { double studentGPA = 3.45; String studentFirstName = "Kayla"; String studentLastName = "Hammon"; - System.out.println(studentFirstName + " " + studentLastName + " has a GPA of " + studentGPA); + System.out.println(studentFirstName + " " + + studentLastName + " has a GPA of " + studentGPA); + System.out.println("What do you want to update it to?"); + + Scanner input = new Scanner(System.in); + studentGPA = input.nextDouble(); + + System.out.println(studentFirstName + " " + studentLastName + + " now has a GPA of " + studentGPA); } } From 59b09024305fe162cc7eea1da9bfe54fc919c291 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 16:35:16 -0800 Subject: [PATCH 12/18] Starting 03_03b --- src/Main.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/Main.java b/src/Main.java index aac917e8..7b17a933 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,19 +1,6 @@ -import java.util.Scanner; - public class Main { public static void main(String[] args) { - double studentGPA = 3.45; - String studentFirstName = "Kayla"; - String studentLastName = "Hammon"; - System.out.println(studentFirstName + " " + - studentLastName + " has a GPA of " + studentGPA); - System.out.println("What do you want to update it to?"); - - Scanner input = new Scanner(System.in); - studentGPA = input.nextDouble(); - - System.out.println(studentFirstName + " " + studentLastName + - " now has a GPA of " + studentGPA); + } } From 8740322cd719aeea9cb4c8fc7fa19d6511e4fa58 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 17:03:32 -0800 Subject: [PATCH 13/18] Completed 03_03 --- .../learning-java-2825378/Main.class | Bin 1451 -> 922 bytes src/Main.java | 13 ++++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index f698aa92e325fe116114708cb7933aaff724509f..8ae0fad349a94fd76275182e6882235d41a25d5f 100644 GIT binary patch delta 605 zcmX9*O-~a+7=ES|W_P=-fUZ`hb-)i=P|AWIc<`u66Coz`!g1OTbm?}s+3tcp_2M5O zdoc0n#RCT;2S_wAp8YHS2958~%k$3rG4nj{Jg0?E-1+_Q`%eHbuzlh*iZ(3R9FB_u z+>?FZw@_lJz70BkA%#u{Z54~QN{*G%!WU9^g}>oo4)YufF0SEvc7<)%Ic_k_AIc-y zNRuFJv^r926`R+~E^gsALoUz^UiOuFjsp*iE@n{4PFZE*;jRmTB?hk5`=qH8hJ3Bw zv~Z7M<&{2+#vCLDs#~f@W`@=q1d^FXZ{mPXmg+LF}BvIYnbilxx48>L= zJN+Fwd?(wXVsKhS)lshllh`{l(CcP>Ea4$?^uHivwBjsbjj{$sMsa5K0_@vmyH04@ zKpv}v?sNcam^`A?#$&8g$=v=(BYBGc8Tdl+99Mt9+dIR}3*33Lc8==HMe8$4rnyYb zFDRJfeL5PZJPcD6oN$&L;bfbQGC5u$&KgSCAVZA;F(tuPgG!*WDtv5`hBA4$g(tMr VQ>r`2{Y8z#WAuA?MwJ|%{|8c6a|HkZ literal 1451 zcmaJ>e{<7D5Pg@(mg5K#ln@9lpg@3_mbirgCFZwHaEcSsnlaPqUl;otACd1o(h2Z4 z0lo$N0W)-l55R|F*pm&I+EaVxPP_Yd_vzj0K7M-t0l+ox$TG}6;ZJ!n zZue)eR&+kqKji5e!!0mb7MF#xLwOAR77%2qe3Hx6AVj_+uQ^# z9rSb(JR@F#(LvH}aU%k0jax1PhC^wG#K^E%Z*rwXWCc3q;WU;RCZuihRf$d2O};3R z$4Q*EXL63==zs=^H4G^6o@8t+O?oT%znwT4Z76?@?I`4T|$CN>f8ZVA)Yt#~Gjavl}jbFpD3?mokEdRXaHN%d6ki(-Gc`a`(En?^@H zh8M$AF#z_9R=H}0B3`a(y`OZ)%;eB3ewX;D*A-*n!&>&g#?tUm4@#7I7}li`r5rX% zMi#K3&EtRvq;{bH30Mvf7=2OXSNhq1VhrA<9m{ga<5La1octn!*|`lgB2% zO$z~)dAL=7YTKV)ci!N@g+=Gwd(7GR5i>)h&taPEW3-;a0j$#3yM|em;iufzhynG-6 Date: Wed, 29 Jan 2020 09:17:16 -0800 Subject: [PATCH 14/18] Starting 03_06 --- out/production/learning-java-2825378/Main.class | Bin 922 -> 564 bytes src/Main.java | 12 ++---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index 8ae0fad349a94fd76275182e6882235d41a25d5f..317b4e5c9b7423d5705aad9f16523860d9f49e62 100644 GIT binary patch delta 332 zcmYLDyGjF55IwWW?#(`v_*^xbs32-{3kwnP1B8I+ilE&^7FkI)A=v~{+1OahcK(GT z1QhIS{3vnurm&bZoH-BXMZA}tpWlx!07uw79%w!z}LRM9m$6ngm<$_R9mKN*dOIT-vB7>Nrl#sy}QH}N+2r=V9YFESP~P{I$-x6rmf(wBI9~E8KnnkdN21i|H>)7BzpQnkI K{%?~N16zLr$}uni literal 922 zcmZuwTW=CU6#fP%3v_z}si-YZy>)4|lzLCq7o!OY)g~B{#;0K!VcKPu?4^}o;=3#3du`z`#!~DKD6m?JNe*JBC zU%C-P_Ly zf4kPPu*k5Gq{fl*>TOqOEdztTV&e*~GNhEr{s*(ENAX{n1(dO52w7&RoYkjE&WF@G zCg{2ijunEV<;SS0X>Q`EnZr$n)mM7oAM4W;KLkqBm|cT2|s)5(RqInljIjcpW;gwxM}im!YuhG z+2`q|;?v6T8p$5vVqi^%nRX=HgB>wCgHveJ?5=#R4B))Mv|;`mR&a+_(|jo~vz#Oy z(&}_FI;Yl7!M-N$8cE{@(pV#DPXe%xyQJlD4;y4L$)6}9O=sg6R&nM8bKgfROlrvQ%eW4*reSx0QjT{ mVcjIHL^%y?5rhh@-hDivi5`-jp58Aw7Rt;b-y^c5@c0kazs{Nf diff --git a/src/Main.java b/src/Main.java index 0838902c..30962bf0 100644 --- a/src/Main.java +++ b/src/Main.java @@ -3,15 +3,7 @@ public class Main { public static void main(String[] args) { - System.out.println("Pick a number between 1 and 10"); - Scanner scanner = new Scanner(System.in); - - int inputtedNum = scanner.nextInt(); - - if (inputtedNum < 5) { - System.out.println("Enjoy the good luck a friend brings you"); - } else { - System.out.println("Your shoe selection will make you very happy today"); - } + Scanner input = new Scanner(System.in); + boolean isOnRepeat = true; } } From 04dfedd5f1e371aa26504de41abfa488c20499a3 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Wed, 29 Jan 2020 09:36:05 -0800 Subject: [PATCH 15/18] Completed 03_06 --- .../learning-java-2825378/Main.class | Bin 564 -> 1062 bytes src/Main.java | 10 ++++++++++ 2 files changed, 10 insertions(+) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index 317b4e5c9b7423d5705aad9f16523860d9f49e62..f2282b48f387bb1db201bb78afd8f86486dbc478 100644 GIT binary patch literal 1062 zcmZuw=}r?-6#j0vY0H4LEP|pAqP4>|?prB{CMG0hi8VFiuS>bq3)7i8i`qxw3H&WT zAkl;e@ELp+mvg5j6lIb*C--dMch0%@$M0{)0G{A^7BR#%By=Q^Vi?@zAGu|7r(vyc z?TUK9kXn$A3>F#UMYEm%adBO<{-*p;UjN_7q%Q_}-g<4U})>5@>#kI>MngubXawW5t#x;iJH*RQe z8*MiG{^n2+?P=>p+L%-pPmf*pXv9d$vS%W+NC*c`w;j5M>bzH|3L&6cC zsh#1X*=fBOFpZnkZj^8fMGdBoY0R7*a72yPBtC@P_WvQ?Sz^iDOk<7~cQO|R88Ovh z5rb8(wv%|_ZVQGB73qkzu(>6?*L=$+OTOaPxn1L)ROhZSp}Hm5ib^g~b~7q6T736^ z8)l6m6Z*o7)~*VkUbF6KsQ~vHRB-5=e1@b{7lyo@%-*|4*jeeXJFlW)Gq6pD{%XMM zd#k+FC7Z3fp;s3#rD`Xm7|$yPn8ZBYfAz&cAV`tCO(%;qBb}T+0{a@d?~qh(Adb5v z^-cip;Xa)*cz}mwQOU;?ksw|E4(;s$GDkGhM0sK#g#+aCqlXw%`YP#}Ll|pw`5T8Q z>?0X3fBExMxn{|wK;uxL^XMa)BB{~qN+U;LsX;s=Qw+<00cY9p`Tzg` delta 228 zcmYLDISRs16rB9*t6<_5x2T;>3M&h5U}+;(R_XNsdIkA+5Zj0lQ1Aer#uJE>SXlfS z=Fh@ATQ|*leeO>Hb4*UoMKuvhPh_^X-DP_P;YJ=sBy*9(c^CUfB&|X#*;nMDG_s3vDVJ9mM=8%PS^Sa`1q;zQQh0TWX8{N>I55T$q^ou&TM_ YS3ws&R$Zz-1|0PHhDfUWMsx(mUza}@N&o-= diff --git a/src/Main.java b/src/Main.java index 30962bf0..1b58433e 100644 --- a/src/Main.java +++ b/src/Main.java @@ -5,5 +5,15 @@ public class Main { public static void main(String[] args) { Scanner input = new Scanner(System.in); boolean isOnRepeat = true; + while(isOnRepeat) { + System.out.println("Playing current song"); + System.out.println("Would you like to take this song off of repeat? If so, answer yes"); + String userInput = input.next(); + + if(userInput.equals("yes")) { + isOnRepeat = false; + } + } + System.out.println("Playing next song"); } } From e958b012d2d0b68a34c8fa678172994c23e93ab7 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Wed, 29 Jan 2020 09:43:42 -0800 Subject: [PATCH 16/18] Starting 03_07 --- src/Main.java | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/Main.java b/src/Main.java index 1b58433e..4b88cab2 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,19 +1,26 @@ -import java.util.Scanner; public class Main { - public static void main(String[] args) { - Scanner input = new Scanner(System.in); - boolean isOnRepeat = true; - while(isOnRepeat) { - System.out.println("Playing current song"); - System.out.println("Would you like to take this song off of repeat? If so, answer yes"); - String userInput = input.next(); - - if(userInput.equals("yes")) { - isOnRepeat = false; - } - } - System.out.println("Playing next song"); + public static void main(String args[]) { + String question = ""; + String choiceOne = ""; + String choiceTwo = ""; + String choiceThree = ""; + + String correctAnswer = choiceTwo; + + // Write a print statement asking the question + // Write a print statement giving the answer choices + + // Have the user input an answer + // Retrieve the user's input + + // If the user's input matches the correctAnswer... + // then the user is correct and we want to print out a congrats message to the user. + + // If the user's input does not match the correctAnswer... + // then the user is incorrect and we want to print out a message saying that the user is incorrect as well as what the correct choice was. + } + } From 1fa882bcfcaeb9708ec29a1d82a5e5899cc94816 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Wed, 29 Jan 2020 10:13:56 -0800 Subject: [PATCH 17/18] Completed 03_08 --- .../learning-java-2825378/Main.class | Bin 1062 -> 1868 bytes src/Main.java | 21 +++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/out/production/learning-java-2825378/Main.class b/out/production/learning-java-2825378/Main.class index f2282b48f387bb1db201bb78afd8f86486dbc478..492d9112e7d5db9ffeee5fb7446b263c42dfc331 100644 GIT binary patch literal 1868 zcmaJ>ZC4XV6n-Xey9wbfh?v&Gq6i5BX>DsuVznBJVgp!`hN4zGgpn*PJ8^eb%0Fp; zK|j|Icn+S^AJ8Aw_Rem4geIpso0&Uz?tSLYGtbPQf1UmTU>U6pVu%|^WRXOQVPv1b z<|T)_d!>z?ebG`3sav*dtJ@6mLa}MWWGHR5xw35EQf*;5+}jhrvO1I`$m?1%@GM`F z-|~-rB@XYH$S@=Y_f*?NmciH$I<^v?i6Mgbxe7ctjS-9*$Yn8x3+L*nhaj}P45*s% zT3DeiOOHLs7{>a<(6Sw!;kX1+h)}|P5`^vURf^3VF>*PJ zk1)wFamWuuRk|&%wrtfV%U9f0KEtCvxxHw;o?@@dfWXJYU|p-(9pEMmz( zDT|MF=ouMA^e_x4S(8V?t8!oH=o?vliqGi$#H)ZiM9eu-Bk@#@PFS_Tjis(FQ8Ct2M4UN>t^pU>L61u2>HacZApA zI}UkrHQC}$lY6!vcby5QD~5-Yaee_C&GNsEk*^`4Z48 zxF_iG>K?)p=~P(f1*#uB#*kgrceLto-xt1t7Yx^W80$xb0Xl%m{}0uQ3|Yf8%JeYn zUySYrJk%yAm91<|e_abN1 za_P0)zGiRbk2>1}LArJ{=aA>K25LovhkgPaiZeo?J1R-zW5m`yXUBtJj zQT#HkvqnAx>x6U#vA<~{)4+y-#q-}34K;yrJf_GPg>6zlL{^p`W8b8NR H*g^guCkoZd literal 1062 zcmZuw=}r?-6#j0vY0H4LEP|pAqP4>|?prB{CMG0hi8VFiuS>bq3)7i8i`qxw3H&WT zAkl;e@ELp+mvg5j6lIb*C--dMch0%@$M0{)0G{A^7BR#%By=Q^Vi?@zAGu|7r(vyc z?TUK9kXn$A3>F#UMYEm%adBO<{-*p;UjN_7q%Q_}-g<4U})>5@>#kI>MngubXawW5t#x;iJH*RQe z8*MiG{^n2+?P=>p+L%-pPmf*pXv9d$vS%W+NC*c`w;j5M>bzH|3L&6cC zsh#1X*=fBOFpZnkZj^8fMGdBoY0R7*a72yPBtC@P_WvQ?Sz^iDOk<7~cQO|R88Ovh z5rb8(wv%|_ZVQGB73qkzu(>6?*L=$+OTOaPxn1L)ROhZSp}Hm5ib^g~b~7q6T736^ z8)l6m6Z*o7)~*VkUbF6KsQ~vHRB-5=e1@b{7lyo@%-*|4*jeeXJFlW)Gq6pD{%XMM zd#k+FC7Z3fp;s3#rD`Xm7|$yPn8ZBYfAz&cAV`tCO(%;qBb}T+0{a@d?~qh(Adb5v z^-cip;Xa)*cz}mwQOU;?ksw|E4(;s$GDkGhM0sK#g#+aCqlXw%`YP#}Ll|pw`5T8Q z>?0X3fBExMxn{|wK;uxL^XMa)BB{~qN+U;LsX;s=Qw+<00cY9p`Tzg` diff --git a/src/Main.java b/src/Main.java index 4b88cab2..af1e85e3 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,23 +1,34 @@ +import java.util.Scanner; public class Main { public static void main(String args[]) { - String question = ""; - String choiceOne = ""; - String choiceTwo = ""; - String choiceThree = ""; + String question = "What is the largest planet in our solar system?"; + String choiceOne = "earth"; + String choiceTwo = "jupiter"; + String choiceThree = "saturn"; String correctAnswer = choiceTwo; // Write a print statement asking the question + System.out.println(question); + // Write a print statement giving the answer choices + System.out.println("Choose one of the following: " + + choiceOne + ", " + choiceTwo + ", or " + choiceThree + "."); // Have the user input an answer + Scanner scanner = new Scanner(System.in); // Retrieve the user's input + String input = scanner.next(); // If the user's input matches the correctAnswer... // then the user is correct and we want to print out a congrats message to the user. - + if(correctAnswer.equals(input.toLowerCase())) { + System.out.println("Congrats! That's the correct answer"); + } else { + System.out.println("You are incorrect. The correct answer is " + correctAnswer); + } // If the user's input does not match the correctAnswer... // then the user is incorrect and we want to print out a message saying that the user is incorrect as well as what the correct choice was. From 028bdabff63965f312a9fda2011e27e08fd4d3d9 Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Wed, 29 Jan 2020 10:27:22 -0800 Subject: [PATCH 18/18] Starting 04_01 --- src/Main.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Main.java b/src/Main.java index af1e85e3..3d1b3c70 100644 --- a/src/Main.java +++ b/src/Main.java @@ -8,14 +8,14 @@ public static void main(String args[]) { String choiceTwo = "jupiter"; String choiceThree = "saturn"; - String correctAnswer = choiceTwo; + String correctAnswe = choiceThree; // Write a print statement asking the question System.out.println(question); // Write a print statement giving the answer choices System.out.println("Choose one of the following: " + - choiceOne + ", " + choiceTwo + ", or " + choiceThree + "."); + choiceOne + ", " + choiceTwo + ", or " + choiceThree + ".") // Have the user input an answer Scanner scanner = new Scanner(System.in);