Merge branch 'master' of git.linphone.org:linphone-private

This commit is contained in:
Jehan Monnier 2010-12-10 16:38:17 +01:00
commit 45934f35c0
7 changed files with 16 additions and 11 deletions

View file

@ -24,6 +24,7 @@ import java.util.Vector;
* Object representing a Call. calls are created using {@link LinphoneCore#invite(LinphoneAddress)} or paased to the application by listener {@link LinphoneCoreListener#callState(LinphoneCore, LinphoneCall, State, String)}
*
*/
@SuppressWarnings("unchecked")
public interface LinphoneCall {
/**
* Linphone call states

View file

@ -24,7 +24,7 @@ package org.linphone.core;
import java.util.Vector;
@SuppressWarnings("unchecked")
public interface LinphoneCallLog {
/**
* Represents call status

View file

@ -25,11 +25,12 @@ import java.util.Vector;
* Linphone core main object created by method {@link LinphoneCoreFactory#createLinphoneCore(LinphoneCoreListener, String, String, Object)}.
*
*/
@SuppressWarnings("unchecked")
public interface LinphoneCore {
/**
* linphone core states
*/
static public class GlobalState {
static public class GlobalState {
static private Vector values = new Vector();
/**
* Off
@ -72,28 +73,28 @@ public interface LinphoneCore {
* Describes proxy registration states.
*
*/
static public class RegistrationState {
static private Vector values = new Vector();
static public class RegistrationState {
private static Vector values = new Vector();
/**
* None
*/
static public RegistrationState RegistrationNone = new RegistrationState(0,"RegistrationNone");
public static RegistrationState RegistrationNone = new RegistrationState(0,"RegistrationNone");
/**
* In Progress
*/
static public RegistrationState RegistrationProgress = new RegistrationState(1,"RegistrationProgress");
public static RegistrationState RegistrationProgress = new RegistrationState(1,"RegistrationProgress");
/**
* Ok
*/
static public RegistrationState RegistrationOk = new RegistrationState(2,"RegistrationOk");
public static RegistrationState RegistrationOk = new RegistrationState(2,"RegistrationOk");
/**
* Cleared
*/
static public RegistrationState RegistrationCleared = new RegistrationState(3,"RegistrationCleared");
public static RegistrationState RegistrationCleared = new RegistrationState(3,"RegistrationCleared");
/**
* Failed
*/
static public RegistrationState RegistrationFailed = new RegistrationState(4,"RegistrationFailed");
public static RegistrationState RegistrationFailed = new RegistrationState(4,"RegistrationFailed");
private final int mValue;
private final String mStringValue;
@ -118,7 +119,7 @@ public interface LinphoneCore {
* Describes firewall policy.
*
*/
static public class FirewallPolicy {
static public class FirewallPolicy {
static private Vector values = new Vector();
/**
* No firewall is assumed.

View file

@ -21,7 +21,7 @@ package org.linphone.core;
@SuppressWarnings("unchecked")
abstract public class LinphoneCoreFactory {
private static String factoryName = "org.linphone.core.LinphoneCoreFactoryImpl";

View file

@ -27,6 +27,7 @@ import java.util.Vector;
*
*
*/
@SuppressWarnings("unchecked")
public interface LinphoneFriend {
/**
* Enum controlling behavior for incoming subscription request.

View file

@ -25,6 +25,7 @@ import java.util.Vector;
* Enum describing remote friend status
*
*/
@SuppressWarnings("unchecked")
public class OnlineStatus {
static private Vector values = new Vector();

View file

@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
package org.linphone.core;
@SuppressWarnings("serial")
public class LinphoneCoreException extends Exception {
public LinphoneCoreException() {