[jboss-svn-commits] JBL Code SVN: r9292 - labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib.

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

Author: adamw
Date: 2007-02-02 10:51:42 -0500 (Fri, 02 Feb 2007)
New Revision: 9292

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ImagePathTag.java
Log:
http://jira.jboss.com/jira/browse/JBLAB-818

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ImagePathTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ImagePathTag.java	2007-02-02 15:37:57 UTC (rev 9291)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ImagePathTag.java	2007-02-02 15:51:42 UTC (rev 9292)
@@ -23,13 +23,12 @@
 
 import java.io.IOException;
 
-import javax.faces.context.FacesContext;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
 import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.Constants;
 import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.portlet.JBossRenderRequest;
 
 public class ImagePathTag extends BodyTagSupport {
 
@@ -57,28 +56,15 @@
     public int doStartTag() throws JspException {
     		
         try {
-            Object portalNameObject = pageContext.
-            								getRequest().
-            								getAttribute(
-            								ForgeHelper.PORTAL_NAME);
-            String portalName = null;
+            String portalName = Constants.LABS_PORTAL;
             
-            if (portalNameObject != null) {
-            		portalName = portalNameObject.toString();
-            } else {
-            		JBossRenderRequest request = (JBossRenderRequest)
-            				FacesContext.getCurrentInstance().getExternalContext().getRequest();
-            		portalName = ForgeHelper.getPortalName(request);
-            }
-            
-
             if (project == null)
                 pageContext.getOut().write(
                         "/" + ForgeHelper.FILE_ACCESS_DIR
                                 + "/" + portalName + "/"
                                 + src);
             else {
-                if (project == ProjectURLTag.SELECTED_PROJECT)
+                if (project.equals(ProjectURLTag.SELECTED_PROJECT))
                     project = pageContext.getRequest().getAttribute(
                             ProjectsHelper.PROJECT_ID).toString();