[jboss-svn-commits] JBoss Portal SVN: r5229 - in trunk: common/src/main/org/jboss/portal/common/invocation common/src/main/org/jboss/portal/test/common server/src/main/org/jboss/portal/server server/src/main/org/jboss/portal/server/impl theme/src/main/org/jboss/portal/test/theme/render

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Sep 20 09:25:52 EDT 2006


Author: julien at jboss.com
Date: 2006-09-20 09:25:32 -0400 (Wed, 20 Sep 2006)
New Revision: 5229

Removed:
   trunk/server/src/main/org/jboss/portal/server/impl/NavigationalStateAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/navigation/
Modified:
   trunk/common/src/main/org/jboss/portal/common/invocation/AbstractInvocationContext.java
   trunk/common/src/main/org/jboss/portal/common/invocation/AttributeResolver.java
   trunk/common/src/main/org/jboss/portal/common/invocation/Invocation.java
   trunk/common/src/main/org/jboss/portal/common/invocation/InvocationContext.java
   trunk/common/src/main/org/jboss/portal/test/common/AbstractInvocationContextTestCase.java
   trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
   trunk/server/src/main/org/jboss/portal/server/impl/AbstractSessionAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/impl/MapAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/impl/PrincipalAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/impl/RequestAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java
   trunk/server/src/main/org/jboss/portal/server/impl/SessionAttributeResolver.java
   trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
Log:
- make the invocation attribute resolver use an object as key instead of a string
- make the session attribute resolver more reusable

Modified: trunk/common/src/main/org/jboss/portal/common/invocation/AbstractInvocationContext.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/invocation/AbstractInvocationContext.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/common/src/main/org/jboss/portal/common/invocation/AbstractInvocationContext.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -89,9 +89,9 @@
       return resolver;
    }
 
-   public Object getAttribute(Scope attrScope, String attrName) throws IllegalArgumentException
+   public Object getAttribute(Scope attrScope, Object attrKey) throws IllegalArgumentException
    {
-      if (attrName == null)
+      if (attrKey == null)
       {
          throw new IllegalArgumentException("Attribute name must not be null");
       }
@@ -104,12 +104,12 @@
       {
          throw new IllegalArgumentException("Scope not recognized " + attrScope);
       }
-      return resolver.getAttribute(attrName);
+      return resolver.getAttribute(attrKey);
    }
 
-   public void setAttribute(Scope attrScope, String attrName, Object attrValue) throws IllegalArgumentException
+   public void setAttribute(Scope attrScope, Object attrKey, Object attrValue) throws IllegalArgumentException
    {
-      if (attrName == null)
+      if (attrKey == null)
       {
          throw new IllegalArgumentException("Attribute name must not be null");
       }
@@ -122,12 +122,12 @@
       {
          throw new IllegalArgumentException("Scope not recognized " + attrScope);
       }
-      resolver.setAttribute(attrName, attrValue);
+      resolver.setAttribute(attrKey, attrValue);
    }
 
-   public void removeAttribute(Scope attrScope, String attrName)
+   public void removeAttribute(Scope attrScope, Object attrKey)
    {
-      setAttribute(attrScope, attrName, null);
+      setAttribute(attrScope, attrKey, null);
    }
 
    /**

Modified: trunk/common/src/main/org/jboss/portal/common/invocation/AttributeResolver.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/invocation/AttributeResolver.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/common/src/main/org/jboss/portal/common/invocation/AttributeResolver.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -32,19 +32,19 @@
    /**
     * Return an attribute from this resolver.
     *
-    * @param attrName the attribute name
-    * @throws IllegalArgumentException if the attribute name is null
+    * @param attrKey
+    * @throws IllegalArgumentException if the attribute key is not valid
     * @return the attribute value or null if it is not found
     */
-   Object getAttribute(String attrName) throws IllegalArgumentException;
+   Object getAttribute(Object attrKey) throws IllegalArgumentException;
 
    /**
     * Update an attribute value on this resolve. If the attribute value is null
     * the resolver must treat the operation as a removal of the attribute.
     *
-    * @param attrName the attribute name
+    * @param attrKey
     * @param attrValue the attribute value
-    * @throws IllegalArgumentException if the attribute name is null
+    * @throws IllegalArgumentException if the attribute key is not valid
     */
