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

Updated to latest smack.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@4869 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-08-09 23:07:58 +00:00
committed by derek
parent a88eb81a9a
commit 0dba8372ee
28 changed files with 375 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/lib/dist/smack.jar vendored
View File

Binary file not shown.

BIN
build/lib/dist/smackx-debug.jar vendored
View File

Binary file not shown.

BIN
build/lib/dist/smackx.jar vendored
View File

Binary file not shown.

388
build/projects/Spark.iws
View File

@ -15,8 +15,12 @@
<option name="CHANGE_AFTER" value="" /> <option name="CHANGE_AFTER" value="" />
</component> </component>
<component name="CheckinPanelState"> <component name="CheckinPanelState">
<Excluded key="C:\spark\build\projects\Spark.ipr" /> <Excluded key="C:\spark\build\lib\dist\smack.jar" />
<Excluded key="C:\spark\build\lib\dist\smackx-debug.jar" />
<Excluded key="C:\spark\build\lib\dist\smackx.jar" />
<Excluded key="C:\spark\build\projects\Spark.iws" /> <Excluded key="C:\spark\build\projects\Spark.iws" />
<Excluded key="C:\spark\src\java\org\jivesoftware\AccountCreationWizard.java" />
<Excluded key="C:\spark\src\java\org\jivesoftware\LoginDialog.java" />
</component> </component>
<component name="Commander"> <component name="Commander">
<leftPanel /> <leftPanel />
@ -122,10 +126,91 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="ContactGroup.java" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="Notifications.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactGroup.java"> <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/component/Notifications.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="78" column="43" selection-start="2553" selection-end="2553" vertical-scroll-proportion="0.38551858"> <state line="277" column="57" selection-start="8150" selection-end="8150" vertical-scroll-proportion="0.21428572">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RosterDialog.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/RosterDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state line="298" column="9" selection-start="10725" selection-end="10725" vertical-scroll-proportion="0.2847358">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="NewRoster.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/NewRoster.java">
<provider selected="true" editor-type-id="text-editor">
<state line="108" column="9" selection-start="3099" selection-end="3099" vertical-scroll-proportion="0.23776908">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ChatViewer.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/panes/ChatViewer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="75" column="65" selection-start="2797" selection-end="2797" vertical-scroll-proportion="0.22113504">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="OnlineAgents.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/panes/OnlineAgents.java">
<provider selected="true" editor-type-id="text-editor">
<state line="212" column="77" selection-start="7881" selection-end="7881" vertical-scroll-proportion="0.45401174">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WorkgroupRosterTree.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java">
<provider selected="true" editor-type-id="text-editor">
<state line="152" column="79" selection-start="5396" selection-end="5396" vertical-scroll-proportion="0.54696673">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WorkgroupManager.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/internal/WorkgroupManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="264" column="57" selection-start="9817" selection-end="9817" vertical-scroll-proportion="0.22113504">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FormUtils.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/internal/FormUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="70" column="47" selection-start="2259" selection-end="2259" vertical-scroll-proportion="0.4373777">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TransportManager.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="71" column="79" selection-start="2270" selection-end="2270" vertical-scroll-proportion="0.22113504">
<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">
<provider selected="true" editor-type-id="text-editor">
<state line="247" column="69" selection-start="9175" selection-end="9175" vertical-scroll-proportion="0.65068495">
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -380,7 +465,92 @@
<option name="SHOW_DIALOG" value="true" /> <option name="SHOW_DIALOG" value="true" />
</component> </component>
<component name="RecentsManager" /> <component name="RecentsManager" />
<component name="RestoreUpdateTree" /> <component name="RestoreUpdateTree">
<UpdateInfo date="8/9/06 12:52 PM" ActionInfo="Update">
<UpdatedFiles>
<FILE-GROUP>
<option name="myUpdateName" value="Updated from server" />
<option name="myStatusName" value="Changed on server" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CHANGED_ON_SERVER" />
<FILE-GROUP>
<option name="myUpdateName" value="Updated" />
<option name="myStatusName" value="Changed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UPDATED" />
<PATH>C:\spark\src\java\org\jivesoftware\spark\PluginManager.java</PATH>
<PATH>C:\spark\src\java\org\jivesoftware\sparkimpl\plugin\viewer\PluginViewer.java</PATH>
<PATH>C:\spark\src\java\org\jivesoftware\sparkimpl\plugin\viewer\SparkPlugUI.java</PATH>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Created" />
<option name="myStatusName" value="Created" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CREATED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Deleted" />
<option name="myStatusName" value="Deleted" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="true" />
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Restored" />
<option name="myStatusName" value="Will be restored" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="RESTORED" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Modified" />
<option name="myStatusName" value="Modified" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MODIFIED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with conflicts" />
<option name="myStatusName" value="Will be merged with conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_CONFLICTS" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged" />
<option name="myStatusName" value="Will be merged" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Not in repository" />
<option name="myStatusName" value="Not in repository" />
<option name="mySupportsDeletion" value="true" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UNKNOWN" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally added" />
<option name="myStatusName" value="Locally added" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_ADDED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally removed" />
<option name="myStatusName" value="Locally removed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_REMOVED" />
</FILE-GROUP>
</UpdatedFiles>
</UpdateInfo>
</component>
<component name="RunManager"> <component name="RunManager">
<activeType name="Application" /> <activeType name="Application" />
<tempConfiguration selected="false" default="false" name="SparkTabbedPane" type="Application" factoryName="Application"> <tempConfiguration selected="false" default="false" name="SparkTabbedPane" type="Application" factoryName="Application">
@ -391,22 +561,15 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" /> <option name="ALTERNATIVE_JRE_PATH" value="" />
<module name="Spark" /> <module name="Spark" />
<RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug"> <RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="3399" /> <option name="DEBUG_PORT" value="3399" />
<option name="TRANSPORT" value="0" /> <option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" /> <option name="LOCAL" value="true" />
</RunnerSettings> </RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" /> <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
</tempConfiguration> </tempConfiguration>
<configuration selected="false" default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
<configuration selected="false" default="true" type="Applet" factoryName="Applet"> <configuration selected="false" default="true" type="Applet" factoryName="Applet">
<module name="" /> <module name="" />
<option name="MAIN_CLASS_NAME" /> <option name="MAIN_CLASS_NAME" />
@ -444,6 +607,13 @@
<value defaultName="wholeProject" /> <value defaultName="wholeProject" />
</option> </option>
</configuration> </configuration>
<configuration selected="false" default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
<configuration selected="true" default="false" name="Spark" type="Application" factoryName="Application"> <configuration selected="true" default="false" name="Spark" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.jivesoftware.Spark" /> <option name="MAIN_CLASS_NAME" value="org.jivesoftware.Spark" />
<option name="VM_PARAMETERS" value="-Dswing.aatext=true" /> <option name="VM_PARAMETERS" value="-Dswing.aatext=true" />
@ -452,14 +622,14 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files/Java/jdk1.6.0" /> <option name="ALTERNATIVE_JRE_PATH" value="C:/Program Files/Java/jdk1.6.0" />
<module name="Spark" /> <module name="Spark" />
<RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug"> <RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1406" /> <option name="DEBUG_PORT" value="1406" />
<option name="TRANSPORT" value="0" /> <option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" /> <option name="LOCAL" value="true" />
</RunnerSettings> </RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" /> <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
</configuration> </configuration>
<configuration selected="false" default="false" name="SparkToaster" type="Application" factoryName="Application"> <configuration selected="false" default="false" name="SparkToaster" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="com.jivesoftware.sparkimpl.plugin.alerts.SparkToaster" /> <option name="MAIN_CLASS_NAME" value="com.jivesoftware.sparkimpl.plugin.alerts.SparkToaster" />
@ -469,14 +639,14 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" /> <option name="ALTERNATIVE_JRE_PATH" value="" />
<module name="Spark" /> <module name="Spark" />
<RunnerSettings RunnerId="Run" />
<RunnerSettings RunnerId="Debug"> <RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="1238" /> <option name="DEBUG_PORT" value="1238" />
<option name="TRANSPORT" value="0" /> <option name="TRANSPORT" value="0" />
<option name="LOCAL" value="true" /> <option name="LOCAL" value="true" />
</RunnerSettings> </RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
<ConfigurationWrapper RunnerId="Run" /> <ConfigurationWrapper RunnerId="Run" />
<ConfigurationWrapper RunnerId="Debug" />
</configuration> </configuration>
<configuration selected="false" default="false" name="NightMode" type="Application" factoryName="Application"> <configuration selected="false" default="false" name="NightMode" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="com.jivesoftware.Spark" /> <option name="MAIN_CLASS_NAME" value="com.jivesoftware.Spark" />
@ -587,7 +757,7 @@
<layout> <layout>
<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="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.3298731" order="7" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3298731" order="7" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.19189766" order="0" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.19402985" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32" order="1" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32" 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="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.3209524" order="8" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3209524" order="8" />
@ -631,7 +801,6 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="Have Tab Pane respond on mousePressed." />
<MESSAGE value="1) Fixed title pane.&#10;2) Fixed reconnection UI confusion.&#10;3) Added JID to Vcard Profile." /> <MESSAGE value="1) Fixed title pane.&#10;2) Fixed reconnection UI confusion.&#10;3) Added JID to Vcard Profile." />
<MESSAGE value="1) Fixed history.&#10;2) Updating gateway support." /> <MESSAGE value="1) Fixed history.&#10;2) Updating gateway support." />
<MESSAGE value="Added better support for Gateway icons." /> <MESSAGE value="Added better support for Gateway icons." />
@ -641,6 +810,7 @@
<MESSAGE value="Updating Fastpath UI." /> <MESSAGE value="Updating Fastpath UI." />
<MESSAGE value="Fixing ChatRoom scroll issue." /> <MESSAGE value="Fixing ChatRoom scroll issue." />
<MESSAGE value="Fixed broadcasting issue with HEADLINE." /> <MESSAGE value="Fixed broadcasting issue with HEADLINE." />
<MESSAGE value="Update ContactList with subtle actions." />
</component> </component>
<component name="VssConfiguration"> <component name="VssConfiguration">
<option name="CLIENT_PATH" value="" /> <option name="CLIENT_PATH" value="" />
@ -681,107 +851,107 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/Spark.java"> <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/component/RosterTree.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="80" column="39" selection-start="2443" selection-end="2443" vertical-scroll-proportion="0.46771038"> <state line="128" column="79" selection-start="4436" selection-end="4436" vertical-scroll-proportion="0.52359885">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="23" selection-start="408" selection-end="408" vertical-scroll-proportion="0.31604695">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ChatRoom.java">
<provider selected="true" editor-type-id="text-editor">
<state line="709" column="102" selection-start="22644" selection-end="22644" vertical-scroll-proportion="-0.5489237">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state line="256" column="10" selection-start="9637" selection-end="9637" vertical-scroll-proportion="0.5988258">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/VCardPanel.java">
<provider selected="true" editor-type-id="text-editor">
<state line="123" column="27" selection-start="3863" selection-end="3863" vertical-scroll-proportion="1.9491193">
<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="200" column="69" selection-start="7069" selection-end="7069" vertical-scroll-proportion="0.4187867">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/preference/PreferenceDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state line="39" column="21" selection-start="1130" selection-end="1130" vertical-scroll-proportion="0.6082474">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/preference/PreferenceManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="63" column="27" selection-start="1729" selection-end="1729" vertical-scroll-proportion="0.3328424">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="272" column="37" selection-start="11551" selection-end="11551" vertical-scroll-proportion="0.5948362">
<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="1669" column="30" selection-start="61590" selection-end="61590" vertical-scroll-proportion="0.3326713">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/filetransfer/preferences/FileTransferPreference.java">
<provider selected="true" editor-type-id="text-editor">
<state line="100" column="11" selection-start="2774" selection-end="2774" vertical-scroll-proportion="0.50097847">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="266" column="0" selection-start="10440" selection-end="10440" vertical-scroll-proportion="0.851272">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state line="55" column="18" selection-start="1825" selection-end="1825" vertical-scroll-proportion="0.18590999">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/MainWindow.java"> <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/MainWindow.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="56" column="19" selection-start="1797" selection-end="1797" vertical-scroll-proportion="0.33268103"> <state line="253" column="74" selection-start="8212" selection-end="8212" vertical-scroll-proportion="0.32300884">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/ContactGroup.java"> <entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/RosterPickList.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="78" column="43" selection-start="2553" selection-end="2553" vertical-scroll-proportion="0.38551858"> <state line="72" column="9" selection-start="2533" selection-end="2533" vertical-scroll-proportion="0.3480826">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/invite/WorkgroupInvitationDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state line="335" column="81" selection-start="12060" selection-end="12060" vertical-scroll-proportion="0.34346506">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java">
<provider selected="true" editor-type-id="text-editor">
<state line="96" column="130" selection-start="3656" selection-end="3656" vertical-scroll-proportion="0.3905775">
<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="247" column="69" selection-start="9175" selection-end="9175" vertical-scroll-proportion="0.65068495">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="71" column="79" selection-start="2270" selection-end="2270" vertical-scroll-proportion="0.22113504">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/internal/WorkgroupManager.java">
<provider selected="true" editor-type-id="text-editor">
<state line="264" column="57" selection-start="9817" selection-end="9817" vertical-scroll-proportion="0.22113504">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/invite/WorkgroupRosterTree.java">
<provider selected="true" editor-type-id="text-editor">
<state line="152" column="79" selection-start="5396" selection-end="5396" vertical-scroll-proportion="0.54696673">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/panes/OnlineAgents.java">
<provider selected="true" editor-type-id="text-editor">
<state line="212" column="77" selection-start="7881" selection-end="7881" vertical-scroll-proportion="0.45401174">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/workspace/panes/ChatViewer.java">
<provider selected="true" editor-type-id="text-editor">
<state line="75" column="65" selection-start="2797" selection-end="2797" vertical-scroll-proportion="0.22113504">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/NewRoster.java">
<provider selected="true" editor-type-id="text-editor">
<state line="108" column="9" selection-start="3099" selection-end="3099" vertical-scroll-proportion="0.23776908">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/ui/RosterDialog.java">
<provider selected="true" editor-type-id="text-editor">
<state line="298" column="9" selection-start="10725" selection-end="10725" vertical-scroll-proportion="0.2847358">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../src/java/org/jivesoftware/spark/component/Notifications.java">
<provider selected="true" editor-type-id="text-editor">
<state line="277" column="57" selection-start="8150" selection-end="8150" vertical-scroll-proportion="0.21428572">
<folding />
</state>
</provider>
</entry>
<entry file="file://C:/code/spark/plugins/fastpath/src/java/com/jivesoftware/fastpath/internal/FormUtils.java">
<provider selected="true" editor-type-id="text-editor">
<state line="70" column="47" selection-start="2259" selection-end="2259" vertical-scroll-proportion="0.4373777">
<folding /> <folding />
</state> </state>
</provider> </provider>

