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

Removed two calls to load vcard.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@5581 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-10-02 04:44:45 +00:00
committed by derek
parent 2763fa5c72
commit 956419329a
3 changed files with 140 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

241
build/projects/Spark.iws
View File

@ -14,7 +14,10 @@
<option name="CHANGE_BEFORE" value="" />
<option name="CHANGE_AFTER" value="" />
</component>
<component name="CheckinPanelState" />
<component name="CheckinPanelState">
<Excluded key="C:\code\spark\build\projects\Spark.iml" />
<Excluded key="C:\code\spark\build\projects\Spark.ipr" />
</component>
<component name="Commander">
<leftPanel />
<rightPanel />
@ -134,82 +137,55 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="SessionManager.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/SessionManager.java">
<file leaf-file-name="Spark.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Spark.java">
<provider selected="true" editor-type-id="text-editor">
<state line="111" column="33" selection-start="3633" selection-end="3633" vertical-scroll-proportion="0.23726708">
<state line="61" column="50" selection-start="1821" selection-end="1821" vertical-scroll-proportion="0.4580802">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserSearchService.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/search/users/UserSearchService.java">
<file leaf-file-name="StatusBar.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/status/StatusBar.java">
<provider selected="true" editor-type-id="text-editor">
<state line="94" column="0" selection-start="3112" selection-end="3112" vertical-scroll-proportion="0.1863354">
<state line="405" column="10" selection-start="15439" selection-end="15439" vertical-scroll-proportion="0.21506684">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CheckUpdates.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/updater/CheckUpdates.java">
<file leaf-file-name="Workspace.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/Workspace.java">
<provider selected="true" editor-type-id="text-editor">
<state line="519" column="36" selection-start="19126" selection-end="19126" vertical-scroll-proportion="0.22857143">
<state line="190" column="25" selection-start="6693" selection-end="6693" vertical-scroll-proportion="0.40826246">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BookmarkPlugin.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/bookmarks/BookmarkPlugin.java">
<file leaf-file-name="ContactList.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactList.java">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="0" selection-start="1911" selection-end="1911" vertical-scroll-proportion="0.19503106">
<state line="97" column="19" selection-start="3469" selection-end="3469" vertical-scroll-proportion="0.36087486">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="GatewayPlugin.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java">
<file leaf-file-name="VCardManager.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/profile/VCardManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="106" column="0" selection-start="3478" selection-end="3478" vertical-scroll-proportion="0.1863354">
<state line="310" column="43" selection-start="11377" selection-end="11377" vertical-scroll-proportion="4.7885785">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Enterprise.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/manager/Enterprise.java">
<file leaf-file-name="SparkManager.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/SparkManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="55" column="43" selection-start="1677" selection-end="1677" vertical-scroll-proportion="0.15900621">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="XMPPConnection.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../../smack/source/org/jivesoftware/smack/XMPPConnection.java">
<provider selected="true" editor-type-id="text-editor">
<state line="233" column="0" selection-start="9514" selection-end="9514" vertical-scroll-proportion="0.34146342">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SwingWorker.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/util/SwingWorker.java">
<provider selected="true" editor-type-id="text-editor">
<state line="131" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="0.21585366">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="LoginDialog.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/LoginDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state line="583" column="59" selection-start="21808" selection-end="21826" vertical-scroll-proportion="0.34037268">
<state line="238" column="21" selection-start="7803" selection-end="7803" vertical-scroll-proportion="0.33890215">
<folding />
</state>
</provider>
@ -413,11 +389,13 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<module name="Spark" />
<RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
<option name="DEBUG_PORT" value="1606" />
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" />
</RunnerSettings>
<ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
</configuration>
</component>
@ -464,26 +442,26 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="2" y="0" width="1278" height="996" extended-state="0" />
<frame x="2" y="0" width="1278" height="994" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.24959217" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="1" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.25203916" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3290993" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3290993" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3986175" order="4" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39838338" order="4" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="-1" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
@ -513,6 +491,7 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="Prevent NPE when connecting to GMAIL." />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@ -553,65 +532,107 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/LoginDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state line="583" column="59" selection-start="21808" selection-end="21826" vertical-scroll-proportion="0.34037268">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/util/SwingWorker.java">
<provider selected="true" editor-type-id="text-editor">
<state line="131" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="0.21585366">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../../smack/source/org/jivesoftware/smack/XMPPConnection.java">
<provider selected="true" editor-type-id="text-editor">
<state line="233" column="0" selection-start="9514" selection-end="9514" vertical-scroll-proportion="0.34146342">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/manager/Enterprise.java">
<provider selected="true" editor-type-id="text-editor">
<state line="55" column="43" selection-start="1677" selection-end="1677" vertical-scroll-proportion="0.15900621">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="106" column="0" selection-start="3478" selection-end="3478" vertical-scroll-proportion="0.1863354">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/bookmarks/BookmarkPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="0" selection-start="1911" selection-end="1911" vertical-scroll-proportion="0.19503106">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/updater/CheckUpdates.java">
<provider selected="true" editor-type-id="text-editor">
<state line="519" column="36" selection-start="19126" selection-end="19126" vertical-scroll-proportion="0.22857143">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/search/users/UserSearchService.java">
<provider selected="true" editor-type-id="text-editor">
<state line="94" column="0" selection-start="3112" selection-end="3112" vertical-scroll-proportion="0.1863354">
<state line="94" column="0" selection-start="3112" selection-end="3112" vertical-scroll-proportion="0.18057285">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/SessionManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="111" column="33" selection-start="3633" selection-end="3633" vertical-scroll-proportion="0.23726708">
<state line="111" column="33" selection-start="3633" selection-end="3633" vertical-scroll-proportion="0.02117061">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/updater/CheckUpdates.java">
<provider selected="true" editor-type-id="text-editor">
<state line="551" column="21" selection-start="20246" selection-end="20246" vertical-scroll-proportion="0.38107097">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/bookmarks/BookmarkPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="0" selection-start="1911" selection-end="1911" vertical-scroll-proportion="0.02117061">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="106" column="0" selection-start="3478" selection-end="3478" vertical-scroll-proportion="0.02117061">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/manager/Enterprise.java">
<provider selected="true" editor-type-id="text-editor">
<state line="55" column="43" selection-start="1677" selection-end="1677" vertical-scroll-proportion="0.15940224">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../../smack/source/org/jivesoftware/smack/XMPPConnection.java">
<provider selected="true" editor-type-id="text-editor">
<state line="233" column="0" selection-start="9514" selection-end="9514" vertical-scroll-proportion="0.020782396">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/util/SwingWorker.java">
<provider selected="true" editor-type-id="text-editor">
<state line="131" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="0.21638142">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/LoginDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state line="583" column="59" selection-start="21808" selection-end="21826" vertical-scroll-proportion="0.02117061">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/SparkManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="238" column="21" selection-start="7803" selection-end="7803" vertical-scroll-proportion="0.33890215">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/profile/VCardManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="310" column="43" selection-start="11377" selection-end="11377" vertical-scroll-proportion="4.7885785">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactList.java">
<provider selected="true" editor-type-id="text-editor">
<state line="97" column="19" selection-start="3469" selection-end="3469" vertical-scroll-proportion="0.36087486">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/Workspace.java">
<provider selected="true" editor-type-id="text-editor">
<state line="190" column="25" selection-start="6693" selection-end="6693" vertical-scroll-proportion="0.40826246">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/status/StatusBar.java">
<provider selected="true" editor-type-id="text-editor">
<state line="405" column="10" selection-start="15439" selection-end="15439" vertical-scroll-proportion="0.21506684">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Spark.java">
<provider selected="true" editor-type-id="text-editor">
<state line="61" column="50" selection-start="1821" selection-end="1821" vertical-scroll-proportion="0.4580802">
<folding />
</state>
</provider>

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

