jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1328686 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk: json/fast/JsopArray.java json/fast/JsopObject.java simple/NodeVersionTest.java
Date Sat, 21 Apr 2012 15:06:02 GMT
Author: mduerig
Date: Sat Apr 21 15:06:02 2012
New Revision: 1328686

URL: http://svn.apache.org/viewvc?rev=1328686&view=rev
Log:
- clean up imports
- don't explicitly extend from Object

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java?rev=1328686&r1=1328685&r2=1328686&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopArray.java
Sat Apr 21 15:06:02 2012
@@ -16,13 +16,14 @@
  */
 package org.apache.jackrabbit.mk.json.fast;
 
+import org.apache.jackrabbit.mk.json.JsopBuilder;
+import org.apache.jackrabbit.mk.json.JsopTokenizer;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
-import org.apache.jackrabbit.mk.json.JsopBuilder;
-import org.apache.jackrabbit.mk.json.JsopTokenizer;
 
 /**
  * An array of objects.
@@ -141,12 +142,12 @@ public class JsopArray extends Jsop impl
     }
 
     @Override
-    public boolean addAll(Collection<? extends Object> c) {
+    public boolean addAll(Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public boolean addAll(int index, Collection<? extends Object> c) {
+    public boolean addAll(int index, Collection<?> c) {
         throw new UnsupportedOperationException();
     }
 

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java?rev=1328686&r1=1328685&r2=1328686&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/json/fast/JsopObject.java
Sat Apr 21 15:06:02 2012
@@ -16,13 +16,14 @@
  */
 package org.apache.jackrabbit.mk.json.fast;
 
+import org.apache.jackrabbit.mk.json.JsopBuilder;
+import org.apache.jackrabbit.mk.json.JsopTokenizer;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import org.apache.jackrabbit.mk.json.JsopBuilder;
-import org.apache.jackrabbit.mk.json.JsopTokenizer;
 
 /**
  * A map.
@@ -191,7 +192,7 @@ public class JsopObject extends Jsop imp
     }
 
     @Override
-    public void putAll(Map<? extends String, ? extends Object> m) {
+    public void putAll(Map<? extends String, ?> m) {
         throw new UnsupportedOperationException();
     }
 

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java?rev=1328686&r1=1328685&r2=1328686&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java
Sat Apr 21 15:06:02 2012
@@ -16,12 +16,12 @@
  */
 package org.apache.jackrabbit.mk.simple;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.simple.NodeImpl;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
 /**
  * Test moving nodes.
  */



Mime
View raw message