From 4359d04f6cf464b89aea76734769360648531ecc Mon Sep 17 00:00:00 2001 From: arthur Date: Tue, 3 Nov 2020 22:11:19 +0300 Subject: [PATCH] SPARK-1469: Code cleanup: make nested classes static if applicable. --- .../main/java/org/jivesoftware/LoginDialog.java | 4 ++-- .../spark/component/CheckRenderer.java | 2 +- .../jivesoftware/spark/component/CheckTree.java | 4 ++-- .../spark/component/JContactItemField.java | 2 +- .../spark/component/JiveSortableTable.java | 12 ++++++------ .../jivesoftware/spark/component/JiveTable.java | 14 +++++++------- .../org/jivesoftware/spark/component/Table.java | 12 ++++++------ .../jivesoftware/spark/component/TitlePanel.java | 2 +- .../java/org/jivesoftware/spark/ui/ChatRoom.java | 2 +- .../spark/ui/ChatRoomTransferHandler.java | 4 ++-- .../spark/ui/ContactGroupTransferHandler.java | 2 +- .../org/jivesoftware/spark/ui/MessageEntry.java | 6 +++--- .../org/jivesoftware/spark/ui/RosterDialog.java | 2 +- .../ui/conferences/ConferenceRoomBrowser.java | 2 +- .../ui/conferences/GroupChatParticipantList.java | 2 +- .../login/MutualAuthenticationSettingsPanel.java | 2 +- .../jivesoftware/spark/ui/themes/ThemePanel.java | 4 ++-- .../sparkimpl/certificates/PemHelper.java | 2 +- .../sparkimpl/plugin/alerts/SparkToaster.java | 2 +- .../transfer/ui/ReceiveFileTransfer.java | 2 +- .../filetransfer/transfer/ui/SendFileTransfer.java | 2 +- .../plugin/history/ConversationHistoryPlugin.java | 2 +- .../plugin/history/FrequentContactsPlugin.java | 2 +- .../sparkimpl/plugin/idle/UserIdlePlugin.java | 2 +- .../notifications/NotificationPlugin.java | 2 +- .../preference/sounds/SoundPreference.java | 4 ++-- .../sparkimpl/profile/AvatarPanel.java | 2 +- .../sparkimpl/search/users/UserSearchResults.java | 2 +- .../jivesoftware/fastpath/workspace/Workpane.java | 2 +- .../jivesoftware/spark/roar/gui/SparkToaster.java | 2 +- .../transfersettings/TransferSettingsPanel.java | 10 +++++----- 31 files changed, 58 insertions(+), 58 deletions(-) diff --git a/core/src/main/java/org/jivesoftware/LoginDialog.java b/core/src/main/java/org/jivesoftware/LoginDialog.java index c393763a..3f6fb522 100644 --- a/core/src/main/java/org/jivesoftware/LoginDialog.java +++ b/core/src/main/java/org/jivesoftware/LoginDialog.java @@ -1402,7 +1402,7 @@ public class LoginDialog { /** * Defines the background to use with the Login panel. */ - public class LoginBackgroundPanel extends JPanel { + public static class LoginBackgroundPanel extends JPanel { private static final long serialVersionUID = -2449309600851007447L; final ImageIcon icons = Default.getImageIcon(Default.LOGIN_DIALOG_BACKGROUND_IMAGE); @@ -1430,7 +1430,7 @@ public class LoginDialog { /** * The image panel to display the Spark Logo. */ - public class ImagePanel extends JPanel { + public static class ImagePanel extends JPanel { private static final long serialVersionUID = -1778389077647562606L; private final ImageIcon icons = Default.getImageIcon(Default.MAIN_IMAGE); diff --git a/core/src/main/java/org/jivesoftware/spark/component/CheckRenderer.java b/core/src/main/java/org/jivesoftware/spark/component/CheckRenderer.java index 8ecd99d0..e3c3f022 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/CheckRenderer.java +++ b/core/src/main/java/org/jivesoftware/spark/component/CheckRenderer.java @@ -114,7 +114,7 @@ public class CheckRenderer extends JPanel implements TreeCellRenderer { /** * Represents one UI node for the checkbox node. */ - public class TreeLabel extends JLabel { + public static class TreeLabel extends JLabel { private static final long serialVersionUID = -6367572474576692556L; boolean isSelected; boolean hasFocus; diff --git a/core/src/main/java/org/jivesoftware/spark/component/CheckTree.java b/core/src/main/java/org/jivesoftware/spark/component/CheckTree.java index 3a1a2b53..d1cbd4ea 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/CheckTree.java +++ b/core/src/main/java/org/jivesoftware/spark/component/CheckTree.java @@ -58,7 +58,7 @@ public class CheckTree extends JPanel { } - class NodeSelectionListener extends MouseAdapter { + static class NodeSelectionListener extends MouseAdapter { JTree tree; NodeSelectionListener(JTree tree) { @@ -100,7 +100,7 @@ public class CheckTree extends JPanel { } - class ButtonActionListener implements ActionListener { + static class ButtonActionListener implements ActionListener { CheckNode root; JTextArea textArea; diff --git a/core/src/main/java/org/jivesoftware/spark/component/JContactItemField.java b/core/src/main/java/org/jivesoftware/spark/component/JContactItemField.java index 956bad04..5840704b 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/JContactItemField.java +++ b/core/src/main/java/org/jivesoftware/spark/component/JContactItemField.java @@ -274,7 +274,7 @@ public class JContactItemField extends JPanel { return popup; } - class PopupRenderer extends JLabel implements ListCellRenderer { + static class PopupRenderer extends JLabel implements ListCellRenderer { private static final long serialVersionUID = 239608430590852355L; /** diff --git a/core/src/main/java/org/jivesoftware/spark/component/JiveSortableTable.java b/core/src/main/java/org/jivesoftware/spark/component/JiveSortableTable.java index ee60069d..2719f974 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/JiveSortableTable.java +++ b/core/src/main/java/org/jivesoftware/spark/component/JiveSortableTable.java @@ -243,7 +243,7 @@ public abstract class JiveSortableTable extends Table { /** * A swing renderer used to display labels within a table. */ - public class JLabelRenderer extends JLabel implements TableCellRenderer { + public static class JLabelRenderer extends JLabel implements TableCellRenderer { private static final long serialVersionUID = 8670248883432881619L; Border unselectedBorder; Border selectedBorder; @@ -303,7 +303,7 @@ public abstract class JiveSortableTable extends Table { /** * A swing renderer to dispaly Textareas within a table. */ - public class TextAreaCellRenderer extends JTextArea implements TableCellRenderer { + public static class TextAreaCellRenderer extends JTextArea implements TableCellRenderer { private static final long serialVersionUID = -1704445909682732833L; /** @@ -334,7 +334,7 @@ public abstract class JiveSortableTable extends Table { /** * A swing renderer used to display Buttons within a table. */ - public class JButtonRenderer extends JButton implements TableCellRenderer { + public static class JButtonRenderer extends JButton implements TableCellRenderer { private static final long serialVersionUID = -1847536957519732935L; Border unselectedBorder; Border selectedBorder; @@ -387,7 +387,7 @@ public abstract class JiveSortableTable extends Table { } } - public class ComboBoxRenderer extends JComboBox implements TableCellRenderer { + public static class ComboBoxRenderer extends JComboBox implements TableCellRenderer { private static final long serialVersionUID = 5892858463680797611L; public ComboBoxRenderer() { @@ -416,7 +416,7 @@ public abstract class JiveSortableTable extends Table { } } - public class MyComboBoxEditor extends DefaultCellEditor { + public static class MyComboBoxEditor extends DefaultCellEditor { private static final long serialVersionUID = 1003726653998005772L; public MyComboBoxEditor(String[] items) { @@ -471,4 +471,4 @@ public abstract class JiveSortableTable extends Table { public void enterPressed() { } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/jivesoftware/spark/component/JiveTable.java b/core/src/main/java/org/jivesoftware/spark/component/JiveTable.java index ea55dacd..35de1e81 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/JiveTable.java +++ b/core/src/main/java/org/jivesoftware/spark/component/JiveTable.java @@ -41,7 +41,7 @@ public class JiveTable extends JTable { public JiveTable(String[] headers, Integer[] columnsToUseRenderer) { - tableModel = new JiveTable.JiveTableModel(headers, 0, false); + tableModel = new JiveTableModel(headers, 0, false); this.setModel(tableModel); getTableHeader().setReorderingAllowed(false); @@ -58,10 +58,10 @@ public class JiveTable extends JTable { @Override public TableCellRenderer getCellRenderer(int row, int column) { if (column == 3 || column == 4) { - return new JiveTable.JButtonRenderer(false); + return new JButtonRenderer(false); } else if (column == 1) { - return new JiveTable.JLabelRenderer(false); + return new JLabelRenderer(false); } else { return super.getCellRenderer(row, column); @@ -92,7 +92,7 @@ public class JiveTable extends JTable { return obj; } - public class JiveTableModel extends DefaultTableModel { + public static class JiveTableModel extends DefaultTableModel { private static final long serialVersionUID = -2072664365332767844L; private boolean _isEditable; @@ -118,7 +118,7 @@ public class JiveTable extends JTable { } } - class JLabelRenderer extends JLabel implements TableCellRenderer { + static class JLabelRenderer extends JLabel implements TableCellRenderer { private static final long serialVersionUID = 4387574944818048720L; Border unselectedBorder = null; Border selectedBorder = null; @@ -169,7 +169,7 @@ public class JiveTable extends JTable { } - class JButtonRenderer extends JButton implements TableCellRenderer { + static class JButtonRenderer extends JButton implements TableCellRenderer { private static final long serialVersionUID = -5287214156125954342L; Border unselectedBorder = null; @@ -226,4 +226,4 @@ public class JiveTable extends JTable { return tableModel; } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/jivesoftware/spark/component/Table.java b/core/src/main/java/org/jivesoftware/spark/component/Table.java index 9c2efc70..e50127ec 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/Table.java +++ b/core/src/main/java/org/jivesoftware/spark/component/Table.java @@ -271,7 +271,7 @@ public abstract class Table extends JXTable { /** * A swing renderer used to display labels within a table. */ - public class JLabelRenderer extends JLabel implements TableCellRenderer { + public static class JLabelRenderer extends JLabel implements TableCellRenderer { private static final long serialVersionUID = 4433780600297455731L; Border unselectedBorder; @@ -332,7 +332,7 @@ public abstract class Table extends JXTable { /** * A swing renderer to dispaly Textareas within a table. */ - public class TextAreaCellRenderer extends JTextArea implements TableCellRenderer { + public static class TextAreaCellRenderer extends JTextArea implements TableCellRenderer { private static final long serialVersionUID = -8533968851464831361L; @@ -364,7 +364,7 @@ public abstract class Table extends JXTable { /** * A swing renderer used to display Buttons within a table. */ - public class JButtonRenderer extends JButton implements TableCellRenderer { + public static class JButtonRenderer extends JButton implements TableCellRenderer { private static final long serialVersionUID = 1268514163461994738L; Border unselectedBorder; @@ -418,7 +418,7 @@ public abstract class Table extends JXTable { } } - public class ComboBoxRenderer extends JComboBox implements TableCellRenderer { + public static class ComboBoxRenderer extends JComboBox implements TableCellRenderer { private static final long serialVersionUID = -545496178928790522L; @@ -448,7 +448,7 @@ public abstract class Table extends JXTable { } } - public class MyComboBoxEditor extends DefaultCellEditor { + public static class MyComboBoxEditor extends DefaultCellEditor { private static final long serialVersionUID = 6097118754932234992L; @@ -499,4 +499,4 @@ public abstract class Table extends JXTable { public void enterPressed() { } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/jivesoftware/spark/component/TitlePanel.java b/core/src/main/java/org/jivesoftware/spark/component/TitlePanel.java index 00b7cbaa..492a32cd 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/TitlePanel.java +++ b/core/src/main/java/org/jivesoftware/spark/component/TitlePanel.java @@ -129,7 +129,7 @@ public final class TitlePanel extends JPanel { descriptionLabel.setText(desc); } - public class ImagePanel extends JPanel { + public static class ImagePanel extends JPanel { private static final long serialVersionUID = 5155908601530113727L; final ImageIcon icons = Default.getImageIcon(Default.SECONDARY_BACKGROUND_IMAGE); diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ChatRoom.java b/core/src/main/java/org/jivesoftware/spark/ui/ChatRoom.java index ffd5f12f..9c2be659 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/ChatRoom.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/ChatRoom.java @@ -1029,7 +1029,7 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener /** * Used for the top toolbar. */ - public class ChatToolBar extends JPanel { + public static class ChatToolBar extends JPanel { private static final long serialVersionUID = 5926527530611601841L; private JPanel buttonPanel; diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ChatRoomTransferHandler.java b/core/src/main/java/org/jivesoftware/spark/ui/ChatRoomTransferHandler.java index 543c3236..ed7ac91c 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/ChatRoomTransferHandler.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/ChatRoomTransferHandler.java @@ -67,7 +67,7 @@ public class ChatRoomTransferHandler extends TransferHandler { @Override public Transferable createTransferable(JComponent comp) { if (comp instanceof TranscriptWindow) { - return new TranscriptWindowTransferable((TranscriptWindow)comp); + return new TranscriptWindowTransferable((TranscriptWindow) comp); } return null; @@ -110,7 +110,7 @@ public class ChatRoomTransferHandler extends TransferHandler { return false; } - public class TranscriptWindowTransferable implements Transferable { + public static class TranscriptWindowTransferable implements Transferable { private TranscriptWindow item; diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java b/core/src/main/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java index 24d63bf5..eec17010 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java @@ -143,7 +143,7 @@ public class ContactGroupTransferHandler extends TransferHandler { return false; } - public class ContactItemTransferable implements Transferable { + public static class ContactItemTransferable implements Transferable { private ContactItem item; diff --git a/core/src/main/java/org/jivesoftware/spark/ui/MessageEntry.java b/core/src/main/java/org/jivesoftware/spark/ui/MessageEntry.java index 441e96a8..ce874ad6 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/MessageEntry.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/MessageEntry.java @@ -235,14 +235,14 @@ public class MessageEntry extends TimeStampedEntry if ( block == null ) { - block = new Block( line ); + block = new Block(line); } else if ( !block.tryAppend( line ) ) { // If this line does not belong to the block that's already being constructed, then that block is // done. Add it to the resul t, and create a new one. result.add( block ); - block = new Block( line ); + block = new Block(line); } } @@ -263,7 +263,7 @@ public class MessageEntry extends TimeStampedEntry *
  • A preformatted code block
    • * */ - class Block + static class Block { java.util.Deque lines = new ArrayDeque<>(); diff --git a/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java b/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java index fb3fd999..e0ab935e 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java @@ -684,7 +684,7 @@ public class RosterDialog implements ActionListener { } } - class AccountItem extends JPanel { + static class AccountItem extends JPanel { private static final long serialVersionUID = -7657731912529801653L; private Transport transport; diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java index 6ceed474..96c525b3 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java @@ -1031,7 +1031,7 @@ public class ConferenceRoomBrowser extends JPanel implements ActionListener, } } - private class RoomObject { + private static class RoomObject { private String roomName; private EntityBareJid roomJID; diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java index 5bca70c1..d2cd77eb 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java @@ -1176,7 +1176,7 @@ public class GroupChatParticipantList extends JPanel { * * @author Derek DeMoro */ - public class ParticipantRenderer extends JLabel implements ListCellRenderer { + public static class ParticipantRenderer extends JLabel implements ListCellRenderer { private static final long serialVersionUID = -7509947975798079141L; /** diff --git a/core/src/main/java/org/jivesoftware/spark/ui/login/MutualAuthenticationSettingsPanel.java b/core/src/main/java/org/jivesoftware/spark/ui/login/MutualAuthenticationSettingsPanel.java index 2ca1b7e9..0b11d491 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/login/MutualAuthenticationSettingsPanel.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/login/MutualAuthenticationSettingsPanel.java @@ -207,7 +207,7 @@ public class MutualAuthenticationSettingsPanel extends JPanel implements ActionL X509Certificate cert = idControll.createSelfSignedCertificate(keyPair); if (saveCertToFile.isSelected()) { - PemBuilder pemBuilder = new PemHelper().new PemBuilder(); + PemBuilder pemBuilder = new PemBuilder(); pemBuilder.add(keyPair.getPrivate()); pemBuilder.add(cert); pemBuilder.saveToPemFile(IdentityController.CERT_FILE); diff --git a/core/src/main/java/org/jivesoftware/spark/ui/themes/ThemePanel.java b/core/src/main/java/org/jivesoftware/spark/ui/themes/ThemePanel.java index a6d641df..acd88bb9 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/themes/ThemePanel.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/themes/ThemePanel.java @@ -472,7 +472,7 @@ public class ThemePanel extends JPanel } fc.setDialogTitle( "Add Emoticon Pack" ); - fc.addChoosableFileFilter( new ZipFilter() ); + fc.addChoosableFileFilter(new ZipFilter()); int returnVal = fc.showOpenDialog( this ); @@ -517,7 +517,7 @@ public class ThemePanel extends JPanel * The ZipFilter class is used by the emoticon file picker to filter out all * other files besides *.zip files. */ - private class ZipFilter extends javax.swing.filechooser.FileFilter + private static class ZipFilter extends javax.swing.filechooser.FileFilter { @Override public boolean accept( File file ) diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/certificates/PemHelper.java b/core/src/main/java/org/jivesoftware/sparkimpl/certificates/PemHelper.java index 86455c8f..bbf70b10 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/certificates/PemHelper.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/certificates/PemHelper.java @@ -136,7 +136,7 @@ public class PemHelper { * @author Paweł Ścibiorski * */ - public class PemBuilder { + public static class PemBuilder { private List buildList = new ArrayList<>(); public void add(Object object) { diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/SparkToaster.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/SparkToaster.java index 37ac9ef9..67d5fc5e 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/SparkToaster.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/SparkToaster.java @@ -642,7 +642,7 @@ public class SparkToaster { } - class TitleLabel extends JPanel { + static class TitleLabel extends JPanel { private static final long serialVersionUID = -5163519932953987400L; private JLabel label; private RolloverButton closeButton; diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java index ea7b2133..77483d47 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveFileTransfer.java @@ -592,7 +592,7 @@ public class ReceiveFileTransfer extends JPanel { } } - private class TransferButton extends JButton { + private static class TransferButton extends JButton { private static final long serialVersionUID = -9198495278243559064L; public TransferButton() { diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/SendFileTransfer.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/SendFileTransfer.java index eb7ba04b..83aaf085 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/SendFileTransfer.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/SendFileTransfer.java @@ -354,7 +354,7 @@ public class SendFileTransfer extends JPanel { } } - private class TransferButton extends JButton { + private static class TransferButton extends JButton { private static final long serialVersionUID = 8807434179541503654L; public TransferButton() { diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/history/ConversationHistoryPlugin.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/history/ConversationHistoryPlugin.java index fe087bff..c6713b2f 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/history/ConversationHistoryPlugin.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/history/ConversationHistoryPlugin.java @@ -306,7 +306,7 @@ public class ConversationHistoryPlugin implements Plugin { /** * Internal handling of a Jlabel Renderer. */ - public class InternalRenderer extends JLabel implements ListCellRenderer { + public static class InternalRenderer extends JLabel implements ListCellRenderer { private static final long serialVersionUID = 1812281106979897477L; /** diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/history/FrequentContactsPlugin.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/history/FrequentContactsPlugin.java index acb93792..4166492a 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/history/FrequentContactsPlugin.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/history/FrequentContactsPlugin.java @@ -264,7 +264,7 @@ public class FrequentContactsPlugin implements Plugin { /** * Internal handling of a JLabel Renderer. */ - public class InternalRenderer extends JLabel implements ListCellRenderer { + public static class InternalRenderer extends JLabel implements ListCellRenderer { private static final long serialVersionUID = -2925096995694392323L; /** diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/UserIdlePlugin.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/UserIdlePlugin.java index 3daa02db..95b3ea59 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/UserIdlePlugin.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/UserIdlePlugin.java @@ -184,7 +184,7 @@ public class UserIdlePlugin extends TimerTask implements Plugin { } - public class LockListener { + public static class LockListener { public void intWinLockListener() { new Thread(() -> { diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/preference/notifications/NotificationPlugin.java b/core/src/main/java/org/jivesoftware/sparkimpl/preference/notifications/NotificationPlugin.java index 373d1eb8..49a77e9f 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/preference/notifications/NotificationPlugin.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/preference/notifications/NotificationPlugin.java @@ -207,7 +207,7 @@ public class NotificationPlugin implements Plugin, StanzaListener { } } - private class ChatAction extends AbstractAction { + private static class ChatAction extends AbstractAction { private static final long serialVersionUID = 4752515615833181939L; private final BareJid jid; diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreference.java b/core/src/main/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreference.java index 98e6343b..82f4afb9 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreference.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreference.java @@ -92,7 +92,7 @@ public class SoundPreference implements Preference { public JComponent getGUI() { if (soundPanel == null) { try { - EventQueue.invokeAndWait( () -> soundPanel = new SoundPanel() ); + EventQueue.invokeAndWait( () -> soundPanel = new SoundPanel()); } catch (Exception e) { e.printStackTrace(); } @@ -189,7 +189,7 @@ public class SoundPreference implements Preference { } - private class SoundPanel extends JPanel { + private static class SoundPanel extends JPanel { private static final long serialVersionUID = 4332294589601051699L; private final JCheckBox incomingMessageBox = new JCheckBox(); private final JTextField incomingMessageSound = new JTextField(); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/profile/AvatarPanel.java b/core/src/main/java/org/jivesoftware/sparkimpl/profile/AvatarPanel.java index 7bbc2535..a9c8e242 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/profile/AvatarPanel.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/profile/AvatarPanel.java @@ -239,7 +239,7 @@ public class AvatarPanel extends JPanel implements ActionListener { worker.start(); } - public class ImageFilter implements FilenameFilter { + public static class ImageFilter implements FilenameFilter { public final String jpeg = "jpeg"; public final String jpg = "jpg"; public final String gif = "gif"; diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchResults.java b/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchResults.java index 281e2c02..f78058ac 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchResults.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/search/users/UserSearchResults.java @@ -219,7 +219,7 @@ public class UserSearchResults extends JPanel { menu.show(resultsTable, e.getX(), e.getY()); } - private final class UsersInfoTable extends Table { + private static final class UsersInfoTable extends Table { private static final long serialVersionUID = -7097826349368800291L; UsersInfoTable(String[] headers) { diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java index a102f656..daa607ce 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java @@ -795,7 +795,7 @@ public class Workpane { } - private class PresenceChangeListener implements PresenceListener { + private static class PresenceChangeListener implements PresenceListener { public void presenceChanged(Presence presence) { String status = presence.getStatus(); if (status == null) { diff --git a/plugins/roar/src/main/java/org/jivesoftware/spark/roar/gui/SparkToaster.java b/plugins/roar/src/main/java/org/jivesoftware/spark/roar/gui/SparkToaster.java index 62496888..66f9210b 100644 --- a/plugins/roar/src/main/java/org/jivesoftware/spark/roar/gui/SparkToaster.java +++ b/plugins/roar/src/main/java/org/jivesoftware/spark/roar/gui/SparkToaster.java @@ -614,7 +614,7 @@ public class SparkToaster { titleLabel.setVisible(false); } - class TitleLabel extends JPanel { + static class TitleLabel extends JPanel { private static final long serialVersionUID = -5163519932953987400L; private JLabel label; private RolloverButton closeButton; diff --git a/plugins/transferguard/src/main/java/org/jivesoftware/spark/plugins/transfersettings/TransferSettingsPanel.java b/plugins/transferguard/src/main/java/org/jivesoftware/spark/plugins/transfersettings/TransferSettingsPanel.java index ec867e96..991a69ee 100644 --- a/plugins/transferguard/src/main/java/org/jivesoftware/spark/plugins/transfersettings/TransferSettingsPanel.java +++ b/plugins/transferguard/src/main/java/org/jivesoftware/spark/plugins/transfersettings/TransferSettingsPanel.java @@ -69,7 +69,7 @@ public class TransferSettingsPanel extends JPanel { settings.setCannedRejectionMessage(pnlResponse.getCannedResponse()); } - private class BlockedTypesPanel extends JPanel { + private static class BlockedTypesPanel extends JPanel { private static final long serialVersionUID = 6152402556852606706L; private JTextArea txtBlockedTypes = new JTextArea(2, 0); @@ -92,7 +92,7 @@ public class TransferSettingsPanel extends JPanel { } } - private class BlockedPeoplePanel extends JPanel { + private static class BlockedPeoplePanel extends JPanel { private static final long serialVersionUID = -1069560705582838620L; private JTextArea txtBlockedPeople = new JTextArea(2, 0); @@ -117,7 +117,7 @@ public class TransferSettingsPanel extends JPanel { } } - private class FileSizePanel extends JPanel { + private static class FileSizePanel extends JPanel { private static final long serialVersionUID = -8457074359832858639L; private JSpinner spinMaxSize = new JSpinner(); private JCheckBox chkMaxEnabled = new JCheckBox(TGuardRes.getString("guard.settings.limitcheck")); @@ -160,7 +160,7 @@ public class TransferSettingsPanel extends JPanel { } } - private class CannedResponsePanel extends JPanel { + private static class CannedResponsePanel extends JPanel { private static final long serialVersionUID = -5992704440953686488L; private JTextArea txtMessage = new JTextArea(2, 0); @@ -181,4 +181,4 @@ public class TransferSettingsPanel extends JPanel { return txtMessage.getText().trim(); } } -} \ No newline at end of file +}