-   void setAttribute(String attrName, Object attrValue) throws IllegalArgumentException;
+   void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException;
 }

Modified: trunk/common/src/main/org/jboss/portal/common/invocation/Invocation.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/invocation/Invocation.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/common/src/main/org/jboss/portal/common/invocation/Invocation.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -64,27 +64,27 @@
    public abstract InvocationContext getContext() throws IllegalStateException;
 
    /**
-    * @see InvocationContext#getAttribute(Scope, String)
+    * @see InvocationContext#getAttribute(Scope,Object)
     */
-   public Object getAttribute(Scope attrScope, String attrName) throws IllegalArgumentException
+   public Object getAttribute(Scope attrScope, Object attrKey) throws IllegalArgumentException
    {
-      return getContext().getAttribute(attrScope, attrName);
+      return getContext().getAttribute(attrScope, attrKey);
    }
 
    /**
-    * @see InvocationContext#setAttribute(Scope, String, Object)
+    * @see InvocationContext#setAttribute(Scope,Object,Object)
     */
-   public void setAttribute(Scope attrScope, String attrName, Object attrValue) throws IllegalArgumentException
+   public void setAttribute(Scope attrScope, Object attrKey, Object attrValue) throws IllegalArgumentException
    {
-      getContext().setAttribute(attrScope, attrName, attrValue);
+      getContext().setAttribute(attrScope, attrKey, attrValue);
    }
 
    /**
-    * @see InvocationContext#removeAttribute(Scope, String)
+    * @see InvocationContext#removeAttribute(Scope,Object)
     */
-   public void removeAttribute(Scope attrScope, String attrName) throws IllegalArgumentException
+   public void removeAttribute(Scope attrScope, Object attrKey) throws IllegalArgumentException
    {
-      getContext().removeAttribute(attrScope, attrName);
+      getContext().removeAttribute(attrScope, attrKey);
    }
 
    public InvocationHandler getHandler()

Modified: trunk/common/src/main/org/jboss/portal/common/invocation/InvocationContext.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/invocation/InvocationContext.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/common/src/main/org/jboss/portal/common/invocation/InvocationContext.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -42,28 +42,28 @@
     * Returns an attribute value.
     *
     * @param attrScope the attribute scope
-    * @param attrName the attribute name
+    * @param attrKey
     * @return the attribute value or null if not found
-    * @throws IllegalArgumentException if the attribute name or the attribute scope is invalid
+    * @throws IllegalArgumentException if the attribute key or the attribute scope is not valid
     */
-   Object getAttribute(Scope attrScope, String attrName) throws IllegalArgumentException;
+   Object getAttribute(Scope attrScope, Object attrKey) throws IllegalArgumentException;
 
    /**
     * Update an attribute value.
     *
     * @param attrScope the attribute scope
-    * @param attrName the attribute name
+    * @param attrKey
     * @param attrValue the attribute value
-    * @throws IllegalArgumentException if the attribute name of the attribute scope is invalid
+    * @throws IllegalArgumentException if the attribute key or the attribute scope is not valid
     */
-   void setAttribute(Scope attrScope, String attrName, Object attrValue) throws IllegalArgumentException;
+   void setAttribute(Scope attrScope, Object attrKey, Object attrValue) throws IllegalArgumentException;
 
    /**
     * Remove an attribute value. If the attribute value is null
     * the resolver must treat the operation as a removal of the attribute.
     *
-    * @param attrName the attribute name
-    * @throws IllegalArgumentException if the attribute name is null or the attribute scope is invalid
+    * @param attrKey
+    * @throws IllegalArgumentException if the attribute key is null or the attribute scope is not valid
     */
-   void removeAttribute(Scope attrScope, String attrName);
+   void removeAttribute(Scope attrScope, Object attrKey);
 }

