zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Renamed EnvoyClient to Client, added Config class

Browse Source
This commit is contained in:
Kai S. K. Engelbart
2019-10-12 11:19:29 +02:00
parent aab15213d7
commit fe95e6bfb6
3 changed files with 94 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/envoy/client/ui/ChatWindow.java
View File

@ -8,6 +8,7 @@ import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.io.IOException;
import java.util.Properties;
import javax.swing.DefaultListModel;
import javax.swing.JButton;
@ -20,12 +21,9 @@ import javax.swing.JTextArea;
import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities;
import javax.swing.border.EmptyBorder;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.http.client.ClientProtocolException;
import org.xml.sax.SAXException;
import envoy.client.EnvoyClient;
import envoy.client.Client;
import envoy.client.Config;
import envoy.schema.Message;
import envoy.schema.User;
import envoy.schema.Users;
@ -43,9 +41,10 @@ public class ChatWindow extends JFrame {
private static final long serialVersionUID = 6865098428255463649L;
private long recipientID = 0;
private JPanel contentPane = new JPanel();
private EnvoyClient envoyClient = new EnvoyClient();
private long recipientID = 0;
private JPanel contentPane = new JPanel();
private static Client client;
private DefaultListModel<String> messageListModel = new DefaultListModel<>();
@ -136,8 +135,8 @@ public class ChatWindow extends JFrame {
// TODO: Acquire proper sender id
if (!messageEnterTextfield.getText().isEmpty() && recipientID != 0) try {
final Message message = envoyClient.createMessage(1, recipientID, messageEnterTextfield.getText());
envoyClient.sendMessage(message);
final Message message = client.createMessage(1, recipientID, messageEnterTextfield.getText());
client.sendMessage(message);
appendMessageToChat(message);
messageEnterTextfield.setText("");
} catch (Exception e) {
@ -187,7 +186,7 @@ public class ChatWindow extends JFrame {
*/
private void loadUserList(JList<User> userList) {
new Thread(() -> {
Users users = envoyClient.getUsersListXml();
Users users = client.getUsersListXml();
DefaultListModel<User> userListModel = new DefaultListModel<>();
users.getUser().forEach(user -> userListModel.addElement(user));
SwingUtilities.invokeLater(() -> userList.setModel(userListModel));
@ -213,8 +212,28 @@ public class ChatWindow extends JFrame {
+ getFirstTextContent(message) + "</span></html>");
}
public static void main(String[] args)
throws ClientProtocolException, IOException, SAXException, ParserConfigurationException {
public static void main(String[] args) {
Config config = new Config();
if (args.length > 0) {
config.load(args);
} else {
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try {
Properties configProperties = new Properties();
configProperties.load(loader.getResourceAsStream("server.properties"));
config.load(configProperties);
} catch (IOException e) {
e.printStackTrace();
}
}
if(!config.isInitialized()) {
System.err.println("Server or port are not defined. Exiting...");
System.exit(1);
}
client = new Client(config);
EventQueue.invokeLater(() -> {
try {
ChatWindow frame = new ChatWindow();