javadoc fixes

diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index c42ebb74019b6588240c2d7d2959f71f901b5394..6fe6704ded9412b7354be5eb22a5b364b8c530d1 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@ -21,7 +21,7 @@ package org.linphone.core;
 import java.util.Vector;
 
 /**
- * Object representing a Call. calls are created using {@link LinphoneCore#invite(LinphoneAddress)} or passed to the application by listener {@link LinphoneCoreListener#callState(LinphoneCore, LinphoneCall, State, String)}
+ * Object representing a call. Calls are created using {@link LinphoneCore#invite(LinphoneAddress)} or passed to the application by listener {@link LinphoneCoreListener#callState}
  * 
  */
 

diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index dbe5611db88808a50acaa325541454fabb0fd247..9e2af91b72d896671cbb3e160fd613a375ae118a 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -373,7 +373,7 @@ public interface LinphoneCore {
         * Accept an incoming call.
         *
         * Basically the application is notified of incoming calls within the
-        * {@link LinphoneCoreListener#inviteReceived(LinphoneCore, String)} listener.
+        * {@link LinphoneCoreListener#callState} listener method.
         * The application can later respond positively to the call using
         * this method.
         * @throws LinphoneCoreException 
@@ -384,7 +384,7 @@ public interface LinphoneCore {
         * Accept an incoming call.
         *
         * Basically the application is notified of incoming calls within the
-        * {@link LinphoneCoreListener#inviteReceived(LinphoneCore, String)} listener.
+        * {@link LinphoneCoreListener#callState} listener method.
         * The application can later respond positively to the call using
         * this method.
         * @throws LinphoneCoreException 
@@ -395,7 +395,7 @@ public interface LinphoneCore {
         * Accept call modifications initiated by other end.
         *
         * Basically the application is notified of incoming calls within the
-        * {@link LinphoneCoreListener#inviteReceived(LinphoneCore, String)} listener.
+        * {@link LinphoneCoreListener#callState} listener method.
         * The application can later respond positively to the call using
         * this method.
         * @throws LinphoneCoreException 
@@ -407,7 +407,7 @@ public interface LinphoneCore {
         * Prevent LinphoneCore from performing an automatic answer
         *
         * Basically the application is notified of incoming calls within the
-        * {@link LinphoneCoreListener#inviteReceived(LinphoneCore, String)} listener.
+        * {@link LinphoneCoreListener#callState} listener method.
         * The application can later respond positively to the call using
         * this method.
         * @throws LinphoneCoreException 

diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index ab9dd1ac3cfb1481d45ab1e0e4703509391a1583..150141ffe7bf00927a65200845cb1f0805976dab 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -24,27 +24,10 @@ package org.linphone.core;
  *This interface holds all callbacks that the application should implement. None is mandatory.
  */
 public interface LinphoneCoreListener {
-
-       /**< Notifies the application that it should show up
-        * @return */
-       void show(LinphoneCore lc);
-
        /**< Ask the application some authentication information 
         * @return */
        void authInfoRequested(LinphoneCore lc,String realm,String username); 
 
-       /**< Callback that notifies various events with human readable text.
-        * @return */
-       void displayStatus(LinphoneCore lc,String message);
-
-       /**< Callback to display a message to the user 
-        * @return */
-       void displayMessage(LinphoneCore lc,String message);
-
-       /** Callback to display a warning to the user 
-        * @return */
-       void displayWarning(LinphoneCore lc,String message);
-
        /** General State notification  
         * @param state LinphoneCore.State
         * @return 
@@ -121,5 +104,22 @@ public interface LinphoneCoreListener {
         *  
         */
        void notifyReceived(LinphoneCore lc, LinphoneCall call, LinphoneAddress from, byte[] event);
+
+       
+       /**< @Deprecated Notifies the application that it should show up
+        * @return */
+       void show(LinphoneCore lc);
+       /**< @Deprecated Callback that notifies various events with human readable text.
+        * @return */
+       void displayStatus(LinphoneCore lc,String message);
+
+       /**< @Deprecated Callback to display a message to the user 
+        * @return */
+       void displayMessage(LinphoneCore lc,String message);
+
+       /** @Deprecated Callback to display a warning to the user 
+        * @return */
+       void displayWarning(LinphoneCore lc,String message);
+
 }
 

diff --git a/java/common/org/linphone/core/package.html b/java/common/org/linphone/core/package.html
index d499e5d60a8151d70d745b7f7f721704ab4d3420..8371def49499fac8a2180b9ce9c9b8afa7c8a03d 100644 (file)
--- a/java/common/org/linphone/core/package.html
+++ b/java/common/org/linphone/core/package.html
@@ -159,7 +159,12 @@ Any subsequente modifications to {@link org.linphone.core.LinphoneFriend} must b
        my_friend.enableSubscribes(true); /*disable subscription for this friend*/
        my_friend.done(); /*commit changes triggering an UNSUBSCRIBE message*/
 </code>
-</pre>
+</pre>                  Do not display status messages
+-J<flag>                  Pass <flag> directly to the runtime system
+
+Provided by Standard doclet:
+-d <directory>                    Destination directory for output files
+-use             
 
 <b> Publishing presence status </b>
 <br>Local presence status can be changed using function {@link org.linphone.core.LinphoneCore#setPresenceInfo }.New status is propagated to all friends {@link org.linphone.core.LinphoneCore#addFriend(LinphoneFriend lf)  previously added } to LinphoneCore.