[Jaffa-svn] SF.net SVN: jaffa:[4071] trunk

[<ga...@us...>]

Revision: 4071
          http://jaffa.svn.sourceforge.net/jaffa/?rev=4071&view=rev
Author:   gautamj
Date:     2009-08-25 17:45:52 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
Merged the latest change from the JAFFA_5_1_0_RELEASE branch

Modified Paths:
--------------
    trunk/JaffaComponentsMessaging/source/java/org/jaffa/modules/messaging/components/queuelist/ui/QueueListComponent.java
    trunk/JaffaComponentsScheduler/source/html/jaffa/scheduler/taskfinder/contextNav.jsp
    trunk/JaffaComponentsScheduler/source/java/org/jaffa/modules/scheduler/components/taskfinder/ui/TaskFinderComponent.java

Modified: trunk/JaffaComponentsMessaging/source/java/org/jaffa/modules/messaging/components/queuelist/ui/QueueListComponent.java
===================================================================
--- trunk/JaffaComponentsMessaging/source/java/org/jaffa/modules/messaging/components/queuelist/ui/QueueListComponent.java	2009-08-25 17:37:04 UTC (rev 4070)
+++ trunk/JaffaComponentsMessaging/source/java/org/jaffa/modules/messaging/components/queuelist/ui/QueueListComponent.java	2009-08-25 17:45:52 UTC (rev 4071)
@@ -74,18 +74,19 @@
     
     
     public FormKey display() throws ApplicationExceptions, FrameworkException {
+        return displayResults();
+    }
+
+    public FormKey displayResults() throws ApplicationExceptions, FrameworkException {
+        getUserSession().getWidgetCache(getComponentId()).clear();
         try {
-            return displayResults();
+            m_finderOutDto = createTx().query(getFilter());
+            m_error = null;
         } catch (Exception e) {
             // Render an empty screen with an error indicator
+            m_finderOutDto = null;
             m_error = e;
-            return getResultsFormKey();
         }
-    }
-
-    public FormKey displayResults() throws ApplicationExceptions, FrameworkException {
-        m_finderOutDto = createTx().query(getFilter());
-        getUserSession().getWidgetCache(getComponentId()).clear();
         return getResultsFormKey();
     }
 

Modified: trunk/JaffaComponentsScheduler/source/html/jaffa/scheduler/taskfinder/contextNav.jsp
===================================================================
--- trunk/JaffaComponentsScheduler/source/html/jaffa/scheduler/taskfinder/contextNav.jsp	2009-08-25 17:37:04 UTC (rev 4070)
+++ trunk/JaffaComponentsScheduler/source/html/jaffa/scheduler/taskfinder/contextNav.jsp	2009-08-25 17:45:52 UTC (rev 4071)
@@ -34,16 +34,16 @@
     <td>
     <span id="context" syle="display:block">
       <table class='contextNavBody' cellspacing='0' cellpadding='0' width='100%'>
-<%
-TaskFinderComponent myComp = ((TaskFinderComponent) TagHelper.getFormBase(pageContext).getComponent());
-if (myComp.getError() == null) {
-%>
         <tr>
           <td>
             <img src="jaffa/imgs/icons/refresh.gif">
             <Portlet:Button field='Refresh' type='link' label='[label.Jaffa.Widgets.Button.Refresh]' guarded='true' preprocess='false'/>
           </td>
         </tr>
+<%
+TaskFinderComponent myComp = ((TaskFinderComponent) TagHelper.getFormBase(pageContext).getComponent());
+if (myComp.getError() == null) {
+%>
         <tr>
           <td>
             <Portlet:ComponentGuard name="Jaffa.Scheduler.TaskMaintenance">

Modified: trunk/JaffaComponentsScheduler/source/java/org/jaffa/modules/scheduler/components/taskfinder/ui/TaskFinderComponent.java
===================================================================
--- trunk/JaffaComponentsScheduler/source/java/org/jaffa/modules/scheduler/components/taskfinder/ui/TaskFinderComponent.java	2009-08-25 17:37:04 UTC (rev 4070)
+++ trunk/JaffaComponentsScheduler/source/java/org/jaffa/modules/scheduler/components/taskfinder/ui/TaskFinderComponent.java	2009-08-25 17:45:52 UTC (rev 4071)
@@ -135,13 +135,7 @@
      * @return The FormKey for the Results screen.
      */
     public FormKey display() throws ApplicationExceptions, FrameworkException {
-        try {
-            return displayResults();
-        } catch (Exception e) {
-            // Render an empty screen with an error indicator
-            m_error = e;
-            return getResultsFormKey();
-        }
+        return displayResults();
     }
 
     /** Invokes the performInquiry() method and then returns the FormKey for the Results screen.
@@ -160,8 +154,15 @@
      * @throws FrameworkException Indicates some system error.
      */
     public void performInquiry() throws ApplicationExceptions, FrameworkException {
-        m_finderOutDto = createTx().find();
         getUserSession().getWidgetCache(getComponentId()).clear();
+        try {
+            m_finderOutDto = createTx().find();
+            m_error = null;
+        } catch (Exception e) {
+            // Render an empty screen with an error indicator
+            m_finderOutDto = null;
+            m_error = e;
+        }
     }
 
     /** Getter for the Results screen's FormKey.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.