mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 19:57:28 +00:00
Code Issues Projects Releases Wiki Activity

Replace usage of deprecated method with alternative and remove method itself.

Browse Source 
Deprecated method:
org.jivesoftware.spark.UserManager.getUserNicknameFromJID(java.lang.CharSequence)
Alternative method:
org.jivesoftware.spark.UserManager.getUserNicknameFromJID(org.jxmpp.jid.BareJid)
This commit is contained in:
arthur 2020-10-25 21:48:20 +03:00
parent c59bb5f057
commit e59dffbcd8
6 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/org/jivesoftware/spark/UserManager.java
View File

@ -284,20 +284,6 @@ public class UserManager {
return new ArrayList<>();
}
/**
* @deprecated use {@link #getUserNicknameFromJID(BareJid)} instead.
*/
@Deprecated
public String getUserNicknameFromJID(CharSequence jid) {
BareJid bareJid;
try {
bareJid = JidCreate.bareFrom(jid);
} catch (XmppStringprepException e) {
throw new IllegalStateException(e);
}
return getUserNicknameFromJID(bareJid);
}
public String getUserNicknameFromJID(BareJid jid) {
ContactList contactList = SparkManager.getWorkspace().getContactList();
ContactItem item = contactList.getContactItemByJID(jid);

2
core/src/main/java/org/jivesoftware/spark/ui/conferences/ConversationInvitation.java
View File

@ -99,7 +99,7 @@ public class ConversationInvitation extends JPanel implements ContainerComponent
final JLabel dateLabelValue = new JLabel();
String nickname = SparkManager.getUserManager().getUserNicknameFromJID(inviter);
String nickname = SparkManager.getUserManager().getUserNicknameFromJID(this.inviter);
add(titleLabel, new GridBagConstraints(0, 0, 4, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(2, 5, 2, 5), 0, 0));

2
core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java
View File

@ -157,7 +157,7 @@ public class GroupChatParticipantList extends JPanel {
chat = groupChatRoom.getMultiUserChat();
chat.addInvitationRejectionListener( ( jid1, reason, message, rejection ) -> {
String nickname = userManager.getUserNicknameFromJID( jid1.toString() );
String nickname = userManager.getUserNicknameFromJID(jid1);
userHasLeft(nickname);

2
core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastDialog.java
View File

@ -373,7 +373,7 @@ Log.warning( "Unable to broadcast.", e1 );
for (String jid : jids) {
final Message message = new Message();
String nickname = SparkManager.getUserManager().getUserNicknameFromJID(jid);
String nickname = SparkManager.getUserManager().getUserNicknameFromJID(JidCreate.bareFromOrThrowUnchecked(jid));
recipients.add(nickname);
message.setTo(JidCreate.fromOrThrowUnchecked(jid));
message.setBody(text);

5
core/src/main/java/org/jivesoftware/sparkimpl/plugin/history/FrequentContactsPlugin.java
View File

@ -22,6 +22,7 @@ import org.jivesoftware.spark.plugin.Plugin;
import org.jivesoftware.spark.ui.ContactItem;
import org.jivesoftware.spark.ui.ContactList;
import org.jivesoftware.spark.util.GraphicUtils;
import org.jxmpp.jid.impl.JidCreate;
import java.awt.*;
import java.awt.event.ActionEvent;
@ -109,7 +110,7 @@ public class FrequentContactsPlugin implements Plugin {
String user = jidMap.get(label);
if (user != null) {
final String contactUsername = SparkManager
.getUserManager().getUserNicknameFromJID(user);
.getUserManager().getUserNicknameFromJID(JidCreate.bareFromOrThrowUnchecked(user));
SparkManager.getChatManager().activateChat(user,
contactUsername);
window.dispose();
@ -125,7 +126,7 @@ public class FrequentContactsPlugin implements Plugin {
final JLabel label = (JLabel) contacts.getSelectedValue();
String user = jidMap.get(label);
if (user != null) {
final String contactUsername = SparkManager.getUserManager().getUserNicknameFromJID(user);
final String contactUsername = SparkManager.getUserManager().getUserNicknameFromJID(JidCreate.bareFromOrThrowUnchecked(user));
SparkManager.getChatManager().activateChat(user, contactUsername);
window.dispose();
}

2
plugins/roar/src/main/java/org/jivesoftware/spark/roar/displaytype/RoarPopupHelper.java
View File

@ -24,7 +24,7 @@ public final class RoarPopupHelper {
* @return nickname
*/
public static String getNickname(ChatRoom room, Message message) {
String nickname = SparkManager.getUserManager().getUserNicknameFromJID(message.getFrom());
String nickname = SparkManager.getUserManager().getUserNicknameFromJID(message.getFrom().asBareJid());
if (room.getChatType() == Message.Type.groupchat) {
nickname = message.getFrom().getResourceOrEmpty().toString();
}