- Fixed 80 chars wrap

- Fixed format of comment
...ommunicator/plugin/sipaccregwizz/ConnectionPanel.java 
- Changed description of configuration checkbox like ibauersachs has
recommended

4 files changed, 17 insertions, 11 deletions

diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 9f1fc2c..cafbe93 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -1232,7 +1232,7 @@ plugin.sipaccregwizz.PREFERRED_TRANSPORT=Preferred transport
 plugin.sipaccregwizz.ADVANCED_OPTIONS=Advanced options
 plugin.sipaccregwizz.PROXY_OPTIONS=Proxy options
 plugin.sipaccregwizz.PROXY_AUTO=Configure proxy automatically
-plugin.sipaccregwizz.PROXY_FORCE_BYPASS=Configure force proxy bypass (for HA scenarios)
+plugin.sipaccregwizz.PROXY_FORCE_BYPASS=Bypass proxy security check for HA scenarios (use only if needed)
 plugin.sipaccregwizz.ENABLE_PRESENCE=Enable presence (SIMPLE)
 plugin.sipaccregwizz.FORCE_P2P_PRESENCE=Force peer-to-peer presence mode
 plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=Offline contacts polling period (in s.)
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java b/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java
index 8595cd0..2e714b5 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java
@@ -1027,7 +1027,8 @@ public class SipStackSharing
                     List<ProtocolProviderServiceSipImpl> candidates,
                     Request                              request)
     {
-        Iterator<ProtocolProviderServiceSipImpl> iterPP = candidates.iterator();
+        Iterator<ProtocolProviderServiceSipImpl> iterPP =
+            candidates.iterator();
         while (iterPP.hasNext())
         {
             ProtocolProviderServiceSipImpl candidate = iterPP.next();
@@ -1037,7 +1038,8 @@ public class SipStackSharing
                         ProtocolProviderFactory.FORCE_PROXY_BYPASS, false);
             if(forceProxyBypass)
             {
-                // Proxy check is disabled all connections are ok (HA sipXecs, sipXcom, ...)
+                // Proxy check is disabled all connections are
+                // ok (HA sipXecs, sipXcom, ...)
                 continue;
             } 
             if(candidate.getRegistrarConnection() == null)
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
index b9a24d0..d5b6763 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java
@@ -855,8 +855,8 @@ public class ConnectionPanel
 
     /**
      * Indicates if the proxy force bypass-configure is enabled.
-     *      * @return <tt>true</tt> if the proxy force bypass-configuration is enabled,
-     *         <tt>false</tt> - otherwise
+     * @return <tt>true</tt> if the proxy force bypass-configuration is
+     * enabled, <tt>false</tt> - otherwise
      */
     boolean isProxyForceBypassConfigureEnabled()
     {
@@ -866,8 +866,8 @@ public class ConnectionPanel
     /**
      * Enables/disables the proxy force bypass-configuration.
      * 
-     * @param isEnable <tt>true</tt> to enable force proxy bypass-configuration,
-     *            <tt>false</tt> - otherwise
+     * @param isEnable <tt>true</tt> to enable force proxy bypass-
+     * configuration, <tt>false</tt> - otherwise
      */
     void enablesProxyForceBypassConfigure(boolean isEnable)
     {
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java
index 348805e..dfb4324 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java
@@ -384,9 +384,11 @@ public class SIPAccountRegistrationForm
 
         String clientTlsCertificateId = sipAccReg.getTlsClientCertificate();
 
-        boolean proxyAutoConfigureEnabled = sipAccReg.isProxyAutoConfigure();
+        boolean proxyAutoConfigureEnabled = 
+            sipAccReg.isProxyAutoConfigure();
         
-        boolean proxyForceBypassConfigureEnabled = sipAccReg.isProxyForceBypassConfigure();
+        boolean proxyForceBypassConfigureEnabled = 
+            sipAccReg.isProxyForceBypassConfigure();
 
         String pollingPeriod = sipAccReg.getPollingPeriod();
 
@@ -432,8 +434,10 @@ public class SIPAccountRegistrationForm
             connectionPanel.setAuthenticationName(authName);
         connectionPanel.setCertificateId(clientTlsCertificateId);
 
-        connectionPanel.enablesProxyAutoConfigure(proxyAutoConfigureEnabled);
-        connectionPanel.enablesProxyForceBypassConfigure(proxyForceBypassConfigureEnabled);
+        connectionPanel.enablesProxyAutoConfigure(
+                proxyAutoConfigureEnabled);
+        connectionPanel.enablesProxyForceBypassConfigure(
+                proxyForceBypassConfigureEnabled);
         connectionPanel.setServerPort(serverPort);
         connectionPanel.setProxy(proxyAddress);