Merge pull request #32 from informatik-ag-ngl/f/logging
Added proper logging
This commit is contained in:
GitHub
commit
93f5c79a32
@ -1,5 +1,7 @@
|
|||||||
package envoy.client;
|
package envoy.client;
|
||||||
|
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import javax.ws.rs.client.ClientBuilder;
|
import javax.ws.rs.client.ClientBuilder;
|
||||||
import javax.ws.rs.client.Entity;
|
import javax.ws.rs.client.Entity;
|
||||||
import javax.ws.rs.client.WebTarget;
|
import javax.ws.rs.client.WebTarget;
|
||||||
@ -28,16 +30,18 @@ public class Client {
|
|||||||
private Config config;
|
private Config config;
|
||||||
private User sender, recipient;
|
private User sender, recipient;
|
||||||
|
|
||||||
|
private static final Logger logger = Logger.getLogger(Client.class.getSimpleName());
|
||||||
|
|
||||||
public Client(Config config, String username) {
|
public Client(Config config, String username) {
|
||||||
this.config = config;
|
this.config = config;
|
||||||
sender = getUser(username);
|
sender = getUser(username);
|
||||||
System.out.println("ID: " + sender.getID());
|
|
||||||
|
logger.info("ID: " + sender.getID());
|
||||||
}
|
}
|
||||||
|
|
||||||
private <T, R> R post(String uri, T body, Class<R> responseBodyClass) {
|
private <T, R> R post(String uri, T body, Class<R> responseBodyClass) {
|
||||||
javax.ws.rs.client.Client client = ClientBuilder.newClient();
|
javax.ws.rs.client.Client client = ClientBuilder.newClient();
|
||||||
WebTarget target = client.target(uri);
|
WebTarget target = client.target(uri);
|
||||||
|
|
||||||
Response response = target.request().post(Entity.entity(body, "application/xml"));
|
Response response = target.request().post(Entity.entity(body, "application/xml"));
|
||||||
R responseBody = response.readEntity(responseBodyClass);
|
R responseBody = response.readEntity(responseBodyClass);
|
||||||
response.close();
|
response.close();
|
||||||
@ -92,7 +96,7 @@ public class Client {
|
|||||||
if (returnSenderSync.getUsers().size() == 1) {
|
if (returnSenderSync.getUsers().size() == 1) {
|
||||||
returnSender = returnSenderSync.getUsers().get(0);
|
returnSender = returnSenderSync.getUsers().get(0);
|
||||||
} else {
|
} else {
|
||||||
System.out.println("ERROR exiting...");
|
logger.warning("ERROR exiting...");
|
||||||
}
|
}
|
||||||
|
|
||||||
return returnSender;
|
return returnSender;
|
||||||
|
|||||||
@ -1,293 +1,305 @@
|
|||||||
package envoy.client;
|
package envoy.client;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.ObjectInputStream;
|
import java.io.ObjectInputStream;
|
||||||
import java.io.ObjectOutputStream;
|
import java.io.ObjectOutputStream;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.logging.Logger;
|
||||||
import javax.xml.datatype.DatatypeConfigurationException;
|
|
||||||
import javax.xml.datatype.DatatypeFactory;
|
import javax.xml.datatype.DatatypeConfigurationException;
|
||||||
|
import javax.xml.datatype.DatatypeFactory;
|
||||||
import envoy.exception.EnvoyException;
|
|
||||||
import envoy.schema.Message;
|
import envoy.exception.EnvoyException;
|
||||||
import envoy.schema.Message.Metadata.MessageState;
|
import envoy.schema.Message;
|
||||||
import envoy.schema.ObjectFactory;
|
import envoy.schema.Message.Metadata.MessageState;
|
||||||
import envoy.schema.Sync;
|
import envoy.schema.ObjectFactory;
|
||||||
import envoy.schema.User;
|
import envoy.schema.Sync;
|
||||||
|
import envoy.schema.User;
|
||||||
/**
|
|
||||||
* Project: <strong>envoy-client</strong><br>
|
/**
|
||||||
* File: <strong>LocalDB.java</strong><br>
|
* Project: <strong>envoy-client</strong><br>
|
||||||
* Created: <strong>27.10.2019</strong><br>
|
* File: <strong>LocalDB.java</strong><br>
|
||||||
*
|
* Created: <strong>27.10.2019</strong><br>
|
||||||
* @author Kai S. K. Engelbart
|
*
|
||||||
* @author Maximilian Käfer
|
* @author Kai S. K. Engelbart
|
||||||
* @since Envoy v0.1-alpha
|
* @author Maximilian Käfer
|
||||||
*/
|
* @since Envoy v0.1-alpha
|
||||||
public class LocalDB {
|
*/
|
||||||
|
public class LocalDB {
|
||||||
private File localDB;
|
|
||||||
private User sender;
|
private File localDB;
|
||||||
private List<Chat> chats = new ArrayList<>();
|
private User sender;
|
||||||
private ObjectFactory objectFactory = new ObjectFactory();
|
private List<Chat> chats = new ArrayList<>();
|
||||||
private DatatypeFactory datatypeFactory;
|
private ObjectFactory objectFactory = new ObjectFactory();
|
||||||
|
private DatatypeFactory datatypeFactory;
|
||||||
private Sync unreadMessagesSync = objectFactory.createSync();
|
|
||||||
private Sync sync = objectFactory.createSync();
|
private static final Logger logger = Logger.getLogger(LocalDB.class.getSimpleName());
|
||||||
private Sync readMessages = objectFactory.createSync();
|
|
||||||
|
private Sync unreadMessagesSync = objectFactory.createSync();
|
||||||
/**
|
private Sync sync = objectFactory.createSync();
|
||||||
* Constructs an empty local database.
|
private Sync readMessages = objectFactory.createSync();
|
||||||
*
|
|
||||||
* @param client the user that is logged in with this client
|
/**
|
||||||
* @since Envoy v0.1-alpha
|
* Constructs an empty local database.
|
||||||
*/
|
*
|
||||||
|
* @param sender the user that is logged in with this client
|
||||||
public LocalDB(User sender) {
|
* @since Envoy v0.1-alpha
|
||||||
this.sender = sender;
|
*/
|
||||||
try {
|
public LocalDB(User sender) {
|
||||||
datatypeFactory = DatatypeFactory.newInstance();
|
this.sender = sender;
|
||||||
} catch (DatatypeConfigurationException e) {
|
try {
|
||||||
e.printStackTrace();
|
datatypeFactory = DatatypeFactory.newInstance();
|
||||||
}
|
} catch (DatatypeConfigurationException e) {
|
||||||
}
|
e.printStackTrace();
|
||||||
|
}
|
||||||
/**
|
}
|
||||||
* Initializes the local database and fills it with values
|
|
||||||
* if the user has already sent or received messages.
|
/**
|
||||||
*
|
* Initializes the local database and fills it with values
|
||||||
* @param localDBDir the directory where we wish to save/load the database from.
|
* if the user has already sent or received messages.
|
||||||
* @throws EnvoyException if the directory selected is not an actual directory.
|
*
|
||||||
* @since Envoy v0.1-alpha
|
* @param localDBDir the directory where we wish to save/load the database from.
|
||||||
*/
|
* @throws EnvoyException if the directory selected is not an actual directory.
|
||||||
public void initializeDBFile(File localDBDir) throws EnvoyException {
|
* @since Envoy v0.1-alpha
|
||||||
if (localDBDir.exists() && !localDBDir.isDirectory())
|
*/
|
||||||
throw new EnvoyException(String.format("LocalDBDir '%s' is not a directory!", localDBDir.getAbsolutePath()));
|
public void initializeDBFile(File localDBDir) throws EnvoyException {
|
||||||
localDB = new File(localDBDir, sender.getID() + ".db");
|
if (localDBDir.exists() && !localDBDir.isDirectory())
|
||||||
if (localDB.exists()) loadFromLocalDB();
|
throw new EnvoyException(String.format("LocalDBDir '%s' is not a directory!", localDBDir.getAbsolutePath()));
|
||||||
}
|
localDB = new File(localDBDir, sender.getID() + ".db");
|
||||||
|
if (localDB.exists()) loadFromLocalDB();
|
||||||
/**
|
}
|
||||||
* Saves the database into a file for future use.
|
|
||||||
*
|
/**
|
||||||
* @throws IOException if something went wrong during saving
|
* Saves the database into a file for future use.
|
||||||
* @since Envoy v0.1-alpha
|
*
|
||||||
*/
|
* @throws IOException if something went wrong during saving
|
||||||
public void saveToLocalDB() {
|
* @since Envoy v0.1-alpha
|
||||||
try {
|
*/
|
||||||
localDB.getParentFile().mkdirs();
|
public void saveToLocalDB() {
|
||||||
localDB.createNewFile();
|
try {
|
||||||
} catch (IOException e) {
|
localDB.getParentFile().mkdirs();
|
||||||
e.printStackTrace();
|
localDB.createNewFile();
|
||||||
System.err.println("unable to save the messages");
|
} catch (IOException e) {
|
||||||
}
|
e.printStackTrace();
|
||||||
try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(localDB))) {
|
logger.warning("unable to save the messages");
|
||||||
out.writeObject(chats);
|
}
|
||||||
} catch (IOException ex) {
|
try (ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(localDB))) {
|
||||||
ex.printStackTrace();
|
out.writeObject(chats);
|
||||||
System.err.println("unable to save the messages");
|
} catch (IOException ex) {
|
||||||
}
|
ex.printStackTrace();
|
||||||
}
|
logger.warning("unable to save the messages");
|
||||||
|
}
|
||||||
/**
|
}
|
||||||
* Loads all chats saved by Envoy for the client user.
|
|
||||||
*
|
/**
|
||||||
* @throws EnvoyException if something fails while loading.
|
* Loads all chats saved by Envoy for the client user.
|
||||||
* @since Envoy v0.1-alpha
|
*
|
||||||
*/
|
* @throws EnvoyException if something fails while loading.
|
||||||
@SuppressWarnings("unchecked")
|
* @since Envoy v0.1-alpha
|
||||||
private void loadFromLocalDB() throws EnvoyException {
|
*/
|
||||||
try (ObjectInputStream in = new ObjectInputStream(new FileInputStream(localDB))) {
|
@SuppressWarnings("unchecked")
|
||||||
Object obj = in.readObject();
|
private void loadFromLocalDB() throws EnvoyException {
|
||||||
if (obj instanceof ArrayList<?>) chats = (ArrayList<Chat>) obj;
|
try (ObjectInputStream in = new ObjectInputStream(new FileInputStream(localDB))) {
|
||||||
} catch (ClassNotFoundException | IOException e) {
|
Object obj = in.readObject();
|
||||||
throw new EnvoyException(e);
|
if (obj instanceof ArrayList<?>) chats = (ArrayList<Chat>) obj;
|
||||||
}
|
} catch (ClassNotFoundException | IOException e) {
|
||||||
}
|
throw new EnvoyException(e);
|
||||||
|
}
|
||||||
/**
|
}
|
||||||
* Creates a {@link Message} object serializable to XML.
|
|
||||||
*
|
/**
|
||||||
* @param textContent The content (text) of the message
|
* Creates a {@link Message} object serializable to XML.
|
||||||
* @return prepared {@link Message} object
|
*
|
||||||
*/
|
* @param textContent The content (text) of the message
|
||||||
public Message createMessage(String textContent, User recipient) {
|
* @param recipient The recipient of the message
|
||||||
Message.Metadata metaData = objectFactory.createMessageMetadata();
|
* @return prepared {@link Message} object
|
||||||
metaData.setSender(sender.getID());
|
* @since Envoy v0.1-alpha
|
||||||
metaData.setRecipient(recipient.getID());
|
*/
|
||||||
metaData.setState(MessageState.WAITING);
|
public Message createMessage(String textContent, User recipient) {
|
||||||
metaData.setDate(datatypeFactory.newXMLGregorianCalendar(Instant.now().toString()));
|
Message.Metadata metaData = objectFactory.createMessageMetadata();
|
||||||
|
metaData.setSender(sender.getID());
|
||||||
Message.Content content = objectFactory.createMessageContent();
|
metaData.setRecipient(recipient.getID());
|
||||||
content.setType("text");
|
metaData.setState(MessageState.WAITING);
|
||||||
content.setText(textContent);
|
metaData.setDate(datatypeFactory.newXMLGregorianCalendar(Instant.now().toString()));
|
||||||
|
|
||||||
Message message = objectFactory.createMessage();
|
Message.Content content = objectFactory.createMessageContent();
|
||||||
message.setMetadata(metaData);
|
content.setType("text");
|
||||||
message.getContent().add(content);
|
content.setText(textContent);
|
||||||
|
|
||||||
return message;
|
Message message = objectFactory.createMessage();
|
||||||
}
|
message.setMetadata(metaData);
|
||||||
|
message.getContent().add(content);
|
||||||
public Sync fillSync(long userId) {
|
|
||||||
addWaitingMessagesToSync();
|
return message;
|
||||||
|
}
|
||||||
sync.getMessages().addAll(readMessages.getMessages());
|
|
||||||
readMessages.getMessages().clear();
|
public Sync fillSync(long userId) {
|
||||||
|
addWaitingMessagesToSync();
|
||||||
System.out.println(sync.getMessages().size());
|
|
||||||
return sync;
|
sync.getMessages().addAll(readMessages.getMessages());
|
||||||
}
|
readMessages.getMessages().clear();
|
||||||
|
|
||||||
public void applySync(Sync returnSync) {
|
logger.info(String.format("Filled sync with %d messages.", sync.getMessages().size()));
|
||||||
for (int i = 0; i < returnSync.getMessages().size(); i++) {
|
return sync;
|
||||||
if (returnSync.getMessages().get(i).getMetadata().getMessageId() != 0
|
}
|
||||||
&& returnSync.getMessages().get(i).getMetadata().getState() == MessageState.SENT) {
|
|
||||||
// Update Local Messages with State WAITING (add Message ID and change State to
|
public void applySync(Sync returnSync) {
|
||||||
// SENT)
|
for (int i = 0; i < returnSync.getMessages().size(); i++) {
|
||||||
for (int j = 0; j < sync.getMessages().size(); j++) {
|
if (returnSync.getMessages().get(i).getMetadata().getMessageId() != 0
|
||||||
if (j == i) {
|
&& returnSync.getMessages().get(i).getMetadata().getState() == MessageState.SENT) {
|
||||||
sync.getMessages().get(j).getMetadata().setMessageId(returnSync.getMessages().get(j).getMetadata().getMessageId());
|
// Update Local Messages with State WAITING (add Message ID and change State to
|
||||||
sync.getMessages().get(j).getMetadata().setState(returnSync.getMessages().get(j).getMetadata().getState());
|
// SENT)
|
||||||
}
|
for (int j = 0; j < sync.getMessages().size(); j++) {
|
||||||
}
|
if (j == i) {
|
||||||
}
|
sync.getMessages().get(j).getMetadata().setMessageId(returnSync.getMessages().get(j).getMetadata().getMessageId());
|
||||||
if (returnSync.getMessages().get(i).getMetadata().getMessageId() != 0 && returnSync.getMessages().get(i).getMetadata().getSender() != 0
|
sync.getMessages().get(j).getMetadata().setState(returnSync.getMessages().get(j).getMetadata().getState());
|
||||||
&& returnSync.getMessages().get(i).getMetadata().getState() == MessageState.RECEIVED) {
|
}
|
||||||
// these are the unread Messages from the server
|
}
|
||||||
unreadMessagesSync.getMessages().add(returnSync.getMessages().get(i));
|
}
|
||||||
}
|
if (returnSync.getMessages().get(i).getMetadata().getMessageId() != 0 && returnSync.getMessages().get(i).getMetadata().getSender() != 0
|
||||||
|
&& returnSync.getMessages().get(i).getMetadata().getState() == MessageState.RECEIVED) {
|
||||||
if (returnSync.getMessages().get(i).getMetadata().getMessageId() != 0 && returnSync.getMessages().get(i).getMetadata().getSender() == 0
|
// these are the unread Messages from the server
|
||||||
&& returnSync.getMessages().get(i).getMetadata().getState() == MessageState.RECEIVED) {
|
unreadMessagesSync.getMessages().add(returnSync.getMessages().get(i));
|
||||||
// Update Messages in localDB to state RECEIVED
|
}
|
||||||
for (int j = 0; j < getChats().size(); j++) {
|
|
||||||
if (getChats().get(j).getRecipient().getID() == returnSync.getMessages().get(i).getMetadata().getRecipient()) {
|
if (returnSync.getMessages().get(i).getMetadata().getMessageId() != 0 && returnSync.getMessages().get(i).getMetadata().getSender() == 0
|
||||||
for (int k = 0; k < getChats().get(j).getModel().getSize(); k++) {
|
&& returnSync.getMessages().get(i).getMetadata().getState() == MessageState.RECEIVED) {
|
||||||
if (getChats().get(j).getModel().get(k).getMetadata().getMessageId() == returnSync.getMessages()
|
// Update Messages in localDB to state RECEIVED
|
||||||
.get(i)
|
for (int j = 0; j < getChats().size(); j++) {
|
||||||
.getMetadata()
|
if (getChats().get(j).getRecipient().getID() == returnSync.getMessages().get(i).getMetadata().getRecipient()) {
|
||||||
.getMessageId()) {
|
for (int k = 0; k < getChats().get(j).getModel().getSize(); k++) {
|
||||||
// Update Message in LocalDB
|
if (getChats().get(j).getModel().get(k).getMetadata().getMessageId() == returnSync.getMessages()
|
||||||
getChats().get(j).getModel().get(k).getMetadata().setState(returnSync.getMessages().get(j).getMetadata().getState());
|
.get(i)
|
||||||
}
|
.getMetadata()
|
||||||
}
|
.getMessageId()) {
|
||||||
}
|
// Update Message in LocalDB
|
||||||
}
|
getChats().get(j).getModel().get(k).getMetadata().setState(returnSync.getMessages().get(j).getMetadata().getState());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (returnSync.getMessages().get(i).getMetadata().getMessageId() != 0
|
}
|
||||||
&& returnSync.getMessages().get(i).getMetadata().getState() == MessageState.READ) {
|
|
||||||
// Update local Messages to state READ
|
}
|
||||||
System.out.println("Message with ID: " + returnSync.getMessages().get(i).getMetadata().getMessageId()
|
|
||||||
+ "was initialized to be set to READ in localDB.");
|
if (returnSync.getMessages().get(i).getMetadata().getMessageId() != 0
|
||||||
for (int j = 0; j < getChats().size(); j++) {
|
&& returnSync.getMessages().get(i).getMetadata().getState() == MessageState.READ) {
|
||||||
if (getChats().get(j).getRecipient().getID() == returnSync.getMessages().get(i).getMetadata().getRecipient()) {
|
// Update local Messages to state READ
|
||||||
System.out.println("Chat with: " + getChats().get(j).getRecipient().getID() + "was selected.");
|
logger.info("Message with ID: " + returnSync.getMessages().get(i).getMetadata().getMessageId()
|
||||||
for (int k = 0; k < getChats().get(j).getModel().getSize(); k++) {
|
+ "was initialized to be set to READ in localDB.");
|
||||||
if (getChats().get(j).getModel().get(k).getMetadata().getMessageId() == returnSync.getMessages()
|
for (int j = 0; j < getChats().size(); j++) {
|
||||||
.get(i)
|
if (getChats().get(j)
|
||||||
.getMetadata()
|
.getRecipient()
|
||||||
.getMessageId()) {
|
.getID() == returnSync.getMessages().get(i).getMetadata().getRecipient()) {
|
||||||
System.out.println(
|
logger.info("Chat with: " + getChats().get(j).getRecipient().getID() + "was selected.");
|
||||||
"Message with ID: " + getChats().get(j).getModel().get(k).getMetadata().getMessageId() + "was selected.");
|
for (int k = 0; k < getChats().get(j).getModel().getSize(); k++) {
|
||||||
getChats().get(j).getModel().get(k).getMetadata().setState(returnSync.getMessages().get(i).getMetadata().getState());
|
if (getChats().get(j).getModel().get(k).getMetadata().getMessageId() == returnSync.getMessages()
|
||||||
System.out
|
.get(i)
|
||||||
.println("Message State is now: " + getChats().get(j).getModel().get(k).getMetadata().getState().toString());
|
.getMetadata()
|
||||||
}
|
.getMessageId()) {
|
||||||
}
|
logger.info("Message with ID: "
|
||||||
}
|
+ getChats().get(j).getModel().get(k).getMetadata().getMessageId()
|
||||||
}
|
+ "was selected.");
|
||||||
}
|
getChats().get(j)
|
||||||
}
|
.getModel()
|
||||||
|
.get(k)
|
||||||
// Updating UserStatus of all users in LocalDB
|
.getMetadata()
|
||||||
for (int j = 0; j < returnSync.getUsers().size(); j++) {
|
.setState(returnSync.getMessages().get(i).getMetadata().getState());
|
||||||
for (int k = 0; k < getChats().size(); k++) {
|
logger.info("Message State is now: "
|
||||||
if (getChats().get(k).getRecipient().getID() == returnSync.getUsers().get(j).getID()) {
|
+ getChats().get(j).getModel().get(k).getMetadata().getState().toString());
|
||||||
|
}
|
||||||
getChats().get(k).getRecipient().setStatus(returnSync.getUsers().get(j).getStatus());
|
}
|
||||||
System.out.println(getChats().get(k).getRecipient().getStatus().toString());
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sync.getMessages().clear();
|
// Updating UserStatus of all users in LocalDB
|
||||||
sync.getUsers().clear();
|
for (int j = 0; j < returnSync.getUsers().size(); j++) {
|
||||||
}
|
for (int k = 0; k < getChats().size(); k++) {
|
||||||
|
if (getChats().get(k).getRecipient().getID() == returnSync.getUsers().get(j).getID()) {
|
||||||
/**
|
|
||||||
* Adds the unread messages returned from the server in the latest sync to the
|
getChats().get(k).getRecipient().setStatus(returnSync.getUsers().get(j).getStatus());
|
||||||
* right chats in the LocalDB.
|
logger.info(getChats().get(k).getRecipient().getStatus().toString());
|
||||||
*
|
}
|
||||||
* @param localDB
|
}
|
||||||
* @since Envoy v0.1-alpha
|
}
|
||||||
*/
|
|
||||||
public void addUnreadMessagesToLocalDB() {
|
sync.getMessages().clear();
|
||||||
Sync unreadMessages = unreadMessagesSync;
|
sync.getUsers().clear();
|
||||||
for (int i = 0; i < unreadMessages.getMessages().size(); i++)
|
}
|
||||||
for (int j = 0; j < getChats().size(); j++)
|
|
||||||
if (getChats().get(j).getRecipient().getID() == unreadMessages.getMessages().get(i).getMetadata().getSender()) {
|
/**
|
||||||
getChats().get(j).appendMessage(unreadMessages.getMessages().get(i));
|
* Adds the unread messages returned from the server in the latest sync to the
|
||||||
}
|
* right chats in the LocalDB.
|
||||||
}
|
*
|
||||||
|
* @param localDB
|
||||||
/**
|
* @since Envoy v0.1-alpha
|
||||||
* Changes all messages with state {@code RECEIVED} of a specific chat to state
|
*/
|
||||||
* {@code READ}.
|
public void addUnreadMessagesToLocalDB() {
|
||||||
* <br>
|
Sync unreadMessages = unreadMessagesSync;
|
||||||
* Adds these messages to the {@code readMessages} {@link Sync} object.
|
for (int i = 0; i < unreadMessages.getMessages().size(); i++)
|
||||||
*
|
for (int j = 0; j < getChats().size(); j++)
|
||||||
* @param currentChat
|
if (getChats().get(j).getRecipient().getID() == unreadMessages.getMessages().get(i).getMetadata().getSender()) {
|
||||||
* @since Envoy v0.1-alpha
|
getChats().get(j).appendMessage(unreadMessages.getMessages().get(i));
|
||||||
*/
|
}
|
||||||
public void setMessagesToRead(Chat currentChat) {
|
}
|
||||||
for (int i = currentChat.getModel().size() - 1; i >= 0; --i)
|
|
||||||
if (currentChat.getModel().get(i).getMetadata().getRecipient() != currentChat.getRecipient().getID())
|
/**
|
||||||
if (currentChat.getModel().get(i).getMetadata().getState() == MessageState.RECEIVED) {
|
* Changes all messages with state {@code RECEIVED} of a specific chat to state
|
||||||
currentChat.getModel().get(i).getMetadata().setState(MessageState.READ);
|
* {@code READ}.
|
||||||
readMessages.getMessages().add(currentChat.getModel().get(i));
|
* <br>
|
||||||
} else break;
|
* Adds these messages to the {@code readMessages} {@link Sync} object.
|
||||||
}
|
*
|
||||||
|
* @param currentChat
|
||||||
/**
|
* @since Envoy v0.1-alpha
|
||||||
* Adds all messages with state {@code WAITING} from the {@link LocalDB} to the
|
*/
|
||||||
* {@link Sync} object.
|
public void setMessagesToRead(Chat currentChat) {
|
||||||
*
|
for (int i = currentChat.getModel().size() - 1; i >= 0; --i)
|
||||||
* @since Envoy v0.1-alpha
|
if (currentChat.getModel().get(i).getMetadata().getRecipient() != currentChat.getRecipient().getID())
|
||||||
*/
|
if (currentChat.getModel().get(i).getMetadata().getState() == MessageState.RECEIVED) {
|
||||||
private void addWaitingMessagesToSync() {
|
currentChat.getModel().get(i).getMetadata().setState(MessageState.READ);
|
||||||
for (Chat chat : getChats())
|
readMessages.getMessages().add(currentChat.getModel().get(i));
|
||||||
for (int i = 0; i < chat.getModel().size(); i++)
|
} else break;
|
||||||
if (chat.getModel().get(i).getMetadata().getState() == MessageState.WAITING) {
|
}
|
||||||
System.out.println("Got Waiting Message");
|
|
||||||
sync.getMessages().add(chat.getModel().get(i));
|
/**
|
||||||
}
|
* Adds all messages with state {@code WAITING} from the {@link LocalDB} to the
|
||||||
}
|
* {@link Sync} object.
|
||||||
|
*
|
||||||
/**
|
* @since Envoy v0.1-alpha
|
||||||
* Clears the {@code unreadMessagesSync} {@link Sync} object.
|
*/
|
||||||
*
|
private void addWaitingMessagesToSync() {
|
||||||
* @since Envoy v0.1-alpha
|
for (Chat chat : getChats())
|
||||||
*/
|
for (int i = 0; i < chat.getModel().size(); i++)
|
||||||
public void clearUnreadMessagesSync() { unreadMessagesSync.getMessages().clear(); }
|
if (chat.getModel().get(i).getMetadata().getState() == MessageState.WAITING) {
|
||||||
|
// addMessageToSync(localDB.getChats().get(i).getModel().get(j));
|
||||||
/**
|
logger.info("Got Waiting Message");
|
||||||
* @return all saves {@link Chat} objects that list the client user as the
|
sync.getMessages().add(chat.getModel().get(i));
|
||||||
* client
|
}
|
||||||
* @since Envoy v0.1-alpha
|
}
|
||||||
**/
|
|
||||||
public List<Chat> getChats() { return chats; }
|
/**
|
||||||
|
* Clears the {@code unreadMessagesSync} {@link Sync} object.
|
||||||
/**
|
*
|
||||||
* @return the {@link User} who initialized the local database
|
* @since Envoy v0.1-alpha
|
||||||
* @since Envoy v0.1-alpha
|
*/
|
||||||
*/
|
public void clearUnreadMessagesSync() { unreadMessagesSync.getMessages().clear(); }
|
||||||
public User getUser() { return sender; }
|
|
||||||
}
|
/**
|
||||||
|
* @return all saves {@link Chat} objects that list the client user as the
|
||||||
|
* client
|
||||||
|
* @since Envoy v0.1-alpha
|
||||||
|
**/
|
||||||
|
public List<Chat> getChats() { return chats; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the {@link User} who initialized the local database
|
||||||
|
* @since Envoy v0.1-alpha
|
||||||
|
*/
|
||||||
|
public User getUser() { return sender; }
|
||||||
|
}
|
||||||
|
|||||||
@ -10,6 +10,7 @@ import java.awt.event.KeyAdapter;
|
|||||||
import java.awt.event.KeyEvent;
|
import java.awt.event.KeyEvent;
|
||||||
import java.awt.event.WindowAdapter;
|
import java.awt.event.WindowAdapter;
|
||||||
import java.awt.event.WindowEvent;
|
import java.awt.event.WindowEvent;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import javax.swing.DefaultListModel;
|
import javax.swing.DefaultListModel;
|
||||||
import javax.swing.JButton;
|
import javax.swing.JButton;
|
||||||
@ -56,6 +57,8 @@ public class ChatWindow extends JFrame {
|
|||||||
private Chat currentChat;
|
private Chat currentChat;
|
||||||
|
|
||||||
private JTextArea messageEnterTextArea;
|
private JTextArea messageEnterTextArea;
|
||||||
|
|
||||||
|
private static final Logger logger = Logger.getLogger(ChatWindow.class.getSimpleName());
|
||||||
|
|
||||||
public ChatWindow(Client client, LocalDB localDB) {
|
public ChatWindow(Client client, LocalDB localDB) {
|
||||||
this.client = client;
|
this.client = client;
|
||||||
@ -186,7 +189,7 @@ public class ChatWindow extends JFrame {
|
|||||||
SettingsScreen.open(localDB.getUser().getName());
|
SettingsScreen.open(localDB.getUser().getName());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
SettingsScreen.open();
|
SettingsScreen.open();
|
||||||
System.err.println("An error occured while opening the settings screen: " + e);
|
logger.warning("An error occured while opening the settings screen: " + e);
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -3,6 +3,8 @@ package envoy.client.ui;
|
|||||||
import java.awt.EventQueue;
|
import java.awt.EventQueue;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import javax.swing.JOptionPane;
|
import javax.swing.JOptionPane;
|
||||||
|
|
||||||
@ -24,7 +26,11 @@ import envoy.exception.EnvoyException;
|
|||||||
*/
|
*/
|
||||||
public class Startup {
|
public class Startup {
|
||||||
|
|
||||||
|
private static final Logger logger = Logger.getLogger(Client.class.getSimpleName());
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
logger.setLevel(Level.ALL);
|
||||||
|
|
||||||
Config config = Config.getInstance();
|
Config config = Config.getInstance();
|
||||||
|
|
||||||
// Load the configuration from client.properties first
|
// Load the configuration from client.properties first
|
||||||
@ -42,6 +48,7 @@ public class Startup {
|
|||||||
config.load(args);
|
config.load(args);
|
||||||
|
|
||||||
if (!config.isInitialized()) {
|
if (!config.isInitialized()) {
|
||||||
|
logger.warning("Server or port are not defined. Exiting...");
|
||||||
JOptionPane.showMessageDialog(null, "Error loading configuration values.", "Configuration error",
|
JOptionPane.showMessageDialog(null, "Error loading configuration values.", "Configuration error",
|
||||||
JOptionPane.ERROR_MESSAGE);
|
JOptionPane.ERROR_MESSAGE);
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
@ -49,7 +56,7 @@ public class Startup {
|
|||||||
|
|
||||||
String userName = JOptionPane.showInputDialog("Please enter your username");
|
String userName = JOptionPane.showInputDialog("Please enter your username");
|
||||||
if (userName == null || userName.isEmpty()) {
|
if (userName == null || userName.isEmpty()) {
|
||||||
System.err.println("User name is not set or empty. Exiting...");
|
logger.warning("User name is not set or empty. Exiting...");
|
||||||
System.exit(1);
|
System.exit(1);
|
||||||
}
|
}
|
||||||
Client client = new Client(config, userName);
|
Client client = new Client(config, userName);
|
||||||
|
|||||||
Reference in New Issue
Block a user