From 6b36c21fa76a4bf73cbcaaa17605da584f0c5c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Fri, 30 Sep 2016 16:53:51 +0200 Subject: [PATCH] Synchronize @deprecated flag between JavaDoc and Java's code --- java/common/org/linphone/core/LinphoneChatRoom.java | 1 + java/common/org/linphone/core/LinphoneCore.java | 9 +++++++++ java/common/org/linphone/core/LinphoneCoreListener.java | 5 +++++ java/common/org/linphone/core/LinphoneFriend.java | 2 ++ java/common/org/linphone/core/OnlineStatus.java | 1 + 5 files changed, 18 insertions(+) diff --git a/java/common/org/linphone/core/LinphoneChatRoom.java b/java/common/org/linphone/core/LinphoneChatRoom.java index 5c47d6e86..e75f2479d 100644 --- a/java/common/org/linphone/core/LinphoneChatRoom.java +++ b/java/common/org/linphone/core/LinphoneChatRoom.java @@ -43,6 +43,7 @@ public interface LinphoneChatRoom { /** * Send a message to peer member of this chat room. * @param message chat message + * @deprecated */ @Deprecated void sendMessage(LinphoneChatMessage message, LinphoneChatMessage.StateListener listener); diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java index 185e9c487..bd1d79f00 100644 --- a/java/common/org/linphone/core/LinphoneCore.java +++ b/java/common/org/linphone/core/LinphoneCore.java @@ -172,6 +172,7 @@ public interface LinphoneCore { * Describes firewall policy. * @deprecated */ + @Deprecated static public class FirewallPolicy { static private Vector values = new Vector(); @@ -1106,12 +1107,14 @@ public interface LinphoneCore { * @param status OnlineStatus * @deprecated Use setPresenceModel() instead */ + @Deprecated void setPresenceInfo(int minutes_away, String alternative_contact, OnlineStatus status); /** * Get my presence status * @return OnlineStatus * @deprecated Use getPresenceModel() instead */ + @Deprecated OnlineStatus getPresenceInfo(); /** * Set my presence status @@ -1216,12 +1219,14 @@ public interface LinphoneCore { * @param pol one of the FirewallPolicy members. * @deprecated */ + @Deprecated void setFirewallPolicy(FirewallPolicy pol); /** * @return previously set firewall policy. * @deprecated */ + @Deprecated FirewallPolicy getFirewallPolicy(); /** @@ -1467,6 +1472,7 @@ public interface LinphoneCore { * @deprecated * @param i */ + @Deprecated void adjustSoftwareVolume(int i); /** @@ -1638,6 +1644,7 @@ public interface LinphoneCore { * @param uri * @return */ + @Deprecated boolean isMyself(String uri); /** @@ -1705,6 +1712,7 @@ public interface LinphoneCore { * Enable or disable tunnel * @param enable True to enable and false to disable */ + @Deprecated void tunnelEnable(boolean enable); /** @@ -1740,6 +1748,7 @@ public interface LinphoneCore { * @deprecated Use tunnelSetMode instaead * Enable tunnel if the mirror RTP session cannot be established */ + @Deprecated void tunnelAutoDetect(); /** diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java index 5ef47813e..0b6b5eaaf 100644 --- a/java/common/org/linphone/core/LinphoneCoreListener.java +++ b/java/common/org/linphone/core/LinphoneCoreListener.java @@ -31,6 +31,7 @@ public interface LinphoneCoreListener { * @deprecated * Ask the application some authentication information **/ + @Deprecated void authInfoRequested(LinphoneCore lc, String realm, String username, String domain); /** @@ -116,24 +117,28 @@ public interface LinphoneCoreListener { * Notifies the application that it should show up * @deprecated */ + @Deprecated void show(LinphoneCore lc); /** * Callback that notifies various events with human readable text. * @deprecated */ + @Deprecated void displayStatus(LinphoneCore lc,String message); /** * Callback to display a message to the user * @deprecated */ + @Deprecated void displayMessage(LinphoneCore lc,String message); /** * Callback to display a warning to the user * @deprecated */ + @Deprecated void displayWarning(LinphoneCore lc,String message); /** diff --git a/java/common/org/linphone/core/LinphoneFriend.java b/java/common/org/linphone/core/LinphoneFriend.java index 8f2fd3160..a9c2d9979 100644 --- a/java/common/org/linphone/core/LinphoneFriend.java +++ b/java/common/org/linphone/core/LinphoneFriend.java @@ -112,12 +112,14 @@ public interface LinphoneFriend { * @return OnlineStatus * @deprecated Use getPresenceModelForUri() instead */ + @Deprecated OnlineStatus getStatus(); /** * Get the presence information of a friend * @return A #PresenceModel object, or null if the friend do not have presence information (in which case he is considered offline) * @deprecated Use getPresenceModelForUri() instead */ + @Deprecated PresenceModel getPresenceModel(); /** diff --git a/java/common/org/linphone/core/OnlineStatus.java b/java/common/org/linphone/core/OnlineStatus.java index d58fc9dd5..b6f2a9bc0 100644 --- a/java/common/org/linphone/core/OnlineStatus.java +++ b/java/common/org/linphone/core/OnlineStatus.java @@ -26,6 +26,7 @@ import java.util.Vector; * @deprecated Use #PresenceModel and #PresenceActivity instead */ +@Deprecated public class OnlineStatus { static private Vector values = new Vector();