Modified: trunk/common/src/main/org/jboss/portal/test/common/AbstractInvocationContextTestCase.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/test/common/AbstractInvocationContextTestCase.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/common/src/main/org/jboss/portal/test/common/AbstractInvocationContextTestCase.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -219,27 +219,27 @@
 
    private static class MapResolver extends HashMap implements AttributeResolver
    {
-      public Object getAttribute(String attrName) throws IllegalArgumentException
+      public Object getAttribute(Object attrKey) throws IllegalArgumentException
       {
-         if (attrName == null)
+         if (attrKey == null)
          {
             throw new IllegalArgumentException();
          }
-         return get(attrName);
+         return get(attrKey);
       }
-      public void setAttribute(String attrName, Object attrValue) throws IllegalArgumentException
+      public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException
       {
-         if (attrName == null)
+         if (attrKey == null)
          {
             throw new IllegalArgumentException();
          }
          if (attrValue != null)
          {
-            put(attrName, attrValue);
+            put(attrKey, attrValue);
          }
          else
          {
-            remove(attrName);
+            remove(attrKey);
          }
       }
    }

Modified: trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/PortalConstants.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/server/src/main/org/jboss/portal/server/PortalConstants.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -50,5 +50,14 @@
 
    // Portal properties
 
-   public static String PORTAL_PROP_NAME_KEY = "org.jboss.portal.property.name";
+   /** . */
+   public static final String PORTAL_PROP_NAME_KEY = "org.jboss.portal.property.name";
+
+   // Session map key prefixes
+
+   /** Generic session objects. */
+   public static final String PORTAL_SESSION_MAP_KEY = "portal.session";
+
+   /** Navigational state objects. */
+   public static final String NAVIGATIONAL_STATE_MAP_KEY = "portal.navigationalstate";
 }

Modified: trunk/server/src/main/org/jboss/portal/server/impl/AbstractSessionAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/AbstractSessionAttributeResolver.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/server/src/main/org/jboss/portal/server/impl/AbstractSessionAttributeResolver.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -25,6 +25,8 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.Map;
+import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -45,55 +47,77 @@
       this.req = req;
    }
 
-   public Object getAttribute(String attrName) throws IllegalArgumentException
+   public Object getAttribute(Object attrKey) throws IllegalArgumentException
    {
-      if (attrName == null)
+      if (attrKey == null)
       {
          throw new IllegalArgumentException();
       }
 
       //
       Object value = null;
-      HttpSession session = req.getSession(false);
-      if (session != null)
+      Map map = getMap(false);
+      if (map != null)
       {
-         String attrKey = createAttributeKey(attrName);
-         value = session.getAttribute(attrKey);
+         value = map.get(attrKey);
       }
       return value;
    }
 
-   public void setAttribute(String attrName, Object attrValue) throws IllegalArgumentException
+   public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException
    {
-      if (attrName == null)
+      if (attrKey == null)
       {
          throw new IllegalArgumentException();
       }
 
       //
-      HttpSession session = req.getSession(false);
-      if (session != null)
+      Map map = getMap(false);
+      if (map != null)
       {
-         String attrKey = createAttributeKey(attrName);
          if (attrValue != null)
          {
-            session.setAttribute(attrKey, attrValue);
+            map.put(attrKey, attrValue);
          }
          else
          {
-            session.removeAttribute(attrKey);
+            map.remove(attrKey);
          }
       }
       else
       {
          if (attrValue != null)
          {
-            String attrKey = createAttributeKey(attrName);
-            session = req.getSession();
-            session.setAttribute(attrKey, attrValue);
+            map = getMap(true);
+            map.put(attrKey, attrValue);
          }
       }
    }
 
-   protected abstract String createAttributeKey(String attrName);
+   protected abstract String getMapKey();
+
+   protected Map createMap(String mapKey)
+   {
+      return new HashMap();
+   }
+
+   private Map getMap(boolean create)
+   {
+      HttpSession session = req.getSession(create);
+      if (session != null)
+      {
+         String mapKey = getMapKey();
+         Map map = (Map)session.getAttribute(mapKey);
+         if (map ==  null)
+         {
+            map = createMap(mapKey);
+            session.setAttribute(mapKey, map);
+         }
+         return map;
+      }
+      else
+      {
+         return null;
+      }
+   }
 }

