From b0c8e73b36985aa13b7a788af2b07116d54189a4 Mon Sep 17 00:00:00 2001 From: boris Date: Mon, 30 Mar 2015 10:49:23 +0000 Subject: [PATCH] Minor formatting changes, make methods package-private. --- src/org/ice4j/ice/Agent.java | 3 +- .../ice4j/ice/ConnectivityCheckClient.java | 31 ++++++++-------- .../ice4j/ice/ConnectivityCheckServer.java | 35 ++++++++++--------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/org/ice4j/ice/Agent.java b/src/org/ice4j/ice/Agent.java index afde2bb..03cf41b 100644 --- a/src/org/ice4j/ice/Agent.java +++ b/src/org/ice4j/ice/Agent.java @@ -1725,7 +1725,8 @@ public class Agent if(!atLeastOneListSucceeded) { //all lists ended but none succeeded. No love today ;( - if (logger.isLoggable(Level.INFO)) { + if (logger.isLoggable(Level.INFO)) + { if (connCheckClient.isAlive() || connCheckServer.isAlive()) { diff --git a/src/org/ice4j/ice/ConnectivityCheckClient.java b/src/org/ice4j/ice/ConnectivityCheckClient.java index eca8541..0060ad3 100644 --- a/src/org/ice4j/ice/ConnectivityCheckClient.java +++ b/src/org/ice4j/ice/ConnectivityCheckClient.java @@ -59,6 +59,20 @@ class ConnectivityCheckClient */ private boolean alive = false; + /** + * Creates a new ConnectivityCheckClient setting + * parentAgent as the agent that will be used for retrieving + * information such as user fragments for example. + * + * @param parentAgent the Agent that is creating this instance. + */ + public ConnectivityCheckClient(Agent parentAgent) + { + this.parentAgent = parentAgent; + + stunStack = this.parentAgent.getStunStack(); + } + /** * Returns a boolean value indicating whether we have received a STUN * response or not. @@ -72,22 +86,9 @@ class ConnectivityCheckClient * @return a boolean value indicating whether we have received a STUN * response or not. */ - public boolean isAlive() { - return alive; - } - - /** - * Creates a new ConnectivityCheckHandler setting - * parentAgent as the agent that will be used for retrieving - * information such as user fragments for example. - * - * @param parentAgent the Agent that is creating this instance. - */ - public ConnectivityCheckClient(Agent parentAgent) + boolean isAlive() { - this.parentAgent = parentAgent; - - stunStack = this.parentAgent.getStunStack(); + return alive; } /** diff --git a/src/org/ice4j/ice/ConnectivityCheckServer.java b/src/org/ice4j/ice/ConnectivityCheckServer.java index 14bac98..db12752 100644 --- a/src/org/ice4j/ice/ConnectivityCheckServer.java +++ b/src/org/ice4j/ice/ConnectivityCheckServer.java @@ -53,23 +53,6 @@ class ConnectivityCheckServer */ private boolean alive = false; - /** - * Returns a boolean value indicating whether we have received a STUN - * request or not. - * - * Note that this should NOT be taken as an indication that the negotiation - * has succeeded, it merely indicates that we have received ANY STUN - * request, even invalid ones (e.g. with the wrong username or ufrag). It is - * completely unrelated/independent from the ICE spec and it's only meant to - * be used for debugging purposes. - * - * @return a boolean value indicating whether we have received a STUN - * request or not. - */ - public boolean isAlive() { - return alive; - } - /** * Creates a new ConnectivityCheckServer setting * parentAgent as the agent that will be used for retrieving @@ -87,6 +70,24 @@ class ConnectivityCheckServer start(); } + /** + * Returns a boolean value indicating whether we have received a STUN + * request or not. + * + * Note that this should NOT be taken as an indication that the negotiation + * has succeeded, it merely indicates that we have received ANY STUN + * request, even invalid ones (e.g. with the wrong username or ufrag). It is + * completely unrelated/independent from the ICE spec and it's only meant to + * be used for debugging purposes. + * + * @return a boolean value indicating whether we have received a STUN + * request or not. + */ + boolean isAlive() + { + return alive; + } + /** * Handles the {@link Request} delivered in evt by possibly * queuing a triggered check and sending a success or an error response