From 90e5225eb0feaaaab192ea12970dcb8e1031b4d1 Mon Sep 17 00:00:00 2001 From: 1004268 <isaac.pedrozaaguirre@student.unimelb.edu.au> Date: Fri, 25 Oct 2019 16:21:55 +1100 Subject: [PATCH] ADD: kickout and new admin pop-up --- .idea/workspace.xml | 27 ------------------ .../infinitymonkeys/GUI/StartScreen$3.class | Bin 782 -> 900 bytes .../infinitymonkeys/GUI/StartScreen.class | Bin 7347 -> 7501 bytes .../infinitymonkeys/client/ClientUpdate.class | Bin 3826 -> 4233 bytes src/GUI/StartScreen.java | 10 +++++++ src/client/ClientUpdate.java | 20 +++++++++++-- 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index cd07381..bba76bb 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,35 +3,8 @@ <component name="ChangeListManager"> <list default="true" id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment=""> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ApplicationMain$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ApplicationMain$1.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ApplicationMain.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ApplicationMain.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ChatScreen$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ChatScreen$1.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ChatScreen.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/ChatScreen.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen$1.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen$2.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/client/Client.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/client/Client.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ClientUpdate$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ClientUpdate$1.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ClientUpdate.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/client/ClientUpdate.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController$Action.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController$Action.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientController.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientUpdate$Action.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientUpdate$Action.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientUpdate.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/remote/IClientUpdate.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ClientController$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ClientController$1.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ClientController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ClientController.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/Server.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/Server.class" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/GUI/ApplicationMain.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/ApplicationMain.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/GUI/ChatScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/ChatScreen.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/GUI/PaintGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/PaintGUI.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/GUI/StartScreen.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/StartScreen.form" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/GUI/StartScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GUI/StartScreen.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/client/Client.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/client/Client.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/client/ClientUpdate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/client/ClientUpdate.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/remote/IClientController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/remote/IClientController.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/remote/IClientUpdate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/remote/IClientUpdate.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/server/ClientController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/server/ClientController.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/server/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/server/Server.java" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="SHOW_DIALOG" value="false" /> diff --git a/out/production/infinitymonkeys/GUI/StartScreen$3.class b/out/production/infinitymonkeys/GUI/StartScreen$3.class index 0be661b8057c888f890e19e6ae5c15ce9e7041b1..518d641f6a8b5d00f22a2a394329f5868a804048 100644 GIT binary patch delta 432 zcmeBUYhkxI^>5cc1_lNb1`|#OP6l}{1}+8#E(Tc!MG&C`B9uXd3W!hz5o+uV>g)^} z8#T=t^)z`Hv>3E`7`PdDco=v=EFA`29tJ%SOP|4jhrtlUH3D&s84M=ZGtR1KWZ=#$ z_RdVsPEGMIEn#F3D$d9+2l4$&OMFv{ixbmR85wwrQ%gW%U^NU144e#H3=9m60s<hL z7#J9s7#J9M8Tc3&8Tc6(80;9Bz#?2)+FKbIwYD=bZ3L?kU|?WiV_;-pU}$3yWME(r zV_;&?WMJT85MmHv00Azraf}R%45AETP{TT*h8a)pXOgVf+QPuNje%_@gAjzp4x*U1 zF>ruvU}gZ>AjiPYz`)SKz{SwXAjr_gAj#0fpv=(ApvBO~V8k#1ZZiXeG2CKf25|-n s21W)+1_lNe1|~@f24)5+u$!eBWWZvw3~~&@47?!MGBR+29LvA}0Hf72TL1t6 delta 321 zcmZo+?_<+E^>5cc1_lNb25n9THU=3k26hHnE(R$EIS?TaA{5ve6xkV+Hd>f7$}96Q zs4%GVFmNz%@-T3LSZWOFJPaBjmL`MN<hhKq>KPOm*cjLu7#J7@1V9QI7#Nrs7#O%1 zxEUB3co-NM>=>9JB3jy885p&;GcaugtKnr}U|?flWME)uW8h<8U=V|-V&G>GWB>s! zuxX48j0{2y!ceo4p=L>GZDC;C#=tz2Ve$(mfi#eT%nTp{g&0^E7#KPjxEMMa1R1&* zBpG^;43~l%F2x|iAj-hVAjZJJz|6oX$-vAY4tA9UgCqk30}F!`gEWHx*dL4xY#`?_ GFaQ9kh8e^F diff --git a/out/production/infinitymonkeys/GUI/StartScreen.class b/out/production/infinitymonkeys/GUI/StartScreen.class index dbf9f6b974b0d0fde53e901f7cd0980230de39a8..67ffc5eaa6080087efbd693ba23540030533ff35 100644 GIT binary patch literal 7501 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 XOl4+J1~)(%82F$xH<T^{*SN(1>?R<+ delta 3953 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 diff --git a/out/production/infinitymonkeys/client/ClientUpdate.class b/out/production/infinitymonkeys/client/ClientUpdate.class index 1554fe715b5103907147acd114f82a60bd60cdcc..546c909d1a2d5ac4faace3164e5479d8faa5159b 100644 GIT binary patch delta 1772 zcmew)+o@Q8>ff$?3=9k=4A;3B3>lI+84MUwxEN9y(zqDX88WySG8wYC7_u31I2m#o z@;Dgsxflu<3fUQoxEQz?l0if<2SW*nE(OVyaWNP$l!NqxwN`+%R&p>@fkdjg7-|@5 zL99A%hI)nuklBs(AhHQWG;=bTFtl(nL^8C3)U<Iiv@>*o9MK7q?c!kQ=3?k!=;dJO z<6!9LV3@$pFp-NvonaCO!(<MIDInETIT)sKFihuQm;sWQ$<8o~onbaR!yI;ox$F${ z7#Vmx^YT)QoO2S3i&Kjk8Q79@GE*nM=wqBext#GBqt|3Rra1Ol><kOo85T}n%w*5F zX!2vGMFtiOVLS|G4Cd?%i+LE9Ff3(fSjNM!oM8n!!%7~8RSc`y85Zy`tYKKo&ajS$ zVLii!$y=Ef*f#PoY+~3v`8Kmm{T7C;j0}tlJPg|yw(~IT0GZ~-;LgLalVLRv!!Cv} zMh0fboE#p8-3;5=85Z&|>|xl;!?2HGKRd$#9)^P;J%<=J^DrC+X*>cVjxrqMVK~lk zf`{QG!zp%#(>x4k7|!xAoCC?7XSl$~psEm=U#d`^T9m4gojEy$MVjp*55pFQ&67h} zH0l`{+@16D(u)#HN^=rRGV}9_6%|S{QWbI&^Agijixdiq@^kY`Qd1Nv^GkIU^76|; z428s^RIsYN)N+_gJw^tO0H|U{2Jx)KvcwAg;_}SAbbT-X0+7i8iFv6!43`)#Gcrhm zTm&*i4`dgzDO`*Uq6(SC7^ZXaFkE3cJ9#}z1S=22RfcPu)mV=*Pd4VX<mD+&E%DAw z&Q4A7FD;o|%PBMY4Tn3AU~xu%xo>K5abkMv<RzRgB4LaS0>!B%js*oFsYSV&d5I;d zDU+vhhRGW+7&0(17%><#FfuTKVwQn{ft`Vo!Ggh(fr-ItGB=mBvo!+)10Mr30|SE~ z0}F!?11EzpgAD@%gBSx70|NsWgDry{0|;<|^)oWqGcYi)FfcMWFfcMWGB|<F$>dV; z1ewDH)+5d!$RG(eLji2AFx(7b24@Br21W)324MzQ1{Ve<B-5A}+!)*$7#XZ4U*ig4 zw4SWZE$;+!2gnQ=1}O#)1{Vfa1_lOaxM|J|o(x_Lj11lk3=F&sO#c`J*cp5n8GkTn zGcYpvGWda=*26uY(R#8Dk9|GJFcSt=23H10uwm>B3=Dm6!}_3x2{TkP_%j4BFfqt6 z6fgub1TZjzEl_7*{m)>|z|PJP#LnQu&JYYnK8%bE41XAu*cn1(elhU<U|>b^5hFt= zLm0>r3=9mG4E2m)k8^8nVPM+EAh?Y|Y9j*!0}}%x+`JgL7`(yZ#sg6bbsTbthckqM z!U$|4x`EQ@2KqB_F$BO2tY=_g;D(yW$PmF04RIOcK?W8E76t}Jc_zC}3^F>~7-aQU zF)%PN3WEr6Tr)7pF)%QcF)%P3Vqjpn1@VBW_BIBwnG9MGo*c_I26+gRc^iWQgeAC* zK~YF)8-wz4hQnH0>Y?6N+|9rhxt)Pqdm96fkjgd&o^1?#U^NRMx}XNjF$$>)sj=)} z(0~Yo4bucGEJuhSo27+hRtQ81$XVJDCNs!glX>`5>vgs<@PIAXg=i4cW8T4_ZzsEk zfq{V;936fPAkT*|FfoKOXfT8`m@z~!I5I>scr!#X#4^M()H1{~G%zGG^f4qcOlL@A zSjmvdaFQXL;S57A!*zx{hKCIK3{Mye8U8X9G0HMjfMY-l637g;36T86D9;cB$qS6~ z46zJx3``76jIs>z3<=N#$HTz>he3nUL`g$Q+yW_8F)<{9(@heCDFXw85Cao~2`GCC Oa4<wN7%@aSNCE&}uv?4( delta 1404 zcmeBF{3Kg{>ff$?3=9k=3@5l4v>9SK8MGMUxESIY61W%=8Irgdk{MFC7*ZM1I2qCz zGB_AAxfrq-ve_AOxEQz?VnIYM2SXl+&Iid9a4~2x6oT}FwHAT27IQF^fJ92U7|IyR zL97aHhDwGiklEG2AhHHT)N(TDG1PG}1T)lwxD6Z(ja&>(49y%2Eg(IuTnudt?I1^W za4>XoFm!P+bh9(`a4~2w^s+Pbu`~3uGfZG-n8?mBY2u3|jFTt#G9Ke{VPxPdEl5c$ zNuB(UQDJf|lPP;2JHr%qhN+WxGTAduoBWe$k%19I01tx!gCRS^bRLEo3^UmoX7Mo0 zW|+gyFqem69>aWghABJ@3m6u%Gc4j^Sj@0w@@ZxTwxv7_%NUkV{>Us7w}N3MBLkxX z55p>k)jSMqK&Ck`IPx&8Wth*yu#O>sk%8GUCx?e&J;Q2thN(OZ8yGh7Fl=Jj%+9cd zhhZy7&o+kTJPg}G8h3z*oeaBp7<M!4;bGXzuy68O77ZhIhW$JYD;SnDGKeZ<7Aurw zq$=d4mMi2Y<|U@57U^;EFdSew$j)$xhv6{85gvx43;~mySR*EDvC1$XV>rI~KI>8D z$*f!+lb3K>3JMgbmN*s^grpYbX67Z9q^3-M#VIp+3s-Qx7K1he6N3(eE(0S26DUL& z7#P?Y7#WNhj2W01Oc)p#+!&Y`m>3usxU{x2FluRUWnkLKz`(%7V9LP2z{kMMz`!8L zz``KJz{w!YV8+0}AO=y*V9sE{00LZKQyCd785kH?7#JC>7#JC>8Ehb?Pj2H@@&uX0 z1=c0bAjlvIHbnt!vM}5fVFp_UI|fDu1_ogUdj>lOCM5Hi7#tWJ85kK%CV%7(VKklW z#v|_patX)`83ri^Ck8tPRt5$JXSiw349*NL42%q}3=9ms3{3wR1lSqe7#V*sXfrS} zxHEWw95;D6&wNJH$?m-N^&rDc7+4ux863feu`@6*^uZ15gBm8xP|e`U;KjhiAjeR^ z;LYI0zznuPoq_c~gE<2`JA)59gBv@8FBrKoGBPmyVNhac@RRw)!1sfJ70E}84E_uO zAV)ATFjz874&xKBkwSzzB&@s`xEQ>_VZ{Ru7jCG7ki$8UApjgMfqXLch*0)t;9>~C zqLYy!h#?eWE2Ap|3j+%S1H(ZkyG;x-I@=gz^;Usmb1MS_*fx-y90LP`BLf3N3IhW} zjn)<hrfm#@+Zg0_GjK(2XW-V}#=s*azm0)s8w1}q1_kTo4CUC>D8kh&X9$5PQDWJ~ zpbTL$Z(~rI+{&+7ueyza2W+MqM7@wY^9}}0JJ~f13=GWR)M&)O!@$50!ob83%Ammz z&fvii!Qjmh#gNSq&5*|s%TUP>$I#3W&(Ow@$S|KFiD5rO1~?S7AU=hL9|OZdhA;+5 zT06)P&JY1k|NEU7A{nBfG0Mfj`iDV-QAtVM0x8m%7^1-$BZfhrfq_AYfr&v66k-A# M48aUK3?UAZ012t>0{{R3 diff --git a/src/GUI/StartScreen.java b/src/GUI/StartScreen.java index 914b944..141e03f 100644 --- a/src/GUI/StartScreen.java +++ b/src/GUI/StartScreen.java @@ -137,6 +137,10 @@ public class StartScreen { showKickAllMessage(); setAppTerminated(false); } + if (isKickedOut()){ + showKickOutMessage(); + setKickedOut(false); + } } }); } @@ -167,6 +171,12 @@ public class StartScreen { JOptionPane.ERROR_MESSAGE); } + public void showKickOutMessage() { + JOptionPane.showMessageDialog(null, + "The manager kicked you out the whiteboard", "Kicked out", + JOptionPane.ERROR_MESSAGE); + } + // public class JPanelWithBackground extends JPanel // { // diff --git a/src/client/ClientUpdate.java b/src/client/ClientUpdate.java index 1e5389a..a451300 100644 --- a/src/client/ClientUpdate.java +++ b/src/client/ClientUpdate.java @@ -84,10 +84,26 @@ public class ClientUpdate extends UnicastRemoteObject implements IClientUpdate, int answer = -1; switch (action) { case KICKOUT: - client.getChatScreen().getChatDisplayBox().append(toClient + " has been kicked out by the manager.\n"); + if (client.getUserName().equals(toClient)) { + client.getStartScreen().setKickedOut(true); + client.getApplicationMain().exitApplication(); + client.getChatScreen().getChatDisplayBox().append(" You were kicked out by the manager.\n"); + } + else { + client.getChatScreen().getChatDisplayBox().append(toClient + " has been kicked out by the manager.\n"); + } break; case ASSIGNADMIN: - client.getChatScreen().getChatDisplayBox().append(toClient + " is the new manager.\n"); + if (client.getUserName().equals(toClient)) { + JOptionPane.showMessageDialog(null, + "Congratulations! the manager promoted you, now you are the new manager.", + "Promoted", + JOptionPane.INFORMATION_MESSAGE); + client.getChatScreen().getChatDisplayBox().append("You are the new manager.\n"); + } + else { + client.getChatScreen().getChatDisplayBox().append(toClient + " is the new manager.\n"); + } break; case KICKALL: client.getStartScreen().setAppTerminated(true); -- GitLab