mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-03-30 11:24:19 +00:00
Code Issues Projects Releases Wiki Activity

ConferenceRoomBrowser: move bookmark logic to BookmarksUI and simplify

Browse Source
This commit is contained in:
Sergey Ponomarev
2026-02-05 22:46:37 +02:00
parent 8fcc17840f
commit bd1ebb0c10
2 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/main/java/org/jivesoftware/spark/ui/conferences/BookmarksUI.java
View File

@ -26,7 +26,6 @@ import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
import org.jivesoftware.smackx.disco.packet.DiscoverItems;
import org.jivesoftware.smackx.muc.MultiUserChatConstants;
import org.jivesoftware.smackx.muc.MultiUserChatManager;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.component.JiveTreeCellRenderer;
import org.jivesoftware.spark.component.JiveTreeNode;
@ -42,7 +41,6 @@ import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.jid.parts.Resourcepart;
import org.jxmpp.stringprep.XmppStringprepException;
import javax.swing.*;
@ -530,10 +528,6 @@ public class BookmarksUI extends JPanel {
return path != null;
}
public Tree getTree() {
return tree;
}
/**
* Sets the current bookmarks used with this account.
*/
@ -645,4 +639,31 @@ public class BookmarksUI extends JPanel {
return List.of();
}
void addOrRemoveNode(DomainBareJid serviceName, boolean isBookmarked, String roomName, EntityBareJid roomJID) {
JiveTreeNode rootNode = (JiveTreeNode) tree.getModel().getRoot();
TreePath rootPath = tree.findByName(tree, new String[]{rootNode.toString(), serviceName.toString()});
if (!isBookmarked) {
JiveTreeNode node = (JiveTreeNode) tree.getLastSelectedPathComponent();
if (node == null) {
String defaultServiceName = ConferenceServices.getDefaultServiceName().toString();
TreePath path = tree.findByName(tree, new String[]{rootNode.toString(), defaultServiceName});
node = (JiveTreeNode) path.getLastPathComponent();
}
JiveTreeNode roomNode = new JiveTreeNode(roomName, false, SparkRes.getImageIcon(SparkRes.BOOKMARK_ICON));
roomNode.setAssociatedObject(roomJID);
node.add(roomNode);
DefaultTreeModel model = (DefaultTreeModel) tree.getModel();
model.nodeStructureChanged(node);
tree.expandPath(rootPath);
addBookmark(roomName, roomJID, false);
} else {
// Remove bookmark
TreePath path = tree.findByName(tree, new String[]{rootNode.toString(), serviceName.toString(), roomName});
JiveTreeNode node = (JiveTreeNode) path.getLastPathComponent();
DefaultTreeModel model = (DefaultTreeModel) tree.getModel();
model.removeNodeFromParent(node);
EntityBareJid jid = ((Jid) node.getAssociatedObject()).asEntityBareJidOrThrow();
removeBookmark(jid);
}
}
}

58
core/src/main/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java
View File

