diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index 24606ada7..4d8e23d80 100644
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@ -31,7 +31,7 @@ public interface LinphoneCall {
 	 *
 	 */
 	static class State {
-		@SuppressWarnings("unchecked")
+		
 		static private Vector values = new Vector();
 		private final int mValue;
 		public final int value() {return mValue;}
@@ -119,7 +119,7 @@ public interface LinphoneCall {
 		 */
 		public static final State CallReleased = new State(18,"CallReleased");
 
-		@SuppressWarnings("unchecked")
+		
 		private State(int value,String stringValue) {
 			mValue = value;
 			values.addElement(this);
diff --git a/java/common/org/linphone/core/LinphoneCallLog.java b/java/common/org/linphone/core/LinphoneCallLog.java
index dbd2bcc27..015f071df 100644
--- a/java/common/org/linphone/core/LinphoneCallLog.java
+++ b/java/common/org/linphone/core/LinphoneCallLog.java
@@ -31,7 +31,7 @@ public interface LinphoneCallLog {
 	 *
 	 */
 	static class CallStatus {
-		@SuppressWarnings("unchecked")
+		
 		static private Vector values = new Vector();
 		private final int mValue;
 		private final String mStringValue;
@@ -52,7 +52,7 @@ public interface LinphoneCallLog {
 		 */
 		public final static CallStatus Declined = new CallStatus(3,"Declined");
 		
-		@SuppressWarnings("unchecked")
+		
 		private CallStatus(int value,String stringValue) {
 			mValue = value;
 			values.addElement(this);
diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 88db6a590..31300e384 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -18,8 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone.core;
 
-
-import java.util.List;
 import java.util.Vector;
 
 import org.linphone.core.LinphoneCallParams;
@@ -34,7 +32,7 @@ public interface LinphoneCore {
 	 * linphone core states
 	 */
 	static public class GlobalState {
-		@SuppressWarnings("unchecked")
+		
 		static private Vector values = new Vector();
 		/**
 		 * Off
@@ -56,7 +54,7 @@ public interface LinphoneCore {
 		private final int mValue;
 		private final String mStringValue;
 
-		@SuppressWarnings("unchecked")
+		
 		private GlobalState(int value,String stringValue) {
 			mValue = value;
 			values.addElement(this);
@@ -79,7 +77,7 @@ public interface LinphoneCore {
 	 *
 	 */
 	static public class RegistrationState {
-		@SuppressWarnings("unchecked")
+		
 		private static Vector values = new Vector();
 		/**
 		 * None
@@ -104,7 +102,7 @@ public interface LinphoneCore {
 		private final int mValue;
 		private final String mStringValue;
 
-		@SuppressWarnings("unchecked")
+		
 		private RegistrationState(int value,String stringValue) {
 			mValue = value;
 			values.addElement(this);
@@ -127,7 +125,7 @@ public interface LinphoneCore {
 	 *
 	 */
 	static public class FirewallPolicy {
-		@SuppressWarnings("unchecked")
+		
 		static private Vector values = new Vector();
 		/**
 		 * No firewall is assumed.
@@ -145,7 +143,7 @@ public interface LinphoneCore {
 		private final int mValue;
 		private final String mStringValue;
 
-		@SuppressWarnings("unchecked")
+		
 		private FirewallPolicy(int value,String stringValue) {
 			mValue = value;
 			values.addElement(this);
@@ -187,7 +185,7 @@ public interface LinphoneCore {
 	 *
 	 */
 	static public class MediaEncryption {
-		@SuppressWarnings("unchecked")
+		
 		static private Vector values = new Vector();
 		/**
 		 * None
@@ -204,7 +202,7 @@ public interface LinphoneCore {
 		protected final int mValue;
 		private final String mStringValue;
 
-		@SuppressWarnings("unchecked")
+		
 		private MediaEncryption(int value,String stringValue) {
 			mValue = value;
 			values.addElement(this);
@@ -226,7 +224,7 @@ public interface LinphoneCore {
 	 * 	EC Calibrator Status
 	 */
 	static public class EcCalibratorStatus {
-		@SuppressWarnings("unchecked")
+		
 		static private Vector values = new Vector();
 		public static final int IN_PROGRESS_STATUS=0;
 		public static final int DONE_STATUS=1;
@@ -247,7 +245,7 @@ public interface LinphoneCore {
 		private final int mValue;
 		private final String mStringValue;
 
-		@SuppressWarnings("unchecked")
+		
 		private EcCalibratorStatus(int value,String stringValue) {
 			mValue = value;
 			values.addElement(this);
@@ -411,8 +409,7 @@ public interface LinphoneCore {
 	/**
 	 * @return a list of LinphoneCallLog 
 	 */
-	@SuppressWarnings("unchecked")
-	public List getCallLogs();
+	public Vector getCallLogs();
 	
 	/**
 	 * This method is called by the application to notify the Linphone core library when network is reachable.
@@ -693,7 +690,7 @@ public interface LinphoneCore {
 	int getConferenceSize();
 	
 	void terminateAllCalls();
-	@SuppressWarnings("unchecked") List getCalls();
+	Vector getCalls();
 	int getCallsNb();
 
 
diff --git a/java/common/org/linphone/core/LinphoneCoreFactory.java b/java/common/org/linphone/core/LinphoneCoreFactory.java
index b5beba393..fe35b257f 100644
--- a/java/common/org/linphone/core/LinphoneCoreFactory.java
+++ b/java/common/org/linphone/core/LinphoneCoreFactory.java
@@ -36,7 +36,7 @@ abstract public class LinphoneCoreFactory {
 		factoryName = className;
 	}
 	
-	@SuppressWarnings("unchecked")
+	
 	public static final synchronized LinphoneCoreFactory instance() {
 		try {
 			if (theLinphoneCoreFactory == null) {
diff --git a/java/common/org/linphone/core/LinphoneFriend.java b/java/common/org/linphone/core/LinphoneFriend.java
index 88bcbab8e..d4f0e7503 100644
--- a/java/common/org/linphone/core/LinphoneFriend.java
+++ b/java/common/org/linphone/core/LinphoneFriend.java
@@ -36,7 +36,7 @@ public interface LinphoneFriend {
 	 */
 	static class SubscribePolicy {
 
-		@SuppressWarnings("unchecked")
+		
 		static private Vector values = new Vector();
 		protected final int mValue;
 		private final String mStringValue;
@@ -54,7 +54,7 @@ public interface LinphoneFriend {
 		 */
 		public final static SubscribePolicy SPAccept = new SubscribePolicy(2,"SPAccept");
 		
-		@SuppressWarnings("unchecked")
+		
 		private SubscribePolicy(int value,String stringValue) {
 			mValue = value;
 			values.addElement(this);
diff --git a/java/common/org/linphone/core/OnlineStatus.java b/java/common/org/linphone/core/OnlineStatus.java
index 8a0da6ce2..a1b36ab37 100644
--- a/java/common/org/linphone/core/OnlineStatus.java
+++ b/java/common/org/linphone/core/OnlineStatus.java
@@ -27,7 +27,7 @@ import java.util.Vector;
  */
 
 public class OnlineStatus {
-	@SuppressWarnings("unchecked")
+	
 	static private Vector values = new Vector();
 	/**
 	 * Offline
@@ -77,7 +77,7 @@ public class OnlineStatus {
 	protected final int mValue;
 	private final String mStringValue;
 
-	@SuppressWarnings("unchecked")
+	
 	private OnlineStatus(int value,String stringValue) {
 		mValue = value;
 		values.addElement(this);