[jboss-svn-commits] JBL Code SVN: r27096 - in labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src: main/java/org/jboss/labs/clearspace/plugin/nfm/dao and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 23 08:25:26 EDT 2009
Author: lkrzyzanek
Date: 2009-06-23 08:25:26 -0400 (Tue, 23 Jun 2009)
New Revision: 27096
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/dao/NukesForumsMappingDAO.java
labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManagerTest.java
Log:
added mapping for polls/comments
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-06-23 12:20:03 UTC (rev 27095)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java 2009-06-23 12:25:26 UTC (rev 27096)
@@ -410,6 +410,9 @@
commentDelegator.addComment(comment);
+ nukesForumsMappingDAO.savePostMapping(reply.getPostID(), (poll
+ .getID() * -1));
+
// add activity
ActivityBean activity = createActivity(poll, community, comment
.getUser(), Activity.Type.commented, comment
@@ -571,6 +574,12 @@
// beware - must be set at last. setEndate change expiration date!
poll.setExpirationDate(DateUtils.getMaxDate());
+ long pollMappingID = poll.getID() * -1;
+
+ nukesForumsMappingDAO.saveTopicMapping(nukesPoll.getTopicID(),
+ pollMappingID);
+ nukesForumsMappingDAO.savePostMapping(topicPost.getPostID(), pollMappingID);
+
return poll;
}
@@ -726,6 +735,9 @@
if (threadID == null) {
return null;
}
+ if (threadID < 0) {
+ return addContext("/poll.jspa?poll=" + threadID * -1);
+ }
return addContext("/thread/" + threadID + "?tstart=0");
}
@@ -735,12 +747,21 @@
if (messageID == null) {
return null;
}
+ if (messageID < 0) {
+ return addContext("/poll.jspa?poll=" + messageID * -1);
+ }
return addContext("/message/" + messageID + "#" + messageID);
}
}
return null;
}
+ /**
+ * Get thread ID/Poll ID
+ *
+ * @param topicID
+ * @return if value < 0 then number is poll ID
+ */
protected Long getThreadID(Long topicID) {
Long threadID = topicMappings.get(topicID);
@@ -756,6 +777,12 @@
return threadID;
}
+ /**
+ * Get message ID/Poll ID for post ID
+ *
+ * @param postID
+ * @return if value < 0 then number is poll ID
+ */
protected Long getMessageID(Long postID) {
Long messageID = postMappings.get(postID);
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesForumsMappingDAO.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesForumsMappingDAO.java 2009-06-23 12:20:03 UTC (rev 27095)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/dao/NukesForumsMappingDAO.java 2009-06-23 12:25:26 UTC (rev 27096)
@@ -51,7 +51,7 @@
* Get topic mapping for specified topicID
*
* @param topicID
- * @return threadID
+ * @return threadID or pollID (pollID is negative, threadID is positive)
* @throws EmptyResultDataAccessException
*/
public Long getTopicMapping(Long topicID)
@@ -61,7 +61,7 @@
* Get post mapping for specified postID
*
* @param postID
- * @return mesageID
+ * @return mesageID or pollID (pollID is negative, threadID is positive)
* @throws EmptyResultDataAccessException
*/
public Long getPostMapping(Long postID) throws EmptyResultDataAccessException;
Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManagerTest.java 2009-06-23 12:20:03 UTC (rev 27095)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManagerTest.java 2009-06-23 12:25:26 UTC (rev 27096)
@@ -45,6 +45,7 @@
private static final String MODULE_BB = "bb";
+ @SuppressWarnings("unchecked")
@Before
public void setupDbNukesForumsManagerTest() {
dbNukesForumsManager = new DbNukesForumsManager();
@@ -68,14 +69,22 @@
// dbNukesForumsManager.getCSForumsURL(MODULE_BB, "main", new Long(5),
// null, null, null));
- assertEquals("/community/thread/1001?tstart=0", dbNukesForumsManager
+ assertEquals("/community/thread/16549?tstart=0", dbNukesForumsManager
.getCSForumsURL(MODULE_BB, "viewtopic", null, null, new Long(16549),
null));
- assertEquals("/community/message/1058#1058", dbNukesForumsManager
+ assertEquals("/community/message/18465#18465", dbNukesForumsManager
.getCSForumsURL(MODULE_BB, "viewtopic", null, null, null, new Long(
18465)));
+ assertEquals("/community/poll.jspa?poll=45984", dbNukesForumsManager
+ .getCSForumsURL(MODULE_BB, "viewtopic", null, null, new Long(-45984),
+ null));
+
+ assertEquals("/community/poll.jspa?poll=9425", dbNukesForumsManager
+ .getCSForumsURL(MODULE_BB, "viewtopic", null, null, null, new Long(
+ -9425)));
+
}
class DummyNukesForumsMappingDAO implements NukesForumsMappingDAO {
@@ -92,12 +101,12 @@
public Long getPostMapping(Long postID)
throws EmptyResultDataAccessException {
- return new Long(1058);
+ return postID;
}
public Long getTopicMapping(Long topicID)
throws EmptyResultDataAccessException {
- return new Long(1001);
+ return topicID;
}
public Map<Long, Long> getAllForumMappings() {
More information about the jboss-svn-commits
mailing list