Scarab commit: svn commit: r11288 - branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java

Author: dabbous
Date: 2012-06-11 01:06:00-0700
New Revision: 11288

Modified:
   branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java

Log:
fix list navigation for descending lists in Issue editor

Modified: branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&pathrev=11288&r1=11287&r2=11288
==============================================================================
--- branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	(original)
+++ branches/scarab_11079_legacy_with_ant_maven1/src/java/org/tigris/scarab/tools/ScarabRequestTool.java	2012-06-11 01:06:00-0700
@@ -2022,6 +2022,7 @@
                 sortpolarity = parser.get("searchsp");
             }
         }
+        
         if(sortpolarity != null) search.setSortPolarity(sortpolarity);
 
         return search;
@@ -2199,7 +2200,8 @@
      */
     public int getCurrentSearchResultsSize()
     {
-        return getCurrentSearchResults().size();
+        List searchResults = (List)data.getUser().getTemp("queryResult");
+        return (searchResults != null) ? searchResults.size():0;
     }
 
     public boolean isIssuePartOfList()
@@ -2226,10 +2228,13 @@
     {
         String nextIssueId = null;
         int nextIssueIndex = getNextIssuePosInList() - 1;
-        List searchResults = getCurrentSearchResults();
-        if(nextIssueIndex>=0 && nextIssueIndex< searchResults.size() )
+        List searchResults = (List)data.getUser().getTemp("queryResult");
+        if(searchResults != null)
         {
-            nextIssueId = ((QueryResult)searchResults.get(nextIssueIndex)).getUniqueId();
+            if(nextIssueIndex>=0 && nextIssueIndex< searchResults.size() )
+            {
+                nextIssueId = ((QueryResult)searchResults.get(nextIssueIndex)).getUniqueId();
+            }
         }
         return nextIssueId;
     }
@@ -2238,6 +2243,7 @@
     {
         return getIssuePosInList() - 1;
     }
+    
     /**
      * Returns previous issue id in list.
      */
@@ -2246,10 +2252,14 @@
     {
         String prevIssueId = null;
         int prevIssueIndex = getPrevIssuePosInList() - 1;
-        List searchResults = getCurrentSearchResults();
-        if(prevIssueIndex>=0 && prevIssueIndex<searchResults.size() )
+        
+        List searchResults = (List)data.getUser().getTemp("queryResult");
+        if(searchResults != null)
         {
-            prevIssueId = ((QueryResult)searchResults.get(prevIssueIndex)).getUniqueId();
+            if(prevIssueIndex>=0 && prevIssueIndex<searchResults.size() )
+            {
+                prevIssueId = ((QueryResult)searchResults.get(prevIssueIndex)).getUniqueId();
+            }
         }
         return prevIssueId;
     }

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2970299