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

Fix NPE in workspace.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@7599 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-03-19 22:20:15 +00:00
committed by derek
parent 316d770068
commit 0b201122df
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,13 @@ 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;
@ -52,13 +59,6 @@ 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
@ -191,13 +191,14 @@ public class Workspace extends JPanel implements PacketListener {
// Initialize Contact List
contactList = new ContactList();
conferences = new ConferenceServices();
// Init contact list.
contactList.initialize();
// Load VCard information for status box
statusBox.loadVCard();
conferences = new ConferenceServices();
// Initialise TransferManager
SparkTransferManager.getInstance();
}
@ -316,11 +317,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;
}