[jboss-svn-commits] JBL Code SVN: r7611 - in labs/jbossforums/trunk/forums/src: main/org/jboss/portlet/forums/impl main/org/jboss/portlet/forums/ui/view resources/portal-forums-war/views/admin

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2006-11-15 04:59:15 -0500 (Wed, 15 Nov 2006)
New Revision: 7611

Modified:
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewAdminPanel.java
   labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/index.xhtml
Log:
[JBFORUMS-135] Improving performance of administration panel.

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2006-11-15 09:58:51 UTC (rev 7610)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2006-11-15 09:59:15 UTC (rev 7611)
@@ -51,7 +51,6 @@
 import java.util.LinkedList;
 import java.util.Map;
 
-import org.jboss.portlet.forums.ui.JSFUtil;
 
 /**
  * @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
@@ -460,8 +459,8 @@
            String message = "Cannot find topics";
            throw new ModuleException(message, e);
         } catch (Exception e) {
-            JSFUtil.handleException(e);
             String message = "Error while using ForumsModule.";
+            log.error(message, e);
             throw new ModuleException(message, e);
         }
      }

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewAdminPanel.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewAdminPanel.java	2006-11-15 09:58:51 UTC (rev 7610)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewAdminPanel.java	2006-11-15 09:59:15 UTC (rev 7611)
@@ -34,10 +34,13 @@
 
 /**
  * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
+ * @author <a href="mailto:ryszard.kozmik at jboss.com">Ryszard Kozmik</a>
  */
 public class ViewAdminPanel extends BaseController
 {
 
+    private List categories = null;
+
     /**
      * 
      */
@@ -52,33 +55,24 @@
      */
     public List getCategories() 
     {
-        try
-        {
-            List categories = getForumsModule().findCategories();                                    
+        if (categories!=null) {
             return categories;
         }
-        catch(Exception e)
-        {
-            JSFUtil.handleException(e);
+        synchronized(this) {
+            if (categories!=null) {
+                return categories;
+            }
+            try
+            {
+                categories = getForumsModule().findCategoriesFetchForums();                                    
+                return categories;
+            }
+            catch(Exception e)
+            {
+                JSFUtil.handleException(e);
+            }
+            return null;
         }
-        return null;
     }
     
-    /**
-     * 
-     *
-     */
-    public List getForums()
-    {
-        try
-        {
-            List forums = getForumsModule().findForums();                                    
-            return forums;
-        }
-        catch(Exception e)
-        {
-            JSFUtil.handleException(e);
-        }
-        return null;
-    }
 }

Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java	2006-11-15 09:58:51 UTC (rev 7610)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/view/ViewForum.java	2006-11-15 09:59:15 UTC (rev 7611)
@@ -302,7 +302,7 @@
                  //setup the page data
                  pageNumber = Integer.parseInt(page);
              }
-             System.out.println("PAGENUMBER: "+pageNumber);              
+             
              //setup the pageNavigator for this forum
              this.pageNavigator = new PageNavigator(
                 forum.getTopicCount(), //total number of entries to be split up into pages

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/index.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/index.xhtml	2006-11-15 09:58:51 UTC (rev 7610)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/admin/index.xhtml	2006-11-15 09:59:15 UTC (rev 7611)
@@ -192,6 +192,7 @@
     </table>    
         
     <!-- integrate the jump box -->    
+    <!--
     <table cellspacing="0" cellpadding="0" border="0" align="right">
       <tr>
         <td align="right" valign="top" nowrap="nowrap">
@@ -199,6 +200,7 @@
         </td>
       </tr>
     </table>
+    -->
    </ui:define>
    </ui:composition>   
 </div>
\ No newline at end of file