From 506e744fbd4cbab2b282a135b6993f279b58fef5 Mon Sep 17 00:00:00 2001 From: arthur Date: Fri, 13 Nov 2020 23:00:43 +0300 Subject: [PATCH] SPARK-1469: Code cleanup: Fix probable bugs: Remove unused assignment and redundant initializers --- .../org/jivesoftware/spark/ButtonFactory.java | 20 ++--- .../spark/component/JiveSortableTable.java | 2 +- .../jivesoftware/spark/component/Table.java | 2 +- .../spark/component/tabbedPane/SparkTab.java | 4 +- .../component/tabbedPane/SparkTabbedPane.java | 2 +- .../spark/ui/BroadcastHistoryFrame.java | 20 ++--- .../spark/ui/ContactInfoWindow.java | 10 +-- .../jivesoftware/spark/ui/RosterDialog.java | 37 ++++---- .../ui/conferences/AnswerFormDialog.java | 2 +- .../spark/ui/conferences/DataFormDialog.java | 3 +- .../ui/conferences/InvitationDialog.java | 4 +- .../jivesoftware/spark/uri/UriManager.java | 88 +++++++++---------- .../org/jivesoftware/spark/util/Base64.java | 2 +- .../sparkimpl/plugin/alerts/SparkToaster.java | 2 +- .../sparkimpl/plugin/emoticons/Emoticon.java | 2 +- .../plugin/gateways/GatewayTabItem.java | 2 +- .../plugin/idle/linux/LinuxIdleTime.java | 13 +-- .../plugin/privacy/PrivacyManager.java | 2 +- .../plugin/privacy/list/SparkPrivacyList.java | 6 +- .../plugin/transcripts/HistoryTranscript.java | 6 +- .../sparkimpl/profile/VCardManager.java | 4 +- .../updater/EasyX509TrustManager.java | 2 +- .../fastpath/internal/FormUtils.java | 2 +- .../fastpath/internal/WorkgroupDataForm.java | 11 +-- .../fastpath/workspace/Workpane.java | 9 +- .../workspace/invite/WorkgroupRosterTree.java | 2 +- .../workspace/panes/AgentConversations.java | 10 +-- .../workspace/panes/CurrentActivity.java | 7 +- .../workspace/panes/InvitationPane.java | 2 +- .../workspace/panes/UserInvitationPane.java | 2 +- .../fastpath/workspace/search/ChatSearch.java | 2 +- .../fileupload/SparkFileUploadPlugin.java | 1 - .../spark/plugin/ofmeet/SparkMeetPlugin.java | 3 +- .../spark/roar/gui/SparkToaster.java | 2 +- 34 files changed, 118 insertions(+), 170 deletions(-) diff --git a/core/src/main/java/org/jivesoftware/spark/ButtonFactory.java b/core/src/main/java/org/jivesoftware/spark/ButtonFactory.java index 083199c7..d028570b 100644 --- a/core/src/main/java/org/jivesoftware/spark/ButtonFactory.java +++ b/core/src/main/java/org/jivesoftware/spark/ButtonFactory.java @@ -59,17 +59,15 @@ public class ButtonFactory { return new RolloverButton(SparkRes.getImageIcon(SparkRes.BUZZ_IMAGE)); } - public RolloverButton createEmoticonButton() { - final EmoticonManager emoticonManager = EmoticonManager.getInstance(); - final String activeEmoticonSetName = emoticonManager.getActiveEmoticonSetName(); - final Emoticon smileEmoticon = emoticonManager.getEmoticon(activeEmoticonSetName, ":)"); - Emoticon firstEmoticon=(smileEmoticon == null) ? firstEmoticon=emoticonManager.getFirstEmotion(activeEmoticonSetName) : smileEmoticon; - URL emotionURL = emoticonManager.getEmoticonURL(firstEmoticon); - ImageIcon icon = new ImageIcon(emotionURL); - firstEmoticon=null; - return new RolloverButton(icon); - - } + public RolloverButton createEmoticonButton() { + final EmoticonManager emoticonManager = EmoticonManager.getInstance(); + final String activeEmoticonSetName = emoticonManager.getActiveEmoticonSetName(); + final Emoticon smileEmoticon = emoticonManager.getEmoticon(activeEmoticonSetName, ":)"); + Emoticon firstEmoticon = (smileEmoticon == null) ? emoticonManager.getFirstEmotion(activeEmoticonSetName) : smileEmoticon; + URL emotionURL = emoticonManager.getEmoticonURL(firstEmoticon); + ImageIcon icon = new ImageIcon(emotionURL); + return new RolloverButton(icon); + } public JLabel createDivider() { return new JLabel(SparkRes.getImageIcon("DIVIDER_IMAGE")); 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 203ea501..456dded8 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/JiveSortableTable.java +++ b/core/src/main/java/org/jivesoftware/spark/component/JiveSortableTable.java @@ -247,7 +247,7 @@ public abstract class JiveSortableTable extends Table { private static final long serialVersionUID = 8670248883432881619L; Border unselectedBorder; Border selectedBorder; - boolean isBordered = true; + boolean isBordered; /** * JLabelConstructor to build ui. 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 1356f273..bdc36f0e 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/Table.java +++ b/core/src/main/java/org/jivesoftware/spark/component/Table.java @@ -276,7 +276,7 @@ public abstract class Table extends JXTable { private static final long serialVersionUID = 4433780600297455731L; Border unselectedBorder; Border selectedBorder; - boolean isBordered = true; + boolean isBordered; /** * JLabelConstructor to build ui. diff --git a/core/src/main/java/org/jivesoftware/spark/component/tabbedPane/SparkTab.java b/core/src/main/java/org/jivesoftware/spark/component/tabbedPane/SparkTab.java index 3255a830..4b82e922 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/tabbedPane/SparkTab.java +++ b/core/src/main/java/org/jivesoftware/spark/component/tabbedPane/SparkTab.java @@ -26,8 +26,8 @@ import javax.swing.JPanel; public class SparkTab extends JPanel { private static final long serialVersionUID = 2027267184472260195L; - private SparkTabbedPane pane = null; - private Component component = null; + private SparkTabbedPane pane; + private Component component; public SparkTab(SparkTabbedPane pane, Component comp) { diff --git a/core/src/main/java/org/jivesoftware/spark/component/tabbedPane/SparkTabbedPane.java b/core/src/main/java/org/jivesoftware/spark/component/tabbedPane/SparkTabbedPane.java index 75bb12ea..b2d8b09e 100644 --- a/core/src/main/java/org/jivesoftware/spark/component/tabbedPane/SparkTabbedPane.java +++ b/core/src/main/java/org/jivesoftware/spark/component/tabbedPane/SparkTabbedPane.java @@ -42,7 +42,7 @@ public class SparkTabbedPane extends JPanel { private static final long serialVersionUID = -9007068462231539973L; private static final String NAME = "SparkTabbedPane"; private List listeners = new ArrayList<>(); - private JTabbedPane pane = null; + private JTabbedPane pane; private Icon closeInactiveButtonIcon; private Icon closeActiveButtonIcon; private boolean closeEnabled = false; diff --git a/core/src/main/java/org/jivesoftware/spark/ui/BroadcastHistoryFrame.java b/core/src/main/java/org/jivesoftware/spark/ui/BroadcastHistoryFrame.java index ab7df56e..9ce9afad 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/BroadcastHistoryFrame.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/BroadcastHistoryFrame.java @@ -40,24 +40,20 @@ public class BroadcastHistoryFrame extends javax.swing.JFrame { BroadcastHistoryArea.setWrapStyleWord(true); initComponents(); } - + public void readFromFile(String date) throws FileNotFoundException, IOException { //String fileName = Spark.getSparkUserHome()+File.separator+"broadcast_history."+date+".txt"; - String fileLocation=Spark.getSparkUserHome()+File.separator+"user"+File.separator+SparkManager.getSessionManager().getUsername()+"@"+SparkManager.getSessionManager().getServerAddress()+File.separator+"transcripts"+File.separator+"broadcast_history."+date+".txt"; + String fileLocation = Spark.getSparkUserHome() + File.separator + "user" + File.separator + SparkManager.getSessionManager().getUsername() + "@" + SparkManager.getSessionManager().getServerAddress() + File.separator + "transcripts" + File.separator + "broadcast_history." + date + ".txt"; File myfile = new File(fileLocation); FileInputStream fis = new FileInputStream(myfile); - - + BufferedReader br = new BufferedReader(new InputStreamReader(fis)); - - String line = null; - + + String line; while ((line = br.readLine()) != null) { - BroadcastHistoryArea.append(line+"\n"); - } - - br.close(); - + BroadcastHistoryArea.append(line + "\n"); + } + br.close(); } private void initComponents() { diff --git a/core/src/main/java/org/jivesoftware/spark/ui/ContactInfoWindow.java b/core/src/main/java/org/jivesoftware/spark/ui/ContactInfoWindow.java index 2c8d5b5f..e6d1b4db 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/ContactInfoWindow.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/ContactInfoWindow.java @@ -239,14 +239,8 @@ public class ContactInfoWindow extends JPanel { //If user is offline or away, try to see last activity try { - Jid client = null; - if (!status.equals(Res.getString("offline"))) { - //If user is away (not offline), last activity request is sent to client - client = contactItem.getPresence().getFrom(); - } else { - client = contactItem.getJid(); - } - + //If user is away (not offline), last activity request is sent to client + Jid client = status.equals(Res.getString("offline")) ? contactItem.getJid() : contactItem.getPresence().getFrom(); LastActivity activity = LastActivityManager.getInstanceFor( SparkManager.getConnection() ).getLastActivity(client); long idleTime = (activity.getIdleTime() * 1000); 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 39c782a9..ba363748 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/RosterDialog.java @@ -660,28 +660,25 @@ public class RosterDialog implements ActionListener { nicknameField.setText(nickname); } - ContactGroup contactGroup = contactList.getContactGroup(group); - boolean isSharedGroup = contactGroup != null - && contactGroup.isSharedGroup(); + ContactGroup contactGroup = contactList.getContactGroup(group); + boolean isSharedGroup = contactGroup != null && contactGroup.isSharedGroup(); - if (isSharedGroup) { - errorMessage = Res - .getString("message.cannot.add.contact.to.shared.group"); - } else if (!ModelUtil.hasLength(contact)) { - errorMessage = Res.getString("message.specify.contact.jid"); - } else if (!XmppStringUtils.parseBareJid(contact).contains("@")) { - errorMessage = Res.getString("message.invalid.jid.error"); - } else if (!ModelUtil.hasLength(group)) { - errorMessage = Res.getString("message.specify.group"); - } else if (ModelUtil.hasLength(contact) && ModelUtil.hasLength(group) - && !isSharedGroup) { - addEntry(); - dialog.setVisible(false); - } else { + if (isSharedGroup) { + errorMessage = Res.getString("message.cannot.add.contact.to.shared.group"); + } else if (!ModelUtil.hasLength(contact)) { + errorMessage = Res.getString("message.specify.contact.jid"); + } else if (!XmppStringUtils.parseBareJid(contact).contains("@")) { + errorMessage = Res.getString("message.invalid.jid.error"); + } else if (!ModelUtil.hasLength(group)) { + errorMessage = Res.getString("message.specify.group"); + } - JOptionPane.showMessageDialog(dialog, errorMessage, - Res.getString("title.error"), JOptionPane.ERROR_MESSAGE); - } + if (ModelUtil.hasLength(contact) && ModelUtil.hasLength(group) && !isSharedGroup) { + addEntry(); + dialog.setVisible(false); + } else { + JOptionPane.showMessageDialog(dialog, errorMessage,Res.getString("title.error"), JOptionPane.ERROR_MESSAGE); + } } static class AccountItem extends JPanel { diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/AnswerFormDialog.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/AnswerFormDialog.java index 13b7e793..9d04c342 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/AnswerFormDialog.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/AnswerFormDialog.java @@ -50,7 +50,7 @@ import org.jivesoftware.spark.util.ResourceUtils; public class AnswerFormDialog { private static final long serialVersionUID = 3637412110943006392L; - private JDialog dialog = null; + private JDialog dialog; private JPanel centerpanel; HashMap _map = new HashMap<>(); diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/DataFormDialog.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/DataFormDialog.java index 1d7a82d2..cbf467a7 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/DataFormDialog.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/DataFormDialog.java @@ -65,8 +65,7 @@ public class DataFormDialog extends JPanel { private static final long serialVersionUID = -1536217028590811636L; private final Map valueMap = new HashMap<>(); private int row = 0; - JDialog dialog = null; - + JDialog dialog; public DataFormDialog(JFrame parent, final MultiUserChat chat, final Form submitForm) { dialog = new JDialog(parent, true); diff --git a/core/src/main/java/org/jivesoftware/spark/ui/conferences/InvitationDialog.java b/core/src/main/java/org/jivesoftware/spark/ui/conferences/InvitationDialog.java index a392aa21..d6eea97d 100644 --- a/core/src/main/java/org/jivesoftware/spark/ui/conferences/InvitationDialog.java +++ b/core/src/main/java/org/jivesoftware/spark/ui/conferences/InvitationDialog.java @@ -81,7 +81,7 @@ final class InvitationDialog extends JPanel { private JDialog dlg; public InvitationDialog(boolean adhoc) { - JComponent roomsField = new JTextField(); + JComponent roomsField; if (adhoc) { roomsField = new JTextField(); textRoomsField = (JTextField) roomsField; @@ -91,7 +91,7 @@ final class InvitationDialog extends JPanel { comboRoomsField.setEditable(true); comboRoomsField.addActionListener( e -> { // get selected bookmark and persist it: - BookmarkedConference bookmarkedConf = null; + BookmarkedConference bookmarkedConf; Object bookmarkedConfItem = comboRoomsField.getSelectedItem(); if (bookmarkedConfItem instanceof ConferenceItem) { bookmarkedConf = ((ConferenceItem) bookmarkedConfItem).getBookmarkedConf(); diff --git a/core/src/main/java/org/jivesoftware/spark/uri/UriManager.java b/core/src/main/java/org/jivesoftware/spark/uri/UriManager.java index c03d82bd..974edb0d 100644 --- a/core/src/main/java/org/jivesoftware/spark/uri/UriManager.java +++ b/core/src/main/java/org/jivesoftware/spark/uri/UriManager.java @@ -159,57 +159,53 @@ public class UriManager { * @throws Exception */ public void handleRoster(URI uri) throws Exception { - // xmpp:romeo@montague.net?roster - // xmpp:romeo@montague.net?roster;name=Romeo%20Montague - // xmpp:romeo@montague.net?roster;group=Friends - // xmpp:romeo@montague.net?roster;name=Romeo%20Montague;group=Friends - BareJid jid; - try { - jid = JidCreate.bareFrom(retrieveJID(uri)); - } catch (XmppStringprepException e) { - throw new IllegalStateException(e); - } + // xmpp:romeo@montague.net?roster + // xmpp:romeo@montague.net?roster;name=Romeo%20Montague + // xmpp:romeo@montague.net?roster;group=Friends + // xmpp:romeo@montague.net?roster;name=Romeo%20Montague;group=Friends + BareJid jid; + try { + jid = JidCreate.bareFrom(retrieveJID(uri)); + } catch (XmppStringprepException e) { + throw new IllegalStateException(e); + } - String name = ""; - String query = uri.getQuery(); - if (query.contains("name=")) { - StringBuilder buf = new StringBuilder(); - int x = query.indexOf("name=") + 5; - while (x < query.length() && query.charAt(x) != ';') { - buf.append(query.charAt(x)); - x++; - } - } - String group = ""; - if (query.contains("group=")) { - StringBuilder buf = new StringBuilder(); - int x = query.indexOf("group=") + 6; - while (x < query.length() && query.charAt(x) != ';') { - buf.append(query.charAt(x)); - x++; - } - } + String name = ""; + String query = uri.getQuery(); + if (query.contains("name=")) { + StringBuilder buf = new StringBuilder(); + int x = query.indexOf("name=") + 5; + while (x < query.length() && query.charAt(x) != ';') { + buf.append(query.charAt(x)); + x++; + } + } + String group = ""; + if (query.contains("group=")) { + StringBuilder buf = new StringBuilder(); + int x = query.indexOf("group=") + 6; + while (x < query.length() && query.charAt(x) != ';') { + buf.append(query.charAt(x)); + x++; + } + } - Roster roster = Roster.getInstanceFor( SparkManager.getConnection() ); - RosterEntry userEntry = roster.getEntry(jid); + Roster roster = Roster.getInstanceFor(SparkManager.getConnection()); + RosterEntry userEntry = roster.getEntry(jid); - roster.createEntry(jid, name, new String[] { group }); + roster.createEntry(jid, name, new String[]{group}); - RosterGroup rosterGroup = roster.getGroup(group); - if (rosterGroup == null) { - rosterGroup = roster.createGroup(group); - } - - if (userEntry == null) { - roster.createEntry(jid, name, new String[] { group }); - userEntry = roster.getEntry(jid); - } else { - userEntry.setName(name); - rosterGroup.addEntry(userEntry); - } - - userEntry = roster.getEntry(jid); + RosterGroup rosterGroup = roster.getGroup(group); + if (rosterGroup == null) { + rosterGroup = roster.createGroup(group); + } + if (userEntry == null) { + roster.createEntry(jid, name, new String[]{group}); + } else { + userEntry.setName(name); + rosterGroup.addEntry(userEntry); + } } /** diff --git a/core/src/main/java/org/jivesoftware/spark/util/Base64.java b/core/src/main/java/org/jivesoftware/spark/util/Base64.java index d66c7eca..3c815692 100644 --- a/core/src/main/java/org/jivesoftware/spark/util/Base64.java +++ b/core/src/main/java/org/jivesoftware/spark/util/Base64.java @@ -758,7 +758,7 @@ public class Base64 { java.io.ByteArrayInputStream bais = null; java.io.ObjectInputStream ois = null; - Object obj = null; + Object obj; try { bais = new java.io.ByteArrayInputStream(objBytes); 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 67d5fc5e..4a77bdf5 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 @@ -127,7 +127,7 @@ public class SparkToaster { // Flag that indicate if use alwaysOnTop or not. // method always on top start only SINCE JDK 5 ! - boolean useAlwaysOnTop = true; + boolean useAlwaysOnTop; private String title; diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/emoticons/Emoticon.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/emoticons/Emoticon.java index 64e330bf..2f2b240b 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/emoticons/Emoticon.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/emoticons/Emoticon.java @@ -29,7 +29,7 @@ public class Emoticon { private String imageName; private String emoticonName; private File emoticonDirectory; - private List equivalants = new ArrayList<>(); + private List equivalants; /** diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayTabItem.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayTabItem.java index 6d602db1..f18711b6 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayTabItem.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayTabItem.java @@ -50,7 +50,7 @@ public class GatewayTabItem extends CollapsiblePane implements GatewayItem { private RolloverButton _signInOut = new RolloverButton(); private RolloverButton _registerButton = new RolloverButton(); private JCheckBox _autoJoin = new JCheckBox(); - private boolean _transportRegistered = false; + private boolean _transportRegistered; private RolloverButton _autoJoinButton = new RolloverButton(); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/linux/LinuxIdleTime.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/linux/LinuxIdleTime.java index 79e36631..42494496 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/linux/LinuxIdleTime.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/linux/LinuxIdleTime.java @@ -46,13 +46,13 @@ public class LinuxIdleTime implements IdleTime { @Override public long getIdleTimeMillis() { - X11.Window win = null; + X11.Window win; Xss.XScreenSaverInfo info = null; X11.Display dpy = null; final X11 x11 = X11.INSTANCE; final Xss xss = Xss.INSTANCE; - long idlemillis = 0L; + long idlemillis; try { dpy = x11.XOpenDisplay(null); win = x11.XDefaultRootWindow(dpy); @@ -61,13 +61,8 @@ public class LinuxIdleTime implements IdleTime { idlemillis = info.idle.longValue(); } finally { - if (info != null) - x11.XFree(info.getPointer()); - info = null; - - if (dpy != null) - x11.XCloseDisplay(dpy); - dpy = null; + if (info != null) x11.XFree(info.getPointer()); + if (dpy != null) x11.XCloseDisplay(dpy); } return idlemillis; } diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/privacy/PrivacyManager.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/privacy/PrivacyManager.java index e8f8a62b..2d53e8be 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/privacy/PrivacyManager.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/privacy/PrivacyManager.java @@ -54,7 +54,7 @@ public class PrivacyManager { private PrivacyListManager privacyManager; private PrivacyPresenceHandler _presenceHandler = new PrivacyPresenceHandler(); private Set _listListeners = new HashSet<>(); - private boolean _active = false; + private boolean _active; private SparkPrivacyList previousActiveList; /** diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/privacy/list/SparkPrivacyList.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/privacy/list/SparkPrivacyList.java index f4f33cf8..f8efb638 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/privacy/list/SparkPrivacyList.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/privacy/list/SparkPrivacyList.java @@ -32,9 +32,9 @@ public class SparkPrivacyList { /** * List name will be used to identify PrivacyList */ - private String _listName = ""; - private boolean _isActive = false; - private boolean _isDefault = false; + private String _listName; + private boolean _isActive; + private boolean _isDefault; private List _privacyItems = new LinkedList<>(); private PrivacyList _myPrivacyList; private final Set _listeners = new HashSet<>(); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/transcripts/HistoryTranscript.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/transcripts/HistoryTranscript.java index fa069f1f..e34ad57a 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/transcripts/HistoryTranscript.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/transcripts/HistoryTranscript.java @@ -63,8 +63,8 @@ public class HistoryTranscript extends SwingWorker { private JButton pageLeft = new JButton("<"); private JButton pageRight = new JButton(">"); private BareJid jid = null; - private SimpleDateFormat notificationDateFormatter = null; - private SimpleDateFormat messageDateFormatter = null; + private SimpleDateFormat notificationDateFormatter; + private SimpleDateFormat messageDateFormatter; private final AtomicBoolean isInitialized = new AtomicBoolean(false); private LocalPreferences pref = SettingsManager.getLocalPreferences(); @@ -400,7 +400,7 @@ public class HistoryTranscript extends SwingWorker { cal.setTime(oldDate); Date newDate; - ChatTranscript history = new ChatTranscript(); + ChatTranscript history; boolean handled = true; for(int i = startValue; i != endValue; i += iteratorValue){ diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardManager.java b/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardManager.java index b1924eab..b3a0d9b2 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardManager.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardManager.java @@ -72,8 +72,8 @@ import java.util.concurrent.LinkedBlockingQueue; public class VCardManager { private VCard personalVCard; - private transient byte[] personalVCardAvatar = null; // lazy loaded cache of avatar binary data. - private transient String personalVCardHash = null; // lazy loaded cache of avatar hash. + private transient byte[] personalVCardAvatar; // lazy loaded cache of avatar binary data. + private transient String personalVCardHash; // lazy loaded cache of avatar hash. private Map vcards = Collections.synchronizedMap( new HashMap<>()); diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/updater/EasyX509TrustManager.java b/core/src/main/java/org/jivesoftware/sparkimpl/updater/EasyX509TrustManager.java index 35c9d7f5..ca6180cf 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/updater/EasyX509TrustManager.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/updater/EasyX509TrustManager.java @@ -50,7 +50,7 @@ import java.security.cert.X509Certificate; */ public class EasyX509TrustManager implements X509TrustManager { - private X509TrustManager standardTrustManager = null; + private X509TrustManager standardTrustManager; /** * Log object for this class. diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/FormUtils.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/FormUtils.java index 6140db40..d94ef2d8 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/FormUtils.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/FormUtils.java @@ -133,7 +133,7 @@ final public class FormUtils { public static String getPushedURL(String body) { - String urlToPush = null; + String urlToPush; int index = body.indexOf("]"); urlToPush = body.substring(index + 1); int index2 = urlToPush.indexOf("http://"); diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupDataForm.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupDataForm.java index e723c10c..777e8a66 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupDataForm.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupDataForm.java @@ -52,7 +52,7 @@ public class WorkgroupDataForm extends JPanel { private final Map valueMap = new HashMap(); private int row = 5; private Form searchForm; - private Map presetVariables = new HashMap(); + private Map presetVariables; private List requiredList = new ArrayList(); private EnterListener listener; @@ -173,13 +173,8 @@ public class WorkgroupDataForm extends JPanel { } else if (o instanceof JComboBox) { Object v = ((JComboBox)o).getSelectedItem(); - String value = ""; - if (v instanceof FormField.Option) { - value = ((FormField.Option)v).getValue(); - } - else { - value = (String)v; - } + String value = (v instanceof FormField.Option) ? ((FormField.Option) v).getValue() : (String) v; + List list = new ArrayList(); list.add(value); if (list.size() > 0) { 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 b153478d..787d276f 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 @@ -387,7 +387,7 @@ public class Workpane { room.getSplitPane().setRightComponent(tabbedPane); - Form form = null; + Form form; try { form = FastpathPlugin.getWorkgroup().getWorkgroupForm(); } @@ -801,13 +801,6 @@ public class Workpane { try { if (FastpathPlugin.getAgentSession().isOnline()) { - Presence.Mode mode = presence.getMode(); - if (status == null) { - status = ""; - } - if (mode == null) { - mode = Presence.Mode.available; - } FastpathPlugin.getAgentSession().setStatus(presence.getMode(), status); } } diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java index 1f3c2ab7..e2f03ac9 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java @@ -52,7 +52,7 @@ public final class WorkgroupRosterTree extends JPanel { private final JiveTreeNode rootNode = new JiveTreeNode(FpRes.getString("title.contact.list")); private final Tree rosterTree; private final Map addressMap = new HashMap<>(); - private boolean showUnavailableAgents = true; + private boolean showUnavailableAgents; private final List workgroupList; private Collection exclusionList; diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java index 84e67267..e01fdcb1 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java @@ -188,11 +188,6 @@ public final class AgentConversations extends JPanel implements ChangeListener { EntityBareJid agentJID = presence.getFrom().asEntityBareJidOrThrow(); AgentStatus agentStatus = presence.getExtension("agent-status", "http://jabber.org/protocol/workgroup"); - String status = presence.getStatus(); - if (status == null) { - status = "Available"; - } - if (agentStatus != null) { List list = agentStatus.getCurrentChats(); @@ -224,12 +219,9 @@ public final class AgentConversations extends JPanel implements ChangeListener { } calculateNumberOfChats(agentRoster); } - - }); } }; - agentWorker.start(); } } @@ -311,7 +303,7 @@ public final class AgentConversations extends JPanel implements ChangeListener { if (muc.isJoined()) { // Try and remove myself as an owner if I am one. - Collection owners = null; + Collection owners; try { owners = muc.getOwners(); } diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java index 2baf8775..3eaee4be 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java @@ -172,11 +172,6 @@ public final class CurrentActivity extends JPanel { BareJid agentJID = presence.getFrom().asBareJid(); AgentStatus agentStatus = presence.getExtension("agent-status", "http://jabber.org/protocol/workgroup"); - String status = presence.getStatus(); - if (status == null) { - status = "Available"; - } - if (agentStatus != null) { List list = agentStatus.getCurrentChats(); @@ -261,7 +256,7 @@ public final class CurrentActivity extends JPanel { if (muc.isJoined()) { // Try and remove myself as an owner if I am one. - Collection owners = null; + Collection owners; try { owners = muc.getOwners(); } diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java index 86c6e670..23f7bdce 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java @@ -253,7 +253,7 @@ public class InvitationPane { private void removeOwner(MultiUserChat muc) { if (muc.isJoined()) { // Try and remove myself as an owner if I am one. - Collection owners = null; + Collection owners; try { owners = muc.getOwners(); } diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/UserInvitationPane.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/UserInvitationPane.java index b8712b95..7c18b950 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/UserInvitationPane.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/UserInvitationPane.java @@ -316,7 +316,7 @@ public class UserInvitationPane { private void removeOwner(MultiUserChat muc) { if (muc.isJoined()) { // Try and remove myself as an owner if I am one. - Collection owners = null; + Collection owners; try { owners = muc.getOwners(); } diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/search/ChatSearch.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/search/ChatSearch.java index 167fd49b..055ae70f 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/search/ChatSearch.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/search/ChatSearch.java @@ -90,7 +90,7 @@ public class ChatSearch implements Searchable { List workgroupStrings = JidUtil.toStringList(workgroups); filledForm.setAnswer("workgroups", workgroupStrings); - ReportedData reportedData = null; + ReportedData reportedData; try { reportedData = agentSession.searchTranscripts(filledForm); for ( final ReportedData.Row row : reportedData.getRows() ) { diff --git a/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/SparkFileUploadPlugin.java b/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/SparkFileUploadPlugin.java index d2c42599..12a7e337 100644 --- a/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/SparkFileUploadPlugin.java +++ b/plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/SparkFileUploadPlugin.java @@ -110,7 +110,6 @@ public class SparkFileUploadPlugin implements Plugin, ChatRoomListener, GlobalMe { ChatRoomDecorator decorator = decorators.remove(roomId); decorator.finished(); - decorator = null; } } diff --git a/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/SparkMeetPlugin.java b/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/SparkMeetPlugin.java index f486005f..3d565f02 100644 --- a/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/SparkMeetPlugin.java +++ b/plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/SparkMeetPlugin.java @@ -265,7 +265,6 @@ public class SparkMeetPlugin implements Plugin, ChatRoomListener, GlobalMessageL { ChatRoomDecorator decorator = decorators.remove(roomId); decorator.finished(); - decorator = null; } if (electronThread != null) @@ -410,7 +409,7 @@ public class SparkMeetPlugin implements Plugin, ChatRoomListener, GlobalMessageL { BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath)); byte[] bytesIn = new byte[4096]; - int read = 0; + int read; while ((read = zipIn.read(bytesIn)) != -1) { 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 66f9210b..e5067a31 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 @@ -106,7 +106,7 @@ public class SparkToaster { // Flag that indicate if use alwaysOnTop or not. // method always on top start only SINCE JDK 5 ! - boolean useAlwaysOnTop = true; + boolean useAlwaysOnTop; private String title;