- HIDDEN_PROTOCOL moved to ProtocolProviderFactory

- Fix global status, when having hidden protocols.

8 files changed, 35 insertions, 12 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/GuiActivator.java b/src/net/java/sip/communicator/impl/gui/GuiActivator.java
index fa5c469..516e2fd 100644
--- a/src/net/java/sip/communicator/impl/gui/GuiActivator.java
+++ b/src/net/java/sip/communicator/impl/gui/GuiActivator.java
@@ -330,6 +330,13 @@ public class GuiActivator implements BundleActivator
         return keybindingsService;
     }
 
+    /**
+     * Returns the <tt>ResourceManagementService</tt>, through which we will
+     * access all resources.
+     * 
+     * @return the <tt>ResourceManagementService</tt>, through which we will
+     * access all resources.
+     */
     public static ResourceManagementService getResources()
     {
         if (resourcesService == null)
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
index 59e8dc2..0718082 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
@@ -124,7 +124,8 @@ public class AccountsConfigurationForm
                 accountID = (AccountID) accountsList.get(i);
 
                 boolean isHidden =
-                    (accountID.getAccountProperties().get("HIDDEN_PROTOCOL")
+                    (accountID.getAccountProperties()
+                        .get(ProtocolProviderFactory.IS_PROTOCOL_HIDDEN)
                         != null);
 
                 if (isHidden)
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
index ad86829..c6bee90 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
@@ -90,7 +90,7 @@ public class GroupRightButtonMenu
             
             boolean isHidden = 
                     pps.getAccountID().getAccountProperties().
-                        get("HIDDEN_PROTOCOL") != null;
+                        get(ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
             
             if(isHidden)
                 continue;
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java
index c43de0f..2e748c1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java
@@ -60,8 +60,8 @@ public class AddContactWizard
             ProtocolProviderService p = (ProtocolProviderService)iter.next();
 
             boolean isHidden = p.getAccountID().getAccountProperties().
-                    get("HIDDEN_PROTOCOL") != null;
-            
+                    get(ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
+
             if(!isHidden)
                 pps.add(p);
         }
diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java
index 53d33bf..de28fce 100644
--- a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java
@@ -115,7 +115,7 @@ public class LoginManager
 
                 boolean isHidden = 
                     accountID.getAccountProperties()
-                        .get("HIDDEN_PROTOCOL") != null;
+                        .get(ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
 
                 if(!isHidden)
                     hasRegisteredAccounts = true;
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
index c38362f..b71af2f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
@@ -324,12 +324,14 @@ public class GlobalStatusSelectorBox
 
                 if (status != null)
                 {
+                    System.out.println("PROTCOLLLL============" + protocolProvider.getProtocolDisplayName());
+                    System.out.println("STATUS============" + status.getStatusName());
+                    
                     new PublishPresenceStatusThread(presence, status)
                         .start();
 
                     this.saveStatusInformation( protocolProvider,
                         status.getStatusName());
-
                 }
             }
         }
@@ -345,11 +347,23 @@ public class GlobalStatusSelectorBox
 
         Iterator pProviders = mainFrame.getProtocolProviders();
 
+        boolean isProtocolHidden;
+
         while (pProviders.hasNext())
         {
             ProtocolProviderService protocolProvider
                 = (ProtocolProviderService) pProviders.next();
 
+            // We do not show hidden protocols in our status bar, so we do not
+            // care about their status here.
+            isProtocolHidden = 
+                protocolProvider.getAccountID().
+                    getAccountProperties().get(
+                        ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
+
+            if (isProtocolHidden)
+                continue;
+
             OperationSetPresence presence
                 = (OperationSetPresence) protocolProvider
                     .getOperationSet(OperationSetPresence.class);
@@ -375,7 +389,7 @@ public class GlobalStatusSelectorBox
         JMenuItem item = getItemFromStatus(status);
 
         setSelected(item, (ImageIcon)item.getIcon());
-        
+
         setSystrayIcon(status);
     }
     
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 ab08ce6..ebf34c2 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
@@ -76,11 +76,12 @@ public class StatusPanel
         }
 
         protocolStatusCombo.addComponentListener(this);
-        
+
         boolean isHidden = 
             protocolProvider.getAccountID().
-                getAccountProperties().get("HIDDEN_PROTOCOL") != null;
-        
+                getAccountProperties().get(
+                    ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
+
         if(isHidden)
             hiddenProviders++;
 
@@ -119,7 +120,7 @@ public class StatusPanel
 
         boolean isHidden = 
             pps.getAccountID().getAccountProperties().
-                get("HIDDEN_PROTOCOL") != null;
+                get(ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
         
         if(isHidden)
             hiddenProviders--;
diff --git a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java
index ede4537..f6bfeba 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java
@@ -151,7 +151,7 @@ public class StatusSubMenu
 
                 boolean isHidden = 
                     provider.getAccountID().getAccountProperties().
-                        get("HIDDEN_PROTOCOL") != null;
+                        get(ProtocolProviderFactory.IS_PROTOCOL_HIDDEN) != null;
                 
                 if(!isHidden)
                     this.addAccount(provider);