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

Load broadcast plugin in main thread.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@7596 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-03-19 14:31:53 +00:00
committed by derek
parent 5429628569
commit 2fbef6b0da
3 changed files with 21 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,18 +36,12 @@ import org.jivesoftware.spark.ui.status.StatusBar;
import org.jivesoftware.spark.util.SwingTimerTask;
import org.jivesoftware.spark.util.TaskEngine;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.plugin.alerts.BroadcastPlugin;
import org.jivesoftware.sparkimpl.plugin.bookmarks.BookmarkPlugin;
import org.jivesoftware.sparkimpl.plugin.gateways.GatewayPlugin;
import org.jivesoftware.sparkimpl.plugin.manager.Enterprise;
import org.jivesoftware.sparkimpl.plugin.transcripts.ChatTranscriptPlugin;
import javax.swing.AbstractAction;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
import java.awt.CardLayout;
import java.awt.Color;
import java.awt.GridBagConstraints;
@ -58,6 +52,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.TimerTask;
import javax.swing.AbstractAction;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
/**
* The inner Container for Spark. The Workspace is the container for all plugins into the Spark
@ -83,6 +84,7 @@ public class Workspace extends JPanel implements PacketListener {
private ChatTranscriptPlugin transcriptPlugin;
private GatewayPlugin gatewayPlugin;
private BookmarkPlugin bookmarkPlugin;
private BroadcastPlugin broadcastPlugin;
private static Workspace singleton;
private static final Object LOCK = new Object();
@ -134,6 +136,7 @@ public class Workspace extends JPanel implements PacketListener {
conferences.shutdown();
gatewayPlugin.shutdown();
bookmarkPlugin.shutdown();
broadcastPlugin.shutdown();
}
public void mainWindowActivated() {
@ -243,6 +246,10 @@ public class Workspace extends JPanel implements PacketListener {
PhoneManager.getInstance();
transcriptPlugin = new ChatTranscriptPlugin();
// Load Broadcast Plugin
broadcastPlugin = new BroadcastPlugin();
broadcastPlugin.initialize();
// Load BookmarkPlugin
bookmarkPlugin = new BookmarkPlugin();
bookmarkPlugin.initialize();
@ -309,11 +316,11 @@ public class Workspace extends JPanel implements PacketListener {
boolean broadcast = message.getProperty("broadcast") != null;
if (body == null ||
isGroupChat ||
broadcast ||
message.getType() == Message.Type.normal ||
message.getType() == Message.Type.headline ||
message.getType() == Message.Type.error) {
isGroupChat ||
broadcast ||
message.getType() == Message.Type.normal ||
message.getType() == Message.Type.headline ||
message.getType() == Message.Type.error) {
return;
}