Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
COMP90015-DSAss2-InfinityMonkeys-remaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ho Dac Hai
COMP90015-DSAss2-InfinityMonkeys-remaster
Commits
0d18d162
Commit
0d18d162
authored
Oct 21, 2019
by
Ho Dac Hai
Browse files
Options
Downloads
Patches
Plain Diff
Replace Client.java
parent
f7eccf94
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!25
Master
,
!24
Master
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/client/Client.java
+1
-35
1 addition, 35 deletions
src/client/Client.java
with
1 addition
and
35 deletions
src/client/Client.java
+
1
−
35
View file @
0d18d162
...
@@ -20,15 +20,13 @@ public class Client
...
@@ -20,15 +20,13 @@ public class Client
private
Registry
registryServer
;
private
Registry
registryServer
;
private
IChatController
chatController
;
private
IChatController
chatController
;
private
IClientController
clientController
;
private
IClientController
clientController
;
private
IDrawingController
drawingController
;
private
IDrawingController
drawingController
;
private
ClientUpdate
clientUpdate
;
private
ClientUpdate
clientUpdate
;
private
ChatUpdate
chatUpdate
;
private
ChatUpdate
chatUpdate
;
private
DrawingUpdate
drawingUpdate
;
private
DrawingUpdate
drawingUpdate
;
private
StartScreen
startScreen
;
private
StartScreen
startScreen
;
private
ChatScreen
chatScreen
;
private
ChatScreen
chatScreen
;
private
PaintGUI
paintGUI
;
private
PaintGUI
paintGUI
;
...
@@ -41,12 +39,6 @@ public class Client
...
@@ -41,12 +39,6 @@ public class Client
public
ChatScreen
getChatScreen
()
{
return
chatScreen
;
}
public
ChatScreen
getChatScreen
()
{
return
chatScreen
;
}
public
void
setConnectedUsers
(
String
[]
users
)
{
this
.
connectedUsers
=
users
;
}
public
IChatController
getChatController
()
public
IChatController
getChatController
()
{
{
return
chatController
;
return
chatController
;
...
@@ -103,22 +95,6 @@ public class Client
...
@@ -103,22 +95,6 @@ public class Client
}
}
}
}
// public void doSomething()
// {
//// new ChatScreen();
//
// try
// {
// new ChatScreen(this);
// System.out.println("Sleeping...");
// TimeUnit.MINUTES.sleep(5);
// }
// catch(Exception e)
// {
// e.printStackTrace();
// }
// }
public
boolean
connect
()
public
boolean
connect
()
{
{
try
try
...
@@ -143,14 +119,4 @@ public class Client
...
@@ -143,14 +119,4 @@ public class Client
return
false
;
return
false
;
}
}
public
String
getReceivedMessage
()
{
return
receivedMessage
;
}
public
void
setReceivedMessage
(
String
receivedMessage
)
{
this
.
receivedMessage
=
receivedMessage
;
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment