From 0ff9f4154002aa5966c14634ebcbecb14cc2cc91 Mon Sep 17 00:00:00 2001
From: Dennis Eisold <de@itstall.de>
Date: Thu, 21 Nov 2019 16:40:22 +0100
Subject: [PATCH] =?UTF-8?q?Client/Server=20l=C3=A4uft?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/de/telefonbuch/model/Client.java | 8 +++++---
src/main/java/de/telefonbuch/model/Datenbank.java | 2 +-
src/main/java/de/telefonbuch/model/Kontakt.java | 4 +++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/de/telefonbuch/model/Client.java b/src/main/java/de/telefonbuch/model/Client.java
index d23c5d8..85f4ab4 100644
--- a/src/main/java/de/telefonbuch/model/Client.java
+++ b/src/main/java/de/telefonbuch/model/Client.java
@@ -13,7 +13,7 @@ public class Client {
public Client(String ipaddress) throws RemoteException, NotBoundException {
// Registry holen, wenn sie sich auf demselben Rechner befindet
- Registry registry = LocateRegistry.getRegistry(Registry.REGISTRY_PORT);
+ Registry registry = LocateRegistry.getRegistry(ipaddress, Registry.REGISTRY_PORT);
// Entferntes Objekt laden
this.server = (IServer) registry.lookup("RMI-Server");
@@ -37,11 +37,12 @@ public class Client {
}
public Kontakt getKontakt(@NotNull String telefon) {
- Kontakt kontakt = null;
+ Kontakt kontakt;
try {
kontakt = server.getKontakt(telefon);
} catch (RemoteException e) {
+ kontakt = null;
e.printStackTrace();
}
@@ -49,11 +50,12 @@ public class Client {
}
public String[] getNavi(String telefon) {
- String[] result = new String[0];
+ String[] result;
try {
result = server.getNavi(telefon);
} catch (RemoteException e) {
+ result = new String[0];
e.printStackTrace();
}
diff --git a/src/main/java/de/telefonbuch/model/Datenbank.java b/src/main/java/de/telefonbuch/model/Datenbank.java
index 01bd07d..83d0380 100644
--- a/src/main/java/de/telefonbuch/model/Datenbank.java
+++ b/src/main/java/de/telefonbuch/model/Datenbank.java
@@ -6,7 +6,7 @@ import java.rmi.NotBoundException;
import java.rmi.RemoteException;
public class Datenbank {
- private final boolean CLIENT = false;
+ private final boolean CLIENT = true;
private Sqlite sqlite;
private Server server;
private Client client;
diff --git a/src/main/java/de/telefonbuch/model/Kontakt.java b/src/main/java/de/telefonbuch/model/Kontakt.java
index a3de30f..34f008d 100644
--- a/src/main/java/de/telefonbuch/model/Kontakt.java
+++ b/src/main/java/de/telefonbuch/model/Kontakt.java
@@ -1,9 +1,11 @@
package de.telefonbuch.model;
+import java.io.Serializable;
+
/**
* Das Model für die Kontakte
*/
-public class Kontakt {
+public class Kontakt implements Serializable {
// region 0 Variables
private String vorname = "";
private String nachname = "";
--
GitLab