From b7ea7f0e85210834a252a9a0497e4b67246dfefe Mon Sep 17 00:00:00 2001 From: DieGurke Date: Wed, 26 Aug 2020 17:53:53 +0200 Subject: [PATCH] Applied some more suggestions from code review. --- .../main/java/envoy/client/event/BackEvent.java | 8 +------- .../envoy/client/ui/controller/ChatScene.java | 16 +--------------- .../client/ui/controller/GroupCreationTab.java | 1 + 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/client/src/main/java/envoy/client/event/BackEvent.java b/client/src/main/java/envoy/client/event/BackEvent.java index ba73134..55c7691 100644 --- a/client/src/main/java/envoy/client/event/BackEvent.java +++ b/client/src/main/java/envoy/client/event/BackEvent.java @@ -3,7 +3,7 @@ package envoy.client.event; import envoy.event.Event.Valueless; /** - * This event serves the purpose to trigger the tab change to tab 1 in {@link ChatScene}.

+ * This event serves the purpose to trigger the tab change to tab 0 in {@link ChatScene}.

* * Project: client
* File: BackEvent.java
@@ -15,10 +15,4 @@ import envoy.event.Event.Valueless; public class BackEvent extends Valueless{ private static final long serialVersionUID = 0L; - - /** - * @since Envoy Client v0.2-beta - */ - public BackEvent() { super(); } - } diff --git a/client/src/main/java/envoy/client/ui/controller/ChatScene.java b/client/src/main/java/envoy/client/ui/controller/ChatScene.java index 7df92bc..96a2eeb 100644 --- a/client/src/main/java/envoy/client/ui/controller/ChatScene.java +++ b/client/src/main/java/envoy/client/ui/controller/ChatScene.java @@ -184,8 +184,7 @@ public final class ChatScene implements Restorable { contactSearchTab.setContent(FXMLLoader.load(new File("src/main/resources/fxml/ContactSearchTab.fxml").toURI().toURL())); groupCreationTab.setContent(FXMLLoader.load(new File("src/main/resources/fxml/GroupCreationTab.fxml").toURI().toURL())); } catch (Exception e2) { - logger.log(Level.SEVERE, "An error occured when attempting to load the tabs!"); - e2.printStackTrace(); + logger.log(Level.SEVERE, "An error occured when attempting to load the tabs!", e2); } } else { contactSearchTab.setContent(createOfflineNote()); @@ -193,7 +192,6 @@ public final class ChatScene implements Restorable { } }); - //Listen to backEvents eventBus.register(BackEvent.class, e -> tabPane.getSelectionModel().select(0)); @@ -504,18 +502,6 @@ public final class ChatScene implements Restorable { } } - /** - * Rotates every element in our application by (at most 4 *) 360° in at most - * 2.75s. - * - * @since Envoy Client v0.1-beta - */ - @FXML - private void doABarrelRoll() { - final var random = new Random(); - doABarrelRoll(random.nextInt(3) + 1, random.nextDouble() * 3 + 1); - } - /** * Rotates every element in our application by {@code rotations}*360° in * {@code an}. diff --git a/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java b/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java index d14b4ee..42442fc 100644 --- a/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java +++ b/client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java @@ -133,6 +133,7 @@ public class GroupCreationTab { } else { createGroup(name); eventBus.dispatch(new BackEvent()); + // Restoring the original design as tabs will always be reused setErrorMessageLabelSize(0); groupNameField.clear(); }