Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
corewars-library
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
st-praktikum16-g1
corewars-library
Commits
29470c3d
Commit
29470c3d
authored
Sep 30, 2016
by
Winfried Lötzsch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'more-javadoccccc' into 'master'
More javadoccccc See merge request !18
parents
2e23f489
e6ad1616
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
50 additions
and
23 deletions
+50
-23
src/main/java/gone/lib/config/ClientConfig.java
src/main/java/gone/lib/config/ClientConfig.java
+0
-1
src/main/java/gone/lib/network/CwClient.java
src/main/java/gone/lib/network/CwClient.java
+1
-1
src/main/java/gone/lib/network/json/CwGameResultContent.java
src/main/java/gone/lib/network/json/CwGameResultContent.java
+3
-1
src/main/java/gone/lib/network/json/CwGameStatusContent.java
src/main/java/gone/lib/network/json/CwGameStatusContent.java
+5
-1
src/main/java/gone/lib/network/json/CwLoginContent.java
src/main/java/gone/lib/network/json/CwLoginContent.java
+4
-1
src/main/java/gone/lib/network/json/CwLoginOkContent.java
src/main/java/gone/lib/network/json/CwLoginOkContent.java
+4
-1
src/main/java/gone/lib/network/json/CwMessageBase.java
src/main/java/gone/lib/network/json/CwMessageBase.java
+0
-9
src/main/java/gone/lib/network/json/CwMessageType.java
src/main/java/gone/lib/network/json/CwMessageType.java
+4
-1
src/main/java/gone/lib/network/json/CwReadyContent.java
src/main/java/gone/lib/network/json/CwReadyContent.java
+4
-1
src/main/java/gone/lib/network/json/CwStartContent.java
src/main/java/gone/lib/network/json/CwStartContent.java
+5
-1
src/main/java/gone/lib/network/serialization/IncomingMessagesInterpreter.java
...ib/network/serialization/IncomingMessagesInterpreter.java
+9
-5
src/main/java/gone/lib/network/tcp/TcpClientModule.java
src/main/java/gone/lib/network/tcp/TcpClientModule.java
+5
-0
src/main/java/gone/lib/network/tcp/TcpReceiveMessage.java
src/main/java/gone/lib/network/tcp/TcpReceiveMessage.java
+3
-0
src/main/java/gone/lib/network/tcp/TcpServerAccept.java
src/main/java/gone/lib/network/tcp/TcpServerAccept.java
+3
-0
No files found.
src/main/java/gone/lib/config/ClientConfig.java
View file @
29470c3d
...
...
@@ -7,7 +7,6 @@ import java.net.InetAddress;
/**
* dataType which represents all configurable parameters for the client/ui
*
* @author matthias
*/
public
class
ClientConfig
extends
ConfigParameters
{
...
...
src/main/java/gone/lib/network/CwClient.java
View file @
29470c3d
...
...
@@ -78,7 +78,7 @@ public class CwClient implements IClient, ITcpListener {
}
else
if
(
type
==
CwMessageType
.
GameStatus
)
{
callback
.
receiveGameStatusTelegram
(
interpreter
.
parseGameStatusMessage
(
data
));
}
else
if
(
type
==
CwMessageType
.
GameResult
)
{
callback
.
receiveGameResultTelegram
(
interpreter
.
parseGameResultMessage
(
data
));
callback
.
receiveGameResultTelegram
(
interpreter
.
parseGameResultMessage
(
data
));
}
else
{
// TODO: print that to log file
System
.
out
.
print
(
"unknown or invalid message type"
);
...
...
src/main/java/gone/lib/network/json/CwGameResultContent.java
View file @
29470c3d
package
gone.lib.network.json
;
/**
* Created by winfr on 30.09.2016.
* message type the clients receive if the game ends
*
* @author winfried
*/
public
class
CwGameResultContent
{
public
String
state
;
...
...
src/main/java/gone/lib/network/json/CwGameStatusContent.java
View file @
29470c3d
package
gone.lib.network.json
;
/**
* Created by winfr on 26.08.2016.
* message type that will be sent regularly from the server
* to the client, which represents the game update of one
* single game step at the server
*
* @author winfried
*/
public
class
CwGameStatusContent
{
public
int
indexOfChangedCoreElement
;
...
...
src/main/java/gone/lib/network/json/CwLoginContent.java
View file @
29470c3d
...
...
@@ -3,7 +3,10 @@ package gone.lib.network.json;
import
gone.lib.common.ClientRole
;
/**
* Created by winfr on 23.08.2016.
* message type that will be sent from the client to
* the server to establish a login on the server
*
* @author winfried
*/
public
class
CwLoginContent
{
public
String
name
;
...
...
src/main/java/gone/lib/network/json/CwLoginOkContent.java
View file @
29470c3d
...
...
@@ -3,7 +3,10 @@ package gone.lib.network.json;
import
gone.lib.common.RcStandard
;
/**
* Created by winfr on 27.09.2016.
* message type that receives the client from the server
* if the previous login of the client was successful
*
* @author winfried
*/
public
class
CwLoginOkContent
{
public
boolean
clientMustWait
;
...
...
src/main/java/gone/lib/network/json/CwMessageBase.java
deleted
100644 → 0
View file @
2e23f489
package
gone.lib.network.json
;
/**
* Created by winfr on 23.08.2016.
*/
public
class
CwMessageBase
{
public
String
packageType
;
public
int
version
;
}
src/main/java/gone/lib/network/json/CwMessageType.java
View file @
29470c3d
package
gone.lib.network.json
;
/**
* Created by winfr on 26.08.2016.
* collection of the different message types including an
* unknown message type to deal with errors
*
* @author winfried
*/
public
enum
CwMessageType
{
Login
,
...
...
src/main/java/gone/lib/network/json/CwReadyContent.java
View file @
29470c3d
...
...
@@ -3,7 +3,10 @@ package gone.lib.network.json;
import
java.util.List
;
/**
* Created by Winfried on 22.09.2016.
* message type to send the warrior code from the client
* to the server
*
* @author Winfried
*/
public
class
CwReadyContent
{
public
List
<
String
>
warriorRedcode
;
...
...
src/main/java/gone/lib/network/json/CwStartContent.java
View file @
29470c3d
...
...
@@ -3,7 +3,11 @@ package gone.lib.network.json;
import
java.util.List
;
/**
* Created by winfr on 26.08.2016.
* message type to send the changes of the
* server core initiation and the count of the competing players
* from the server to the client
*
* @author winfried
*/
public
class
CwStartContent
{
public
int
players
;
...
...
src/main/java/gone/lib/network/serialization/IncomingMessagesInterpreter.java
View file @
29470c3d
...
...
@@ -23,9 +23,17 @@ import java.util.LinkedList;
import
java.util.List
;
/**
* Created by winfr on 23.08.2016.
* this class
*
* @author winfried
*/
public
class
IncomingMessagesInterpreter
{
/**
*
* @param data
* @return
*/
public
CwMessageType
getMessageType
(
String
data
)
{
JSONObject
object
=
new
JSONObject
(
data
);
...
...
@@ -42,7 +50,6 @@ public class IncomingMessagesInterpreter {
}
else
if
(
object
.
getString
(
"packageType"
).
equals
(
"finish"
))
{
return
CwMessageType
.
GameResult
;
}
return
CwMessageType
.
Unknown
;
}
...
...
@@ -58,7 +65,6 @@ public class IncomingMessagesInterpreter {
}
else
if
(
object
.
getJSONObject
(
"content"
).
getString
(
"standard"
).
equals
(
"Viewer"
))
{
result
.
role
=
ClientRole
.
Viewer
;
}
return
result
;
}
...
...
@@ -68,7 +74,6 @@ public class IncomingMessagesInterpreter {
CwStartContent
result
=
new
CwStartContent
();
String
[]
fullStateArray
=
object
.
getJSONObject
(
"content"
)
.
getString
(
"fullState"
).
split
(
NetworkConstants
.
FULLSTATESEPARATOR
);
List
<
String
>
fullStateList
=
new
LinkedList
<>();
...
...
@@ -95,7 +100,6 @@ public class IncomingMessagesInterpreter {
}
else
if
(
object
.
getJSONObject
(
"content"
).
getString
(
"standard"
).
equals
(
"ICWS94"
))
{
result
.
standard
=
RcStandard
.
ICWS94
;
}
return
result
;
}
...
...
src/main/java/gone/lib/network/tcp/TcpClientModule.java
View file @
29470c3d
...
...
@@ -20,6 +20,11 @@ public class TcpClientModule implements ITcpClientModule, ITcpListener {
private
Socket
clientSocket
;
private
List
<
ITcpListener
>
listeners
=
new
LinkedList
<>();
/**
* connects to a remote server
* @param address
* @param port
*/
@Override
public
void
connect
(
String
address
,
int
port
)
{
try
{
...
...
src/main/java/gone/lib/network/tcp/TcpReceiveMessage.java
View file @
29470c3d
...
...
@@ -27,6 +27,9 @@ public class TcpReceiveMessage implements Runnable {
listeners
.
add
(
listener
);
}
/**
* Asynchronously receives incoming messages
*/
@Override
public
void
run
()
{
try
{
...
...
src/main/java/gone/lib/network/tcp/TcpServerAccept.java
View file @
29470c3d
...
...
@@ -28,6 +28,9 @@ public class TcpServerAccept implements Runnable {
this
.
accepted
=
accepted
;
}
/**
* Asynchronously wait for incoming clients
*/
@Override
public
void
run
()
{
try
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment