[jboss-svn-commits] JBL Code SVN: r35902 - in labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo: struts and 1 other directory.

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

Author: lkrzyzanek
Date: 2010-11-08 06:54:08 -0500 (Mon, 08 Nov 2010)
New Revision: 35902

Modified:
   labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java
   labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java
Log:
project name is retrieved from Action not from actual container

Modified: labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java	2010-11-08 11:49:22 UTC (rev 35901)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/ProjectInfoManagerImpl.java	2010-11-08 11:54:08 UTC (rev 35902)
@@ -135,6 +135,24 @@
     return projectID;
   }
 
+  /**
+   * Get project Name based on specific container
+   * 
+   * @param container
+   * @param examineParentContainers if true then parent containers are examined
+   *          and project user space is used
+   * @return
+   * @see #getProjectSpace(JiveContainer)
+   */
+  public static String getProjectName(JiveContainer container, boolean examineParentContainers) {
+    JiveContainer projectSpace = container;
+    if (examineParentContainers) {
+      projectSpace = getProjectSpace(projectSpace);
+    }
+
+    return projectSpace.getName();
+  }
+
   public static String getGACode(JiveContainer container, boolean examineParentContainers) {
     JiveContainer projectSpace = container;
     if (examineParentContainers) {

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-11-08 11:49:22 UTC (rev 35901)
+++ labs/jbosslabs/labs-3.0-build/integration/sbs-projectinfo/trunk/src/main/java/org/jboss/labs/sbs/plugin/projectinfo/struts/ProjectInfoAction.java	2010-11-08 11:54:08 UTC (rev 35902)
@@ -132,6 +132,18 @@
   }
 
   /**
+   * Get Project Name
+   * 
+   * @param containerType
+   * @param containerID
+   * @return Project Name like JBoss AS or Hibernate
+   */
+  public static String getProjectName(int containerType, int containerID) {
+    JiveContainer container = getSpaceContainer(containerType, containerID);
+    return ProjectInfoManagerImpl.getProjectName(container, true);
+  }
+
+  /**
    * Get Project ID for specified container
    * 
    * @param containerType