Modified: trunk/server/src/main/org/jboss/portal/server/impl/MapAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/MapAttributeResolver.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/server/src/main/org/jboss/portal/server/impl/MapAttributeResolver.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -33,8 +33,7 @@
 public class MapAttributeResolver implements AttributeResolver
 {
 
-   /** .
-    * */
+   /** . */
    private final Map attributes;
 
    public MapAttributeResolver(Map attributes)
@@ -51,28 +50,28 @@
       this(new HashMap());
    }
 
-   public Object getAttribute(String attrName) throws IllegalArgumentException
+   public Object getAttribute(Object attrKey) throws IllegalArgumentException
    {
-      if (attrName == null)
+      if (attrKey == null)
       {
          throw new IllegalArgumentException();
       }
-      return attributes.get(attrName);
+      return attributes.get(attrKey);
    }
 
-   public void setAttribute(String attrName, Object attrValue) throws IllegalArgumentException
+   public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException
    {
-      if (attrName == null)
+      if (attrKey == null)
       {
          throw new IllegalArgumentException();
       }
       if (attrValue != null)
       {
-         attributes.put(attrName, attrValue);
+         attributes.put(attrKey, attrValue);
       }
       else
       {
-         attributes.remove(attrName);
+         attributes.remove(attrKey);
       }
    }
 }

Deleted: trunk/server/src/main/org/jboss/portal/server/impl/NavigationalStateAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/NavigationalStateAttributeResolver.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/server/src/main/org/jboss/portal/server/impl/NavigationalStateAttributeResolver.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -1,43 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.portal.server.impl;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class NavigationalStateAttributeResolver extends AbstractSessionAttributeResolver
-{
-
-   public NavigationalStateAttributeResolver(HttpServletRequest req)
-   {
-      super(req);
-   }
-
-   protected String createAttributeKey(String attrName)
-   {
-      String attrKey = "portal.navigationalstate." + attrName;
-      return attrKey;
-   }
-}

Modified: trunk/server/src/main/org/jboss/portal/server/impl/PrincipalAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/PrincipalAttributeResolver.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/server/src/main/org/jboss/portal/server/impl/PrincipalAttributeResolver.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -30,15 +30,57 @@
  */
 public class PrincipalAttributeResolver extends AbstractSessionAttributeResolver
 {
+
+   /** . */
+   private String cachedPrincipalName;
+
+   /** . */
+   private String cachedMapKey;
+
    public PrincipalAttributeResolver(HttpServletRequest req)
    {
       super(req);
    }
 
-   protected String createAttributeKey(String attrName)
+   protected String getMapKey()
    {
       Principal principal = req.getUserPrincipal();
-      String attrKey = "portal.principal." + (principal != null ? principal.getName() : "") + "." + attrName;
-      return attrKey;
+
+      //
+      if (cachedMapKey != null)
+      {
+         if (cachedPrincipalName == null)
+         {
+            if (principal != null)
+            {
+               cachedMapKey = null;
+            }
+         }
+         else
+         {
+            if (principal == null || (cachedPrincipalName.equals(principal.getName()) == false))
+            {
+               cachedMapKey = null;
+            }
+         }
+      }
+
+      //
+      if (cachedMapKey == null)
+      {
+         if (principal == null)
+         {
+            cachedMapKey = "portal.principal";
+            cachedPrincipalName = null;
+         }
+         else
+         {
+            cachedMapKey = "portal.principal." + principal.getName();
+            cachedPrincipalName = principal.getName();
+         }
+      }
+
+      //
+      return cachedMapKey;
    }
 }

