[jboss-svn-commits] JBL Code SVN: r16876 - labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 27 19:09:10 EST 2007
Author: sviluppatorefico
Date: 2007-11-27 19:09:10 -0500 (Tue, 27 Nov 2007)
New Revision: 16876
Modified:
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewAdminPanel.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewJumpbox.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsAllSubscribed.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsEditAllForums.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsMain.java
labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewSummary.java
Log:
[JBFORUMS-245] added multiple forums updates
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewAdminPanel.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewAdminPanel.java 2007-11-28 00:08:20 UTC (rev 16875)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewAdminPanel.java 2007-11-28 00:09:10 UTC (rev 16876)
@@ -65,7 +65,18 @@
}
try
{
- categories = getForumsModule().findCategoriesFetchForums();
+ // 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);
+ }
+
+ categories = getForumsModule().findCategoriesFetchForums(new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
return categories;
}
catch(Exception e)
@@ -86,8 +97,19 @@
return categories;
}
try
- {
- forums = getForumsModule().findForums();
+ {
+ // 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);
+ }
+
+ forums = getForumsModule().findForums(new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
return forums;
}
catch(Exception e)
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java 2007-11-28 00:08:20 UTC (rev 16875)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java 2007-11-28 00:09:10 UTC (rev 16876)
@@ -173,13 +173,24 @@
this.categorySelected=true;
}
- this.forumLastPosts = this.getForumsModule().findLastPostsOfForums();
+ // Luca Stancapiano start
+ //get the forumInstanceId where this forum should be added
+ int forumInstanceId = -1;
+ String cou = ForumUtil.getPreference(Constants.FORUM_INSTANCE_ID);
+ if(cou!=null && cou.trim().length()>0)
+ {
+ forumInstanceId = Integer.parseInt(cou);
+ }
+ this.forumLastPosts = this.getForumsModule().findLastPostsOfForums(new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
//setup category related data to be displayed
if(categoryId==-1)
{
//process a default level category
- Collection cour = BaseController.getForumsModule().findCategoriesFetchForums();
+ // Luca Stancapiano
+ Collection cour = BaseController.getForumsModule().findCategoriesFetchForums(new Integer(forumInstanceId));
if(cour!=null)
{
Iterator iterator = cour.iterator();
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewJumpbox.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewJumpbox.java 2007-11-28 00:08:20 UTC (rev 16875)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewJumpbox.java 2007-11-28 00:09:10 UTC (rev 16876)
@@ -57,7 +57,18 @@
}
try
{
- categories = getForumsModule().findCategoriesFetchForums();
+ // 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);
+ }
+
+ categories = getForumsModule().findCategoriesFetchForums(new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
return categories;
}
catch(Exception e)
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsAllSubscribed.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsAllSubscribed.java 2007-11-28 00:08:20 UTC (rev 16875)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsAllSubscribed.java 2007-11-28 00:09:10 UTC (rev 16876)
@@ -28,6 +28,8 @@
import org.jboss.portlet.forums.model.Watch;
import org.jboss.portlet.forums.ui.BaseController;
import org.jboss.portlet.forums.ui.Constants;
+// Luca Stancapiano - import
+import org.jboss.portlet.forums.ui.ForumUtil;
import org.jboss.portlet.forums.ui.JSFUtil;
import org.jboss.portlet.forums.ui.PortalUtil;
@@ -99,8 +101,18 @@
if (watchedTopics==null)
{
try
- {
- watchedTopics = BaseController.getForumsModule().findTopicWatchedByUser(PortalUtil.getUser());
+ {
+ // 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);
+ }
+ watchedTopics = BaseController.getForumsModule().findTopicWatchedByUser(PortalUtil.getUser(), new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
} catch (Exception e)
{
JSFUtil.handleException(e);
@@ -117,8 +129,18 @@
if (topicWatches==null)
{
try
- {
- topicWatches = BaseController.getForumsModule().findTopicWatches(PortalUtil.getUser());
+ {
+ // 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);
+ }
+ topicWatches = BaseController.getForumsModule().findTopicWatches(PortalUtil.getUser(), new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
} catch (Exception e)
{
JSFUtil.handleException(e);
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsEditAllForums.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsEditAllForums.java 2007-11-28 00:08:20 UTC (rev 16875)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsEditAllForums.java 2007-11-28 00:09:10 UTC (rev 16876)
@@ -11,6 +11,8 @@
import org.jboss.portlet.forums.model.Watch;
import org.jboss.portlet.forums.ui.BaseController;
import org.jboss.portlet.forums.ui.Constants;
+// Luca Stancapiano - import
+import org.jboss.portlet.forums.ui.ForumUtil;
import org.jboss.portlet.forums.ui.JSFUtil;
import org.jboss.portlet.forums.ui.PortalUtil;
import org.jboss.portlet.forums.ui.ThemeHelper;
@@ -77,7 +79,17 @@
{
try
{
- forumsLastPosts = BaseController.getForumsModule().findLastPostsOfForums();
+ //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);
+ }
+
+ forumsLastPosts = BaseController.getForumsModule().findLastPostsOfForums(new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
} catch (Exception e)
{
JSFUtil.handleException(e);
@@ -118,8 +130,18 @@
if (watchedForums==null)
{
try
- {
- watchedForums = BaseController.getForumsModule().findForumWatchedByUser(PortalUtil.getUser());
+ {
+ // 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);
+ }
+ watchedForums = BaseController.getForumsModule().findForumWatchedByUser(PortalUtil.getUser(), new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
} catch (Exception e)
{
JSFUtil.handleException(e);
@@ -204,8 +226,18 @@
Collection forums = getWatchedForums();
try
- {
- this.forumWatches = getForumsModule().findForumWatches(PortalUtil.getUser());
+ {
+ // 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);
+ }
+ this.forumWatches = getForumsModule().findForumWatches(PortalUtil.getUser(), new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
} catch (Exception e)
{
JSFUtil.handleException(e);
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsMain.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsMain.java 2007-11-28 00:08:20 UTC (rev 16875)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewMyForumsMain.java 2007-11-28 00:09:10 UTC (rev 16876)
@@ -33,6 +33,8 @@
import org.jboss.portlet.forums.model.Topic;
import org.jboss.portlet.forums.ui.BaseController;
import org.jboss.portlet.forums.ui.Constants;
+// Luca Stancapiano - import
+import org.jboss.portlet.forums.ui.ForumUtil;
import org.jboss.portlet.forums.ui.JSFUtil;
import org.jboss.portlet.forums.ui.PortalUtil;
import org.jboss.portlet.forums.ui.ThemeHelper;
@@ -61,9 +63,19 @@
if (lastLoginDate==null)
{
return watchedTopics;
- }
+ }
+ // 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);
+ }
watchedTopics = BaseController.getForumsModule().
- findTopicWatchedByUser(PortalUtil.getUser(),lastLoginDate);
+ findTopicWatchedByUser(PortalUtil.getUser(),lastLoginDate, new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
} catch (Exception e)
{
JSFUtil.handleException(e);
@@ -88,8 +100,18 @@
if (watchedForums==null)
{
try
- {
- watchedForums = BaseController.getForumsModule().findForumWatchedByUser(PortalUtil.getUser());
+ {
+ // 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);
+ }
+ watchedForums = BaseController.getForumsModule().findForumWatchedByUser(PortalUtil.getUser(), new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
} catch (Exception e)
{
JSFUtil.handleException(e);
@@ -139,7 +161,18 @@
{
try
{
- forumsLastPosts = BaseController.getForumsModule().findLastPostsOfForums();
+ // 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);
+ }
+
+ forumsLastPosts = BaseController.getForumsModule().findLastPostsOfForums(new Integer(forumInstanceId));
+ // Luca Stancapiano end
+
} catch (Exception e)
{
JSFUtil.handleException(e);
Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewSummary.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewSummary.java 2007-11-28 00:08:20 UTC (rev 16875)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/view/ViewSummary.java 2007-11-28 00:09:10 UTC (rev 16876)
@@ -28,6 +28,8 @@
import org.jboss.portlet.forums.ui.BaseController;
import org.jboss.portlet.forums.ui.Constants;
+// Luca Stancapiano - import
+import org.jboss.portlet.forums.ui.ForumUtil;
import org.jboss.portlet.forums.ui.JSFUtil;
import org.jboss.portlet.forums.ui.PortalUtil;
@@ -165,20 +167,40 @@
Date time = after.getTime();
int summaryTopicReplies = Integer.parseInt(this.userPreferences.getPreference(Constants.SUMMARY_REPLIES_KEY));
int summaryTopicLimit = Integer.parseInt(this.userPreferences.getPreference(Constants.SUMMARY_LIMIT_KEY));
+
+ // 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);
+ }
+
+ if (BaseController.getForumsModule().findForumInstanceById(new Integer(forumInstanceId)) == null)
+ BaseController.getForumsModule().createForumInstance(new Integer(forumInstanceId), "by_manual_preferences");
+
+ // Luca Stancapiano end
+
switch(Integer.parseInt(this.userPreferences.getPreference(Constants.SUMMARY_MODE_KEY)))
- {
+ {
+ /* Luca Stancapiano start - findTopicsHot, findTopicsHottest,
+ findTopicsByLatestPosts, findTopicsMostViewed methods need to a forumInstanceId argument
+ to take only categories of a specific forum instance
+ */
case Constants.BLOCK_TOPICS_MODE_HOT_TOPICS:
- this.topics = BaseController.getForumsModule().findTopicsHot(summaryTopicReplies,summaryTopicLimit);
- break;
+ this.topics = BaseController.getForumsModule().findTopicsHot(summaryTopicReplies,summaryTopicLimit,new Integer(forumInstanceId));
+ break;
case Constants.BLOCK_TOPICS_MODE_HOTTEST_TOPICS:
- this.topics = BaseController.getForumsModule().findTopicsHottest(time,summaryTopicLimit);
- break;
- case Constants.BLOCK_TOPICS_MODE_LATEST_POSTS:
- this.topics = BaseController.getForumsModule().findTopicsByLatestPosts(summaryTopicLimit);
- break;
+ this.topics = BaseController.getForumsModule().findTopicsHottest(time,summaryTopicLimit,new Integer(forumInstanceId));
+ break;
+ case Constants.BLOCK_TOPICS_MODE_LATEST_POSTS:
+ this.topics = BaseController.getForumsModule().findTopicsByLatestPosts(summaryTopicLimit,new Integer(forumInstanceId));
+ break;
case Constants.BLOCK_TOPICS_MODE_MOST_VIEWED:
- this.topics = BaseController.getForumsModule().findTopicsMostViewed(time,summaryTopicLimit);
- break;
+ this.topics = BaseController.getForumsModule().findTopicsMostViewed(time,summaryTopicLimit,new Integer(forumInstanceId));
+ break;
+ // Luca Stancapiano end
}
}
}
More information about the jboss-svn-commits
mailing list