From 6728f5b99066bbda20369ffeb744c532bf38fd20 Mon Sep 17 00:00:00 2001 From: retgal Date: Sat, 27 Jul 2024 20:56:52 +0200 Subject: [PATCH] Simplifications --- src/main/java/mpo/dayon/assistant/gui/AssistantFrame.java | 2 -- .../java/mpo/dayon/common/network/message/FileMetaData.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/mpo/dayon/assistant/gui/AssistantFrame.java b/src/main/java/mpo/dayon/assistant/gui/AssistantFrame.java index 0256772f..daf71f65 100644 --- a/src/main/java/mpo/dayon/assistant/gui/AssistantFrame.java +++ b/src/main/java/mpo/dayon/assistant/gui/AssistantFrame.java @@ -274,10 +274,8 @@ private JTabbedPane createTabbedPane() { tabbedPane.addTab(translate("connection"), connectionPanel); tabbedPane.addTab(translate("session"), sessionPanel); tabbedPane.addTab(translate("settings"), settingsPanel); - tabbedPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); // must not be focusable or the key listener won't work tabbedPane.setFocusable(false); - tabbedPane.setBorder(null); return tabbedPane; } diff --git a/src/main/java/mpo/dayon/common/network/message/FileMetaData.java b/src/main/java/mpo/dayon/common/network/message/FileMetaData.java index 4082da33..94a30699 100644 --- a/src/main/java/mpo/dayon/common/network/message/FileMetaData.java +++ b/src/main/java/mpo/dayon/common/network/message/FileMetaData.java @@ -34,7 +34,7 @@ public boolean equals(Object o) { @Override public int hashCode() { int result = fileName != null ? fileName.hashCode() : 0; - result = 31 * result + (int) (fileSize ^ (fileSize >>> 32)); + result = 31 * result + Long.hashCode(fileSize); return result; } }