Author: ivaynberg Date: Thu Mar 18 05:52:36 2010 New Revision: 924650 URL: http://svn.apache.org/viewvc?rev=924650&view=rev Log: cleaned up some warnings
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java?rev=924650&r1=924649&r2=924650&view=diff ============================================================================== --- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java (original) +++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java Thu Mar 18 05:52:36 2010 @@ -212,6 +212,7 @@ public class ConcurrentHashSet<E> extend * @throws ClassNotFoundException * @throws IOException */ + @SuppressWarnings("unchecked") private void readObject(ObjectInputStream inputStream) throws ClassNotFoundException, IOException { Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java?rev=924650&r1=924649&r2=924650&view=diff ============================================================================== --- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java (original) +++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Classes.java Thu Mar 18 05:52:36 2010 @@ -18,8 +18,6 @@ package org.apache.wicket.util.lang; import org.apache.wicket.util.string.Strings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** @@ -29,7 +27,6 @@ import org.slf4j.LoggerFactory; */ public final class Classes { - private static final Logger log = LoggerFactory.getLogger(Classes.class); /** * Gets the name of the given class or null if the class is null. Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=924650&r1=924649&r2=924650&view=diff ============================================================================== --- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java (original) +++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/lang/Objects.java Thu Mar 18 05:52:36 2010 @@ -21,9 +21,6 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.HashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Object utilities. @@ -57,9 +54,6 @@ public final class Objects /** Type tag meaning int. */ private static final int INT = 4; - /** log. */ - private static final Logger log = LoggerFactory.getLogger(Objects.class); - /** Type tag meaning long. */ private static final int LONG = 5; Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java?rev=924650&r1=924649&r2=924650&view=diff ============================================================================== --- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java (original) +++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/value/CopyOnWriteValueMap.java Thu Mar 18 05:52:36 2010 @@ -95,7 +95,7 @@ public class CopyOnWriteValueMap impleme /** * @see java.util.Map#entrySet() */ - public Set entrySet() + public Set<Entry<String,Object>> entrySet() { checkAndCopy(); return wrapped.entrySet(); @@ -257,7 +257,7 @@ public class CopyOnWriteValueMap impleme /** * @see java.util.Map#keySet() */ - public Set keySet() + public Set<String> keySet() { checkAndCopy(); return wrapped.keySet(); @@ -283,7 +283,7 @@ public class CopyOnWriteValueMap impleme /** * @see java.util.Map#putAll(Map) */ - public void putAll(Map map) + public void putAll(Map<? extends String,? extends Object> map) { checkAndCopy(); wrapped.putAll(map); @@ -309,7 +309,7 @@ public class CopyOnWriteValueMap impleme /** * @see java.util.Map#values() */ - public Collection values() + public Collection<Object> values() { return wrapped.values(); }