portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jf...@apache.org
Subject cvs commit: jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam PortletApplicationBrowser.java
Date Wed, 22 Sep 2004 17:03:26 GMT
jford       2004/09/22 10:03:26

  Modified:    applications/pam/src/java/org/apache/jetspeed/portlets/pam
                        PortletApplicationBrowser.java
  Log:
  Made PortletDefinitions unique by adding PortletApp prefix
  
  Revision  Changes    Path
  1.13      +4 -3      jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationBrowser.java
  
  Index: PortletApplicationBrowser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationBrowser.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- PortletApplicationBrowser.java	17 Sep 2004 03:39:51 -0000	1.12
  +++ PortletApplicationBrowser.java	22 Sep 2004 17:03:26 -0000	1.13
  @@ -129,7 +129,8 @@
   			            if(pa != null)
   			            {
   			                //TODO:  do we need to look up the pdef?  Could we just pass the child
name into setAttribute?
  -			                PortletDefinition pdef = pa.getPortletDefinitionByName(child.getName());
  +			                String pdefName = child.getName().substring(pa.getName().length() +
2); //remove pa prefix
  +			                PortletDefinition pdef = pa.getPortletDefinitionByName(pdefName);
   			                actionRequest.getPortletSession().setAttribute(PortletApplicationResources.REQUEST_SELECT_PORTLET,
pdef.getName(), PortletSession.APPLICATION_SCOPE);
   			                actionRequest.getPortletSession().setAttribute(PortletApplicationResources.REQUEST_SELECT_TAB,
new TabBean("pa_portlets"), PortletSession.APPLICATION_SCOPE);
   			            }
  @@ -189,7 +190,7 @@
               while (pdefIter.hasNext())
               {
                   PortletDefinitionComposite portlet = (PortletDefinitionComposite) pdefIter.next();
  -                TreeControlNode portletNode = new TreeControlNode(portlet.getName(), 
  +                TreeControlNode portletNode = new TreeControlNode(pa.getName() + "::" +
portlet.getName(), 
                                                                     null, 
                                                                     portlet.getDisplayNameText(locale),

                                                                     PortletApplicationResources.PORTLET_URL,

  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message