peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge dev into test #28

Merged
j23f0712 merged 29 commits from development into dev/test 2024-12-01 23:11:24 +01:00
Conversation 2 Commits 29 Files Changed 106 +5 -6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 92be52b62a - Show all commits

4
Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java
View File

@@ -68,9 +68,7 @@ public void run() {
private void startServer() { private void startServer() {
try { try {
LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS
InetAddress localhost;
localhost = InetAddress.getLocalHost();
String ip = localhost.getHostAddress();
myServer = Network.createServer(port); myServer = Network.createServer(port);
initializeSerializables(); initializeSerializables();
myServer.start(); myServer.start();

7
Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java
View File

@@ -126,7 +126,7 @@ private void tryHost() {
private void tryJoin() { private void tryJoin() {
int port = 0; int port = 0;
String ip = joinDialog.getIpt(); String ip = joinDialog.getIpt();
String portText = hostDialog.getPort(); String portText = joinDialog.getPort();
try { try {
// Validate the port // Validate the port
@@ -134,9 +134,10 @@ private void tryJoin() {
if (port < 1 || port > 65535) { if (port < 1 || port > 65535) {
throw new IllegalArgumentException("Invalid port"); throw new IllegalArgumentException("Invalid port");
} }
joinDialog.setPortNumber(port);
// Validate the IP address // Validate the IP address
if (isValidIpAddress(ip)) { if (isValidIpAddress(ip)) {
joinDialog.setHostname(ip);
app.getModelSynchronize().setName(startDialog.getName()); app.getModelSynchronize().setName(startDialog.getName());
app.getModelSynchronize().setJoin(ip, port); app.getModelSynchronize().setJoin(ip, port);
joinDialog.connectToServer(); joinDialog.connectToServer();
@@ -146,7 +147,7 @@ private void tryJoin() {
// Invalid input, fall through to reset // Invalid input, fall through to reset
} }
hostDialog.resetPort(); joinDialog.resetPort();
joinDialog.resetIp(); joinDialog.resetIp();
app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT); app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
} }