@ -29,8 +29,6 @@ import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
import org.jivesoftware.resource.Res;
@ -46,11 +44,9 @@ import org.jivesoftware.smackx.muc.MultiUserChat;
import org.jivesoftware.smackx.muc.RoomInfo;
import org.jivesoftware.spark.ChatManager;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.component.JiveTreeNode;
import org.jivesoftware.spark.component.RolloverButton;
import org.jivesoftware.spark.component.Table;
import org.jivesoftware.spark.component.TitlePanel;
import org.jivesoftware.spark.component.Tree;
import org.jivesoftware.spark.ui.ChatRoomNotFoundException;
import org.jivesoftware.spark.ui.rooms.GroupChatRoom;
import org.jivesoftware.spark.util.ImageCombiner;
@ -64,7 +60,6 @@ import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.jid.parts.Resourcepart;
import org.jxmpp.stringprep.XmppStringprepException;
@ -273,7 +268,7 @@ public class ConferenceRoomBrowser extends JPanel implements ActionListener, Com
});
popupMenu.add(itemCopyUri);
// Select the row where the use made ther right-clicked
// Select the row where the use made their right-clicked
popupMenu.addPopupMenuListener(new PopupMenuListener() {
@Override
public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
@ -386,7 +381,7 @@ public class ConferenceRoomBrowser extends JPanel implements ActionListener, Com
} finally {
stopLoadingImg();
}
// if there was an error show it to a user
// If there was an error, show it to a user
if (errorMsg != null) {
UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
JOptionPane.showMessageDialog(conferences,
@ -428,6 +423,7 @@ public class ConferenceRoomBrowser extends JPanel implements ActionListener, Com
return;
}
RoomObject roomInfo1 = selectedRoomInfo();
final String roomJIDString = roomsTable.getValueAt(selectedRow, 2) + "@" + serviceName;
EntityBareJid roomJID;
try {
@ -451,41 +447,18 @@ public class ConferenceRoomBrowser extends JPanel implements ActionListener, Com
return;
}
Tree serviceTree = conferences.getTree();
JiveTreeNode rootNode = (JiveTreeNode) serviceTree.getModel().getRoot();
TreePath rootPath = serviceTree.findByName(serviceTree, new String[]{rootNode.toString(), serviceName.toString()});
boolean isBookmarked = isBookmarked(roomJID);
conferences.addOrRemoveNode(serviceName, isBookmarked, roomName, roomJID);
if (!isBookmarked) {
JiveTreeNode node = (JiveTreeNode) serviceTree.getLastSelectedPathComponent();
if (node == null) {
String defaultServiceName = ConferenceServices.getDefaultServiceName().toString();
TreePath path = serviceTree.findByName(serviceTree, new String[]{rootNode.toString(), defaultServiceName});
node = (JiveTreeNode) path.getLastPathComponent();
}
JiveTreeNode roomNode = new JiveTreeNode(roomName, false, SparkRes.getImageIcon(SparkRes.BOOKMARK_ICON));
roomNode.setAssociatedObject(roomJID);
node.add(roomNode);
final DefaultTreeModel model = (DefaultTreeModel) serviceTree.getModel();
model.nodeStructureChanged(node);
serviceTree.expandPath(rootPath);
roomsTable.getTableModel().setValueAt(new JLabel(SparkRes.getImageIcon(SparkRes.BOOKMARK_ICON)), selectedRow, 0);
addBookmarkUI(false);
conferences.addBookmark(roomName, roomJID, false);
} else {
// Remove bookmark
TreePath path = serviceTree.findByName(serviceTree, new String[]{rootNode.toString(), serviceName.toString(), roomName});
JiveTreeNode node = (JiveTreeNode) path.getLastPathComponent();
final DefaultTreeModel model = (DefaultTreeModel) serviceTree.getModel();
model.removeNodeFromParent(node);
roomsTable.getTableModel().setValueAt(new JLabel(SparkRes.getImageIcon(SparkRes.BLANK_IMAGE)), selectedRow, 0);
addBookmarkUI(true);
EntityBareJid jid = ((Jid) node.getAssociatedObject()).asEntityBareJidOrThrow();
conferences.removeBookmark(jid);
roomsTable.getTableModel().setValueAt(new JLabel(SparkRes.getImageIcon(SparkRes.BOOKMARK_ICON)), selectedRow, 0);
} else {
addBookmarkUI(false);
roomsTable.getTableModel().setValueAt(new JLabel(SparkRes.getImageIcon(SparkRes.BLANK_IMAGE)), selectedRow, 0);
}
}
private void joinSelectedRoom() {
int selectedRow = roomsTable.getSelectedRow();
UIManager.put("OptionPane.okButtonText", Res.getString("ok"));
@ -577,7 +550,7 @@ public class ConferenceRoomBrowser extends JPanel implements ActionListener, Com
}
});
// will need that when the window is smaller then the buttons width...
// will need that when the window is smaller than the buttons width...
setButtonsWidth();
showHiddenButtons.setVisible(false);
@ -616,7 +589,8 @@ public class ConferenceRoomBrowser extends JPanel implements ActionListener, Com
Res.getString("title.name"),
Res.getString("title.address"),
Res.getString("title.occupants"),
Res.getString("menuitem.languages")
Res.getString("menuitem.languages"),
Res.getString("description"),
});
getColumnModel().setColumnMargin(0);
getColumnModel().getColumn(0).setMaxWidth(30);
@ -635,14 +609,6 @@ public class ConferenceRoomBrowser extends JPanel implements ActionListener, Com
enterRoom();
}
}
@Override
public void mouseReleased(MouseEvent e) {
}
@Override
public void mousePressed(MouseEvent e) {
}
});
}