Switch Systems and Weapons Function keys and silence style complaint …

…from IDE re:String empty check
MegaMek · Aug 5, 2024 · 9aeb5f4 · 9aeb5f4
1 parent 4eebb0f
commit 9aeb5f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/ChatterBox.java b/megamek/src/megamek/client/ui/swing/ChatterBox.java
@@ -142,7 +142,7 @@ public void focusGained(FocusEvent e) {
 
             @Override
             public void focusLost(FocusEvent e) {
-                if (inputField.getText().equals("")) {
+                if (inputField.getText().isEmpty()) {
                     inputField.setText(chatPlaceholder);
                 }
             }
@@ -156,7 +156,7 @@ public void focusLost(FocusEvent e) {
         playerChatSplit = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true,
                 scrPlayers, new JScrollPane(chatArea));
         playerChatSplit.setResizeWeight(0.01);
-        
+
         JPanel subPanel = new JPanel(new BorderLayout());
         subPanel.setPreferredSize(new Dimension(284, 80));
         subPanel.setMinimumSize(new Dimension(284, 80));

diff --git a/megamek/src/megamek/client/ui/swing/util/KeyCommandBind.java b/megamek/src/megamek/client/ui/swing/util/KeyCommandBind.java
@@ -82,8 +82,8 @@ public enum KeyCommandBind {
     UD_GENERAL("udGeneral", VK_F1),
     UD_PILOT("udPilot", VK_F2),
     UD_ARMOR("udArmor", VK_F3),
-    UD_SYSTEMS("udSystems", VK_F4),
-    UD_WEAPONS("udWeapons", VK_F5),
+    UD_WEAPONS("udWeapons", VK_F4),
+    UD_SYSTEMS("udSystems", VK_F5),
     UD_EXTRAS("udExtras", VK_F6),
     /** Toggles between Jumping and Walk/Run, also acts as a reset when a unit cannot jump */
     TOGGLE_MOVEMODE("toggleJump", VK_J),