[jboss-cvs] jboss-seam/trinidad/src/org/jboss/seam/trinidad ...

[Peter Muir]

  User: pmuir   
  Date: 07/05/04 06:22:07

  Modified:    trinidad/src/org/jboss/seam/trinidad 
                        SeamCollectionModel.java
  Log:
  fix order parsing
  
  Revision  Changes    Path
  1.2       +16 -8     jboss-seam/trinidad/src/org/jboss/seam/trinidad/SeamCollectionModel.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamCollectionModel.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/trinidad/src/org/jboss/seam/trinidad/SeamCollectionModel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SeamCollectionModel.java	15 Apr 2007 17:45:44 -0000	1.1
  +++ SeamCollectionModel.java	4 May 2007 10:22:07 -0000	1.2
  @@ -191,7 +191,10 @@
            {
               SortCriterion sortCriterion;
               String fragment = tokenizer.nextToken();
  -            String s = fragment.substring(fragment.lastIndexOf(" "));
  +            int index = fragment.lastIndexOf(" ");
  +            if (index > 0)
  +            {
  +               String s = fragment.substring(index);
               if (" ASC".equalsIgnoreCase(s))
               {
                  sortCriterion = new SortCriterion(fragment.substring(0, fragment.length() - 4), true);
  @@ -205,6 +208,11 @@
               {
                  sortCriterion = new SortCriterion(fragment, false);
               }
  +            }
  +            else
  +            {
  +               sortCriterion = new SortCriterion(fragment, false);
  +            }
               criteria.add(sortCriterion);
            }
         }