[jboss-svn-commits] JBL Code SVN: r26639 - in labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main: java/org/jboss/labs/clearspace/plugin/nfm/dao and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 20 10:56:47 EDT 2009
Author: lkrzyzanek
Date: 2009-05-20 10:56:47 -0400 (Wed, 20 May 2009)
New Revision: 26639
Modified:
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/NukesForumsManager.java
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsMappingDAOImpl.java
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/AdminNfmAction.java
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/plugin_i18n.properties
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/web/admin/nukes-forums-migration.ftl
Log:
added count of categories and forums
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java 2009-05-20 14:14:19 UTC (rev 26638)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java 2009-05-20 14:56:47 UTC (rev 26639)
@@ -47,11 +47,12 @@
private NukesForumsDAO nukesForumsDAO;
+ Map<Long, Long> categoryMappings = null;
+
+ Map<Long, Long> forumMappings = null;
+
public int createForumMappingFromCategories() {
- Map<Long, Long> categoryMappings = nukesForumsMappingDAO
- .getAllCategoryMappings();
-
- Set<Map.Entry<Long, Long>> entries = categoryMappings.entrySet();
+ Set<Map.Entry<Long, Long>> entries = getCategoryMappings().entrySet();
int count = 0;
for (Map.Entry<Long, Long> entry : entries) {
Long catID = entry.getKey();
@@ -73,9 +74,32 @@
}
}
}
+ forumMappings = null;
return count;
}
+ public int getCategoryCount() {
+ return getCategoryMappings().size();
+ }
+
+ public int getForumCount() {
+ return getForumMappings().size();
+ }
+
+ public Map<Long, Long> getCategoryMappings() {
+ if (categoryMappings == null) {
+ categoryMappings = nukesForumsMappingDAO.getAllCategoryMappings();
+ }
+ return categoryMappings;
+ }
+
+ public Map<Long, Long> getForumMappings() {
+ if (forumMappings == null) {
+ forumMappings = nukesForumsMappingDAO.getAllForumMappings();
+ }
+ return forumMappings;
+ }
+
public void setNukesForumsMappingDAO(
NukesForumsMappingDAO nukesForumsMappingDAO) {
this.nukesForumsMappingDAO = nukesForumsMappingDAO;
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/NukesForumsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/NukesForumsManager.java 2009-05-20 14:14:19 UTC (rev 26638)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/NukesForumsManager.java 2009-05-20 14:56:47 UTC (rev 26639)
@@ -36,4 +36,18 @@
*/
public int createForumMappingFromCategories();
+ /**
+ * Gets forum mapping count
+ *
+ * @return
+ */
+ public int getForumCount();
+
+ /**
+ * Gets category mapping count
+ *
+ * @return
+ */
+ public int getCategoryCount();
+
}
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsMappingDAOImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsMappingDAOImpl.java 2009-05-20 14:14:19 UTC (rev 26638)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/DbNukesForumsMappingDAOImpl.java 2009-05-20 14:56:47 UTC (rev 26639)
@@ -42,7 +42,7 @@
private static final String SELECT_ALL_CATEGORY_MAPPINGS = "SELECT cat_id, communityID FROM nukesForumsCategoryMapping";
- private static final String SELECT_ALL_FORUMS_MAPPINGS = "SELECT cat_id, communityID FROM nukesForumsForumMapping";
+ private static final String SELECT_ALL_FORUMS_MAPPINGS = "SELECT forum_id, communityID FROM nukesForumsForumMapping";
private static final String INSERT_FORUMS_MAPPING = "INSERT INTO nukesForumsForumMapping (forum_id, communityID) VALUES (?, ?)";
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/AdminNfmAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/AdminNfmAction.java 2009-05-20 14:14:19 UTC (rev 26638)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/struts/AdminNfmAction.java 2009-05-20 14:56:47 UTC (rev 26639)
@@ -24,6 +24,7 @@
import org.jboss.labs.clearspace.plugin.nfm.NukesForumsManager;
import com.jivesoftware.community.action.JiveActionSupport;
+import com.opensymphony.xwork2.Preparable;
/**
* Admin action for NFM plugin
@@ -31,10 +32,19 @@
* @author <a href="mailto:lkrzyzan at redhat.com">Libor Krzyzanek</a>
*
*/
-public class AdminNfmAction extends JiveActionSupport {
+public class AdminNfmAction extends JiveActionSupport implements Preparable {
private NukesForumsManager nukesForumsManager;
+ private Integer categoryCount;
+
+ private Integer forumCount;
+
+ public void prepare() throws Exception {
+ categoryCount = nukesForumsManager.getCategoryCount();
+ forumCount = nukesForumsManager.getForumCount();
+ }
+
public String createForumMapping() {
int count = nukesForumsManager.createForumMappingFromCategories();
@@ -49,4 +59,12 @@
this.nukesForumsManager = nukesForumsManager;
}
+ public Integer getCategoryCount() {
+ return categoryCount;
+ }
+
+ public Integer getForumCount() {
+ return forumCount;
+ }
+
}
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/plugin_i18n.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/plugin_i18n.properties 2009-05-20 14:14:19 UTC (rev 26638)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/resources/plugin_i18n.properties 2009-05-20 14:56:47 UTC (rev 26639)
@@ -2,6 +2,9 @@
plugin.nfm.admin.nfm.name=Nukes Forums migration
plugin.nfm.admin.nfm.description=Click to manage Nukes Forums migration
-plugin.nfm.admin.nfm.create-forums-mapping.description=Create mapping of forum to communities based on categories mapping
+plugin.nfm.admin.nfm.refresh-category-mapping.count=Count of mapped categories
+
+plugin.nfm.admin.nfm.create-forums-mapping.count=Count of mapped forums
+plugin.nfm.admin.nfm.create-forums-mapping.description=Create mapping of forums to communities based on mapping of categories to communities
plugin.nfm.admin.nfm.create-forums-mapping.submit=Create mapping
plugin.nfm.admin.nfm.create-forums-mapping.sucess=Mapping has been sucessfully created. Count: {0}
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/web/admin/nukes-forums-migration.ftl
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/web/admin/nukes-forums-migration.ftl 2009-05-20 14:14:19 UTC (rev 26638)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/web/admin/nukes-forums-migration.ftl 2009-05-20 14:56:47 UTC (rev 26639)
@@ -8,9 +8,18 @@
<body>
<@s.actionmessage />
<@s.fielderror />
+ <table>
+ <tr>
+ <td colspan="2"><@s.text name="plugin.nfm.admin.nfm.refresh-category-mapping.count" />: <@s.property value="categoryCount"/></td>
+ </tr>
+ </table>
+
<@s.form theme="simple" action="nukes-forums-create-forums-mapping">
<table>
<tr>
+ <td colspan="2"><@s.text name="plugin.nfm.admin.nfm.create-forums-mapping.count" />: <@s.property value="forumCount"/></td>
+ </tr>
+ <tr>
<td><@s.text name="plugin.nfm.admin.nfm.create-forums-mapping.description"/>:</td>
<td><@s.submit value="${action.getText('plugin.nfm.admin.nfm.create-forums-mapping.submit')}"/></td>
</tr>
More information about the jboss-svn-commits
mailing list