Changeset 2011

Timestamp:

07/16/09 23:17:57 (3 years ago)

Author:

mswertz

Message:

BUGFIX: pager reset to first when any setting changes. this meant that only one setting could be set at one time. therefore removed.

File:

• molgenis3_3/src/org/molgenis/framework/data/paging/AbstractPager.java (modified) (6 diffs)

molgenis3_3/src/org/molgenis/framework/data/paging/AbstractPager.java

@@ -166 +166 @@
                         throw new NullPointerException("orderByField cannot be null");
                 
-                pagingState = State.FIRST;
+                //pagingState = State.FIRST;
                 this.orderByField = orderByField;
-                logger.debug("set order by field to '"+orderByField +"' and go to first");
+                logger.debug("set order by field to '"+orderByField +"'");
         }
 
@@ -184 +184 @@
 
                 this.orderByOperator = orderByOperator;
-                if (this.orderByOperator.equals(orderByOperator))
-                {
-                        pagingState = State.FIRST;
-                }
-                logger.debug("set order by operator to '"+orderByOperator +"' and go to first");
+                logger.debug("set order by operator to '"+orderByOperator +"'");
         }
         
@@ -196 +192 @@
                 this.setOrderByField(this.defaultOrderByField);
                 this.setOrderByOperator(Operator.SORTASC);
-                pagingState = State.FIRST;
-                logger.debug("reset order by to default: field '"+orderByField +"', operator '"+orderByOperator +"', go to first");
+                //pagingState = State.FIRST;
+                logger.debug("reset order by to default: field '"+orderByField +"', operator '"+orderByOperator +"'");
         }
 
@@ -229 +225 @@
 
                 filters.add(filter);
-                pagingState = State.FIRST;
+                //pagingState = State.FIRST;
                 //FIXME: would be great if we kept the original object!!!
-                logger.debug("added filter '"+filter+"' and go to first.");
+                logger.debug("added filter '"+filter+"'.");
         }
 
@@ -245 +241 @@
                 logger.debug("removed filter: "+filters.get(index));
                 filters.remove(index);
-                pagingState = State.FIRST;
+                //pagingState = State.FIRST;
         }
 
@@ -252 +248 @@
         {
                 filters = new ArrayList<QueryRule>();
-                pagingState = State.FIRST;
+                //pagingState = State.FIRST;
         }