5
src/java/org/jivesoftware/AccountCreationWizard.java
View File

@ -11,7 +11,6 @@
package org.jivesoftware; package org.jivesoftware;
import org.jivesoftware.smack.AccountManager; import org.jivesoftware.smack.AccountManager;
import org.jivesoftware.smack.SSLXMPPConnection;
import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.spark.component.TitlePanel; import org.jivesoftware.spark.component.TitlePanel;
@ -265,10 +264,10 @@ public class AccountCreationWizard extends JPanel {
if (useSSL) { if (useSSL) {
if (!hostPortConfigured) { if (!hostPortConfigured) {
con = new SSLXMPPConnection(serverName); con = new XMPPConnection(serverName);
} }
else { else {
con = new SSLXMPPConnection(localPref.getXmppHost(), port, serverName); con = new XMPPConnection(localPref.getXmppHost(), port, serverName);
} }
} }
else { else {

7
src/java/org/jivesoftware/LoginDialog.java
View File

@ -13,7 +13,6 @@ package org.jivesoftware;
import org.jivesoftware.resource.Default; import org.jivesoftware.resource.Default;
import org.jivesoftware.resource.SparkRes; import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.Roster; import org.jivesoftware.smack.Roster;
import org.jivesoftware.smack.SSLXMPPConnection;
import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.XMPPException;
@ -591,10 +590,10 @@ public final class LoginDialog {
if (useSSL) { if (useSSL) {
if (!hostPortConfigured) { if (!hostPortConfigured) {
connection = new SSLXMPPConnection(serverName); connection = new XMPPConnection(serverName);
} }
else { else {
connection = new SSLXMPPConnection(localPref.getXmppHost(), port, serverName); connection = new XMPPConnection(localPref.getXmppHost(), port, serverName);
} }
} }
else { else {
@ -614,7 +613,7 @@ public final class LoginDialog {
// Subscriptions are always manual // Subscriptions are always manual
Roster roster = connection.getRoster(); Roster roster = connection.getRoster();
roster.setSubscriptionMode(Roster.SUBSCRIPTION_MANUAL); roster.setSubscriptionMode(Roster.SubscriptionMode.manual);
sessionManager.setServerAddress(connection.getServiceName()); sessionManager.setServerAddress(connection.getServiceName());
sessionManager.initializeSession(connection, getUsername(), getPassword()); sessionManager.initializeSession(connection, getUsername(), getPassword());

2
src/java/org/jivesoftware/MainWindow.java
View File

@ -251,7 +251,7 @@ public final class MainWindow extends JFrame implements ActionListener {
SparkRes.getImageIcon(SparkRes.USER1_MESSAGE_24x24), this); SparkRes.getImageIcon(SparkRes.USER1_MESSAGE_24x24), this);
if (status != null) { if (status != null) {
Presence presence = new Presence(Presence.Type.UNAVAILABLE); Presence presence = new Presence(Presence.Type.unavailable);
presence.setStatus(status); presence.setStatus(status);
con.sendPacket(presence); con.sendPacket(presence);
} }

2
src/java/org/jivesoftware/spark/SessionManager.java
View File

@ -306,7 +306,7 @@ public final class SessionManager implements ConnectionListener {
// Change Status // Change Status
Workspace workspace = SparkManager.getWorkspace(); Workspace workspace = SparkManager.getWorkspace();
Presence presence = workspace.getStatusBar().getPresence(); Presence presence = workspace.getStatusBar().getPresence();
if (workspace != null && presence.getMode() == Presence.Mode.AVAILABLE) { if (workspace != null && presence.getMode() == Presence.Mode.available) {
unavaliable = true; unavaliable = true;
StatusItem away = workspace.getStatusBar().getStatusItem("Away"); StatusItem away = workspace.getStatusBar().getStatusItem("Away");
Presence p = away.getPresence(); Presence p = away.getPresence();

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

@ -213,10 +213,10 @@ public class Workspace extends JPanel implements PacketListener {
public void processPacket(Packet packet) { public void processPacket(Packet packet) {
Presence presence = (Presence)packet; Presence presence = (Presence)packet;
if (presence != null && presence.getProperty("anonymous") != null) { if (presence != null && presence.getProperty("anonymous") != null) {
boolean isAvailable = statusBox.getPresence().getMode() == Presence.Mode.AVAILABLE; boolean isAvailable = statusBox.getPresence().getMode() == Presence.Mode.available;
Presence reply = new Presence(Presence.Type.AVAILABLE); Presence reply = new Presence(Presence.Type.available);
if (!isAvailable) { if (!isAvailable) {
reply.setType(Presence.Type.UNAVAILABLE); reply.setType(Presence.Type.unavailable);
} }
reply.setTo(presence.getFrom()); reply.setTo(presence.getFrom());
SparkManager.getSessionManager().getConnection().sendPacket(reply); SparkManager.getSessionManager().getConnection().sendPacket(reply);

6
src/java/org/jivesoftware/spark/component/Notifications.java
View File

@ -151,10 +151,10 @@ public final class Notifications implements ActionListener, MainWindowListener {
return; return;
} }
if (presence.getMode() == Presence.Mode.AVAILABLE || presence.getMode() == Presence.Mode.CHAT) { if (presence.getMode() == Presence.Mode.available || presence.getMode() == Presence.Mode.chat) {
trayIcon.setIcon(availableIcon); trayIcon.setIcon(availableIcon);
} }
else if (presence.getMode() == Presence.Mode.AWAY || presence.getMode() == Presence.Mode.EXTENDED_AWAY) { else if (presence.getMode() == Presence.Mode.away || presence.getMode() == Presence.Mode.xa) {
trayIcon.setIcon(unavaliableIcon); trayIcon.setIcon(unavaliableIcon);
} }
else { else {
@ -275,7 +275,7 @@ public final class Notifications implements ActionListener, MainWindowListener {
StatusBar statusBox = workspace.getStatusBar(); StatusBar statusBox = workspace.getStatusBar();
Presence presence = statusBox.getPresence(); Presence presence = statusBox.getPresence();
if (presence.getMode() != Presence.Mode.AVAILABLE) { if (presence.getMode() != Presence.Mode.available) {
SparkManager.getSessionManager().changePresence(presence); SparkManager.getSessionManager().changePresence(presence);
} }

16
src/java/org/jivesoftware/spark/component/RosterTree.java
View File

@ -100,26 +100,20 @@ public final class RosterTree extends JPanel {
public void presenceChanged(String user) { public void presenceChanged(String user) {
Presence presence = roster.getPresence(user); Presence presence = roster.getPresence(user);
changePresence(user, presence != null && presence.getMode() == Presence.Mode.AVAILABLE); changePresence(user, presence != null && presence.getMode() == Presence.Mode.available);
} }
}); });
final Iterator iter = roster.getGroups(); for(RosterGroup group : roster.getGroups()){
while (iter.hasNext()) {
final RosterGroup group = (RosterGroup)iter.next();
final JiveTreeNode groupNode = new JiveTreeNode(group.getName(), true); final JiveTreeNode groupNode = new JiveTreeNode(group.getName(), true);
groupNode.setAllowsChildren(true); groupNode.setAllowsChildren(true);
if (group.getEntryCount() > 0) { if (group.getEntryCount() > 0) {
rootNode.add(groupNode); rootNode.add(groupNode);
} }
Iterator entries = group.getEntries(); for(RosterEntry entry : group.getEntries()){
while (entries.hasNext()) {
final RosterEntry entry = (RosterEntry)entries.next();
String name = entry.getName(); String name = entry.getName();
if (name == null) { if (name == null) {
name = entry.getUser(); name = entry.getUser();
@ -129,10 +123,10 @@ public final class RosterTree extends JPanel {
final JiveTreeNode entryNode = new JiveTreeNode(name, false); final JiveTreeNode entryNode = new JiveTreeNode(name, false);
final Presence p = roster.getPresence(entry.getUser()); final Presence p = roster.getPresence(entry.getUser());
addressMap.put(entryNode, entry.getUser()); addressMap.put(entryNode, entry.getUser());
if (p != null && p.getType() == Presence.Type.AVAILABLE && p.getMode() == Presence.Mode.AVAILABLE) { if (p != null && p.getType() == Presence.Type.available && p.getMode() == Presence.Mode.available) {
groupNode.add(entryNode); groupNode.add(entryNode);
} }
else if ((p == null || p.getType() == Presence.Type.UNAVAILABLE) && showUnavailableAgents) { else if ((p == null || p.getType() == Presence.Type.unavailable) && showUnavailableAgents) {
groupNode.add(entryNode); groupNode.add(entryNode);
} }

2
src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
View File

@ -522,7 +522,7 @@ public class SparkTransferManager {
final PacketListener packetListener = new PacketListener() { final PacketListener packetListener = new PacketListener() {
public void processPacket(Packet packet) { public void processPacket(Packet packet) {
Presence presence = (Presence)packet; Presence presence = (Presence)packet;
if (presence == null || presence.getType() == Presence.Type.UNAVAILABLE) { if (presence == null || presence.getType() == Presence.Type.unavailable) {
if (transfer != null) { if (transfer != null) {
transfer.cancel(); transfer.cancel();
} }

6
src/java/org/jivesoftware/spark/ui/ChatContainer.java
View File

@ -267,10 +267,10 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
} }
final String userid = StringUtils.parseResource(p.getFrom()); final String userid = StringUtils.parseResource(p.getFrom());
if (p.getType() == Presence.Type.UNAVAILABLE) { if (p.getType() == Presence.Type.unavailable) {
fireUserHasLeft(chatRoom, userid); fireUserHasLeft(chatRoom, userid);
} }
else if (p.getType() == Presence.Type.AVAILABLE) { else if (p.getType() == Presence.Type.available) {
fireUserHasJoined(chatRoom, userid); fireUserHasJoined(chatRoom, userid);
} }
@ -282,7 +282,7 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
if (statusItem == null && p == null) { if (statusItem == null && p == null) {
tabIcon = SparkRes.getImageIcon(SparkRes.CLEAR_BALL_ICON); tabIcon = SparkRes.getImageIcon(SparkRes.CLEAR_BALL_ICON);
} }
else if (statusItem == null && p != null && p.getType() == Presence.Type.AVAILABLE) { else if (statusItem == null && p != null && p.getType() == Presence.Type.available) {
tabIcon = SparkRes.getImageIcon(SparkRes.GREEN_BALL); tabIcon = SparkRes.getImageIcon(SparkRes.GREEN_BALL);
} }
else { else {

10
src/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java
View File

@ -233,10 +233,9 @@ public class ContactGroupTransferHandler extends TransferHandler {
Roster roster = SparkManager.getConnection().getRoster(); Roster roster = SparkManager.getConnection().getRoster();
RosterEntry entry = roster.getEntry(item.getFullJID()); RosterEntry entry = roster.getEntry(item.getFullJID());
Iterator iter = roster.getGroups();
RosterGroup groupFound = null; RosterGroup groupFound = null;
while (iter.hasNext()) {
RosterGroup group = (RosterGroup)iter.next(); for(RosterGroup group : roster.getGroups()){
if (group.getName().equals(contactGroup.getGroupName())) { if (group.getName().equals(contactGroup.getGroupName())) {
try { try {
groupFound = group; groupFound = group;
@ -287,10 +286,9 @@ public class ContactGroupTransferHandler extends TransferHandler {
Roster roster = SparkManager.getConnection().getRoster(); Roster roster = SparkManager.getConnection().getRoster();
RosterEntry entry = roster.getEntry(item.getFullJID()); RosterEntry entry = roster.getEntry(item.getFullJID());
Iterator groups = roster.getGroups();
RosterGroup rosterGroup = null; RosterGroup rosterGroup = null;
while (groups.hasNext()) {
RosterGroup group = (RosterGroup)groups.next(); for(RosterGroup group : roster.getGroups()){
if (group.getName().equals(contactGroup.getGroupName())) { if (group.getName().equals(contactGroup.getGroupName())) {
try { try {
rosterGroup = group; rosterGroup = group;

36
src/java/org/jivesoftware/spark/ui/ContactItem.java
View File

@ -258,7 +258,7 @@ public class ContactItem extends JPanel {
String date = formatter.format(new Date()); String date = formatter.format(new Date());
if (presence == null) { if (presence == null) {
if (this.presence != null && (this.presence.getMode() == Presence.Mode.AVAILABLE || this.presence.getMode() == Presence.Mode.CHAT)) { if (this.presence != null && (this.presence.getMode() == Presence.Mode.available || this.presence.getMode() == Presence.Mode.chat)) {
awayTime = new Date(); awayTime = new Date();
presenceHistory.add("Signed out at " + date); presenceHistory.add("Signed out at " + date);
} }
@ -266,10 +266,10 @@ public class ContactItem extends JPanel {
} }
// Add away time. // Add away time.
if (presence.getMode() == Presence.Mode.AVAILABLE || presence.getMode() == Presence.Mode.CHAT) { if (presence.getMode() == Presence.Mode.available || presence.getMode() == Presence.Mode.chat) {
awayTime = null; awayTime = null;
if (this.presence == null || (this.presence.getMode() != Presence.Mode.AVAILABLE || this.presence.getMode() != Presence.Mode.CHAT)) { if (this.presence == null || (this.presence.getMode() != Presence.Mode.available || this.presence.getMode() != Presence.Mode.chat)) {
String status = presence.getStatus(); String status = presence.getStatus();
if (!ModelUtil.hasLength(status)) { if (!ModelUtil.hasLength(status)) {
status = "Available"; status = "Available";
@ -278,8 +278,8 @@ public class ContactItem extends JPanel {
presenceHistory.add(status + " at " + date); presenceHistory.add(status + " at " + date);
} }
} }
else if (this.presence != null && (this.presence.getMode() == Presence.Mode.AVAILABLE || this.presence.getMode() == Presence.Mode.CHAT)) { else if (this.presence != null && (this.presence.getMode() == Presence.Mode.available || this.presence.getMode() == Presence.Mode.chat)) {
if (presence != null && presence.getMode() != Presence.Mode.AVAILABLE && presence.getMode() != Presence.Mode.CHAT) { if (presence != null && presence.getMode() != Presence.Mode.available && presence.getMode() != Presence.Mode.chat) {
awayTime = new Date(); awayTime = new Date();
String status = presence.getStatus(); String status = presence.getStatus();
if (!ModelUtil.hasLength(status)) { if (!ModelUtil.hasLength(status)) {
@ -315,30 +315,30 @@ public class ContactItem extends JPanel {
boolean isAvailable = false; boolean isAvailable = false;
if (status == null && presence != null) { if (status == null && presence != null) {
Presence.Mode mode = presence.getMode(); Presence.Mode mode = presence.getMode();
if (mode == Presence.Mode.AVAILABLE) { if (mode == Presence.Mode.available) {
status = "Available"; status = "Available";
isAvailable = true; isAvailable = true;
} }
else if (mode == Presence.Mode.AWAY) { else if (mode == Presence.Mode.away) {
status = "I'm away"; status = "I'm away";
statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY); statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
} }
else if (mode == Presence.Mode.CHAT) { else if (mode == Presence.Mode.chat) {
status = "I'm free to chat"; status = "I'm free to chat";
} }
else if (mode == Presence.Mode.DO_NOT_DISTURB) { else if (mode == Presence.Mode.dnd) {
status = "Do not disturb"; status = "Do not disturb";
statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY); statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
} }
else if (mode == Presence.Mode.EXTENDED_AWAY) { else if (mode == Presence.Mode.xa) {
status = "Extended away"; status = "Extended away";
statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY); statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
} }
} }
else if (presence != null && (presence.getMode() == Presence.Mode.DO_NOT_DISTURB || presence.getMode() == Presence.Mode.AWAY || presence.getMode() == Presence.Mode.EXTENDED_AWAY)) { else if (presence != null && (presence.getMode() == Presence.Mode.dnd || presence.getMode() == Presence.Mode.away || presence.getMode() == Presence.Mode.xa)) {
statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY); statusIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
} }
else if (presence != null && presence.getType() == Presence.Type.AVAILABLE) { else if (presence != null && presence.getType() == Presence.Type.available) {
isAvailable = true; isAvailable = true;
} }
else if (presence == null) { else if (presence == null) {
@ -411,24 +411,24 @@ public class ContactItem extends JPanel {
boolean isAvailable = false; boolean isAvailable = false;
if (status == null && presence != null) { if (status == null && presence != null) {
Presence.Mode mode = presence.getMode(); Presence.Mode mode = presence.getMode();
if (mode == Presence.Mode.AVAILABLE) { if (mode == Presence.Mode.available) {
status = "Available"; status = "Available";
isAvailable = true; isAvailable = true;
} }
else if (mode == Presence.Mode.AWAY) { else if (mode == Presence.Mode.away) {
status = "I'm away"; status = "I'm away";
} }
else if (mode == Presence.Mode.CHAT) { else if (mode == Presence.Mode.chat) {
status = "I'm free to chat"; status = "I'm free to chat";
} }
else if (mode == Presence.Mode.DO_NOT_DISTURB) { else if (mode == Presence.Mode.dnd) {
status = "Do not disturb"; status = "Do not disturb";
} }
else if (mode == Presence.Mode.EXTENDED_AWAY) { else if (mode == Presence.Mode.xa) {
status = "Extended away"; status = "Extended away";
} }
} }
else if (presence != null && presence.getType() == Presence.Type.AVAILABLE) { else if (presence != null && presence.getType() == Presence.Type.available) {
isAvailable = true; isAvailable = true;
} }
else if (presence == null) { else if (presence == null) {

75
src/java/org/jivesoftware/spark/ui/ContactList.java
View File

@ -277,7 +277,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
// If online, check to see if they are in the offline group. // If online, check to see if they are in the offline group.
// If so, remove from offline group and add to all groups they // If so, remove from offline group and add to all groups they
// belong to. // belong to.
if (presence.getType() == Presence.Type.AVAILABLE && offlineGroup.getContactItemByJID(bareJID) != null) { if (presence.getType() == Presence.Type.available && offlineGroup.getContactItemByJID(bareJID) != null) {
changeOfflineToOnline(bareJID, entry, presence); changeOfflineToOnline(bareJID, entry, presence);
} }
else if (presence.getFrom().indexOf("workgroup.") != -1) { else if (presence.getFrom().indexOf("workgroup.") != -1) {
@ -285,7 +285,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
} }
// If online, but not in offline group, update presence. // If online, but not in offline group, update presence.
else if (presence.getType() == Presence.Type.AVAILABLE) { else if (presence.getType() == Presence.Type.available) {
final Iterator groupIterator = groupList.iterator(); final Iterator groupIterator = groupList.iterator();
while (groupIterator.hasNext()) { while (groupIterator.hasNext()) {
ContactGroup group = (ContactGroup)groupIterator.next(); ContactGroup group = (ContactGroup)groupIterator.next();
@ -298,7 +298,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
} }
// If not available, move to offline group. // If not available, move to offline group.
else if (presence.getType() == Presence.Type.UNAVAILABLE && !isPending) { else if (presence.getType() == Presence.Type.unavailable && !isPending) {
moveToOfflineGroup(bareJID); moveToOfflineGroup(bareJID);
} }
@ -347,11 +347,9 @@ public final class ContactList extends JPanel implements ActionListener, Contact
offlineGroup.removeContactItem(offlineItem); offlineGroup.removeContactItem(offlineItem);
// Add To all groups it belongs to. // Add To all groups it belongs to.
Iterator groups = entry.getGroups(); boolean isFiled = false;
boolean isFiled = groups.hasNext(); for(RosterGroup rosterGroup : entry.getGroups()){
isFiled = true;
while (groups.hasNext()) {
final RosterGroup rosterGroup = (RosterGroup)groups.next();
ContactGroup contactGroup = getContactGroup(rosterGroup.getName()); ContactGroup contactGroup = getContactGroup(rosterGroup.getName());
if (contactGroup != null) { if (contactGroup != null) {
String name = entry.getName(); String name = entry.getName();
@ -415,14 +413,10 @@ public final class ContactList extends JPanel implements ActionListener, Contact
roster.addRosterListener(this); roster.addRosterListener(this);
final Iterator rosterGroups = roster.getGroups(); for(RosterGroup group : roster.getGroups()){
while (rosterGroups.hasNext()) {
RosterGroup group = (RosterGroup)rosterGroups.next();
ContactGroup contactGroup = addContactGroup(group.getName()); ContactGroup contactGroup = addContactGroup(group.getName());
Iterator entries = group.getEntries(); for(RosterEntry entry : group.getEntries()){
while (entries.hasNext()) {
RosterEntry entry = (RosterEntry)entries.next();
String name = entry.getName(); String name = entry.getName();
if (name == null) { if (name == null) {
name = entry.getUser(); name = entry.getUser();
@ -447,9 +441,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
// Add Unfiled Group // Add Unfiled Group
// addContactGroup(unfiledGroup); // addContactGroup(unfiledGroup);
final Iterator unfiledEntries = roster.getUnfiledEntries(); for(RosterEntry entry : roster.getUnfiledEntries()){
while (unfiledEntries.hasNext()) {
RosterEntry entry = (RosterEntry)unfiledEntries.next();
String name = entry.getName(); String name = entry.getName();
if (name == null) { if (name == null) {
name = entry.getUser(); name = entry.getUser();
@ -501,9 +493,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
if (entry != null && (entry.getType() == RosterPacket.ItemType.NONE || entry.getType() == RosterPacket.ItemType.FROM)) { if (entry != null && (entry.getType() == RosterPacket.ItemType.NONE || entry.getType() == RosterPacket.ItemType.FROM)) {
// Ignore, since the new user is pending to be added. // Ignore, since the new user is pending to be added.
final Iterator groups = entry.getGroups(); for(RosterGroup group : entry.getGroups()){
while (groups.hasNext()) {
final RosterGroup group = (RosterGroup)groups.next();
ContactGroup contactGroup = getContactGroup(group.getName()); ContactGroup contactGroup = getContactGroup(group.getName());
if (contactGroup == null) { if (contactGroup == null) {
contactGroup = addContactGroup(group.getName()); contactGroup = addContactGroup(group.getName());
@ -550,12 +540,9 @@ public final class ContactList extends JPanel implements ActionListener, Contact
RosterEntry rosterEntry = roster.getEntry(jid); RosterEntry rosterEntry = roster.getEntry(jid);
if (rosterEntry != null) { if (rosterEntry != null) {
// Check for new Roster Groups and add them if they do not exist. // Check for new Roster Groups and add them if they do not exist.
Iterator rosterGroups = rosterEntry.getGroups(); boolean isUnfiled = true;
for(RosterGroup group : rosterEntry.getGroups()){
boolean isUnfiled = true;
while (rosterGroups.hasNext()) {
isUnfiled = false; isUnfiled = false;
RosterGroup group = (RosterGroup)rosterGroups.next();
// Handle if this is a new Entry in a new Group. // Handle if this is a new Entry in a new Group.
if (getContactGroup(group.getName()) == null) { if (getContactGroup(group.getName()) == null) {
@ -612,9 +599,8 @@ public final class ContactList extends JPanel implements ActionListener, Contact
while (jids.hasNext()) { while (jids.hasNext()) {
jid = (String)jids.next(); jid = (String)jids.next();
rosterEntry = roster.getEntry(jid); rosterEntry = roster.getEntry(jid);
Iterator groups = rosterEntry.getGroups();
while (groups.hasNext()) { for(RosterGroup g : rosterEntry.getGroups()){
RosterGroup g = (RosterGroup)groups.next();
groupSet.add(g.getName()); groupSet.add(g.getName());
} }
@ -1200,9 +1186,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
RosterGroup rosterGroup = roster.getGroup(groupName); RosterGroup rosterGroup = roster.getGroup(groupName);
if (rosterGroup != null) { if (rosterGroup != null) {
Iterator entries = rosterGroup.getEntries(); for(RosterEntry entry : rosterGroup.getEntries()){
while (entries.hasNext()) {
RosterEntry entry = (RosterEntry)entries.next();
try { try {
rosterGroup.removeEntry(entry); rosterGroup.removeEntry(entry);
} }
@ -1289,12 +1273,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
Roster roster = SparkManager.getConnection().getRoster(); Roster roster = SparkManager.getConnection().getRoster();
RosterEntry entry = roster.getEntry(item.getFullJID()); RosterEntry entry = roster.getEntry(item.getFullJID());
if (entry != null) { if (entry != null) {
int groupCount = 0; int groupCount = entry.getGroups().size();
Iterator groups = entry.getGroups();
while (groups.hasNext()) {
groups.next();
groupCount++;
}
if (groupCount > 1) { if (groupCount > 1) {
popup.add(removeContactFromGroupMenu); popup.add(removeContactFromGroupMenu);
@ -1397,7 +1376,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
Action subscribeAction = new AbstractAction() { Action subscribeAction = new AbstractAction() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
String jid = item.getFullJID(); String jid = item.getFullJID();
Presence response = new Presence(Presence.Type.SUBSCRIBE); Presence response = new Presence(Presence.Type.subscribe);
response.setTo(jid); response.setTo(jid);
SparkManager.getConnection().sendPacket(response); SparkManager.getConnection().sendPacket(response);
@ -1538,14 +1517,14 @@ public final class ContactList extends JPanel implements ActionListener, Contact
PacketListener subscribeListener = new PacketListener() { PacketListener subscribeListener = new PacketListener() {
public void processPacket(Packet packet) { public void processPacket(Packet packet) {
final Presence presence = (Presence)packet; final Presence presence = (Presence)packet;
if (presence != null && presence.getType() == Presence.Type.SUBSCRIBE) { if (presence != null && presence.getType() == Presence.Type.subscribe) {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
public void run() { public void run() {
subscriptionRequest(presence.getFrom()); subscriptionRequest(presence.getFrom());
} }
}); });
} }
else if (presence != null && presence.getType() == Presence.Type.UNSUBSCRIBE) { else if (presence != null && presence.getType() == Presence.Type.unsubscribe) {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
public void run() { public void run() {
Roster roster = SparkManager.getConnection().getRoster(); Roster roster = SparkManager.getConnection().getRoster();
@ -1556,7 +1535,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
roster.removeEntry(entry); roster.removeEntry(entry);
} }
catch (XMPPException e) { catch (XMPPException e) {
Presence unsub = new Presence(Presence.Type.UNSUBSCRIBED); Presence unsub = new Presence(Presence.Type.unsubscribed);
unsub.setTo(presence.getFrom()); unsub.setTo(presence.getFrom());
SparkManager.getConnection().sendPacket(unsub); SparkManager.getConnection().sendPacket(unsub);
Log.error(e); Log.error(e);
@ -1567,7 +1546,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
} }
else if (presence != null && presence.getType() == Presence.Type.SUBSCRIBED) { else if (presence != null && presence.getType() == Presence.Type.subscribe) {
// Find Contact in Contact List // Find Contact in Contact List
String jid = StringUtils.parseBareAddress(presence.getFrom()); String jid = StringUtils.parseBareAddress(presence.getFrom());
ContactItem item = getContactItemByJID(jid); ContactItem item = getContactItemByJID(jid);
@ -1587,7 +1566,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
} }
} }
} }
else if (presence != null && presence.getType() == Presence.Type.UNSUBSCRIBED) { else if (presence != null && presence.getType() == Presence.Type.unsubscribed) {
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
public void run() { public void run() {
Roster roster = SparkManager.getConnection().getRoster(); Roster roster = SparkManager.getConnection().getRoster();
@ -1730,7 +1709,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
final Roster roster = SparkManager.getConnection().getRoster(); final Roster roster = SparkManager.getConnection().getRoster();
RosterEntry entry = roster.getEntry(jid); RosterEntry entry = roster.getEntry(jid);
if (entry != null && entry.getType() == RosterPacket.ItemType.TO) { if (entry != null && entry.getType() == RosterPacket.ItemType.TO) {
Presence response = new Presence(Presence.Type.SUBSCRIBED); Presence response = new Presence(Presence.Type.subscribed);
response.setTo(jid); response.setTo(jid);
SparkManager.getConnection().sendPacket(response); SparkManager.getConnection().sendPacket(response);
@ -1760,7 +1739,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
dialog.dispose(); dialog.dispose();
Presence response = new Presence(Presence.Type.SUBSCRIBED); Presence response = new Presence(Presence.Type.subscribed);
response.setTo(jid); response.setTo(jid);
SparkManager.getConnection().sendPacket(response); SparkManager.getConnection().sendPacket(response);
@ -1777,7 +1756,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
denyButton.addActionListener(new ActionListener() { denyButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
// Send subscribed // Send subscribed
Presence response = new Presence(Presence.Type.UNSUBSCRIBE); Presence response = new Presence(Presence.Type.unsubscribe);
response.setTo(jid); response.setTo(jid);
SparkManager.getConnection().sendPacket(response); SparkManager.getConnection().sendPacket(response);
dialog.dispose(); dialog.dispose();
@ -2061,9 +2040,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
SparkManager.getSessionManager().changePresence(presence); SparkManager.getSessionManager().changePresence(presence);
final Roster roster = con.getRoster(); final Roster roster = con.getRoster();
final Iterator rosterEntries = roster.getEntries(); for(RosterEntry entry : roster.getEntries()){
while (rosterEntries.hasNext()) {
RosterEntry entry = (RosterEntry)rosterEntries.next();
updateUserPresence(roster.getPresence(entry.getUser())); updateUserPresence(roster.getPresence(entry.getUser()));
} }
} }

13
src/java/org/jivesoftware/spark/ui/NewRoster.java
View File

@ -78,9 +78,7 @@ public class NewRoster extends JPanel implements RosterListener {
roster.addRosterListener(this); roster.addRosterListener(this);
final Iterator rosterGroups = roster.getGroups(); for(RosterGroup group : roster.getGroups()){
while (rosterGroups.hasNext()) {
RosterGroup group = (RosterGroup)rosterGroups.next();
// Create Group node. // Create Group node.
final RosterNode groupNode = new RosterNode(group.getName(), true); final RosterNode groupNode = new RosterNode(group.getName(), true);
@ -88,10 +86,7 @@ public class NewRoster extends JPanel implements RosterListener {
rootNode.add(groupNode); rootNode.add(groupNode);
} }
for(RosterEntry entry : group.getEntries()){
Iterator entries = group.getEntries();
while (entries.hasNext()) {
RosterEntry entry = (RosterEntry)entries.next();
String nickname = entry.getName(); String nickname = entry.getName();
if (nickname == null) { if (nickname == null) {
nickname = entry.getUser(); nickname = entry.getUser();
@ -110,9 +105,7 @@ public class NewRoster extends JPanel implements RosterListener {
rootNode.add(unfiledGroup); rootNode.add(unfiledGroup);
// Add Unfiled Group // Add Unfiled Group
final Iterator unfiledEntries = roster.getUnfiledEntries(); for(RosterEntry entry : roster.getUnfiledEntries()){
while (unfiledEntries.hasNext()) {
RosterEntry entry = (RosterEntry)unfiledEntries.next();
String name = entry.getName(); String name = entry.getName();
if (name == null) { if (name == null) {
name = entry.getUser(); name = entry.getUser();

6
src/java/org/jivesoftware/spark/ui/RetryPanel.java
View File

@ -69,7 +69,7 @@ public class RetryPanel extends JPanel {
retryButton.addActionListener(new ActionListener() { retryButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent actionEvent) { public void actionPerformed(ActionEvent actionEvent) {
attemptReconnect(); //attemptReconnect();
} }
}); });
@ -120,7 +120,7 @@ public class RetryPanel extends JPanel {
countdown--; countdown--;
} }
else { else {
attemptReconnect(); //attemptReconnect();
} }
} }
}; };
@ -136,6 +136,7 @@ public class RetryPanel extends JPanel {
retryButton.setVisible(false); retryButton.setVisible(false);
} }
/*
private void attemptReconnect() { private void attemptReconnect() {
retryButton.setText("Attempting...."); retryButton.setText("Attempting....");
timer.stop(); timer.stop();
@ -171,6 +172,7 @@ public class RetryPanel extends JPanel {
} }
*/
/** /**
* Adds a <code>ReconnectListener</code>. * Adds a <code>ReconnectListener</code>.

5
src/java/org/jivesoftware/spark/ui/RosterDialog.java
View File

@ -295,10 +295,7 @@ public class RosterDialog implements PropertyChangeListener, ActionListener {
boolean isSubscribed = true; boolean isSubscribed = true;
if (userEntry != null) { if (userEntry != null) {
Iterator iter = userEntry.getGroups(); isSubscribed = userEntry.getGroups().size() == 0;
if (iter.hasNext()) {
isSubscribed = false;
}
} }
if (isSubscribed) { if (isSubscribed) {

4
src/java/org/jivesoftware/spark/ui/RosterPickList.java
View File

@ -69,9 +69,7 @@ public class RosterPickList extends JPanel {
public Collection showRoster(JDialog parent) { public Collection showRoster(JDialog parent) {
// Populate Invite Panel with Available users. // Populate Invite Panel with Available users.
Roster roster = SparkManager.getConnection().getRoster(); Roster roster = SparkManager.getConnection().getRoster();
Iterator iter = roster.getEntries(); for(RosterEntry entry : roster.getEntries()){
while (iter.hasNext()) {
RosterEntry entry = (RosterEntry)iter.next();
Presence presence = roster.getPresence(entry.getUser()); Presence presence = roster.getPresence(entry.getUser());
if (presence != null) { if (presence != null) {
ContactItem item = new ContactItem(entry.getName(), entry.getUser()); ContactItem item = new ContactItem(entry.getName(), entry.getUser());

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

@ -145,7 +145,7 @@ public final class ConferenceRoomInfo extends JPanel implements ChatRoomListener
String nickname = StringUtils.parseResource(userid); String nickname = StringUtils.parseResource(userid);
userMap.put(nickname, userid); userMap.put(nickname, userid);
if (p.getType() == Presence.Type.AVAILABLE) { if (p.getType() == Presence.Type.available) {
addParticipant(userid, p); addParticipant(userid, p);
agentInfoPanel.setVisible(true); agentInfoPanel.setVisible(true);
} }

4
src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
View File

@ -407,13 +407,13 @@ public class ChatRoomImpl extends ChatRoom {
final SimpleDateFormat formatter = new SimpleDateFormat("h:mm a"); final SimpleDateFormat formatter = new SimpleDateFormat("h:mm a");
String time = formatter.format(new Date()); String time = formatter.format(new Date());
if (presence.getType() == Presence.Type.UNAVAILABLE && contactItem != null) { if (presence.getType() == Presence.Type.unavailable && contactItem != null) {
if (isOnline) { if (isOnline) {
getTranscriptWindow().insertNotificationMessage("*** " + participantNickname + " went offline at " + time + "."); getTranscriptWindow().insertNotificationMessage("*** " + participantNickname + " went offline at " + time + ".");
} }
isOnline = false; isOnline = false;
} }
else if (presence.getType() == Presence.Type.AVAILABLE) { else if (presence.getType() == Presence.Type.available) {
if (!isOnline) { if (!isOnline) {
getTranscriptWindow().insertNotificationMessage("*** " + participantNickname + " is online at " + time + "."); getTranscriptWindow().insertNotificationMessage("*** " + participantNickname + " is online at " + time + ".");
} }

2
src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java
View File

@ -621,7 +621,7 @@ public final class GroupChatRoom extends ChatRoom {
} }
if (presence.getType() == Presence.Type.UNAVAILABLE && !"303".equals(code)) { if (presence.getType() == Presence.Type.unavailable && !"303".equals(code)) {
if (currentUserList.contains(from)) { if (currentUserList.contains(from)) {
if (showPresenceMessages) { if (showPresenceMessages) {
getTranscriptWindow().insertNotificationMessage(nickname + " has left the room."); getTranscriptWindow().insertNotificationMessage(nickname + " has left the room.");

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

@ -104,7 +104,7 @@ public class StatusBar extends JPanel {
setStatus("Online"); setStatus("Online");
currentPresence = new Presence(Presence.Type.AVAILABLE, "Online", -1, Presence.Mode.AVAILABLE); currentPresence = new Presence(Presence.Type.available, "Online", -1, Presence.Mode.available);
setBorder(BorderFactory.createLineBorder(new Color(197, 213, 230), 1)); setBorder(BorderFactory.createLineBorder(new Color(197, 213, 230), 1));
@ -330,11 +330,11 @@ public class StatusBar extends JPanel {
final ImageIcon awayIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY); final ImageIcon awayIcon = SparkRes.getImageIcon(SparkRes.IM_AWAY);
final ImageIcon dndIcon = SparkRes.getImageIcon(SparkRes.IM_DND); final ImageIcon dndIcon = SparkRes.getImageIcon(SparkRes.IM_DND);
StatusItem online = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Online", -1, Presence.Mode.AVAILABLE), availableIcon); StatusItem online = new StatusItem(new Presence(Presence.Type.available, "Online", -1, Presence.Mode.available), availableIcon);
StatusItem freeToChat = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Free To Chat", -1, Presence.Mode.CHAT), SparkRes.getImageIcon(SparkRes.FREE_TO_CHAT_IMAGE)); StatusItem freeToChat = new StatusItem(new Presence(Presence.Type.available, "Free To Chat", -1, Presence.Mode.chat), SparkRes.getImageIcon(SparkRes.FREE_TO_CHAT_IMAGE));
StatusItem away = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Away", -1, Presence.Mode.AWAY), awayIcon); StatusItem away = new StatusItem(new Presence(Presence.Type.available, "Away", -1, Presence.Mode.away), awayIcon);
StatusItem dnd = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Do Not Disturb", -1, Presence.Mode.DO_NOT_DISTURB), dndIcon); StatusItem dnd = new StatusItem(new Presence(Presence.Type.available, "Do Not Disturb", -1, Presence.Mode.dnd), dndIcon);
StatusItem extendedAway = new StatusItem(new Presence(Presence.Type.AVAILABLE, "Extended Away", -1, Presence.Mode.EXTENDED_AWAY), awayIcon); StatusItem extendedAway = new StatusItem(new Presence(Presence.Type.available, "Extended Away", -1, Presence.Mode.xa), awayIcon);
dndList.add(freeToChat); dndList.add(freeToChat);
dndList.add(online); dndList.add(online);

4
src/java/org/jivesoftware/sparkimpl/plugin/chat/PresenceChangePlugin.java
View File

@ -70,7 +70,7 @@ public class PresenceChangePlugin implements Plugin {
public void poppingUp(Object object, JPopupMenu popup) { public void poppingUp(Object object, JPopupMenu popup) {
if (object instanceof ContactItem) { if (object instanceof ContactItem) {
ContactItem item = (ContactItem)object; ContactItem item = (ContactItem)object;
if (item.getPresence() == null || (item.getPresence().getMode() != Presence.Mode.AVAILABLE && item.getPresence().getMode() != Presence.Mode.CHAT)) { if (item.getPresence() == null || (item.getPresence().getMode() != Presence.Mode.available && item.getPresence().getMode() != Presence.Mode.chat)) {
if (contacts.contains(item)) { if (contacts.contains(item)) {
popup.add(removeAction); popup.add(removeAction);
} }
@ -94,7 +94,7 @@ public class PresenceChangePlugin implements Plugin {
SparkManager.getConnection().addPacketListener(new PacketListener() { SparkManager.getConnection().addPacketListener(new PacketListener() {
public void processPacket(Packet packet) { public void processPacket(Packet packet) {
Presence presence = (Presence)packet; Presence presence = (Presence)packet;
if (presence == null || (presence.getMode() != Presence.Mode.AVAILABLE && presence.getMode() != Presence.Mode.CHAT)) { if (presence == null || (presence.getMode() != Presence.Mode.available && presence.getMode() != Presence.Mode.chat)) {
return; return;
} }
String from = presence.getFrom(); String from = presence.getFrom();

6
src/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java
View File

@ -194,7 +194,7 @@ public class GatewayPlugin implements Plugin {
Transport transport = TransportManager.getTransport(packet.getFrom()); Transport transport = TransportManager.getTransport(packet.getFrom());
if (transport != null) { if (transport != null) {
boolean registered = presence != null && presence.getMode() != null; boolean registered = presence != null && presence.getMode() != null;
if (presence.getType() == Presence.Type.UNAVAILABLE) { if (presence.getType() == Presence.Type.unavailable) {
registered = false; registered = false;
} }
RolloverButton button = uiMap.get(transport); RolloverButton button = uiMap.get(transport);
@ -218,7 +218,7 @@ public class GatewayPlugin implements Plugin {
String domain = StringUtils.parseServer(presence.getFrom()); String domain = StringUtils.parseServer(presence.getFrom());
Transport transport = TransportManager.getTransport(domain); Transport transport = TransportManager.getTransport(domain);
if (transport != null) { if (transport != null) {
if (presence.getType() == Presence.Type.AVAILABLE) { if (presence.getType() == Presence.Type.available) {
item.setIcon(transport.getIcon()); item.setIcon(transport.getIcon());
} }
else { else {
@ -245,7 +245,7 @@ public class GatewayPlugin implements Plugin {
String domain = StringUtils.parseServer(presence.getFrom()); String domain = StringUtils.parseServer(presence.getFrom());
Transport transport = TransportManager.getTransport(domain); Transport transport = TransportManager.getTransport(domain);
if (transport != null) { if (transport != null) {
if (presence.getType() == Presence.Type.AVAILABLE) { if (presence.getType() == Presence.Type.available) {
return transport.getIcon(); return transport.getIcon();
} }
else { else {

2
src/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportManager.java
View File

@ -69,7 +69,7 @@ public class TransportManager {
public static boolean isRegistered(XMPPConnection con, Transport transport) { public static boolean isRegistered(XMPPConnection con, Transport transport) {
Presence presence = con.getRoster().getPresence(transport.getServiceName()); Presence presence = con.getRoster().getPresence(transport.getServiceName());
boolean registered = presence != null && presence.getMode() != null; boolean registered = presence != null && presence.getMode() != null;
if (presence == null || presence.getType() == Presence.Type.UNAVAILABLE) { if (presence == null || presence.getType() == Presence.Type.unavailable) {
registered = false; registered = false;
} }
return registered; return registered;

2
src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPlugin.java
View File

@ -36,7 +36,7 @@ public class SoundPlugin implements Plugin, MessageListener, ChatRoomListener {
SparkManager.getConnection().addPacketListener(new PacketListener() { SparkManager.getConnection().addPacketListener(new PacketListener() {
public void processPacket(Packet packet) { public void processPacket(Packet packet) {
Presence presence = (Presence)packet; Presence presence = (Presence)packet;
if (presence != null && presence.getType() == Presence.Type.UNAVAILABLE) { if (presence != null && presence.getType() == Presence.Type.unavailable) {
SoundPreferences preferences = soundPreference.getPreferences(); SoundPreferences preferences = soundPreference.getPreferences();
if (preferences != null && preferences.isPlayOfflineSound()) { if (preferences != null && preferences.isPlayOfflineSound()) {
String offline = preferences.getOfflineSound(); String offline = preferences.getOfflineSound();