Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 69 insertions, 69 deletions

diff --git a/src/net/java/sip/communicator/service/sysactivity/SystemActivityNotificationsService.java b/src/net/java/sip/communicator/service/sysactivity/SystemActivityNotificationsService.java
index f7de167..c7069b0 100644
--- a/src/net/java/sip/communicator/service/sysactivity/SystemActivityNotificationsService.java
+++ b/src/net/java/sip/communicator/service/sysactivity/SystemActivityNotificationsService.java
@@ -1,4 +1,4 @@
-/*

+/*
  * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
  *
  * Copyright @ 2015 Atlassian Pty Ltd
@@ -15,71 +15,71 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package net.java.sip.communicator.service.sysactivity;

-

-/**

- * Listens for some system specific events such as sleep, wake, network change,

- * desktop activity, screensaver etc. and informs the registered listeners.

- *

- * @author Damian Minkov

- */

-public interface SystemActivityNotificationsService

-{

-    /**

-     * Registers a listener that would be notified of changes that have occurred

-     * in the underlying system.

-     *

-     * @param listener the listener that we'd like to register for changes in

-     * the underlying system.

-     */

-    public void addSystemActivityChangeListener(

-        SystemActivityChangeListener listener);

-

-    /**

-     * Remove the specified listener so that it won't receive further

-     * notifications of changes that occur in the underlying system

-     *

-     * @param listener the listener to remove.

-     */

-    public void removeSystemActivityChangeListener(

-        SystemActivityChangeListener listener);

-

-    /**

-     * Registers a listener that would be notified for idle of the system

-     * for <tt>idleTime</tt>.

-     *

-     * @param idleTime the time in milliseconds after which we will consider

-     * system to be idle. This doesn't count when system seems idle as

-     * monitor is off or screensaver is on, or desktop is locked.

-     * @param listener the listener that we'd like to register for changes in

-     * the underlying system.

-     */

-    public void addIdleSystemChangeListener(

-        long idleTime,

-        SystemActivityChangeListener listener);

-

-    /**

-     * Remove the specified listener so that it won't receive further

-     * notifications for idle system.

-     *

-     * @param listener the listener to remove.

-     */

-    public void removeIdleSystemChangeListener(

-        SystemActivityChangeListener listener);

-

-    /**

-     * Can check whether an event id is supported on

-     * current operation system.

-     * @param eventID the event to check.

-     * @return whether the supplied event id is supported.

-     */

-    public boolean isSupported(int eventID);

-

-    /**

-     * The time since last user input. The time the system has been idle.

-     * Or -1 if there is no such information or error has occured.

-     * @return time the system has been idle.

-     */

-    public long getTimeSinceLastInput();

-

-}

+package net.java.sip.communicator.service.sysactivity;
+
+/**
+ * Listens for some system specific events such as sleep, wake, network change,
+ * desktop activity, screensaver etc. and informs the registered listeners.
+ *
+ * @author Damian Minkov
+ */
+public interface SystemActivityNotificationsService
+{
+    /**
+     * Registers a listener that would be notified of changes that have occurred
+     * in the underlying system.
+     *
+     * @param listener the listener that we'd like to register for changes in
+     * the underlying system.
+     */
+    public void addSystemActivityChangeListener(
+        SystemActivityChangeListener listener);
+
+    /**
+     * Remove the specified listener so that it won't receive further
+     * notifications of changes that occur in the underlying system
+     *
+     * @param listener the listener to remove.
+     */
+    public void removeSystemActivityChangeListener(
+        SystemActivityChangeListener listener);
+
+    /**
+     * Registers a listener that would be notified for idle of the system
+     * for <tt>idleTime</tt>.
+     *
+     * @param idleTime the time in milliseconds after which we will consider
+     * system to be idle. This doesn't count when system seems idle as
+     * monitor is off or screensaver is on, or desktop is locked.
+     * @param listener the listener that we'd like to register for changes in
+     * the underlying system.
+     */
+    public void addIdleSystemChangeListener(
+        long idleTime,
+        SystemActivityChangeListener listener);
+
+    /**
+     * Remove the specified listener so that it won't receive further
+     * notifications for idle system.
+     *
+     * @param listener the listener to remove.
+     */
+    public void removeIdleSystemChangeListener(
+        SystemActivityChangeListener listener);
+
+    /**
+     * Can check whether an event id is supported on
+     * current operation system.
+     * @param eventID the event to check.
+     * @return whether the supplied event id is supported.
+     */
+    public boolean isSupported(int eventID);
+
+    /**
+     * The time since last user input. The time the system has been idle.
+     * Or -1 if there is no such information or error has occured.
+     * @return time the system has been idle.
+     */
+    public long getTimeSinceLastInput();
+
+}