[jboss-svn-commits] JBL Code SVN: r16875 - labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/action.

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

Author: sviluppatorefico
Date: 2007-11-27 19:08:20 -0500 (Tue, 27 Nov 2007)
New Revision: 16875

Modified:
   labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
Log:
[JBFORUMS-245] added multiple forums updates

Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java	2007-11-28 00:07:51 UTC (rev 16874)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java	2007-11-28 00:08:20 UTC (rev 16875)
@@ -29,6 +29,8 @@
 
 import org.jboss.portlet.forums.model.Category;
 import org.jboss.portlet.forums.model.Forum;
+// Luca Stancapiano - import
+import org.jboss.portlet.forums.model.ForumInstance;
 import org.jboss.portlet.forums.model.Topic;
 
 /**
@@ -258,7 +260,21 @@
         boolean success = false;
         try
         {
-            BaseController.getForumsModule().createCategory(this.categoryName);
+        	// Luca Stancapiano start
+            //get the forumInstanceId where this forum should be added
+	        int forumInstanceId = -1;
+	        String cour = ForumUtil.getPreference(Constants.FORUM_INSTANCE_ID);
+	        if(cour!=null && cour.trim().length()>0)
+	        {
+	        	forumInstanceId = Integer.parseInt(cour);
+	        }
+            
+            //add this new category to the forum instance
+            ForumInstance forumInstance = BaseController.getForumsModule().findForumInstanceById(new Integer(forumInstanceId));
+            
+            BaseController.getForumsModule().createCategory(this.categoryName, forumInstance);
+            // Luca Stancapiano end
+            
             String start = JSFUtil.getBundleMessage("ResourceJSF","Category_created_0");
             String end = JSFUtil.getBundleMessage("ResourceJSF","Category_created_1");
             JSFUtil.setMessage(Constants.FEEDBACK,start+"\""+this.categoryName+"\""+end);
@@ -549,7 +565,19 @@
 	        	        
 	        Category category = BaseController.getForumsModule().findCategoryById(new Integer(categoryId));
 	        category.setOrder(category.getOrder() + AdminController.up);
-	        Iterator categories = BaseController.getForumsModule().findCategories().iterator();
+	        
+	         // Luca Stancapiano start
+	         //get the forumInstanceId where this forum should be added
+	        int forumInstanceId = -1;
+	        cour = ForumUtil.getPreference(Constants.FORUM_INSTANCE_ID);
+	        if(cour!=null && cour.trim().length()>0)
+	        {
+	        	forumInstanceId = Integer.parseInt(cour);
+	        }
+	         
+	        Iterator categories = BaseController.getForumsModule().findCategories(new Integer(forumInstanceId)).iterator();
+	         // Luca Stancapiano end
+	        
 	        for (int index = 10; categories.hasNext(); index += 10)
 	        {
 	           category = (Category)categories.next();
@@ -582,7 +610,19 @@
 	        	        
 	        Category category = BaseController.getForumsModule().findCategoryById(new Integer(categoryId));
 	        category.setOrder(category.getOrder() + AdminController.down);
-	        Iterator categories = BaseController.getForumsModule().findCategories().iterator();
+	        
+	        // Luca Stancapiano start
+	        //get the forumInstanceId where this forum should be added
+	        int forumInstanceId = -1;
+	        cour = ForumUtil.getPreference(Constants.FORUM_INSTANCE_ID);
+	        if(cour!=null && cour.trim().length()>0)
+	        {
+	        	forumInstanceId = Integer.parseInt(cour);
+	        }
+	         
+	        Iterator categories = BaseController.getForumsModule().findCategories(new Integer(forumInstanceId)).iterator();
+	        // Luca Stancapiano end
+	        
 	        for (int index = 10; categories.hasNext(); index += 10)
 	        {
 	           category = (Category)categories.next();