diff options
3 files changed, 83 insertions, 72 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusSelectorBox.java index bd6ae77..130fde2 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusSelectorBox.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusSelectorBox.java @@ -143,7 +143,7 @@ public class SimpleStatusSelectorBox } } } - + saveStatusInformation( protocolProvider, Constants.OFFLINE_STATUS); } @@ -189,9 +189,9 @@ public class SimpleStatusSelectorBox } else { setSelected(offlineItem, offlineIcon); - + this.setToolTipText(tooltip.concat("<br>" + offlineItem.getText())); - } + } } /** diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/StatusPanel.java b/src/net/java/sip/communicator/impl/gui/main/presence/StatusPanel.java index c464b02..f8f1cb0 100644 --- a/src/net/java/sip/communicator/impl/gui/main/presence/StatusPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/presence/StatusPanel.java @@ -153,9 +153,9 @@ public class StatusPanel ConfigurationService configService = GuiActivator.getConfigurationService(); - //find the last contact status saved in the configuration. + //find the last contact status saved in the configuration. String lastStatus = null; - + String prefix = "net.java.sip.communicator.impl.gui.accounts"; List accounts = configService @@ -179,39 +179,43 @@ public class StatusPanel break; } } - + return lastStatus; } /** * Returns the last status that was stored in the configuration xml for the * given protocol provider. + * * @param protocolProvider the protocol provider * @return the last status that was stored in the configuration xml for the * given protocol provider */ public PresenceStatus getLastPresenceStatus( ProtocolProviderService protocolProvider) - { + { String lastStatus = getLastStatusString(protocolProvider); - + OperationSetPresence presence = mainFrame.getProtocolPresenceOpSet(protocolProvider); - + if(presence == null) return null; - + Iterator i = presence.getSupportedStatusSet(); - - if(lastStatus != null) { + + if(lastStatus != null) + { PresenceStatus status; - while(i.hasNext()) { + while(i.hasNext()) + { status = (PresenceStatus)i.next(); - if(status.getStatusName().equals(lastStatus)) { + if(status.getStatusName().equals(lastStatus)) + { return status; - } + } } - } + } return null; } @@ -221,35 +225,42 @@ public class StatusPanel * @param protocolProvider The ProtocolProvider, which presence status to * update. */ - public void updateStatus(ProtocolProviderService protocolProvider) { - StatusSelectorBox selectorBox + public void updateStatus(ProtocolProviderService protocolProvider) + { + StatusSelectorBox selectorBox = (StatusSelectorBox) protocolStatusCombos .get(protocolProvider); - + if(selectorBox == null) return; - - if(selectorBox instanceof PresenceStatusSelectorBox) { + + if(selectorBox instanceof PresenceStatusSelectorBox) + { PresenceStatusSelectorBox presenceSelectorBox = (PresenceStatusSelectorBox) selectorBox; - + if(!protocolProvider.isRegistered()) presenceSelectorBox.updateStatus( presenceSelectorBox.getOfflineStatus()); - else { - if(presenceSelectorBox.getLastSelectedStatus() != null) { + else + { + if(presenceSelectorBox.getLastSelectedStatus() != null) + { presenceSelectorBox.updateStatus( presenceSelectorBox.getLastSelectedStatus()); } - else { + else + { PresenceStatus lastStatus = getLastPresenceStatus(protocolProvider); - - if(lastStatus == null) { + + if(lastStatus == null) + { presenceSelectorBox.updateStatus( presenceSelectorBox.getOnlineStatus()); } - else { + else + { presenceSelectorBox.updateStatus(lastStatus); } } @@ -257,16 +268,16 @@ public class StatusPanel } else { ((SimpleStatusSelectorBox)selectorBox).updateStatus(); - } + } selectorBox.repaint(); } - + public void updateStatus(ProtocolProviderService pps, PresenceStatus status) { StatusSelectorBox selectorBox = (StatusSelectorBox) protocolStatusCombos .get(pps); - + if(selectorBox == null) return; diff --git a/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java b/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java index 7dba522..db8365d 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java +++ b/src/net/java/sip/communicator/impl/gui/utils/ConfigurationManager.java @@ -13,7 +13,7 @@ import net.java.sip.communicator.service.configuration.*; import net.java.sip.communicator.service.protocol.*; public class ConfigurationManager -{ +{ public static final String ENTER_COMMAND = "Enter"; public static final String CTRL_ENTER_COMMAND = "Ctrl-Enter"; @@ -35,32 +35,32 @@ public class ConfigurationManager private static ConfigurationService configService = GuiActivator.getConfigurationService(); - + public static void loadGuiConfigurations() { // Load the "auPopupNewMessage" property. String autoPopup = configService.getString( "net.java.sip.communicator.impl.gui.autoPopupNewMessage"); - + if(autoPopup != null && autoPopup.equalsIgnoreCase("yes")) autoPopupNewMessage = true; - + // Load the "sendMessageCommand" property. String messageCommand = configService.getString( "net.java.sip.communicator.impl.gui.sendMessageCommand"); - + if(messageCommand == null || messageCommand != "") sendMessageCommand = messageCommand; - + // Load the showCallPanel property. String callPanelShown = configService.getString( "net.java.sip.communicator.impl.gui.showCallPanel"); - + if(callPanelShown != null && callPanelShown != "") { isCallPanelShown = new Boolean(callPanelShown).booleanValue(); } - + // Load the "showOffline" property. String showOffline = configService.getString( "net.java.sip.communicator.impl.gui.showOffline"); @@ -73,7 +73,7 @@ public class ConfigurationManager // Load the "showApplication" property. String isVisible = configService.getString( "net.java.sip.communicator.impl.systray.showApplication"); - + if(isVisible != null && isVisible != "") { isApplicationVisible = new Boolean(isVisible).booleanValue(); @@ -101,7 +101,7 @@ public class ConfigurationManager { return autoPopupNewMessage; } - + /** * Return TRUE if "showCallPanel" property is true, otherwise - return * FALSE. Indicates to the user interface whether the panel containing the @@ -113,7 +113,7 @@ public class ConfigurationManager { return isCallPanelShown; } - + /** * Return TRUE if "showOffline" property is true, otherwise - return * FALSE. Indicates to the user interface whether offline user should be @@ -125,7 +125,7 @@ public class ConfigurationManager { return isShowOffline; } - + /** * Return TRUE if "showApplication" property is true, otherwise - return * FALSE. Indicates to the user interface whether the main application @@ -137,7 +137,7 @@ public class ConfigurationManager { return isApplicationVisible; } - + /** * Return TRUE if "sendTypingNotifications" property is true, otherwise - * return FALSE. Indicates to the user interface whether typing @@ -149,7 +149,7 @@ public class ConfigurationManager { return isSendTypingNotifications; } - + /** * Return the "sendMessageCommand" property that was saved previously through * the <tt>ConfigurationService</tt>. Indicates to the user interface whether @@ -160,7 +160,7 @@ public class ConfigurationManager { return sendMessageCommand; } - + /** * Updates the "autoPopupNewMessage" property. * @@ -180,25 +180,25 @@ public class ConfigurationManager "net.java.sip.communicator.impl.gui.autoPopupNewMessage", "no"); } - + public static void setShowOffline(boolean isShowOffline) { ConfigurationManager.isShowOffline = isShowOffline; - + configService.setProperty( "net.java.sip.communicator.impl.gui.showOffline", new Boolean(isShowOffline)); } - + public static void setShowCallPanel(boolean isCallPanelShown) { ConfigurationManager.isCallPanelShown = isCallPanelShown; - + configService.setProperty( "net.java.sip.communicator.impl.gui.showCallPanel", new Boolean(isCallPanelShown)); } - + public static void setApplicationVisible(boolean isVisible) { isApplicationVisible = isVisible; @@ -207,7 +207,7 @@ public class ConfigurationManager "net.java.sip.communicator.impl.systray.showApplication", new Boolean(isVisible)); } - + public static void setSendTypingNotifications(boolean isSendTypingNotif) { isSendTypingNotifications = isSendTypingNotif; @@ -216,16 +216,16 @@ public class ConfigurationManager "net.java.sip.communicator.impl.gui.sendTypingNotifications", new Boolean(isSendTypingNotif)); } - + public static void setSendMessageCommand(String newMessageCommand) { sendMessageCommand = newMessageCommand; - + configService.setProperty( "net.java.sip.communicator.impl.gui.sendMessageCommand", newMessageCommand); } - + public static void saveChatRoom(ProtocolProviderService protocolProvider, String oldChatRoomId, String newChatRoomId, String newChatRoomName) { @@ -233,58 +233,58 @@ public class ConfigurationManager List accounts = configService .getPropertyNamesByPrefix(prefix, true); - + Iterator accountsIter = accounts.iterator(); - + while(accountsIter.hasNext()) { String accountRootPropName = (String) accountsIter.next(); - + String accountUID = configService.getString(accountRootPropName); - + if(accountUID.equals(protocolProvider .getAccountID().getAccountUniqueID())) - { + { List chatRooms = configService .getPropertyNamesByPrefix( accountRootPropName + ".chatRooms", true); - + Iterator chatRoomsIter = chatRooms.iterator(); - + boolean isExistingChatRoom = false; - + while(chatRoomsIter.hasNext()) { String chatRoomPropName = (String) chatRoomsIter.next(); - + String chatRoomID = configService.getString(chatRoomPropName); - + if(!oldChatRoomId.equals(chatRoomID)) continue; isExistingChatRoom = true; - + configService.setProperty(chatRoomPropName, newChatRoomId); - + configService.setProperty(chatRoomPropName + ".chatRoomName", newChatRoomName); } - - if(!isExistingChatRoom) + + if(!isExistingChatRoom) { String chatRoomNodeName = "chatRoom" + Long.toString(System.currentTimeMillis()); - + String chatRoomPackage = accountRootPropName + ".chatRooms." + chatRoomNodeName; - + configService.setProperty(chatRoomPackage, newChatRoomId); - + configService.setProperty(chatRoomPackage + ".chatRoomName", newChatRoomName); } |