From 7abf999c31b07eab3a6a6159e65c8ef53e8aa0de Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 11:46:52 -0800 Subject: [PATCH 01/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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/13] 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 2c73e543f45c94ca0eb346176d81b6a3ebe8298e Mon Sep 17 00:00:00 2001 From: Kathryn Hodge Date: Tue, 28 Jan 2020 16:44:01 -0800 Subject: [PATCH 13/13] Update begin state --- src/Main.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Main.java b/src/Main.java index 7b17a933..40df4ae4 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,6 +1,11 @@ +import java.util.Scanner; + 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(); } }