From 894478ab45df182c1e0d2f472aeafa28203c3581 Mon Sep 17 00:00:00 2001 From: arthur Date: Thu, 26 Nov 2020 22:54:05 +0300 Subject: [PATCH 1/3] SPARK-2204: Code cleanup: Fix raw using of parametrized classes --- .../fastpath/workspace/Workpane.java | 49 +++++-------------- .../workspace/assistants/CoBrowser.java | 3 +- .../workspace/assistants/RoomInformation.java | 5 +- .../fastpath/workspace/panes/ChatQueue.java | 3 +- .../workspace/panes/InvitationPane.java | 2 +- .../workspace/panes/UserInvitationPane.java | 2 +- .../fastpath/workspace/util/RequestUtils.java | 10 ++-- 7 files changed, 25 insertions(+), 49 deletions(-) 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 a050a83b9..86cd605ca 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 @@ -216,8 +216,8 @@ public class Workpane { SparkManager.getChatManager().addInvitationListener(roomInviteListener); } - public Map getMetadata(String sessionID) { - Map map = null; + public Map> getMetadata(String sessionID) { + Map> map = null; if (offerMap.get(sessionID) != null) { Offer offer = offerMap.get(sessionID); map = offer.getMetaData(); @@ -258,11 +258,10 @@ public class Workpane { } } - public void decorateRoom(ChatRoom room, Map metadata) { + public void decorateRoom(ChatRoom room, Map> metadata) { EntityBareJid roomName = room.getBareJid(); Localpart sessionID =roomName.getLocalpart(); - RequestUtils utils = new RequestUtils(metadata); addRoomInfo(sessionID, utils, room); @@ -617,8 +616,10 @@ public class Workpane { else if (message != null) { MetaData metaDataExt = message.getExtension(MetaData.ELEMENT_NAME, MetaData.NAMESPACE); if (metaDataExt != null) { - Map metadata = metaDataExt.getMetaData(); - metadata.put("sessionID", chat.getRoom().getLocalpart().toString()); + Map> metadata = metaDataExt.getMetaData(); + List values = new ArrayList<>(); + values.add(chat.getRoom().getLocalpart().toString()); + metadata.put("sessionID", values); RequestUtils utils = new RequestUtils(metadata); inviteMap.put(utils.getSessionID(), metadata); @@ -637,9 +638,11 @@ public class Workpane { * @param offer the Offer */ public void handleOfferInvite(final Offer offer) { - Map metadata = offer.getMetaData(); + Map> metadata = offer.getMetaData(); String sessionID = offer.getSessionID(); - metadata.put("sessionID", sessionID); + List values = new ArrayList<>(); + values.add(sessionID); + metadata.put("sessionID", values); RequestUtils utils = new RequestUtils(metadata); inviteMap.put(sessionID, metadata); @@ -704,36 +707,6 @@ public class Workpane { } } - private Message getMessage(String messageText, RequestUtils util, boolean transfer) { - Map metadata = new HashMap(); - metadata.put("messageText", messageText); - metadata.put("username", util.getUsername()); - metadata.put("userID", util.getUserID()); - metadata.put("transfer", Boolean.toString(transfer)); - metadata.put("question", util.getQuestion()); - metadata.put("email", util.getEmailAddress()); - metadata.put("workgroup", util.getWorkgroup()); - - if (ModelUtil.hasLength(util.getRequestLocation())) { - metadata.put("Location", util.getRequestLocation()); - } - - // Add Metadata as message extension - final MetaData data = new MetaData(metadata); - Message message = new Message(); - message.addExtension(data); - return message; - - } - - private RequestUtils getRequestUtils(String sessionID) { - Map map = getMetadata(sessionID); - if (map != null) { - return new RequestUtils(map); - } - return null; - } - private void setupQueueViewer() { FastpathPlugin.getUI().getMainPanel().addTab(FpRes.getString("tab.queue.activity"), null, queueActivity); } diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/assistants/CoBrowser.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/assistants/CoBrowser.java index 65bee1095..6f31b2e6f 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/assistants/CoBrowser.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/assistants/CoBrowser.java @@ -26,6 +26,7 @@ import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.swing.Icon; @@ -367,7 +368,7 @@ public class CoBrowser extends JPanel implements ActionListener, BrowserListener } private String getStartLocation() { - Map metadata = FastpathPlugin.getLitWorkspace().getMetadata(sessionID); + Map> metadata = FastpathPlugin.getLitWorkspace().getMetadata(sessionID); RequestUtils utils = new RequestUtils(metadata); String location = utils.getRequestLocation(); if (location == null) { diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/assistants/RoomInformation.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/assistants/RoomInformation.java index f77fa50c0..45ca36adc 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/assistants/RoomInformation.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/assistants/RoomInformation.java @@ -36,6 +36,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import javax.swing.JFrame; @@ -52,9 +53,9 @@ public class RoomInformation extends JPanel { } - public void showAllInformation(Map map) { + public void showAllInformation(Map> map) { if (map == null) { - map = new HashMap(); + map = new HashMap<>(); } LiveTitlePane titlePanel = new LiveTitlePane(FpRes.getString("title.request.information"), FastpathRes.getImageIcon(FastpathRes.FASTPATH_IMAGE_24x24)); diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/ChatQueue.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/ChatQueue.java index 9b609e4e6..f64f88b3a 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/ChatQueue.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/ChatQueue.java @@ -25,6 +25,7 @@ import java.awt.Insets; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Date; +import java.util.List; import java.util.Map; import javax.swing.JLabel; @@ -88,7 +89,7 @@ public class ChatQueue extends JPanel { return; } - Map metadata = offer.getMetaData(); + Map> metadata = offer.getMetaData(); RoomInformation roomInformation = new RoomInformation(); roomInformation.showAllInformation(metadata); roomInformation.showRoomInformation(); 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 72318903f..d85fad24f 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 @@ -65,7 +65,7 @@ import org.jxmpp.util.XmppStringUtils; public class InvitationPane { - private Map metadata = null; + private Map> metadata = null; private GroupChatRoom chatRoom; public InvitationPane(final RequestUtils request, final EntityBareJid room, final EntityBareJid inviter, String reason, final String password, final Message message) { 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 c17a58888..19678b077 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 @@ -73,7 +73,7 @@ import org.jxmpp.jid.util.JidUtil; */ public class UserInvitationPane { - private Map metadata; + private Map> metadata; private AcceptListener listener; private Offer offer; diff --git a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/util/RequestUtils.java b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/util/RequestUtils.java index eb3c6db35..d435ea228 100644 --- a/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/util/RequestUtils.java +++ b/plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/util/RequestUtils.java @@ -25,13 +25,13 @@ import org.jxmpp.jid.impl.JidCreate; public class RequestUtils { - private final Map metadata; + private final Map> metadata; - public RequestUtils(Map requestData) { + public RequestUtils(Map> requestData) { this.metadata = requestData; } - public Map getMetadata() { + public Map> getMetadata() { return metadata; } @@ -107,8 +107,8 @@ public class RequestUtils { return getMetadata() == null ? null : getFirstValue("sessionID"); } - public Map getMap() { - final Map returnMap = new HashMap(metadata); + public Map> getMap() { + final Map> returnMap = new HashMap<>(metadata); returnMap.remove("sessionID"); returnMap.remove("transfer"); returnMap.remove("workgroup"); From 790cf68b6aaf65c24833ea6b71fa7d08a4f40671 Mon Sep 17 00:00:00 2001 From: arthur Date: Thu, 26 Nov 2020 23:15:10 +0300 Subject: [PATCH 2/3] SPARK-2204: Code cleanup: Remove some deprecated methods usage --- .../sparkimpl/plugin/idle/linux/LinuxIdleTime.java | 2 +- .../jivesoftware/sparkimpl/plugin/idle/mac/MacIdleTime.java | 2 +- .../sparkimpl/plugin/idle/windows/Win32IdleTime.java | 4 ++-- .../java/com/jivesoftware/spark/plugin/apple/AppleDock.java | 2 +- .../spark/roar/displaytype/MacNotificationCenter.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) 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 7682d4fb4..9580d7f8b 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 @@ -22,7 +22,7 @@ import org.jivesoftware.sparkimpl.plugin.idle.IdleTime; public class LinuxIdleTime implements IdleTime { /** Definition (incomplete) of the Xext library. */ interface Xss extends Library { - Xss INSTANCE = Native.loadLibrary("Xss", Xss.class); + Xss INSTANCE = Native.load("Xss", Xss.class); class XScreenSaverInfo extends Structure { public X11.Window window; /* screen saver window */ diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/mac/MacIdleTime.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/mac/MacIdleTime.java index 43ee1e82e..e6d095caf 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/mac/MacIdleTime.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/mac/MacIdleTime.java @@ -12,7 +12,7 @@ public class MacIdleTime implements IdleTime { public interface ApplicationServices extends Library { - ApplicationServices INSTANCE = Native.loadLibrary("ApplicationServices", ApplicationServices.class); + ApplicationServices INSTANCE = Native.load("ApplicationServices", ApplicationServices.class); int kCGAnyInputEventType = ~0; int kCGEventSourceStatePrivate = -1; diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/windows/Win32IdleTime.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/windows/Win32IdleTime.java index d0c0f43c8..6dfb717f9 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/windows/Win32IdleTime.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/idle/windows/Win32IdleTime.java @@ -15,7 +15,7 @@ import java.util.List; */ public class Win32IdleTime implements IdleTime { public interface Kernel32 extends StdCallLibrary { - Kernel32 INSTANCE = Native.loadLibrary("kernel32", Kernel32.class); + Kernel32 INSTANCE = Native.load("kernel32", Kernel32.class); /** * Retrieves the number of milliseconds that have elapsed since the system was started. @@ -26,7 +26,7 @@ public class Win32IdleTime implements IdleTime { } public interface User32 extends StdCallLibrary { - User32 INSTANCE = Native.loadLibrary("user32", User32.class); + User32 INSTANCE = Native.load("user32", User32.class); /** * Contains the time of the last input. * @see "http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winui/windowsuserinterface/userinput/keyboardinput/keyboardinputreference/keyboardinputstructures/lastinputinfo.asp" diff --git a/plugins/apple/src/main/java/com/jivesoftware/spark/plugin/apple/AppleDock.java b/plugins/apple/src/main/java/com/jivesoftware/spark/plugin/apple/AppleDock.java index 2a7c71dec..bf63e0d02 100644 --- a/plugins/apple/src/main/java/com/jivesoftware/spark/plugin/apple/AppleDock.java +++ b/plugins/apple/src/main/java/com/jivesoftware/spark/plugin/apple/AppleDock.java @@ -49,7 +49,7 @@ public class AppleDock implements ActionListener { frame.add(menu); // set dock menu - Application app = new Application(); + Application app = Application.getApplication(); app.setDockMenu(menu); } diff --git a/plugins/roar/src/main/java/org/jivesoftware/spark/roar/displaytype/MacNotificationCenter.java b/plugins/roar/src/main/java/org/jivesoftware/spark/roar/displaytype/MacNotificationCenter.java index 2b72463bf..0d1c18b67 100644 --- a/plugins/roar/src/main/java/org/jivesoftware/spark/roar/displaytype/MacNotificationCenter.java +++ b/plugins/roar/src/main/java/org/jivesoftware/spark/roar/displaytype/MacNotificationCenter.java @@ -23,7 +23,7 @@ public class MacNotificationCenter { File dylib = new File(Spark.getPluginDirectory().getAbsolutePath() + File.separator + "roar" + File.separator + "native" + File.separator + "NSUserNotificationsBridge.dylib" ); - NSUserNotificationsBridge instance = Native.loadLibrary(dylib.getAbsolutePath(), NSUserNotificationsBridge.class); + NSUserNotificationsBridge instance = Native.load(dylib.getAbsolutePath(), NSUserNotificationsBridge.class); int sendNotification(String title, String subtitle, String text, int timeoffset, String sound); } From 648679cf88df15632197441b19f890ccce488e79 Mon Sep 17 00:00:00 2001 From: arthur Date: Thu, 26 Nov 2020 23:31:01 +0300 Subject: [PATCH 3/3] SPARK-2204: Code cleanup: Remove statements with empty body --- .../jivesoftware/spark/util/StringUtils.java | 183 +++++++++--------- 1 file changed, 91 insertions(+), 92 deletions(-) diff --git a/core/src/main/java/org/jivesoftware/spark/util/StringUtils.java b/core/src/main/java/org/jivesoftware/spark/util/StringUtils.java index 74fbf891e..3543ff903 100644 --- a/core/src/main/java/org/jivesoftware/spark/util/StringUtils.java +++ b/core/src/main/java/org/jivesoftware/spark/util/StringUtils.java @@ -339,46 +339,46 @@ public class StringUtils { * with their HTML escape sequences. */ public static String escapeHTMLTags(String in) { - if (in == null) { - return null; - } - char ch; - int i = 0; - int last = 0; - char[] input = in.toCharArray(); - int len = input.length; - StringBuilder out = new StringBuilder((int) (len * 1.3)); - for (; i < len; i++) { - ch = input[i]; - if (ch > '>') { - // Nothing to do - } else if (ch == '<') { - if (i > last) { - out.append(input, last, i - last); - } - last = i + 1; - out.append(LT_ENCODE); - } else if (ch == '>') { - if (i > last) { - out.append(input, last, i - last); - } - last = i + 1; - out.append(GT_ENCODE); - } else if (ch == '"') { - if (i > last) { - out.append(input, last, i - last); - } - last = i + 1; - out.append(QUOTE_ENCODE); - } - } - if (last == 0) { - return in; - } - if (i > last) { - out.append(input, last, i - last); - } - return out.toString(); + if (in == null) { + return null; + } + char ch; + int i = 0; + int last = 0; + char[] input = in.toCharArray(); + int len = input.length; + StringBuilder out = new StringBuilder((int) (len * 1.3)); + for (; i < len; i++) { + ch = input[i]; + if (ch <= '>') { + if (ch == '<') { + if (i > last) { + out.append(input, last, i - last); + } + last = i + 1; + out.append(LT_ENCODE); + } else if (ch == '>') { + if (i > last) { + out.append(input, last, i - last); + } + last = i + 1; + out.append(GT_ENCODE); + } else if (ch == '"') { + if (i > last) { + out.append(input, last, i - last); + } + last = i + 1; + out.append(QUOTE_ENCODE); + } + } + } + if (last == 0) { + return in; + } + if (i > last) { + out.append(input, last, i - last); + } + return out.toString(); } /** @@ -1261,58 +1261,57 @@ public class StringUtils { * @return the string with appropriate characters escaped. */ public static String escapeForXML(String string) { - if (string == null) { - return null; - } - char ch; - int i = 0; - int last = 0; - char[] input = string.toCharArray(); - int len = input.length; - StringBuilder out = new StringBuilder((int) (len * 1.3)); - for (; i < len; i++) { - ch = input[i]; - - if (ch > '>') { - // Nothing to do - } else if (ch == '<') { - if (i > last) { - out.append(input, last, i - last); - } - last = i + 1; - out.append(LT_ENCODE); - } else if (ch == '&') { - if (i > last) { - out.append(input, last, i - last); - } - last = i + 1; - out.append(AMP_ENCODE); - } else if (ch == '"') { - if (i > last) { - out.append(input, last, i - last); - } - last = i + 1; - out.append(QUOTE_ENCODE); - } else if (ch == 10 || ch == 13 || ch == 9) { - // Nothing to do - } else if (ch < 32) { - // Disallow all ASCII control characters, except space, - // enter characters and tabs: - if (i > last) { - out.append(input, last, i - last); - } - last = i + 1; - } - } - if (last == 0) { - // Return after escaping end sequence "]]>" - return string.replace("]]>", "]]&gt;"); - } - if (i > last) { - out.append(input, last, i - last); - } - // Return after escaping end sequence "]]>" - return out.toString().replace("]]>", "]]&gt;"); + if (string == null) { + return null; + } + char ch; + int i = 0; + int last = 0; + char[] input = string.toCharArray(); + int len = input.length; + StringBuilder out = new StringBuilder((int) (len * 1.3)); + for (; i < len; i++) { + ch = input[i]; + if (ch <= '>') { + if (ch == '<') { + if (i > last) { + out.append(input, last, i - last); + } + last = i + 1; + out.append(LT_ENCODE); + } else if (ch == '&') { + if (i > last) { + out.append(input, last, i - last); + } + last = i + 1; + out.append(AMP_ENCODE); + } else if (ch == '"') { + if (i > last) { + out.append(input, last, i - last); + } + last = i + 1; + out.append(QUOTE_ENCODE); + } else if (ch != 10 && ch != 13 && ch != 9) { + // Disallow all ASCII control characters, except space, + // enter characters and tabs: + if (ch < 32) { + if (i > last) { + out.append(input, last, i - last); + } + last = i + 1; + } + } + } + } + if (last == 0) { + // Return after escaping end sequence "]]>" + return string.replace("]]>", "]]&gt;"); + } + if (i > last) { + out.append(input, last, i - last); + } + // Return after escaping end sequence "]]>" + return out.toString().replace("]]>", "]]&gt;"); } /**