From 00ebd001adf4c5e5e6790af59e8899ab15633ae9 Mon Sep 17 00:00:00 2001 From: Karen Date: Thu, 1 Nov 2018 19:42:28 +0100 Subject: [PATCH 01/22] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3f096ef --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +.idea/workspace.xml From f612c61ac8788b864dc2cf9bde65ae2e66c5e0a6 Mon Sep 17 00:00:00 2001 From: Karen Date: Thu, 1 Nov 2018 19:43:40 +0100 Subject: [PATCH 02/22] Update .idea/workspace.xml check gitignore --- .idea/workspace.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 28b67ac..eae4a21 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,7 @@ - - - + - + - + + @@ -304,8 +303,8 @@ - - + + From f60eeff1f6f1d38c3c5c593abff084bb1f0cba19 Mon Sep 17 00:00:00 2001 From: Karen Date: Sat, 3 Nov 2018 21:03:56 +0100 Subject: [PATCH 03/22] chapter 15 socket --- .idea/workspace.xml | 114 ++++++++++++++---- .../DailyAdviceClient.class | Bin 0 -> 1349 bytes .../HeadFirstJavaExamples/Main.class | Bin 458 -> 459 bytes src/DailyAdviceClient.java | 21 ++++ src/Main.java | 7 +- 5 files changed, 115 insertions(+), 27 deletions(-) create mode 100644 out/production/HeadFirstJavaExamples/DailyAdviceClient.class create mode 100644 src/DailyAdviceClient.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index eae4a21..074cd0b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,7 @@ + - + - - + + @@ -29,13 +30,25 @@ - - + + + + + + + + + + + + + + @@ -62,12 +75,13 @@ - + - - - - - 1541095190663 + + 1543423815013 - - - - - - - - - - + + - - + + - + - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - + + - + - - - - - + + + - + - - + + diff --git a/out/production/HeadFirstJavaExamples/SimpleChatClientA_C15$IncomingReader.class b/out/production/HeadFirstJavaExamples/SimpleChatClientA_C15$IncomingReader.class new file mode 100644 index 0000000000000000000000000000000000000000..4519b3ec71f7cad9ead3a9f810121c9f4f0c29a8 GIT binary patch literal 1362 zcmZ`(>r)a@6#rdB7PeK91kGMlWQY&6w3n}xe1nRRGk$7Txau10GRso*7x~%7a3*K^ z)bydhsmadWMbV^TI6LQ_-#O=Z9{2wG^X)r;F>LwJi2)e_4EivHVHt6Z_%Mp65}wKM zV9<*(@f{c9xr`ThDS)rMcr9ZBlM<$6bYNP-jD$B5W*I!zzE+NmFmxv~TCr5%iG9^d z6f~||v+on5;}Zm#)O5|7X6TLn2h+dB;7%BM&d`z6biP(8?r<}!?iA=GkTh~?VM{eN zq1O-HA}vGvvYs=Fn!dNm)jT&Dlx1D#W}={$%be_e%@anhx)H|~v!auX3MNvKm&@v& zo%%risKyJbz8B9}CgmZhi&q(f$%bXVn&Tx)GjuYxWh^!KA*GgVo)YHlR!uR;8KYw6 z_<|-%>TTMpVG&Y67lH~x2unyPc#C-n3knvoBw<;>3RbDrjoc2axr$b>%WpNQ4`BsK zq!g?PpLGQrNGsSxhJncvvcj5XxY-DDQGkMX2s1>Q()*`r4E{!h^_>HrvuIY0qs@x0 zI|ICgbLdk0nr5I?5&Xp*dz}7iMtrWayUR_UcP30N4%s=bSs1*+S*#C3SG51qfG$RN znaSs}#fvm@qe8svjV#nx3aFHHDH_0B-rb&0vSB?#Q1&f`)b!201k@OG-SU@kykb}Z)+#`+fb~IWp z+()<`>jzrs2c%=iV8>{w!M&aQiODZ$J%wlc1X93TgKvQTHOMvGaBxc9D9!_I=f?KK zv(rO(Q-d}5k8C1KSfyvE1%g@#tt5q>L=-73VVyR9!=@T0jDi^|{vr7#;l?9GZ2IXs o{m10nP3OO{D539+Y)rxvA);U{$!D3{WNjEk7;G8j7#tWB8SEI880;C;7#tal7@Qbv7@Q{;u=oN1 D6S4`U delta 47 zcmdnXxtDXp8D>Vc$!D3{WVIMX7_=GW81xtv8FUzw7<3ub81xy87z`L}7z`&Du=oN1 D21E%0 diff --git a/out/production/HeadFirstJavaExamples/SimpleChatClientA_C15.class b/out/production/HeadFirstJavaExamples/SimpleChatClientA_C15.class index 19a19941b80c6e3582a92c76e2a3d118a9462d05..5a0dcad4f524618f37f36b822f262075f80bf0d6 100644 GIT binary patch literal 3137 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 YoBa_9IUuIVL54&t32c_ Date: Wed, 2 Jan 2019 13:21:04 +0100 Subject: [PATCH 10/22] add chat server class from ch. 15 --- ...rySimpleChatServer_C15$ClientHanlder.class | Bin 0 -> 1721 bytes .../VerySimpleChatServer_C15.class | Bin 0 -> 2122 bytes src/VerySimpleChatServer_C15.java | 62 ++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 out/production/HeadFirstJavaExamples/VerySimpleChatServer_C15$ClientHanlder.class create mode 100644 out/production/HeadFirstJavaExamples/VerySimpleChatServer_C15.class create mode 100644 src/VerySimpleChatServer_C15.java diff --git a/out/production/HeadFirstJavaExamples/VerySimpleChatServer_C15$ClientHanlder.class b/out/production/HeadFirstJavaExamples/VerySimpleChatServer_C15$ClientHanlder.class new file mode 100644 index 0000000000000000000000000000000000000000..ccf2535cec86b26018b9dbc0731262d1494d1e46 GIT binary patch literal 1721 zcmZ`)-%}G;6#i}!xXE^f5Cl=Hr4=;}EC_NB$yT z`qEAbGo{lpz)o4^12<1YX=v7NvOZW|cIf`0l` zV$r}Id}bhqyAq!pkoZD-?nx{eFp$@lFB4eCeTfGK2CxvvLw#S-%OeAiQ82KIHHjw@ zPbIz*==YRWQJ%n9;f3|e%GqviskyzaJXKi_Jd2EJxaF717Z?g-9OdVVfk`|4=XPUa zR^UQmQ+c~ZyH>BN{Bz4MD({u@p5^Cm>8LxlWBYdnX41XG-pM|>DGb1Z~7*e&Io!s*4 zva0*G>kw^Ba}qd{uiDD-A6iZ|Xpy<%ILgactwux9-J8io*G48Z%R#2FX-r)7t@6uN zs~(^Zrm-$j4*4$-HH5%4VKsK08fRs#ZXJ=7jL%=AyO|Pu(+qxr{dJSMk zZ#MBhE}6KDc@r0KQQ-X1z~AW)v6%Q8n>zX%fzhMDZe?iiwkj7He4x8J@@l?i5Jj2f>EWKyTL>U!{brT8|for|!b+=m}*(vg5 z>xC*)xv7q6z3Diig2s9!q}+n|j?lZ3hR6j5c9egjcVw5IJWX^Iz*zcJhaU29$JJJ+ zwhq=gWQvwL+3>6~ryJJ|(qDnV*`qoq_0SD*x8bWAb>ue5zO8e9+fT!+OjRSQeyd(r z4qKaTV>p?wP345CJu7aE`|eQ_!pV21rg8)LRVsPpwA3VMHduL?C&aGnD169sY!vJu zqCEU4DX!2m1(HcET)su#P$V3rDRas4-(Ilw?^AA_l63qw=9T1d4p%pk$Hvu_UnA)(djHX&dZH;xI75-`|I z{dHbtGiM3tHUVlf<1CgS=o_RZc!gvl8bF(j27ZqAf02{8b*LLp{B7hBd`x!)pRhw< MK~9)|DQSrR0o?4I&j0`b literal 0 HcmV?d00001 diff --git a/out/production/HeadFirstJavaExamples/VerySimpleChatServer_C15.class b/out/production/HeadFirstJavaExamples/VerySimpleChatServer_C15.class new file mode 100644 index 0000000000000000000000000000000000000000..5f0e24b7a6465902d20cd96bc4eab095a8f7753f GIT binary patch literal 2122 zcmZ`)?NZxT5Iyn-0$G&ruh67POM@YRlQg6O6I$XzLTgNlDTE|VDs06T*pe&B1p4*6 zuh1vpcRG!k)-#>{>r9`aKl>P&(sLynn>38at9y6%?(W$=SNiMU-+l*h13xIZfF&7s z6$G#(#620y3c^@wOpgE52 zNa)FU=GC%WD!Xad*0mzFeaRhdPm7gZqYzuLZS5dwIBr}*%bZ~v?!1IxbZkRHC}CxF z2^~qp)Klf+wr;O$+XZU6lU7D6Y-qM2_BCb5%^Qq;F1exG2Wg{ND(H#4=B9OfPq&{Y zu1zyRsHhpHg#PFwzk-5h=3*?%FmrJ)qh{ws)o(CM2;?l{^8ux;%&zWA=yLNa78a_FbykqpBdauPfZ7j2fLdJSkJRBSsGNwE4ChdpecBhfsO%v|0KMJVR1jB zmt4a#X>3osT4r}eD|w9}4@eRY(+h8A7uk&i%VZb(qD?h4H9;=wj-%zgK6`U&?vjL7 z0Zwx*0_^nzcynB?Y2z|@Qb}87JEJcdVqE9Xn#hz0ui`z7NEkfJNyU_~_q>5JDlXw& z0`W}V44T>`;yzQ6L%x3a^dMvyDt53d{0b_HATc@{c>SSBxO`S!Bd3@zqF6$dRD6vQ z8MX=s9CT;SaxZEZGZybfModUXS;Zd6av##^`Kfr05fuyAXCGA@;2Ra+;yV@JizYPH zx4ONHq2!;Rc$ix>hz#aqqnw8+KgH7Hw`!E`8v* zdXY6)Wg1?)g#J5-)%(q_Q^HqEkW1pG7D$B-Z{=O3bz94j#{KnHoaQ?ZpQuL9-!+{O45w($57q!(NSaGA2j zS7MZFwYH98jJr0B;|ew6@C?1h;YbyMts?|02sJ{8Zv}7>3iCF?L@N%a08jhJR zOx=U=D#DD@@)B|tty^6^KOUhid8GnnrHaVbLqzAk8sydSi=N0N?2D}+Z|SR zmwj2~ZVlJ4iR)hd^Q>~1U&I*o0cxVOU1z*IXvYWChZt!N)40iOY3@G6Ev|@)o}zIx z{P!X73jH!>j}eC?`(lo6w=qvCdis*VLwsHpC@UCRnfMjwB>aR+TntP21Ci7uQN7I$ zoIgDNC&lOB;ql)BWEUZgo`AdnnQ^B1VZKSrEfzn+am>;uP7t>}P&e54Vb0Wt60MaT x6!~jqi`7T?n9*CQSs>hi2c;dsS7?=ycp_s?rt%XW3Sf~bz?t)^aQ6 Date: Sat, 12 Jan 2019 16:57:45 +0100 Subject: [PATCH 11/22] ADD Jukebox1.class CHAPTER 16 --- SongList_C16.txt | 7 ++++ .../HeadFirstJavaExamples/Jukebox1_C16.class | Bin 0 -> 1687 bytes .../HeadFirstJavaExamples/Main.class | Bin 416 -> 407 bytes src/Jukebox1_C16.java | 32 ++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 SongList_C16.txt create mode 100644 out/production/HeadFirstJavaExamples/Jukebox1_C16.class create mode 100644 src/Jukebox1_C16.java diff --git a/SongList_C16.txt b/SongList_C16.txt new file mode 100644 index 0000000..5a2d5aa --- /dev/null +++ b/SongList_C16.txt @@ -0,0 +1,7 @@ +Pink Moon/Nick Drake +Somersault/Zero 7 +Shiva Moon/Prem Joshua +Circles/BT +Deep Channel/Afro Celts +Passenger/Headmix +Listen/Tahiti 80 \ No newline at end of file diff --git a/out/production/HeadFirstJavaExamples/Jukebox1_C16.class b/out/production/HeadFirstJavaExamples/Jukebox1_C16.class new file mode 100644 index 0000000000000000000000000000000000000000..2bfc6d49736f83a4fd50fd78b2ced3da012a4d3b GIT binary patch literal 1687 zcmZ`(T~`}b6x}xoOfn215J<7M5I+kEkWvw~AX>0hYoORrYN%Q#$&gM78P;UtqQ9um zb!pNiYx(5zp+BcjK2`U*2_Lcekb5WRp0m$B`<#1Uy!!nQ01J3zVjR~EESU)5dJGq^ zY;yTDh828f;&a?Ev5GYVUqo@!L=3kKd}-h-6NC8LgoWF(d?PV=1M4P6uo1-_6Px%} zAnzI|7}!#XHoST@?=}L3vHWBEXFJyn+*5`aGZIj zjgjDy+faz-Z#Vaxl6N@&aBY5(prNWq(p4uYkT)G7yRKlwI}}_mcZ>fex$oE&$5$9X zIazJ)?mE6xxvNj;6RDAk@&cMM!V3+sS?E_7gP0-@s zqtFV5U8x8+Mo+yCEJ6%O+AVL>_8ZLJA9#CCos}dXyzZ`G7QCikcBCqW;j?1Q32O_N zF~Qh#I%nYxT(s~WCJby_xR37)6fNxFfr0NW{D2=7EFITXO(7w~rRyU0TyPi&{DMO2 z*sWJWN_Tu9{5rZy$U|9vvS6cR;R8YF5bPDwLRq-0oPm25DsU|9g1T8}t0XC%Lx)nsaF3__d1D}q-n4v|z~g9MMz5DRv5d^dBI$g*acmF|LysI+G{e%>%guL>JC~GAhD-@d&Zvh}p(K z{s>m_2!q9J8}T-V*44&L3yI>!Ul_>DwlMtkpO;S&&1YLkKGPg$ah1<$7-`~6usR^g zN=K>G7&S^U+Xc*0xesZPsu!5kWX12}3ga)*dkWK9&tYVcCDJ@O%`iq3SnRT%<97;? zSGZ(=H{_~;`M;4^HE>P%^HOyyDl$GyOENn$+QQhnNH!C`)o;mGjKC7Fz_%i0!eNL0R}-J&B!1G IB$*h50iPfVkpKVy delta 42 ycmbQvynuPa88Ok|%-n*UROgJu66c)E)VvbMcxOY?i8tr6@-lES@J+5}lmP%kzYVhh diff --git a/src/Jukebox1_C16.java b/src/Jukebox1_C16.java new file mode 100644 index 0000000..ecfd627 --- /dev/null +++ b/src/Jukebox1_C16.java @@ -0,0 +1,32 @@ +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.util.ArrayList; +import java.util.Collections; + +public class Jukebox1_C16 { + ArrayList songList = new ArrayList(); + + public void go() { + getSongs(); + System.out.println(songList); + Collections.sort(songList); + System.out.println(songList); + } + + void getSongs() { + try { + File file = new File("SongList_C16.txt"); + BufferedReader reader = new BufferedReader(new FileReader(file)); + String line = null; + while((line = reader.readLine()) != null) { + addSong(line); + } + } catch (Exception ex) {ex.printStackTrace();} + } + + void addSong(String lineToParse) { + String[] tokens = lineToParse.split("/"); + songList.add(tokens[0]); + } +} From 39b54ebd58f3bb8be2c9609f8ccddf7c263e3055 Mon Sep 17 00:00:00 2001 From: Karen Date: Sat, 12 Jan 2019 16:58:04 +0100 Subject: [PATCH 12/22] use Jukebox1.class in main --- src/Main.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Main.java b/src/Main.java index c3ce92e..55bbbbe 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,15 +1,20 @@ public class Main { public static void main(String[] args) { - // Chapter 14 + // CHAPTER 14 + // ReadAFile_C14 readAFile_c14 = new ReadAFile_C14(); // readAFile_c14.go(); - // Chapter 15 + // CHAPTER 15 + // DailyAdviceServer_C15 server = new DailyAdviceServer_C15(); // server.go(); // DailyAdviceClient_С15 client = new DailyAdviceClient_С15(); // client.go(); - new SimpleChatClientA_C15().go(); + // new SimpleChatClientA_C15().go(); + + // CHAPTER 16 + new Jukebox1_C16().go(); } } From 77b2a6e8a704e8fc85e0ec4b8029d4976982fd5d Mon Sep 17 00:00:00 2001 From: Karen Date: Sat, 12 Jan 2019 17:13:23 +0100 Subject: [PATCH 13/22] add packages as chapters --- src/{ => CHAPTER_14}/ReadAFile_C14.java | 2 ++ .../CHAPTER_15/DailyAdviceClient_\320\24115.java" | 2 ++ src/{ => CHAPTER_15}/DailyAdviceServer_C15.java | 2 ++ src/{ => CHAPTER_15}/SimpleChatClientA_C15.java | 2 ++ src/{ => CHAPTER_15}/VerySimpleChatServer_C15.java | 2 ++ src/{ => CHAPTER_16}/Jukebox1_C16.java | 3 +++ src/Main.java | 4 ++++ 7 files changed, 17 insertions(+) rename src/{ => CHAPTER_14}/ReadAFile_C14.java (96%) rename "src/DailyAdviceClient_\320\24115.java" => "src/CHAPTER_15/DailyAdviceClient_\320\24115.java" (96%) rename src/{ => CHAPTER_15}/DailyAdviceServer_C15.java (97%) rename src/{ => CHAPTER_15}/SimpleChatClientA_C15.java (99%) rename src/{ => CHAPTER_15}/VerySimpleChatServer_C15.java (98%) rename src/{ => CHAPTER_16}/Jukebox1_C16.java (97%) diff --git a/src/ReadAFile_C14.java b/src/CHAPTER_14/ReadAFile_C14.java similarity index 96% rename from src/ReadAFile_C14.java rename to src/CHAPTER_14/ReadAFile_C14.java index d510012..04c329e 100644 --- a/src/ReadAFile_C14.java +++ b/src/CHAPTER_14/ReadAFile_C14.java @@ -1,3 +1,5 @@ +package CHAPTER_14; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; diff --git "a/src/DailyAdviceClient_\320\24115.java" "b/src/CHAPTER_15/DailyAdviceClient_\320\24115.java" similarity index 96% rename from "src/DailyAdviceClient_\320\24115.java" rename to "src/CHAPTER_15/DailyAdviceClient_\320\24115.java" index 2316c14..a425d7b 100644 --- "a/src/DailyAdviceClient_\320\24115.java" +++ "b/src/CHAPTER_15/DailyAdviceClient_\320\24115.java" @@ -1,3 +1,5 @@ +package CHAPTER_15; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; diff --git a/src/DailyAdviceServer_C15.java b/src/CHAPTER_15/DailyAdviceServer_C15.java similarity index 97% rename from src/DailyAdviceServer_C15.java rename to src/CHAPTER_15/DailyAdviceServer_C15.java index 4a6073f..1a960c0 100644 --- a/src/DailyAdviceServer_C15.java +++ b/src/CHAPTER_15/DailyAdviceServer_C15.java @@ -1,3 +1,5 @@ +package CHAPTER_15; + import java.io.*; import java.net.*; diff --git a/src/SimpleChatClientA_C15.java b/src/CHAPTER_15/SimpleChatClientA_C15.java similarity index 99% rename from src/SimpleChatClientA_C15.java rename to src/CHAPTER_15/SimpleChatClientA_C15.java index 27b666d..c30e334 100644 --- a/src/SimpleChatClientA_C15.java +++ b/src/CHAPTER_15/SimpleChatClientA_C15.java @@ -1,3 +1,5 @@ +package CHAPTER_15; + import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; diff --git a/src/VerySimpleChatServer_C15.java b/src/CHAPTER_15/VerySimpleChatServer_C15.java similarity index 98% rename from src/VerySimpleChatServer_C15.java rename to src/CHAPTER_15/VerySimpleChatServer_C15.java index 9e080c4..ff6f3aa 100644 --- a/src/VerySimpleChatServer_C15.java +++ b/src/CHAPTER_15/VerySimpleChatServer_C15.java @@ -1,3 +1,5 @@ +package CHAPTER_15; + import java.io.*; import java.net.*; import java.util.*; diff --git a/src/Jukebox1_C16.java b/src/CHAPTER_16/Jukebox1_C16.java similarity index 97% rename from src/Jukebox1_C16.java rename to src/CHAPTER_16/Jukebox1_C16.java index ecfd627..8152743 100644 --- a/src/Jukebox1_C16.java +++ b/src/CHAPTER_16/Jukebox1_C16.java @@ -1,9 +1,12 @@ +package CHAPTER_16; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.util.ArrayList; import java.util.Collections; + public class Jukebox1_C16 { ArrayList songList = new ArrayList(); diff --git a/src/Main.java b/src/Main.java index 55bbbbe..96442c8 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,3 +1,7 @@ +import CHAPTER_14.*; +import CHAPTER_15.*; +import CHAPTER_16.*; + public class Main { public static void main(String[] args) { From 0fc905a3958867c2bdcb1694cca3a400975bc18e Mon Sep 17 00:00:00 2001 From: Karen Date: Sat, 12 Jan 2019 17:17:35 +0100 Subject: [PATCH 14/22] change folder structure --- .idea/uiDesigner.xml | 124 ++++++++ .idea/workspace.xml | 268 ++++++++++++++++-- .../{ReadAFile_C14.java => ReadAFile.java} | 2 +- .../CHAPTER_15/DailyAdviceClient.java | 2 +- ...Server_C15.java => DailyAdviceServer.java} | 2 +- ...lientA_C15.java => SimpleChatClientA.java} | 2 +- ...ver_C15.java => VerySimpleChatServer.java} | 4 +- .../{Jukebox1_C16.java => Jukebox1.java} | 2 +- src/Main.java | 12 +- 9 files changed, 381 insertions(+), 37 deletions(-) create mode 100644 .idea/uiDesigner.xml rename src/CHAPTER_14/{ReadAFile_C14.java => ReadAFile.java} (95%) rename "src/CHAPTER_15/DailyAdviceClient_\320\24115.java" => src/CHAPTER_15/DailyAdviceClient.java (94%) rename src/CHAPTER_15/{DailyAdviceServer_C15.java => DailyAdviceServer.java} (95%) rename src/CHAPTER_15/{SimpleChatClientA_C15.java => SimpleChatClientA.java} (98%) rename src/CHAPTER_15/{VerySimpleChatServer_C15.java => VerySimpleChatServer.java} (95%) rename src/CHAPTER_16/{Jukebox1_C16.java => Jukebox1.java} (96%) 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/workspace.xml b/.idea/workspace.xml index 02ba166..cfac3ae 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,13 @@ - + + + + + + + + + + - + - - + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -45,6 +108,7 @@ + @@ -55,9 +119,20 @@ @@ -82,7 +157,6 @@ - @@ -95,14 +169,37 @@ + + + + + + + + + + + + + + + + + + - + @@ -367,111 +342,216 @@ - - - + - - + + + - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + - + - - + + - + + + + + + + + + - + - + - - + + + + + + + + + + + + + + + + + + + - + + - - + + - + + + + + + + + + + + + + + + + + + + @@ -479,7 +559,7 @@ - + @@ -487,7 +567,7 @@ - + @@ -495,7 +575,7 @@ - + @@ -503,7 +583,7 @@ - + @@ -511,44 +591,70 @@ - + - - + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + - - - - + + + diff --git a/src/Main.java b/src/Main.java index 446f563..2705a77 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,4 +1,4 @@ -import CHAPTER_16.*; +import chapter16.*; public class Main { public static void main(String[] args) { diff --git a/src/CHAPTER_14/ReadAFile.java b/src/chapter14/ReadAFile.java similarity index 96% rename from src/CHAPTER_14/ReadAFile.java rename to src/chapter14/ReadAFile.java index d1601be..dd8fb15 100644 --- a/src/CHAPTER_14/ReadAFile.java +++ b/src/chapter14/ReadAFile.java @@ -1,4 +1,4 @@ -package CHAPTER_14; +package chapter14; import java.io.BufferedReader; import java.io.File; diff --git a/src/CHAPTER_15/DailyAdviceClient.java b/src/chapter15/DailyAdviceClient.java similarity index 96% rename from src/CHAPTER_15/DailyAdviceClient.java rename to src/chapter15/DailyAdviceClient.java index 56bc355..d10fa82 100644 --- a/src/CHAPTER_15/DailyAdviceClient.java +++ b/src/chapter15/DailyAdviceClient.java @@ -1,4 +1,4 @@ -package CHAPTER_15; +package chapter15; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/CHAPTER_15/DailyAdviceServer.java b/src/chapter15/DailyAdviceServer.java similarity index 97% rename from src/CHAPTER_15/DailyAdviceServer.java rename to src/chapter15/DailyAdviceServer.java index f2e2fb6..f499b23 100644 --- a/src/CHAPTER_15/DailyAdviceServer.java +++ b/src/chapter15/DailyAdviceServer.java @@ -1,4 +1,4 @@ -package CHAPTER_15; +package chapter15; import java.io.*; import java.net.*; diff --git a/src/CHAPTER_15/SimpleChatClientA.java b/src/chapter15/SimpleChatClientA.java similarity index 99% rename from src/CHAPTER_15/SimpleChatClientA.java rename to src/chapter15/SimpleChatClientA.java index da4bcf9..f128d36 100644 --- a/src/CHAPTER_15/SimpleChatClientA.java +++ b/src/chapter15/SimpleChatClientA.java @@ -1,4 +1,4 @@ -package CHAPTER_15; +package chapter15; import javax.swing.*; import java.awt.*; diff --git a/src/CHAPTER_15/VerySimpleChatServer.java b/src/chapter15/VerySimpleChatServer.java similarity index 98% rename from src/CHAPTER_15/VerySimpleChatServer.java rename to src/chapter15/VerySimpleChatServer.java index 22d39ef..93dfcf6 100644 --- a/src/CHAPTER_15/VerySimpleChatServer.java +++ b/src/chapter15/VerySimpleChatServer.java @@ -1,4 +1,4 @@ -package CHAPTER_15; +package chapter15; import java.io.*; import java.net.*; diff --git a/src/CHAPTER_16/Jukebox.java b/src/chapter16/Jukebox.java similarity index 98% rename from src/CHAPTER_16/Jukebox.java rename to src/chapter16/Jukebox.java index f389033..7d78616 100644 --- a/src/CHAPTER_16/Jukebox.java +++ b/src/chapter16/Jukebox.java @@ -1,4 +1,4 @@ -package CHAPTER_16; +package chapter16; import java.io.BufferedReader; import java.io.File; diff --git a/src/CHAPTER_16/Song.java b/src/chapter16/Song.java similarity index 97% rename from src/CHAPTER_16/Song.java rename to src/chapter16/Song.java index 63590cd..494f80f 100644 --- a/src/CHAPTER_16/Song.java +++ b/src/chapter16/Song.java @@ -1,4 +1,4 @@ -package CHAPTER_16; +package chapter16; class Song implements Comparable { String title; diff --git a/src/CHAPTER_16/TestGenerics.java b/src/chapter16/TestGenerics.java similarity index 97% rename from src/CHAPTER_16/TestGenerics.java rename to src/chapter16/TestGenerics.java index aaf09ce..cc53315 100644 --- a/src/CHAPTER_16/TestGenerics.java +++ b/src/chapter16/TestGenerics.java @@ -1,4 +1,4 @@ -package CHAPTER_16; +package chapter16; import java.util.ArrayList; diff --git a/src/CHAPTER_16/TestMap.java b/src/chapter16/TestMap.java similarity index 94% rename from src/CHAPTER_16/TestMap.java rename to src/chapter16/TestMap.java index 3cf35d6..06aba11 100644 --- a/src/CHAPTER_16/TestMap.java +++ b/src/chapter16/TestMap.java @@ -1,4 +1,4 @@ -package CHAPTER_16; +package chapter16; import java.util.HashMap;