Skip to content
Snippets Groups Projects
Commit 871a877a authored by Pedroza Aguirre Isaac's avatar Pedroza Aguirre Isaac
Browse files

Kick out bug fixed

parent 040ddf7b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 2
− 25
View file @ 871a877a
...@@ -3,33 +3,10 @@ ...@@ -3,33 +3,10 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="688d774d-cfc7-4b0d-b00c-5ca931aba600" name="Default Changelist" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/infinitymonkeys.iml" beforeDir="false" afterPath="$PROJECT_DIR$/infinitymonkeys.iml" 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/DrawingArea$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/DrawingArea$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/DrawingArea.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/DrawingArea.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/PaintGUI$2.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$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$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/StartScreen$3.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/GUI/icon/circle.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/icon/eraser.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/icon/freehand.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/icon/line.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/icon/oval.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/icon/palette.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/icon/rectangle.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/icon/square.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/GUI/icon/text.png" beforeDir="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/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/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$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/ClientController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/ClientController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/infinitymonkeys/server/DrawingController.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/DrawingController.class" 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$/out/production/infinitymonkeys/server/Server.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/infinitymonkeys/server/Server.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/server/ClientController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/server/ClientController.java" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
......
out/production/infinitymonkeys/server/ClientController$1.class
+ 0
− 0
View file @ 871a877a
No preview for this file type
out/production/infinitymonkeys/server/ClientController.class
+ 0
− 0
View file @ 871a877a
No preview for this file type
src/GUI/StartScreen.java
+ 1
− 1
View file @ 871a877a
...@@ -178,7 +178,7 @@ public class StartScreen { ...@@ -178,7 +178,7 @@ public class StartScreen {
public void showKickOutMessage() { public void showKickOutMessage() {
JOptionPane.showMessageDialog(null, JOptionPane.showMessageDialog(null,
"The manager kicked you out the whiteboard", "Kicked out", "The manager kicked you out of the whiteboard", "Kicked out",
JOptionPane.ERROR_MESSAGE); JOptionPane.ERROR_MESSAGE);
} }
......
src/server/ClientController.java
+ 3
− 11
View file @ 871a877a
...@@ -111,17 +111,9 @@ public class ClientController extends UnicastRemoteObject implements IClientCont ...@@ -111,17 +111,9 @@ public class ClientController extends UnicastRemoteObject implements IClientCont
if ( adminIndex >= 0 && userIndex >= 0 && server.users.get(adminIndex).isAdmin() ) if ( adminIndex >= 0 && userIndex >= 0 && server.users.get(adminIndex).isAdmin() )
{ {
broadcastManagerMessage(kickedUser, Action.KICKOUT);
try
{
server.users.get(userIndex).getIClientUpdate().terminateChat();
}
finally {
server.users.remove(userIndex); server.users.remove(userIndex);
broadcastUserList(); broadcastUserList();
broadcastManagerMessage(kickedUser, Action.KICKOUT);
}
return true; return true;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment