Apply suggestions from code review

Co-authored-by: CyB3RC0nN0R <kske@outlook.de>
This commit is contained in:
delvh 2020-07-25 16:51:46 +02:00
parent 6f8859c3fd
commit e382a86623
3 changed files with 11 additions and 21 deletions

View File

@ -7,9 +7,10 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
import envoy.client.net.WriteProxy; import envoy.client.net.WriteProxy;
import envoy.data.*; import envoy.data.Contact;
import envoy.data.Message;
import envoy.data.Message.MessageStatus; import envoy.data.Message.MessageStatus;
import envoy.event.IsWriting; import envoy.data.User;
import envoy.event.MessageStatusChange; import envoy.event.MessageStatusChange;
/** /**
@ -33,8 +34,7 @@ public class Chat implements Serializable {
protected int unreadAmount; protected int unreadAmount;
/** /**
* Counts the milliseconds until another {@link IsWriting} event will be sent if * Stores the last time an {@link envoy.event.IsWriting} event has been sent.
* something is typed.
*/ */
protected transient long lastWritingEvent; protected transient long lastWritingEvent;
@ -145,19 +145,8 @@ public class Chat implements Serializable {
public Contact getRecipient() { return recipient; } public Contact getRecipient() { return recipient; }
/** /**
* @return whether this {@link Chat} points at a {@link User} * @return the last known time a {@link envoy.event.IsWriting} event has been
* @since Envoy Client v0.1-beta * sent
*/
public boolean isUserChat() { return recipient instanceof User; }
/**
* @return whether this {@link Chat} points at a {@link Group}
* @since Envoy Client v0.1-beta
*/
public boolean isGroupChat() { return recipient instanceof Group; }
/**
* @return the last known time a {@link IsWriting} event has been sent
* @since Envoy Client v0.2-beta * @since Envoy Client v0.2-beta
*/ */
public long getLastWritingEvent() { return lastWritingEvent; } public long getLastWritingEvent() { return lastWritingEvent; }

View File

@ -31,7 +31,7 @@ public class ChatControl extends HBox {
// Unread messages // Unread messages
if (chat.getUnreadAmount() != 0) { if (chat.getUnreadAmount() != 0) {
final Region spacing = new Region(); final var spacing = new Region();
setHgrow(spacing, Priority.ALWAYS); setHgrow(spacing, Priority.ALWAYS);
getChildren().add(spacing); getChildren().add(spacing);
final var unreadMessagesLabel = new Label(Integer.toString(chat.getUnreadAmount())); final var unreadMessagesLabel = new Label(Integer.toString(chat.getUnreadAmount()));

View File

@ -21,6 +21,8 @@ public class IsWriting extends Event<Long> {
/** /**
* The number of milliseconds that this event will be active.<br> * The number of milliseconds that this event will be active.<br>
* Currently set to 3.5 seconds. * Currently set to 3.5 seconds.
*
* @since Envoy Common v0.2-beta
*/ */
public static final int millisecondsActive = 3500; public static final int millisecondsActive = 3500;
@ -30,7 +32,7 @@ public class IsWriting extends Event<Long> {
* @param sourceID the id of the originator * @param sourceID the id of the originator
* @param displayName the name of the originator * @param displayName the name of the originator
* @param destinationID the id of the contact the user wrote to * @param destinationID the id of the contact the user wrote to
* @since Envoy Client v0.2-beta * @since Envoy Common v0.2-beta
*/ */
public IsWriting(Long sourceID, long destinationID, String displayName) { public IsWriting(Long sourceID, long destinationID, String displayName) {
super(sourceID); super(sourceID);
@ -40,7 +42,7 @@ public class IsWriting extends Event<Long> {
/** /**
* @return the id of the contact in whose chat the user wrote something * @return the id of the contact in whose chat the user wrote something
* @since Envoy Client v0.2-beta * @since Envoy Common v0.2-beta
*/ */
public long getDestinationID() { return destinationID; } public long getDestinationID() { return destinationID; }
@ -49,5 +51,4 @@ public class IsWriting extends Event<Long> {
* @since Envoy Common v0.2-beta * @since Envoy Common v0.2-beta
*/ */
public String getDisplayName() { return displayName; } public String getDisplayName() { return displayName; }
} }