mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Updating conference code.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@6846 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-01-28 04:03:59 +00:00
committed by derek
parent 2d24941447
commit 8516f59408
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/jivesoftware/spark/Workspace.java
View File

@ -30,7 +30,7 @@ import org.jivesoftware.spark.ui.ChatRoomNotFoundException;
import org.jivesoftware.spark.ui.CommandPanel; import org.jivesoftware.spark.ui.CommandPanel;
import org.jivesoftware.spark.ui.ContactItem; import org.jivesoftware.spark.ui.ContactItem;
import org.jivesoftware.spark.ui.ContactList; import org.jivesoftware.spark.ui.ContactList;
import org.jivesoftware.spark.ui.conferences.Conferences; import org.jivesoftware.spark.ui.conferences.ConferencePlugin;
import org.jivesoftware.spark.ui.status.StatusBar; import org.jivesoftware.spark.ui.status.StatusBar;
import org.jivesoftware.spark.util.SwingWorker; import org.jivesoftware.spark.util.SwingWorker;
import org.jivesoftware.spark.util.log.Log; import org.jivesoftware.spark.util.log.Log;
@ -77,7 +77,7 @@ public class Workspace extends JPanel implements PacketListener {
private StatusBar statusBox; private StatusBar statusBox;
private CommandPanel commandPanel; private CommandPanel commandPanel;
private ContactList contactList; private ContactList contactList;
private Conferences conferences; private ConferencePlugin conferences;
private static Workspace singleton; private static Workspace singleton;
private static final Object LOCK = new Object(); private static final Object LOCK = new Object();
@ -186,7 +186,7 @@ public class Workspace extends JPanel implements PacketListener {
// Load VCard information for status box // Load VCard information for status box
statusBox.loadVCard(); statusBox.loadVCard();
conferences = new Conferences(); conferences = new ConferencePlugin();
conferences.initialize(); conferences.initialize();
// Initialize Search Service // Initialize Search Service

2
src/java/org/jivesoftware/spark/ui/conferences/BookmarkedConferences.java
View File

@ -274,7 +274,7 @@ public class BookmarkedConferences extends JPanel {
} }
public void browseRooms(String serviceName) { public void browseRooms(String serviceName) {
ConferenceRooms rooms = new ConferenceRooms(tree, serviceName); ConferenceRoomBrowser rooms = new ConferenceRoomBrowser(tree, serviceName);
rooms.invoke(); rooms.invoke();
} }

5
src/java/org/jivesoftware/spark/ui/conferences/Conferences.java → src/java/org/jivesoftware/spark/ui/conferences/ConferencePlugin.java
View File

@ -35,7 +35,6 @@ import org.jivesoftware.spark.ui.ContactList;
import org.jivesoftware.spark.ui.PresenceListener; import org.jivesoftware.spark.ui.PresenceListener;
import org.jivesoftware.spark.ui.rooms.ChatRoomImpl; import org.jivesoftware.spark.ui.rooms.ChatRoomImpl;
import org.jivesoftware.spark.ui.rooms.GroupChatRoom; import org.jivesoftware.spark.ui.rooms.GroupChatRoom;
import org.jivesoftware.spark.ui.status.StatusBar;
import org.jivesoftware.spark.util.ModelUtil; import org.jivesoftware.spark.util.ModelUtil;
import org.jivesoftware.spark.util.SwingWorker; import org.jivesoftware.spark.util.SwingWorker;
import org.jivesoftware.spark.util.log.Log; import org.jivesoftware.spark.util.log.Log;
@ -59,7 +58,7 @@ import java.util.List;
* Conference plugin is reponsible for the initial loading of MultiUser Chat support. To disable plugin, * Conference plugin is reponsible for the initial loading of MultiUser Chat support. To disable plugin,
* you can remove from the plugins.xml file located in the classpath of Communicator. * you can remove from the plugins.xml file located in the classpath of Communicator.
*/ */
public class Conferences { public class ConferencePlugin {
private static BookmarkedConferences bookedMarkedConferences; private static BookmarkedConferences bookedMarkedConferences;
private boolean mucSupported; private boolean mucSupported;
@ -88,7 +87,7 @@ public class Conferences {
commandPanel.add(joinConference); commandPanel.add(joinConference);
joinConference.addActionListener(new ActionListener() { joinConference.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
ConferenceRooms rooms = new ConferenceRooms(bookedMarkedConferences.getTree(), getDefaultServiceName()); ConferenceRoomBrowser rooms = new ConferenceRoomBrowser(bookedMarkedConferences.getTree(), getDefaultServiceName());
rooms.invoke(); rooms.invoke();
} }
}); });

6
src/java/org/jivesoftware/spark/ui/conferences/ConferenceRooms.java → src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomBrowser.java
View File

@ -72,7 +72,7 @@ import javax.swing.tree.TreePath;
* creation and joining of rooms for group chat discussions as well as the listing * creation and joining of rooms for group chat discussions as well as the listing
* of the creation times, number of occupants in a room, and the room name itself. * of the creation times, number of occupants in a room, and the room name itself.
*/ */
public class ConferenceRooms extends JPanel implements ActionListener { public class ConferenceRoomBrowser extends JPanel implements ActionListener {
private final RoomList roomsTable; private final RoomList roomsTable;
private final RolloverButton createButton = new RolloverButton("", SparkRes.getImageIcon(SparkRes.SMALL_USER1_NEW)); private final RolloverButton createButton = new RolloverButton("", SparkRes.getImageIcon(SparkRes.SMALL_USER1_NEW));
private final RolloverButton joinRoomButton = new RolloverButton("", SparkRes.getImageIcon(SparkRes.DOOR_IMAGE)); private final RolloverButton joinRoomButton = new RolloverButton("", SparkRes.getImageIcon(SparkRes.DOOR_IMAGE));
@ -95,7 +95,7 @@ public class ConferenceRooms extends JPanel implements ActionListener {
* @param serviceName the name of the conference service. * @param serviceName the name of the conference service.
* //TODO This needs to be refactored. * //TODO This needs to be refactored.
*/ */
public ConferenceRooms(final Tree serviceTree, final String serviceName) { public ConferenceRoomBrowser(final Tree serviceTree, final String serviceName) {
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
@ -272,7 +272,7 @@ public class ConferenceRooms extends JPanel implements ActionListener {
if (!isBookmarked) { if (!isBookmarked) {
JiveTreeNode node = (JiveTreeNode)serviceTree.getLastSelectedPathComponent(); JiveTreeNode node = (JiveTreeNode)serviceTree.getLastSelectedPathComponent();
if (node == null) { if (node == null) {
TreePath path = serviceTree.findByName(serviceTree, new String[]{rootNode.toString(), Conferences.getDefaultServiceName()}); TreePath path = serviceTree.findByName(serviceTree, new String[]{rootNode.toString(), ConferencePlugin.getDefaultServiceName()});
node = (JiveTreeNode)path.getLastPathComponent(); node = (JiveTreeNode)path.getLastPathComponent();
} }
JiveTreeNode roomNode = new JiveTreeNode(roomName, false, SparkRes.getImageIcon(SparkRes.BOOKMARK_ICON)); JiveTreeNode roomNode = new JiveTreeNode(roomName, false, SparkRes.getImageIcon(SparkRes.BOOKMARK_ICON));