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.

Browse Source 
Deprecated method:
```
public void org.jivesoftware.smack.packet.setTo(String)
```
Alternative method:
```
public void org.jivesoftware.smack.packet.setTo(Jid)
```
This commit is contained in:
arthur 2020-10-25 20:36:22 +03:00
parent 8eb2cec285
commit 48708bdb07
7 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/org/jivesoftware/spark/ui/ChatRoom.java
View File

@ -42,6 +42,7 @@ import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.EntityJid;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.jid.parts.Resourcepart;
import javax.swing.*;
@ -605,8 +606,8 @@ public abstract class ChatRoom extends BackgroundPanel implements ActionListener
*/
public void addToTranscript(String to, String from, String body, Date date) {
final Message newMessage = new Message();
newMessage.setTo(to);
newMessage.setFrom(from);
newMessage.setTo(JidCreate.fromOrThrowUnchecked(to));
newMessage.setFrom(JidCreate.fromOrThrowUnchecked(from));
newMessage.setBody(body);
final Map<String, Object> properties = new HashMap<>();
properties.put( "date", new Date() );

4
core/src/main/java/org/jivesoftware/spark/ui/ContactList.java
View File

@ -1621,7 +1621,7 @@ public class ContactList extends JPanel implements ActionListener,
@Override
public void actionPerformed(ActionEvent e) {
String jid = item.getJID();
BareJid jid = item.getJid();
Presence response = new Presence(Presence.Type.subscribe);
response.setTo(jid);
@ -1708,7 +1708,7 @@ public class ContactList extends JPanel implements ActionListener,
final Map<String, Message> broadcastMessages = new HashMap<>();
for (ContactItem item : items) {
final Message message = new Message();
message.setTo(item.getJID());
message.setTo(item.getJid());
final Map<String, Object> properties = new HashMap<>();
properties.put("broadcast", true);
message.addExtension(new JivePropertiesExtension(properties));

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

@ -61,6 +61,7 @@ import org.jivesoftware.spark.ui.ContactList;
import org.jivesoftware.spark.util.ModelUtil;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.plugin.layout.LayoutSettingsManager;
import org.jxmpp.jid.impl.JidCreate;
/**
* Allows for better selective broadcasting.
@ -374,7 +375,7 @@ Log.warning( "Unable to broadcast.", e1 );
final Message message = new Message();
String nickname = SparkManager.getUserManager().getUserNicknameFromJID(jid);
recipients.add(nickname);
message.setTo(jid);
message.setTo(JidCreate.fromOrThrowUnchecked(jid));
message.setBody(text);
if (normalMessageButton.isSelected()) {

8
core/src/main/java/org/jivesoftware/sparkimpl/plugin/jabber/VersionViewer.java
View File

@ -28,6 +28,8 @@ import org.jivesoftware.spark.UserManager;
import org.jivesoftware.spark.component.MessageDialog;
import org.jivesoftware.spark.util.ResourceUtils;
import org.jivesoftware.spark.util.log.Log;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.impl.JidCreate;
import javax.swing.*;
@ -40,7 +42,9 @@ public class VersionViewer {
}
public static void viewVersion(String jid) {
public static void viewVersion(String jidString) {
final Jid jid = JidCreate.fromOrThrowUnchecked(jidString);
final JPanel loadingCard = new JPanel();
final ImageIcon icon = new ImageIcon( VersionViewer.class.getClassLoader().getResource( "images/ajax-loader.gif"));
loadingCard.add(new JLabel("loading... ", icon, JLabel.CENTER));
@ -122,7 +126,7 @@ public class VersionViewer {
((CardLayout)(cards.getLayout())).last( cards );
}
MessageDialog.showComponent(Res.getString("title.version.and.time"), Res.getString("message.client.information", UserManager.unescapeJID(jid)), SparkRes.getImageIcon(SparkRes.PROFILE_IMAGE_24x24), cards, SparkManager.getMainWindow(), 400, 300, false);
MessageDialog.showComponent(Res.getString("title.version.and.time"), Res.getString("message.client.information", UserManager.unescapeJID(jidString)), SparkRes.getImageIcon(SparkRes.PROFILE_IMAGE_24x24), cards, SparkManager.getMainWindow(), 400, 300, false);
}
}

3
core/src/main/java/org/jivesoftware/sparkimpl/updater/CheckUpdates.java
View File

@ -42,6 +42,7 @@ import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.settings.JiveInfo;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jxmpp.jid.impl.JidCreate;
import javax.swing.JEditorPane;
import javax.swing.JFrame;
@ -565,7 +566,7 @@ public class CheckUpdates {
{
SparkVersion request = new SparkVersion();
request.setType(IQ.Type.get);
request.setTo("updater." + connection.getXMPPServiceDomain());
request.setTo(JidCreate.fromOrThrowUnchecked("updater." + connection.getXMPPServiceDomain()));
// TODO: This should not use stanza collectors but simply createStanzaCollectorAndSend(IQ).nextResultOrThrow();
StanzaCollector collector = connection.createStanzaCollector(new IQReplyFilter( request, connection ));

3
plugins/fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/ChatRoomDecorator.java
View File

@ -41,6 +41,7 @@ import org.apache.commons.httpclient.protocol.Protocol;
import org.jivesoftware.sparkimpl.updater.EasySSLProtocolSocketFactory;
import org.jxmpp.jid.impl.JidCreate;
import sun.misc.BASE64Decoder;
public class ChatRoomDecorator
@ -113,7 +114,7 @@ public class ChatRoomDecorator
}
try {
UploadRequest request = new UploadRequest(fileName, file.length());
request.setTo("httpfileupload." + SparkManager.getSessionManager().getServerAddress());
request.setTo(JidCreate.fromOrThrowUnchecked("httpfileupload." + SparkManager.getSessionManager().getServerAddress()));
request.setType(IQ.Type.get);
IQ result = SparkManager.getConnection().createStanzaCollectorAndSend(request).nextResultOrThrow();

2
plugins/meet/src/main/java/org/jivesoftware/spark/plugin/ofmeet/SparkMeetPlugin.java
View File

@ -428,7 +428,7 @@ public class SparkMeetPlugin implements Plugin, ChatRoomListener, GlobalMessageL
private void sendInvite(ChatRoom room, String url, Message.Type type)
{
Message message2 = new Message();
message2.setTo(room.getBareJid().toString());
message2.setTo(room.getBareJid());
message2.setType(type);
message2.setBody(url);
room.sendMessage(message2);