IQuickReuseStrategy isPaging() replaced with isAddItemsSupported() + …

…other useless tests removed
marcusaram · Dec 17, 2012 · 4eb6df9 · 4eb6df9
1 parent 1947271
commit 4eb6df9
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 176 deletions.
diff --git a/wicket-quickview/src/main/java/com/aplombee/AbstractItemsNavigationStrategy.java b/wicket-quickview/src/main/java/com/aplombee/AbstractItemsNavigationStrategy.java
@@ -40,7 +40,7 @@ public <T> Iterator<Item<T>> addItems(int startIndex, IItemFactory<T> factory, I
      *
      */
     @Override
-    public boolean isPaging() {
-        return false;
+    public boolean isAddItemsSupported() {
+        return true;
     }
 }
diff --git a/wicket-quickview/src/main/java/com/aplombee/AbstractPagingNavigationStrategy.java b/wicket-quickview/src/main/java/com/aplombee/AbstractPagingNavigationStrategy.java
@@ -19,10 +19,11 @@ public abstract class AbstractPagingNavigationStrategy implements IQuickReuseStr
 
     @Override
     public <T> Iterator<Item<T>> addItems(int startIndex, IItemFactory<T> factory, Iterator<IModel<T>> newModels) {
-        throw  new UnsupportedOperationException("adding items dynamically for partial updates is not supported by this strategy");
+        throw  new IRepeaterUtil.ReuseStrategyNotSupportedException("adding items dynamically for partial updates is not supported by this strategy");
     }
 
-    public boolean isPaging(){
-        return true;
+    @Override
+    public boolean isAddItemsSupported(){
+        return false;
     }
 }
diff --git a/wicket-quickview/src/main/java/com/aplombee/IQuickReuseStrategy.java b/wicket-quickview/src/main/java/com/aplombee/IQuickReuseStrategy.java
@@ -73,8 +73,8 @@ public interface IQuickReuseStrategy extends Serializable {
     /**
      *  tells whether reuse strategy support addition of items to view without re-rendering QuickView
      *
-     * @return   true if the reuse strategy doesn't support {@link this#addItems(int, org.apache.wicket.markup.repeater.IItemFactory, java.util.Iterator)}  else false
+     * @return   boolean
      */
-    boolean isPaging();
+    boolean isAddItemsSupported();
 
 }
diff --git a/wicket-quickview/src/main/java/com/aplombee/IRepeaterUtil.java b/wicket-quickview/src/main/java/com/aplombee/IRepeaterUtil.java
@@ -163,15 +163,6 @@ public interface IRepeaterUtil {
     public String isPageScrollBarAtBottom();
 
 
-    /**
-     * return iterator of those items whose models are equal ,if the model is not equal new item is returned
-     *
-     * @param oldIterator    old iterator
-     * @param newIterator    new iterator (iterator of the list of expected modelobjects)
-     * @return
-     */
-    Iterator<Item> reuseItemsIfModelsEqual(Iterator<Item> oldIterator, Iterator<Item> newIterator);
-
     /**
      *  throw this exception if quickview's parent is not found
      *

diff --git a/wicket-quickview/src/main/java/com/aplombee/RepeaterUtil.java b/wicket-quickview/src/main/java/com/aplombee/RepeaterUtil.java
@@ -20,13 +20,8 @@
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.IMarkupFragment;
 import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.IModel;
 import org.apache.wicket.util.lang.Args;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -137,7 +132,7 @@ public int safeLongToInt(long value) {
     @Override
     public final void parentNotSuitable(IQuickView quickView) {
         Args.notNull(quickView, "quickview");
-        if (quickView.getReuseStrategy() .isPaging()) {
+        if (!quickView.getReuseStrategy() .isAddItemsSupported()) {
             return;
         }
         MarkupContainer parent = quickView.getParent();
@@ -169,34 +164,11 @@ public final void outPutMarkupIdNotTrue(IQuickView quickView) {
     @Override
     public final void reuseStategyNotSupportedForItemsNavigation(IQuickView quickView) {
         Args.notNull(quickView, "quickview");
-        if ( quickView.getReuseStrategy().isPaging()) {
+        if (!quickView.getReuseStrategy().isAddItemsSupported()) {
             throw new ReuseStrategyNotSupportedException(" stategy is not supported for itemsnavigator ");
         }
     }
 
-    @Override
-    public final Iterator<Item> reuseItemsIfModelsEqual(Iterator<Item> oldIterator, Iterator<Item> newIterator) {
-        List<Item> list = new ArrayList<Item>();
-        while (newIterator.hasNext()) {
-            Item newItem = newIterator.next();
-            Item old = null;
-            if (oldIterator.hasNext()) {
-                old = (Item) oldIterator.next();
-            }
-            if (old == null) {
-                list.add(newItem);
-            } else {
-                if (!old.getModel().equals(newItem.getModel())) {
-                    list.add(newItem);
-                } else {
-                    list.add(old);
-                }
-            }
-        }
-        return list.iterator();
-    }
-
-
 
     protected String scripts(String regex, String input) {
         int regexEnd = end(regex, input);

diff --git a/wicket-quickview/src/test/java/com/aplombee/AbstractItemsNavigationStrategyTest.java b/wicket-quickview/src/test/java/com/aplombee/AbstractItemsNavigationStrategyTest.java
@@ -5,7 +5,6 @@
 import org.apache.wicket.model.IModel;
 import org.mockito.Mockito;
 import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import java.util.Iterator;
 
@@ -37,8 +36,8 @@ public void assertAddItems(IQuickReuseStrategy strategy){
 
     }
 
-       public void assertIsPaging(IQuickReuseStrategy strategy){
-        Assert.assertFalse(strategy.isPaging());
+       public void assertIsAddItemsSupported(IQuickReuseStrategy strategy){
+        Assert.assertTrue(strategy.isAddItemsSupported());
     }
 
 

diff --git a/wicket-quickview/src/test/java/com/aplombee/AbstractPagingNavigationStrategyTest.java b/wicket-quickview/src/test/java/com/aplombee/AbstractPagingNavigationStrategyTest.java
@@ -3,7 +3,6 @@
 import org.apache.wicket.markup.repeater.IItemFactory;
 import org.mockito.Mockito;
 import org.testng.Assert;
-import org.testng.annotations.Test;
 
 import java.util.Iterator;
 
@@ -12,8 +11,8 @@
  */
 public class AbstractPagingNavigationStrategyTest {
 
-    public void assertIsPaging(IQuickReuseStrategy strategy){
-       Assert.assertTrue(strategy.isPaging());
+    public void assertIsAddItemsSupported(IQuickReuseStrategy strategy){
+       Assert.assertFalse(strategy.isAddItemsSupported());
     }
 
    public void assertAddItems(IQuickReuseStrategy strategy){

diff --git a/wicket-quickview/src/test/java/com/aplombee/DefaultQuickReuseStrategyTest.java b/wicket-quickview/src/test/java/com/aplombee/DefaultQuickReuseStrategyTest.java
@@ -19,14 +19,14 @@
  */
 public class DefaultQuickReuseStrategyTest extends AbstractPagingNavigationStrategyTest {
 
-    @Test(groups = {"wicketTests"} ,expectedExceptions = UnsupportedOperationException.class)
+    @Test(groups = {"wicketTests"} ,expectedExceptions = IRepeaterUtil.ReuseStrategyNotSupportedException.class)
     public void addItems_1(){
        super.assertAddItems(new DefaultQuickReuseStrategy());
     }
 
     @Test(groups = {"wicketTests"})
     public void isPaging_1(){
-     super.assertIsPaging(new DefaultQuickReuseStrategy());
+     super.assertIsAddItemsSupported(new DefaultQuickReuseStrategy());
     }
 
     /**

diff --git a/wicket-quickview/src/test/java/com/aplombee/ItemsNavigationStrategyTest.java b/wicket-quickview/src/test/java/com/aplombee/ItemsNavigationStrategyTest.java
@@ -25,7 +25,7 @@ public void addItems_1(){
 
     @Test(groups = {"wicketTests"})
     public void isPaging_1(){
-       super.assertIsPaging(new ItemsNavigationStrategy());
+       super.assertIsAddItemsSupported(new ItemsNavigationStrategy());
     }
 
 

diff --git a/wicket-quickview/src/test/java/com/aplombee/QuickGridViewTest.java b/wicket-quickview/src/test/java/com/aplombee/QuickGridViewTest.java
@@ -652,9 +652,6 @@ protected Iterator buildItems(long index, Iterator iterator) {
     }
 
 
-
-
-
     /*
      *start index=10
     */

diff --git a/wicket-quickview/src/test/java/com/aplombee/QuickReuseIfModelsEqualStrategyTest.java b/wicket-quickview/src/test/java/com/aplombee/QuickReuseIfModelsEqualStrategyTest.java
@@ -10,10 +10,10 @@ public class QuickReuseIfModelsEqualStrategyTest extends AbstractPagingNavigatio
 
     @Test(groups = {"wicketTests"})
     public void isPaging_1(){
-        super.assertIsPaging(new QuickReuseIfModelsEqualStrategy());
+        super.assertIsAddItemsSupported(new QuickReuseIfModelsEqualStrategy());
     }
 
-    @Test(groups = {"wicketTests"} ,expectedExceptions = UnsupportedOperationException.class)
+    @Test(groups = {"wicketTests"} ,expectedExceptions = IRepeaterUtil.ReuseStrategyNotSupportedException.class)
     public void addItems_1(){
        super.assertAddItems(new QuickReuseIfModelsEqualStrategy());
     }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /*
          *start index=10
         */
@@ Expand Down @@