Skip to content

Commit

Permalink
Refactor: rename getRoomJid() to getBareJid() in ChatRoom class and i…
Browse files Browse the repository at this point in the history 
…ts derived classes for more clarity.
  • Loading branch information
R87A committed Oct 7, 2020
1 parent 0c11a9d commit 31abf18
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions core/src/main/java/org/jivesoftware/spark/ui/ChatContainer.java
View file
Expand Up @@ -265,7 +265,7 @@ public synchronized void addChatRoom(final ChatRoom room) {
createFrameIfNeeded();

room.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0, Color.LIGHT_GRAY));
AndFilter presenceFilter = new AndFilter(new StanzaTypeFilter(Presence.class), FromMatchesFilter.createBare( room.getRoomJid()));
AndFilter presenceFilter = new AndFilter(new StanzaTypeFilter(Presence.class), FromMatchesFilter.createBare( room.getBareJid()));

// Next, create a packet listener. We use an anonymous inner class for brevity.
StanzaListener myListener = stanza -> SwingUtilities.invokeLater(() -> {
Expand All @@ -291,7 +291,7 @@ public synchronized void addChatRoom(final ChatRoom room) {
tooltip = "<html><body><b>Contact:&nbsp;</b>" + nickname + "<br><b>JID:&nbsp;</b>" + tooltip;
}
else {
tooltip = room.getRoomJid().toString();
tooltip = room.getBareJid().toString();
}

// Create ChatRoom UI and dock
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/jivesoftware/spark/ui/ChatRoom.java
View file
Expand Up @@ -913,19 +913,19 @@ public void closeChatRoom() {
* Get the roomname to use for this ChatRoom. This is expected to be a bare jid.
*
* @return - the Roomname of this ChatRoom.
* @deprecated use {@link #getRoomJid()} instead.
* @deprecated use {@link #getBareJid()} instead.
*/
@Deprecated
public EntityBareJid getRoomname() {
return getRoomJid();
return getBareJid();
}

/**
* Get the XMPP address of this room.
*
* @return the XMPP address of this room
*/
public abstract EntityBareJid getRoomJid();
public abstract EntityBareJid getBareJid();

public abstract EntityJid getJid();

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceUtils.java
View file
Expand Up @@ -393,7 +393,7 @@ public static void addUnclosableChatRoom(String jidString) {
public static boolean isChatRoomClosable(Component c) {
if(c instanceof GroupChatRoom ) {
GroupChatRoom groupChatRoom = (GroupChatRoom) c;
EntityBareJid roomName = groupChatRoom.getChatRoom().getRoomJid();
EntityBareJid roomName = groupChatRoom.getChatRoom().getBareJid();

if(unclosableChatRooms.contains(roomName)){
return false;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jivesoftware/spark/ui/conferences/GroupChatParticipantList.java
View file
Expand Up @@ -397,7 +397,7 @@ protected String getSelectedUser() {
protected void startChat(ChatRoom groupChat, EntityFullJid groupJID) {
Resourcepart userNickname = groupJID.getResourcepart();
String roomTitle = userNickname + " - "
+ groupChat.getRoomJid();
+ groupChat.getBareJid();

// TODO: Remove duplicate variable userNickname and nicknameOfUser.
Resourcepart nicknameOfUser = userNickname;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
View file
Expand Up @@ -361,7 +361,7 @@ private void displaySendMessage( Message message )
}

@Override
public EntityBareJid getRoomJid() {
public EntityBareJid getBareJid() {
return roomname;
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java
View file
Expand Up @@ -432,7 +432,7 @@ public EntityBareJid getRoomname()
}

@Override
public EntityBareJid getRoomJid()
public EntityBareJid getBareJid()
{
return chat.getRoom();
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/jivesoftware/sparkimpl/plugin/transcripts/ChatTranscriptPlugin.java
View file
Expand Up @@ -192,7 +192,7 @@ public void chatRoomOpened(final ChatRoom room) {
return;
}

final EntityBareJid jid = room.getRoomJid();
final EntityBareJid jid = room.getBareJid();

File transcriptFile = ChatTranscripts.getTranscriptFile(jid);
if (!transcriptFile.exists()) {
Expand Down Expand Up @@ -223,7 +223,7 @@ public void persistChatRoom(final ChatRoom room) {
return;
}

final EntityBareJid jid = room.getRoomJid();
final EntityBareJid jid = room.getBareJid();

final List<Message> transcripts = room.getTranscripts();
ChatTranscript transcript = new ChatTranscript();
Expand Down
6 changes: 3 additions & 3 deletions plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/Workpane.java
View file
Expand Up @@ -238,7 +238,7 @@ public void chatRoomOpened(ChatRoom room) {
if (!(room instanceof GroupChatRoom)) {
return;
}
EntityBareJid roomName = room.getRoomJid();
EntityBareJid roomName = room.getBareJid();
Localpart sessionID = roomName.getLocalpart();
if (offerMap.get(sessionID.toString()) != null) {
Offer offer = offerMap.get(sessionID.toString());
Expand All @@ -248,7 +248,7 @@ public void chatRoomOpened(ChatRoom room) {
}

public void chatRoomClosed(ChatRoom room) {
EntityBareJid roomName = room.getRoomJid();
EntityBareJid roomName = room.getBareJid();
Localpart sessionID = roomName.getLocalpart();
offerMap.remove(sessionID.toString());
}
Expand All @@ -263,7 +263,7 @@ public void checkForDecoration(ChatRoom chatRoom, String sessionID) {
}

public void decorateRoom(ChatRoom room, Map metadata) {
EntityBareJid roomName = room.getRoomJid();
EntityBareJid roomName = room.getBareJid();
Localpart sessionID =roomName.getLocalpart();


Expand Down
2 changes: 1 addition & 1 deletion ...h/src/main/java/org/jivesoftware/fastpath/workspace/invite/WorkgroupInvitationDialog.java
View file
Expand Up @@ -110,7 +110,7 @@ public boolean hasSelectedAgent(ChatRoom chatRoom, boolean transfer) {
final DomainBareJid workgroupService = JidCreate.domainBareFromOrThrowUnchecked("workgroup." + SparkManager.getSessionManager().getServerAddress());
final EntityFullJid jid = SparkManager.getSessionManager().getJID();

EntityBareJid room = chatRoom.getRoomJid();
EntityBareJid room = chatRoom.getBareJid();
Collection agents = null;
try
{
Expand Down
8 changes: 4 additions & 4 deletions .../fileupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/ChatRoomDecorator.java
View file
Expand Up @@ -85,7 +85,7 @@ public void actionPerformed(ActionEvent event)

public void finished()
{
Log.warning("ChatRoomDecorator: finished " + room.getRoomJid());
Log.warning("ChatRoomDecorator: finished " + room.getBareJid());
}

private void getUploadUrl(ChatRoom room, Message.Type type)
Expand Down Expand Up @@ -129,13 +129,13 @@ private void handleUpload(File file, ChatRoom room, Message.Type type)

} catch (Exception e) {
Log.error("uploadFile error", e);
broadcastUploadUrl(room.getRoomJid(), file.getName() + " upload failed", type);
broadcastUploadUrl(room.getBareJid(), file.getName() + " upload failed", type);
}
}

private void uploadFile(File file, UploadRequest response, ChatRoom room, Message.Type type)
{
Log.warning("uploadFile request " + room.getRoomJid() + " " + response.putUrl);
Log.warning("uploadFile request " + room.getBareJid() + " " + response.putUrl);
URLConnection urlconnection = null;

try {
Expand All @@ -159,7 +159,7 @@ private void uploadFile(File file, UploadRequest response, ChatRoom room, Messag

if ((statusCode >= 200) && (statusCode <= 202))
{
broadcastUploadUrl(room.getRoomJid(), response.getUrl, type);
broadcastUploadUrl(room.getBareJid(), response.getUrl, type);
}

} catch (Exception e) {
Expand Down
10 changes: 5 additions & 5 deletions ...eupload/src/main/java/org/jivesoftware/spark/plugin/fileupload/SparkFileUploadPlugin.java
View file
Expand Up @@ -102,7 +102,7 @@ public void chatRoomLeft(ChatRoom chatroom)

public void chatRoomClosed(ChatRoom chatroom)
{
EntityBareJid roomId = chatroom.getRoomJid();
EntityBareJid roomId = chatroom.getBareJid();

Log.debug("chatRoomClosed: " + roomId);

Expand All @@ -116,28 +116,28 @@ public void chatRoomClosed(ChatRoom chatroom)

public void chatRoomActivated(ChatRoom chatroom)
{
EntityBareJid roomId = chatroom.getRoomJid();
EntityBareJid roomId = chatroom.getBareJid();

Log.debug("chatRoomActivated: " + roomId);
}

public void userHasJoined(ChatRoom room, String s)
{
EntityBareJid roomId = room.getRoomJid();
EntityBareJid roomId = room.getBareJid();

Log.debug("userHasJoined: " + roomId + " " + s);
}

public void userHasLeft(ChatRoom room, String s)
{
EntityBareJid roomId = room.getRoomJid();
EntityBareJid roomId = room.getBareJid();

Log.debug("userHasLeft: " + roomId + " " + s);
}

public void chatRoomOpened(final ChatRoom room)
{
EntityBareJid roomId = room.getRoomJid();
EntityBareJid roomId = room.getBareJid();

Log.debug("chatRoomOpened: " + roomId);

Expand Down
12 changes: 6 additions & 6 deletions plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarMessageListener.java
View file
Expand Up @@ -146,20 +146,20 @@ private boolean isOldGroupChat(ChatRoom room) {

if (room.getChatType() == Message.Type.groupchat) {

if (_rooms.containsKey(room.getRoomJid()) && _rooms.get(room.getRoomJid()) == -1L) {
if (_rooms.containsKey(room.getBareJid()) && _rooms.get(room.getBareJid()) == -1L) {
return true;
}

if (!_rooms.containsKey(room.getRoomJid())) {
_rooms.put(room.getRoomJid(), System.currentTimeMillis());
if (!_rooms.containsKey(room.getBareJid())) {
_rooms.put(room.getBareJid(), System.currentTimeMillis());
return true;
} else {
long start = _rooms.get(room.getRoomJid());
long start = _rooms.get(room.getBareJid());
long now = System.currentTimeMillis();

result = (now - start) < 1500;
if (result) {
_rooms.put(room.getRoomJid(), -1L);
_rooms.put(room.getBareJid(), -1L);
}

}
Expand All @@ -182,7 +182,7 @@ public void messageSent(ChatRoom room, Message message) {
* @return boolean
*/
private boolean isMessageFromRoom(ChatRoom room, Message message) {
return message.getFrom().equals(room.getRoomJid());
return message.getFrom().equals(room.getBareJid());
}

}

0 comments on commit 31abf18

Please sign in to comment.