diff --git a/src/main/java/envoy/client/ui/IconUtil.java b/src/main/java/envoy/client/ui/IconUtil.java index cdb99c5..b477e53 100644 --- a/src/main/java/envoy/client/ui/IconUtil.java +++ b/src/main/java/envoy/client/ui/IconUtil.java @@ -1,6 +1,5 @@ package envoy.client.ui; -import java.io.IOException; import java.util.EnumMap; import java.util.EnumSet; @@ -23,46 +22,43 @@ public class IconUtil { /** * Loads an icon from the resource folder. - * + * * @param path the path to the icon inside the resource folder * @return the icon - * @throws IOException if the loading process failed * @since Envoy Client v0.1-beta */ - public static Image load(String path) throws IOException { return new Image(IconUtil.class.getResource(path).toExternalForm()); } + public static Image load(String path) { return new Image(IconUtil.class.getResource(path).toExternalForm()); } /** * Loads an icon from the resource folder and scales it to a given size. - * + * * @param path the path to the icon inside the resource folder * @param size the size to scale the icon to * @return the scaled icon - * @throws IOException if the loading process failed * @since Envoy Client v0.1-beta */ - public static Image load(String path, int size) throws IOException { + public static Image load(String path, int size) { return new Image(IconUtil.class.getResource(path).toExternalForm(), size, size, true, true); } /** - * + * * Loads icons specified by an enum. The images have to be named like the * lowercase enum constants with {@code .png} extension and be located inside a * folder with the lowercase name of the enum, which must be contained inside * the {@code /icons} folder. - * + * * @param the enum that specifies the icons to load * @param enumClass the class of the enum * @param size the size to scale the icons to * @return a map containing the loaded icons with the corresponding enum * constants as keys - * @throws IOException if the loading process failed * @since Envoy Client v0.1-beta */ - public static > EnumMap loadByEnum(Class enumClass, int size) throws IOException { - var icons = new EnumMap(enumClass); - var path = "/icons/" + enumClass.getSimpleName().toLowerCase() + "/"; - for (var e : EnumSet.allOf(enumClass)) + public static > EnumMap loadByEnum(Class enumClass, int size) { + final var icons = new EnumMap(enumClass); + final var path = "/icons/" + enumClass.getSimpleName().toLowerCase() + "/"; + for (final var e : EnumSet.allOf(enumClass)) icons.put(e, load(path + e.toString().toLowerCase() + ".png", size)); return icons; } diff --git a/src/main/java/envoy/client/ui/MessageListCell.java b/src/main/java/envoy/client/ui/MessageListCell.java index 22aa188..21a094e 100644 --- a/src/main/java/envoy/client/ui/MessageListCell.java +++ b/src/main/java/envoy/client/ui/MessageListCell.java @@ -1,9 +1,7 @@ package envoy.client.ui; -import java.io.IOException; import java.time.format.DateTimeFormatter; import java.util.Map; -import java.util.logging.Level; import javafx.geometry.Insets; import javafx.scene.control.Label; @@ -15,7 +13,6 @@ import javafx.scene.layout.VBox; import envoy.data.Message; import envoy.data.Message.MessageStatus; import envoy.data.User; -import envoy.util.EnvoyLog; /** * Displays a single message inside the message list. @@ -29,18 +26,9 @@ import envoy.util.EnvoyLog; */ public class MessageListCell extends ListCell { - private static final DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm"); - private static Map statusImages; - private static User client; - - static { - try { - statusImages = IconUtil.loadByEnum(MessageStatus.class, 16); - } catch (final IOException e) { - e.printStackTrace(); - EnvoyLog.getLogger(MessageListCell.class).log(Level.WARNING, "could not load status icons: ", e); - } - } + private static User client; + private static final DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm"); + private static final Map statusImages = IconUtil.loadByEnum(MessageStatus.class, 16); /** * Displays the text, the data of creation and the status of a message. diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java index 66d8305..91665c8 100644 --- a/src/main/java/envoy/client/ui/controller/ChatScene.java +++ b/src/main/java/envoy/client/ui/controller/ChatScene.java @@ -95,11 +95,7 @@ public final class ChatScene { messageList.setCellFactory(listView -> new MessageListCell()); userList.setCellFactory(listView -> new ContactListCell()); - try { - settingsButton.setGraphic(new ImageView(IconUtil.load("/icons/settings.png", 16))); - } catch (final IOException e2) { - logger.log(Level.WARNING, "Could not load settings icon", e2); - } + settingsButton.setGraphic(new ImageView(IconUtil.load("/icons/settings.png", 16))); // Listen to received messages eventBus.register(MessageCreationEvent.class, e -> { diff --git a/src/main/java/envoy/client/ui/controller/GroupCreationScene.java b/src/main/java/envoy/client/ui/controller/GroupCreationScene.java index ea4a58e..c6d7d05 100644 --- a/src/main/java/envoy/client/ui/controller/GroupCreationScene.java +++ b/src/main/java/envoy/client/ui/controller/GroupCreationScene.java @@ -5,15 +5,16 @@ import java.util.stream.Collectors; import javafx.application.Platform; import javafx.fxml.FXML; import javafx.scene.control.*; +import javafx.scene.control.Alert.AlertType; import envoy.client.data.LocalDB; import envoy.client.event.SendEvent; import envoy.client.ui.ContactListCell; import envoy.client.ui.SceneContext; import envoy.data.Contact; -import envoy.data.User; import envoy.event.EventBus; import envoy.event.GroupCreation; +import envoy.util.Bounds; /** * Project: envoy-client
@@ -25,21 +26,18 @@ import envoy.event.GroupCreation; */ public class GroupCreationScene { - @FXML - private Button backButton; - @FXML private Button createButton; @FXML - private TextField groupNameBar; + private TextField groupNameField; @FXML private ListView contactList; private SceneContext sceneContext; - private static EventBus eventBus = EventBus.getInstance(); + private static final EventBus eventBus = EventBus.getInstance(); @FXML private void initialize() { @@ -56,22 +54,36 @@ public class GroupCreationScene { public void initializeData(SceneContext sceneContext, LocalDB localDB) { this.sceneContext = sceneContext; Platform.runLater(() -> contactList.getItems() - .addAll(localDB.getUsers() - .values() - .stream() - .filter(c -> c instanceof User && c.getID() != localDB.getUser().getID()) - .collect(Collectors.toList()))); + .addAll(localDB.getUsers().values().stream().filter(c -> c.getID() != localDB.getUser().getID()).collect(Collectors.toList()))); } /** - * Sends a {@link GroupCreation} to the server. + * Enables the {@code createButton} if at least one contact is selected. + * + * @since Envoy Client v0.1-beta + */ + @FXML + private void contactListClicked() { createButton.setDisable(contactList.getSelectionModel().isEmpty()); } + + /** + * Sends a {@link GroupCreation} to the server and closes this scene. + *

+ * If the given group name is not valid, an error is displayed instead. * * @since Envoy Client v0.1-beta */ @FXML - private void sendGroupObject() { - eventBus.dispatch(new SendEvent(new GroupCreation(groupNameBar.getText(), - contactList.getSelectionModel().getSelectedItems().stream().map(Contact::getID).collect(Collectors.toSet())))); + private void createButtonClicked() { + final var name = groupNameField.getText(); + if (!Bounds.isValidContactName(name)) { + new Alert(AlertType.ERROR, "The entered group name is not valid (" + Bounds.CONTACT_NAME_PATTERN + ")").showAndWait(); + groupNameField.clear(); + } else { + eventBus.dispatch(new SendEvent(new GroupCreation(name, + contactList.getSelectionModel().getSelectedItems().stream().map(Contact::getID).collect(Collectors.toSet())))); + new Alert(AlertType.INFORMATION, String.format("Group '%s' successfully created.", name)).showAndWait(); + sceneContext.pop(); + } } @FXML diff --git a/src/main/java/envoy/client/ui/controller/LoginScene.java b/src/main/java/envoy/client/ui/controller/LoginScene.java index 2bae2dc..380842a 100644 --- a/src/main/java/envoy/client/ui/controller/LoginScene.java +++ b/src/main/java/envoy/client/ui/controller/LoginScene.java @@ -23,6 +23,7 @@ import envoy.event.EventBus; import envoy.event.HandshakeRejection; import envoy.event.MessageStatusChange; import envoy.exception.EnvoyException; +import envoy.util.Bounds; import envoy.util.EnvoyLog; /** @@ -115,7 +116,11 @@ public final class LoginScene { if (registerCheckBox.isSelected() && !passwordField.getText().equals(repeatPasswordField.getText())) { new Alert(AlertType.ERROR, "The entered password is unequal to the repeated one").showAndWait(); repeatPasswordField.clear(); - } else performHandshake( + } else if (!Bounds.isValidContactName(userTextField.getText())) { + new Alert(AlertType.ERROR, "The entered user name is not valid (" + Bounds.CONTACT_NAME_PATTERN + ")").showAndWait(); + userTextField.clear(); + } else + performHandshake( new LoginCredentials(userTextField.getText(), passwordField.getText().toCharArray(), registerCheckBox.isSelected(), Startup.VERSION)); } diff --git a/src/main/resources/fxml/GroupCreationScene.fxml b/src/main/resources/fxml/GroupCreationScene.fxml index 8e36d11..7987a63 100644 --- a/src/main/resources/fxml/GroupCreationScene.fxml +++ b/src/main/resources/fxml/GroupCreationScene.fxml @@ -14,7 +14,7 @@ - + @@ -38,21 +38,21 @@ - + - -