Modified: trunk/server/src/main/org/jboss/portal/server/impl/RequestAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/RequestAttributeResolver.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/server/src/main/org/jboss/portal/server/impl/RequestAttributeResolver.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -32,7 +32,8 @@
 public class RequestAttributeResolver implements AttributeResolver
 {
 
-   private HttpServletRequest req;
+   /** . */
+   private final HttpServletRequest req;
 
    public RequestAttributeResolver(HttpServletRequest req)
    {
@@ -43,32 +44,40 @@
       this.req = req;
    }
 
-   public Object getAttribute(String attrName) throws IllegalArgumentException
+   public Object getAttribute(Object attrKey) throws IllegalArgumentException
    {
-      if (attrName == null)
+      if (attrKey == null)
       {
-         throw new IllegalArgumentException();
+         throw new IllegalArgumentException("No null attribute key accepted");
       }
+      if (attrKey instanceof String == false)
+      {
+         throw new IllegalArgumentException("Attribute key must be a string");
+      }
 
       //
-      return req.getAttribute(attrName);
+      return req.getAttribute((String)attrKey);
    }
 
-   public void setAttribute(String attrName, Object attrValue) throws IllegalArgumentException
+   public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException
    {
-      if (attrName == null)
+      if (attrKey == null)
       {
-         throw new IllegalArgumentException();
+         throw new IllegalArgumentException("No null attribute key accepted");
       }
+      if (attrKey instanceof String == false)
+      {
+         throw new IllegalArgumentException("Attribute key must be a string");
+      }
 
       //
       if (attrValue != null)
       {
-         req.setAttribute(attrName, attrValue);
+         req.setAttribute((String)attrKey, attrValue);
       }
       else
       {
-         req.removeAttribute(attrName);
+         req.removeAttribute((String)attrKey);
       }
    }
 }

Modified: trunk/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -25,6 +25,7 @@
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerInvocationContext;
 import org.jboss.portal.server.ServerURL;
+import org.jboss.portal.server.PortalConstants;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.server.request.URLFormat;
 import org.jboss.portal.server.servlet.PortalServlet;
@@ -90,9 +91,9 @@
 
       //
       addResolver(ServerInvocation.REQUEST_SCOPE, new RequestAttributeResolver(req));
-      addResolver(ServerInvocation.SESSION_SCOPE, new SessionAttributeResolver(req));
+      addResolver(ServerInvocation.SESSION_SCOPE, new SessionAttributeResolver(req, PortalConstants.PORTAL_SESSION_MAP_KEY));
       addResolver(ServerInvocation.PRINCIPAL_SCOPE, new PrincipalAttributeResolver(req));
-      addResolver(ServerInvocation.NAVIGATIONAL_STATE_SCOPE, new NavigationalStateAttributeResolver(req));
+      addResolver(ServerInvocation.NAVIGATIONAL_STATE_SCOPE, new SessionAttributeResolver(req, PortalConstants.NAVIGATIONAL_STATE_MAP_KEY));
    }
 
    public HttpServletRequest getClientRequest()

Modified: trunk/server/src/main/org/jboss/portal/server/impl/SessionAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/SessionAttributeResolver.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/server/src/main/org/jboss/portal/server/impl/SessionAttributeResolver.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -30,13 +30,25 @@
 public class SessionAttributeResolver extends AbstractSessionAttributeResolver
 {
 
-   public SessionAttributeResolver(HttpServletRequest req)
+   /** . */
+   private final String mapKey;
+
+   public SessionAttributeResolver(HttpServletRequest req, String mapKey)
    {
       super(req);
+
+      //
+      if (mapKey == null)
+      {
+         throw new IllegalArgumentException("No null map key allowed");
+      }
+
+      //
+      this.mapKey = mapKey;
    }
 
-   protected String createAttributeKey(String attrName)
+   protected String getMapKey()
    {
-      return attrName;
+      return mapKey;
    }
 }

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java	2006-09-20 09:19:50 UTC (rev 5228)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java	2006-09-20 13:25:32 UTC (rev 5229)
@@ -63,11 +63,11 @@
 
       navCtx = new AttributeResolver()
       {
-         public Object getAttribute(String attrName) throws IllegalArgumentException
+         public Object getAttribute(Object attrKey) throws IllegalArgumentException
          {
             throw new UnsupportedOperationException();
          }
-         public void setAttribute(String attrName, Object attrValue) throws IllegalArgumentException
+         public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException
          {
             throw new UnsupportedOperationException();
          }




More information about the jboss-svn-commits mailing list