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

SPARK-2355: Use getExtension(Class) and hasExtension(Class)

Browse Source
This commit is contained in:
Sergey Ponomarev 2025-10-04 20:54:48 +03:00 committed by Guus der Kinderen
parent efda43bf5d
commit dc0f625f25
19 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,7 @@ import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smackx.debugger.EnhancedDebuggerWindow;
import org.jivesoftware.smackx.delay.packet.DelayInformation;
import org.jivesoftware.smackx.jiveproperties.packet.JivePropertiesExtension;
import org.jivesoftware.smackx.muc.packet.GroupChatInvitation;
import org.jivesoftware.smackx.vcardtemp.packet.VCard;
import org.jivesoftware.spark.component.tabbedPane.SparkTabbedPane;
import org.jivesoftware.spark.filetransfer.SparkTransferManager;
@ -347,7 +348,7 @@ public class Workspace extends JPanel implements StanzaListener {
boolean isGroupChat = message.getType() == Message.Type.groupchat;
// Check if Conference invite. If so, do not handle here.
if (message.hasExtension("x", "jabber:x:conference")) {
if (message.hasExtension(GroupChatInvitation.class)) {
return;
}
@ -356,7 +357,7 @@ public class Workspace extends JPanel implements StanzaListener {
final boolean broadcast = extension != null && extension.getProperty( "broadcast" ) != null;
// Handle offline message.
DelayInformation offlineInformation = message.getExtension("delay", "urn:xmpp:delay");
DelayInformation offlineInformation = message.getExtension(DelayInformation.class);
if (offlineInformation != null && (Message.Type.chat == message.getType() ||
Message.Type.normal == message.getType())) {
handleOfflineMessage(message);

8
core/src/main/java/org/jivesoftware/spark/ui/ContactItem.java
View File

@ -341,25 +341,19 @@ public class ContactItem extends JPanel {
* @param presence the presence.
*/
public void setPresence(Presence presence) {
this.presence = presence;
final VCardUpdateExtension extension = presence.getExtension("x", "vcard-temp:x:update");
final VCardUpdateExtension extension = presence.getExtension(VCardUpdateExtension.class);
// Handle vCard update packet.
if (extension != null) {
String hash = extension.getPhotoHash();
if (hash != null) {
this.hash = hash;
if (!hashExists(hash)) {
updateAvatar();
updateAvatarInSideIcon();
}
}
}
updatePresenceIcon(presence);
}

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

@ -247,7 +247,7 @@ public class TranscriptWindow extends ChatArea implements ContextMenuListener
String body = message.getBody();
// Verify the timestamp of this message. Determine if it is a 'live' message, or one that was sent earlier.
final DelayInformation inf = message.getExtension( "delay", "urn:xmpp:delay" );
final DelayInformation inf = message.getExtension(DelayInformation.class);
final ZonedDateTime sentDate;
final boolean isDelayed;
if ( inf != null )

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

@ -194,7 +194,7 @@ public class GroupChatParticipantList extends JPanel {
// When joining a room, check if the current user is an owner/admin. If so, the UI should allow the current
// user to change settings of this MUC.
final MUCUser mucUserEx = p.getExtension(MUCUser.ELEMENT, MUCUser.NAMESPACE);
final MUCUser mucUserEx = p.getExtension(MUCUser.class);
if ( mucUserEx != null && mucUserEx.getStatus().contains(MUCUser.Status.create(110)) ) // 110 = Inform user that presence refers to itself
{
final MUCItem item = mucUserEx.getItem();
@ -270,7 +270,7 @@ public class GroupChatParticipantList extends JPanel {
MUCAffiliation affiliation = null;
MUCRole role = null;
final MUCUser extension = (MUCUser) presence.getExtension( MUCUser.NAMESPACE );
final MUCUser extension = presence.getExtension(MUCUser.class);
if ( extension != null && extension.getItem() != null )
{
affiliation = extension.getItem().getAffiliation();

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

@ -521,7 +521,7 @@ public class ChatRoomImpl extends ChatRoom {
}
// Do not Handle offline messages. Offline messages are handling by Workspace.
if (message.hasExtension("delay", "urn:xmpp:delay") &&
if (message.hasExtension(DelayInformation.class) &&
(message.getType() == Message.Type.chat ||
message.getType() == Message.Type.normal)) {
return;
@ -601,7 +601,7 @@ public class ChatRoomImpl extends ChatRoom {
public void insertMessage(Message message) {
// Debug info
super.insertMessage(message);
MessageEvent messageEvent = message.getExtension("x", "jabber:x:event");
MessageEvent messageEvent = message.getExtension(MessageEvent.class);
if (messageEvent != null) {
checkEvents(message.getFrom(), message.getStanzaId(), messageEvent);
}

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

@ -614,7 +614,7 @@ public class GroupChatRoom extends ChatRoom
lastMessage = message;
if ( message.getType() == Message.Type.groupchat )
{
final DelayInformation inf = message.getExtension( "delay", "urn:xmpp:delay" );
final DelayInformation inf = message.getExtension(DelayInformation.class);
final Date sentDate = inf != null ? inf.getStamp() : new Date();
// Do not accept Administrative messages.
@ -725,7 +725,7 @@ public class GroupChatRoom extends ChatRoom
final Resourcepart nickname = from.getResourcepart();
final MUCUser mucUser = stanza.getExtension( "x", "http://jabber.org/protocol/muc#user" );
final MUCUser mucUser = stanza.getExtension(MUCUser.class);
final Set<MUCUser.Status> status = new HashSet<>();
if ( mucUser != null )
{

3
core/src/main/java/org/jivesoftware/spark/ui/status/StatusBar.java
View File

@ -76,6 +76,7 @@ import org.jivesoftware.sparkimpl.plugin.privacy.list.SparkPrivacyList;
import org.jivesoftware.sparkimpl.profile.VCardEditor;
import org.jivesoftware.sparkimpl.profile.VCardListener;
import org.jivesoftware.sparkimpl.profile.VCardManager;
import org.jivesoftware.sparkimpl.profile.ext.VCardUpdateExtension;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
//TODO: I need to remove the presence logic from this class.
@ -391,7 +392,7 @@ public class StatusBar extends JPanel implements VCardListener {
}
if ((presence.getMode() == currentPresence.getMode()) && (presence.getType() == currentPresence.getType()) && (presence.getStatus().equals(currentPresence.getStatus()))) {
if (presence.hasExtension("x", "vcard-temp:x:update")) {
if (presence.hasExtension(VCardUpdateExtension.class)) {
// Update VCard
loadVCard();
}

5
core/src/main/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
View File

@ -201,9 +201,8 @@ public class BroadcastPlugin extends SparkTabHandler implements Plugin, StanzaLi
SwingUtilities.invokeLater(() -> {
try {
final Message message = (Message) stanza;
// Do not handle errors or offline messages
if (message.hasExtension("delay", "urn:xmpp:delay") || message.getError() != null) {
if (message.hasExtension(DelayInformation.class) || message.getError() != null) {
return;
}
@ -336,7 +335,7 @@ public class BroadcastPlugin extends SparkTabHandler implements Plugin, StanzaLi
SparkManager.getChatManager().fireGlobalMessageReceievedListeners(chatRoom, message);
if (message.hasExtension("delay", "urn:xmpp:delay")) {
if (message.hasExtension(DelayInformation.class)) {
SoundPreference soundPreference = (SoundPreference) SparkManager.getPreferenceManager().getPreference(new SoundPreference().getNamespace());
SoundPreferences preferences = soundPreference.getPreferences();
if (preferences.isPlayIncomingSound()) {

2
core/src/main/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java
View File

@ -74,7 +74,7 @@ public class SoundPlugin implements Plugin, MessageListener, ChatRoomListener {
@Override
public void messageReceived(ChatRoom room, Message message) {
// Do not play sounds on history updates.
if (message.hasExtension("delay", "urn:xmpp:delay")) {
if (message.hasExtension(DelayInformation.class)) {
return;
}

3
plugins/battleships/src/main/java/battleship/gui/GUI.java
View File

@ -81,8 +81,7 @@ public class GUI extends JPanel implements Observer{
@Override
public void processPacket(Stanza stanza) {
MovePacket move = (MovePacket) stanza.getExtension(
MovePacket.ELEMENT_NAME, MovePacket.NAMESPACE);
MovePacket move = stanza.getExtension(MovePacket.class);
if (move.getGameID() == _gameID) {
boolean opponentMadeHit = _gameboard.placeBomb(move.getPositionX(), move.getPositionY());

9
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/WorkgroupManager.java
View File

@ -41,9 +41,10 @@ import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smackx.muc.MultiUserChat;
import org.jivesoftware.smackx.workgroup.packet.QueueOverview;
import org.jivesoftware.smackx.workgroup.packet.WorkgroupInformation;
import org.jivesoftware.smackx.xdata.FormField;
import org.jivesoftware.smackx.xdata.form.FillableForm;
import org.jivesoftware.smackx.xdata.form.FilledForm;
@ -269,11 +270,9 @@ public class WorkgroupManager {
public void handleContactItem(final ContactItem contactItem) {
Presence presence = contactItem.getPresence();
// TODO It probably can be WorkgroupInformation.class but it has namespace http://jabber.org/protocol/workgroup
boolean hasWorkgroup = presence.hasExtension("workgroup", "http://jivesoftware.com/protocol/workgroup");
boolean hasNotifyQueue = presence.hasExtension("notify-queue", "http://jabber.org/protocol/workgroup");
boolean hasNotifyQueue = presence.hasExtension(QueueOverview.class);
if (!hasWorkgroup && !hasNotifyQueue) {
return;
}
@ -404,7 +403,7 @@ public class WorkgroupManager {
public boolean handleInvitation(final XMPPConnection conn, final MultiUserChat room, final EntityBareJid inviter, final String reason, final String password, final Message message) {
invites.add(inviter);
if (message.hasExtension("workgroup", "http://jabber.org/protocol/workgroup")) {
if (message.hasExtension(WorkgroupInformation.class)) {
Localpart workgroupName = inviter.getLocalpart();
GroupChatRoom groupChatRoom = ConferenceUtils.enterRoomOnSameThread(workgroupName, room.getRoom(), null, password);

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java
View File

@ -614,7 +614,7 @@ public class Workpane {
return true;
}
else if (message != null) {
MetaData metaDataExt = message.getExtension(MetaData.ELEMENT_NAME, MetaData.NAMESPACE);
MetaData metaDataExt = message.getExtension(MetaData.class);
if (metaDataExt != null) {
Map<String, List<String>> metadata = metaDataExt.getMetaData();
List<String> values = new ArrayList<>();

4
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/AgentConversations.java
View File

@ -186,7 +186,7 @@ public final class AgentConversations extends JPanel implements ChangeListener {
@Override
public void presenceChanged(Presence presence) {
EntityBareJid agentJID = presence.getFrom().asEntityBareJidOrThrow();
AgentStatus agentStatus = presence.getExtension("agent-status", "http://jabber.org/protocol/workgroup");
AgentStatus agentStatus = presence.getExtension(AgentStatus.class);
if (agentStatus != null) {
List<AgentStatus.ChatInfo> list = agentStatus.getCurrentChats();
@ -231,7 +231,7 @@ public final class AgentConversations extends JPanel implements ChangeListener {
for (EntityBareJid agent : agentRoster.getAgents()) {
Presence presence = agentRoster.getPresence(agent);
if (presence.isAvailable()) {
AgentStatus agentStatus = presence.getExtension("agent-status", "http://jabber.org/protocol/workgroup");
AgentStatus agentStatus = presence.getExtension(AgentStatus.class);
if (agentStatus != null) {
counter += agentStatus.getCurrentChats().size();
}

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/ChatViewer.java
View File

@ -73,7 +73,7 @@ public class ChatViewer extends JPanel {
if (stanza instanceof Message) {
Message message = (Message) stanza;
String from = message.getFrom().getResourceOrThrow().toString();
DelayInformation delayInformation = message.getExtension("delay", "urn:xmpp:delay");
DelayInformation delayInformation = message.getExtension(DelayInformation.class);
Date stamp = null;
if (delayInformation != null) {
stamp = delayInformation.getStamp();

3
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/CurrentActivity.java
View File

@ -170,8 +170,7 @@ public final class CurrentActivity extends JPanel {
@Override
public void presenceChanged(Presence presence) {
BareJid agentJID = presence.getFrom().asBareJid();
AgentStatus agentStatus = presence.getExtension("agent-status", "http://jabber.org/protocol/workgroup");
AgentStatus agentStatus = presence.getExtension(AgentStatus.class);
if (agentStatus != null) {
List<ChatInfo> list = agentStatus.getCurrentChats();

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/InvitationPane.java
View File

@ -124,7 +124,7 @@ public class InvitationPane {
transcriptAlert.add(new JLabel(), new GridBagConstraints(2, 5, 1, 1, 0.0, 1.0, GridBagConstraints.SOUTH, GridBagConstraints.NONE, new Insets(2, 2, 2, 2), 0, 0));
MetaData metaDataExt = message.getExtension(MetaData.ELEMENT_NAME, MetaData.NAMESPACE);
MetaData metaDataExt = message.getExtension(MetaData.class);
if (metaDataExt != null) {
metadata = metaDataExt.getMetaData();
}

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/panes/OnlineAgents.java
View File

@ -209,7 +209,7 @@ public final class OnlineAgents extends JPanel {
return FpRes.getString("message.user.not.logged.in");
}
AgentStatus agentStatus = presence.getExtension("agent-status", "http://jabber.org/protocol/workgroup");
AgentStatus agentStatus = presence.getExtension(AgentStatus.class);
List<AgentStatus.ChatInfo> list = agentStatus.getCurrentChats();
// Add new ones.

2
plugins/reversi/src/main/java/org/jivesoftware/game/reversi/ReversiPanel.java
View File

@ -93,7 +93,7 @@ public class ReversiPanel extends JPanel {
if (connection != null) {
gameMoveListener = stanza -> {
GameMove move = stanza.getExtension(GameMove.ELEMENT_NAME, GameMove.NAMESPACE);
GameMove move = stanza.getExtension(GameMove.class);
// If this is a move for the current game.
if (move.getGameID() == gameID) {
int position = move.getPosition();

6
plugins/tictactoe/src/main/java/tic/tac/toe/ui/GamePanel.java
View File

@ -86,9 +86,7 @@ public class GamePanel extends JPanel {
add(_playerdisplay, BorderLayout.SOUTH);
_connection.addAsyncStanzaListener(stanza -> {
MovePacket move = stanza.getExtension(
MovePacket.ELEMENT_NAME, MovePacket.NAMESPACE);
MovePacket move = stanza.getExtension(MovePacket.class);
if (move.getGameID() == _gameID) {
if (_gameboard.isValidMove(getYourMark(), move.getPositionX(), move.getPositionY())) {
_gameboardpanel.placeMark(getYourMark(), move.getPositionX(), move.getPositionY());
@ -109,7 +107,7 @@ public class GamePanel extends JPanel {
}, new StanzaExtensionFilter(MovePacket.ELEMENT_NAME, MovePacket.NAMESPACE));
_connection.addAsyncStanzaListener(stanza -> {
//InvalidMove im = (InvalidMove)packet.getExtension(InvalidMove.ELEMENT_NAME, InvalidMove.NAMESPACE);
//InvalidMove im = packet.getExtension(InvalidMove.class);
ChatRoom cr = SparkManager.getChatManager().getChatRoom(_opponent.asEntityBareJid());
cr.getTranscriptWindow().insertCustomText("You seem to be Cheating\n" +
"You placed a wrong Move", true, false, Color.red);