@ -77,7 +77,7 @@ import javax.swing.UIManager;
*/
public class Workspace extends JPanel implements PacketListener {
private SparkTabbedPane workspacePane;
private final StatusBar statusBox = new StatusBar();
private StatusBar statusBox;
private ContactList contactList;
private Conferences conferences;
@ -163,6 +163,8 @@ public class Workspace extends JPanel implements PacketListener {
alerts.getTitlePane().setVisible(false);
alerts.setVisible(false);
statusBox = new StatusBar();
// Build default workspace
this.setLayout(new GridBagLayout());
add(workspacePane, new GridBagConstraints(0, 9, 1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(2, 4, 4, 4), 0, 0));
@ -195,6 +197,9 @@ public class Workspace extends JPanel implements PacketListener {
contactList = new ContactList();
contactList.initialize();
// Load VCard information for status box
statusBox.loadVCard();
conferences = new Conferences();
conferences.initialize();

17
src/java/org/jivesoftware/spark/ui/status/StatusBar.java
View File

@ -13,10 +13,8 @@ package org.jivesoftware.spark.ui.status;
import org.jivesoftware.resource.Default;
import org.jivesoftware.resource.Res;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smackx.packet.VCard;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.ui.PresenceListener;
@ -110,8 +108,6 @@ public class StatusBar extends JPanel {
setBorder(BorderFactory.createLineBorder(new Color(197, 213, 230), 1));
loadVCard();
SparkManager.getSessionManager().addPresenceListener(new PresenceListener() {
public void presenceChanged(Presence presence) {
changeAvailability(presence);
@ -407,21 +403,14 @@ public class StatusBar extends JPanel {
}
private void loadVCard() {
final VCard vCard = new VCard();
public void loadVCard() {
final SwingWorker worker = new SwingWorker() {
public Object construct() {
try {
vCard.load(SparkManager.getConnection());
}
catch (XMPPException e) {
vCard.setError(new XMPPError(404));
}
return vCard;
return SparkManager.getVCardManager().getVCard();
}
public void finished() {
final VCard vCard = (VCard)get();
populateWithVCardInfo(vCard);
}
};