[jboss-svn-commits] JBL Code SVN: r35491 - labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts.

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

Author: lkrzyzanek
Date: 2010-10-12 06:04:44 -0400 (Tue, 12 Oct 2010)
New Revision: 35491

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java
Log:
improved getContainer (getSpaceContainer) - omitted only to Spaces.

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java	2010-10-12 08:27:30 UTC (rev 35490)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java	2010-10-12 10:04:44 UTC (rev 35491)
@@ -25,6 +25,7 @@
 import org.jboss.labs.sbs.plugin.projectinfo.ProjectInfoManagerImpl;
 
 import com.jivesoftware.base.UnauthorizedException;
+import com.jivesoftware.community.JiveConstants;
 import com.jivesoftware.community.JiveContainer;
 import com.jivesoftware.community.NotFoundException;
 import com.jivesoftware.community.action.JiveActionSupport;
@@ -89,8 +90,8 @@
    * @param containerID
    * @return container or null if not found
    */
-  private static JiveContainer getContainer(int containerType, int containerID) {
-    if (containerType > 0 && containerID > 0) {
+  private static JiveContainer getSpaceContainer(int containerType, int containerID) {
+    if (containerType > 0 && containerID > 0 && containerType == JiveConstants.COMMUNITY) {
       try {
         return JiveApplication.getEffectiveContext().getJiveContainerManager()
             .getJiveContainer(containerType, containerID);
@@ -111,7 +112,7 @@
    * @return "true" or "false"
    */
   public static String isSpaceProject(int containerType, int containerID) {
-    JiveContainer container = getContainer(containerType, containerID);
+    JiveContainer container = getSpaceContainer(containerType, containerID);
     if (container != null) {
       return "" + ProjectInfoManagerImpl.isSpaceProject(container);
     }
@@ -126,7 +127,7 @@
    * @return project ID like "hibernate"
    */
   public static String getProjectID(int containerType, int containerID) {
-    JiveContainer container = getContainer(containerType, containerID);
+    JiveContainer container = getSpaceContainer(containerType, containerID);
     if (container != null) {
       return ProjectInfoManagerImpl.getProjectID(container, true);
     }
@@ -141,7 +142,7 @@
    * @return GA Code like "UA-16109419-1"
    */
   public static String getGACode(int containerType, int containerID) {
-    JiveContainer container = getContainer(containerType, containerID);
+    JiveContainer container = getSpaceContainer(containerType, containerID);
     if (container != null) {
       return ProjectInfoManagerImpl.getGACode(container, true);
     }