You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2013/04/24 17:14:56 UTC
svn commit: r1471470 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java
Author: mduerig
Date: Wed Apr 24 15:14:56 2013
New Revision: 1471470
URL: http://svn.apache.org/r1471470
Log:
more accurate variance annotations: reduce IDE warnings:
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java?rev=1471470&r1=1471469&r2=1471470&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryChildNodeEntry.java Wed Apr 24 15:14:56 2013
@@ -18,30 +18,29 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.util.Map;
import java.util.Map.Entry;
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.spi.state.AbstractChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import com.google.common.base.Function;
-import com.google.common.collect.Iterables;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* Basic JavaBean implementation of a child node entry.
*/
public class MemoryChildNodeEntry extends AbstractChildNodeEntry {
- public static <T extends NodeState> Iterable<ChildNodeEntry> iterable(
- Iterable<Entry<String, T>> set) {
+ public static <E extends Entry<String, ? extends NodeState>> Iterable<ChildNodeEntry> iterable(
+ Iterable<E> set) {
return Iterables.transform(
set,
- new Function<Entry<String, T>, ChildNodeEntry>() {
+ new Function<Entry<String, ? extends NodeState>, ChildNodeEntry>() {
@Override
- public ChildNodeEntry apply(Entry<String, T> input) {
+ public ChildNodeEntry apply(Entry<String, ? extends NodeState> input) {
return new MemoryChildNodeEntry(input);
}
});