You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2002/06/20 21:22:40 UTC

cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/security PortalResource.java

taylor      2002/06/20 12:22:39

  Modified:    src/java/org/apache/jetspeed/services/security Tag:
                        security_14 PortalResource.java
  Log:
  Changed the constructor PortalResource(RegistryEntry regsitryEntry) to use the class variable registryEntry instead of entry.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +16 -16    jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/PortalResource.java
  
  Index: PortalResource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/Attic/PortalResource.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- PortalResource.java	4 Jun 2002 02:43:36 -0000	1.1.2.2
  +++ PortalResource.java	20 Jun 2002 19:22:39 -0000	1.1.2.3
  @@ -75,17 +75,17 @@
       public static final int TYPE_REGISTRY_PARAMETER = 301;
   
       private int resourceType = 0;
  -    
  +
       private Entry entry = null;
       private org.apache.jetspeed.om.profile.Parameter entryParameter = null;
  -    private Portlet portlet = null;    
  +    private Portlet portlet = null;
       private org.apache.jetspeed.om.registry.Parameter registryParameter = null;
       private RegistryEntry registryEntry = null;
  -    
  +
       /**
        * Resource is a PSML entry, i.e. a Portlet Instance
        * @param entry PSML Entry, i.e Portlet Instance
  -     */    
  +     */
       public PortalResource( Entry entry)
       {
           resourceType = TYPE_ENTRY;
  @@ -96,7 +96,7 @@
        * Resource is a parameter associated with a PSML entry, i.e. a Portlet Instance
        * @param entry PSML Entry, i.e Portlet Instance
        * @param parameter Requesting parameter
  -     */    
  +     */
       public PortalResource( Entry entry, org.apache.jetspeed.om.profile.Parameter parameter)
       {
           resourceType = TYPE_ENTRY_PARAMETER;
  @@ -107,7 +107,7 @@
       /**
        * Resource is a Portlet, i.e. a Portlet
        * @param portlet Portlet registry entry
  -     */    
  +     */
       public PortalResource( Portlet portlet)
       {
           resourceType = TYPE_PORTLET;
  @@ -117,18 +117,18 @@
       /**
        * Resource is a registry entry
        * @param registryEntry
  -     */    
  +     */
       public PortalResource( RegistryEntry registryEntry)
       {
  -        resourceType = TYPE_ENTRY;
  -        this.entry = entry;
  +        resourceType = TYPE_REGISTRY;
  +        this.registryEntry = registryEntry;
       }
   
       /**
        * Resource is a parameter associated with a registry entry
        * @param registryEntry
        * @param parameter Requesting parameter
  -     */    
  +     */
       public PortalResource( RegistryEntry registryEntry, org.apache.jetspeed.om.registry.Parameter parameter)
       {
           resourceType = TYPE_REGISTRY_PARAMETER;
  @@ -144,7 +144,7 @@
       {
           return resourceType;
       }
  -    
  +
       /**
        * Getter for property entry.
        * @return Value of property entry.
  @@ -162,7 +162,7 @@
       {
           return entryParameter;
       }
  -    
  +
       /**
        * Getter for property portlet.
        * @return Value of property portlet.
  @@ -171,7 +171,7 @@
       {
           return portlet;
       }
  -    
  +
       /**
        * Getter for property registryEntry.
        * @return Value of property registryEntry.
  @@ -180,7 +180,7 @@
       {
           return registryEntry;
       }
  -    
  +
       /**
        * Getter for property registryParameter.
        * @return Value of property registryParameter.
  @@ -189,5 +189,5 @@
       {
           return registryParameter;
       }
  -    
  +
   }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>