You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/07/03 17:21:15 UTC

svn commit: r1751161 - in /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model: ScrollPosition.java SheetState.java

Author: lofwyr
Date: Sun Jul  3 17:21:15 2016
New Revision: 1751161

URL: http://svn.apache.org/viewvc?rev=1751161&view=rev
Log:
TOBAGO-703: sheet paging should adjust scroll position

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java?rev=1751161&r1=1751160&r2=1751161&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/ScrollPosition.java Sun Jul  3 17:21:15 2016
@@ -33,7 +33,7 @@ public class ScrollPosition implements S
   private Integer top;
 
   public String encode() {
-    return (left != null ? left : "0") + ":" + (top != null ? top : "0");
+    return (left != null ? left : "0") + ";" + (top != null ? top : "0");
   }
 
   public void clear() {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java?rev=1751161&r1=1751160&r2=1751161&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/model/SheetState.java Sun Jul  3 17:21:15 2016
@@ -172,27 +172,4 @@ public class SheetState implements Seria
   public void setToBeSorted(boolean toBeSorted) {
     this.toBeSorted = toBeSorted;
   }
-
-  /**
-   * @deprecated since 2.0.0
-   */
-  @Deprecated
-  public static Integer[] parseScrollPosition(final String value) {
-    Integer[] position = null;
-    if (!StringUtils.isBlank(value)) {
-      final int sep = value.indexOf(";");
-      if (LOG.isInfoEnabled()) {
-        LOG.info("value = \"" + value + "\"  sep = " + sep + "");
-      }
-      if (sep == -1) {
-        throw new NumberFormatException(value);
-      }
-      final int left = Integer.parseInt(value.substring(0, sep));
-      final int top = Integer.parseInt(value.substring(sep + 1));
-      position = new Integer[2];
-      position[0] = left;
-      position[1] = top;
-    }
-    return position;
-  }
 }