[jboss-svn-commits] JBoss Portal SVN: r5264 - in trunk: common/src/main/org/jboss/portal/common/util core/src/main/org/jboss/portal/core/portlet/test

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

Author: julien at jboss.com
Date: 2006-09-26 18:49:20 -0400 (Tue, 26 Sep 2006)
New Revision: 5264

Modified:
   trunk/common/src/main/org/jboss/portal/common/util/TypedMap.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java
Log:
- replaced UnsupportedOperationException by NotYetImplementedException
- improve PortletSessionPortlet to not force the creation of the session and display the session id when available

Modified: trunk/common/src/main/org/jboss/portal/common/util/TypedMap.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/util/TypedMap.java	2006-09-26 21:45:47 UTC (rev 5263)
+++ trunk/common/src/main/org/jboss/portal/common/util/TypedMap.java	2006-09-26 22:49:20 UTC (rev 5264)
@@ -21,6 +21,8 @@
 */
 package org.jboss.portal.common.util;
 
+import org.jboss.portal.common.NotYetImplemented;
+
 import java.util.Map;
 import java.util.Collection;
 import java.util.Iterator;
@@ -89,7 +91,7 @@
 
    public Collection values()
    {
-      throw new UnsupportedOperationException("NYI");
+      throw new NotYetImplemented("TypedMap.values()");
    }
 
    public void putAll(Map t)
@@ -167,42 +169,42 @@
 
       public Object[] toArray()
       {
-         throw new UnsupportedOperationException();
+         throw new NotYetImplemented("TypedEntrySet.toArray()");
       }
 
       public boolean add(Object o)
       {
-         throw new UnsupportedOperationException();
+         throw new NotYetImplemented("TypedEntrySet.add(Object o)");
       }
 
       public boolean contains(Object o)
       {
-         throw new UnsupportedOperationException();
+         throw new NotYetImplemented("TypedEntrySet.contains(Object o)");
       }
 
       public boolean remove(Object o)
       {
-         throw new UnsupportedOperationException();
+         throw new NotYetImplemented("TypedEntrySet.remove(Object o)");
       }
 
       public boolean addAll(Collection c)
       {
-         throw new UnsupportedOperationException();
+         throw new NotYetImplemented("TypedEntrySet.addAll(Collection c)");
       }
 
       public boolean containsAll(Collection c)
       {
-         throw new UnsupportedOperationException();
+         throw new NotYetImplemented("TypedEntrySet.containsAll(Collection c)");
       }
 
       public boolean removeAll(Collection c)
       {
-         throw new UnsupportedOperationException();
+         throw new NotYetImplemented("TypedEntrySet.removeAll(Collection c)");
       }
 
       public boolean retainAll(Collection c)
       {
-         throw new UnsupportedOperationException();
+         throw new NotYetImplemented("TypedEntrySet.retainAll(Collection c)");
       }
 
       public Iterator iterator()
@@ -212,7 +214,7 @@
 
       public Object[] toArray(Object a[])
       {
-         throw new UnsupportedOperationException();
+         throw new NotYetImplemented("TypedEntrySet.toArray(Object a[])");
       }
    }
 

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java	2006-09-26 21:45:47 UTC (rev 5263)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java	2006-09-26 22:49:20 UTC (rev 5264)
@@ -22,7 +22,7 @@
 package org.jboss.portal.core.portlet.test;
 
 import java.io.IOException;
-import java.io.Writer;
+import java.io.PrintWriter;
 import java.util.Enumeration;
 
 import javax.portlet.ActionRequest;
@@ -57,40 +57,57 @@
 
    public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
    {
-      PortletSession session = req.getPortletSession();
+      PortletSession session = req.getPortletSession(false);
       PortletURL purl = resp.createActionURL();
 
+      //
       resp.setContentType("text/html");
-      Writer writer = resp.getWriter();
+      PrintWriter writer = resp.getWriter();
 
-      print(session, PortletSession.PORTLET_SCOPE, writer);
-      writer.write("<br/>");
+      //
+      if (session == null)
+      {
+         writer.println("No session");
+      }
+      else
+      {
+         writer.println("Session id = " + session.getId());
+         writer.println("<br/>");
 
-      print(session, PortletSession.APPLICATION_SCOPE, writer);
-      writer.write("<br/>");
+         //
+         print(session, PortletSession.PORTLET_SCOPE, writer);
+         writer.println("<br/>");
 
-      writer.write("<form action=\"" + purl.toString() + "\" method=\"post\">");
-      writer.write("<input type=\"text\" name=\"name\"/>");
-      writer.write("<input type=\"text\" name=\"value\"/>");
-      writer.write("<input type=\"submit\" name=\"portlet\" value=\"Add to portlet scope\"/>");
-      writer.write("<input type=\"submit\" name=\"application\" value=\"Add to application scope\"/>");
-      writer.write("</form><br/>");
+         //
+         print(session, PortletSession.APPLICATION_SCOPE, writer);
+         writer.println("<br/>");
 
+      }
+
+      //
+      writer.println("<form action=\"" + purl.toString() + "\" method=\"post\">");
+      writer.println("<input type=\"text\" name=\"name\"/>");
+      writer.println("<input type=\"text\" name=\"value\"/>");
+      writer.println("<input type=\"submit\" name=\"portlet\" value=\"Add to portlet scope\"/>");
+      writer.println("<input type=\"submit\" name=\"application\" value=\"Add to application scope\"/>");
+      writer.println("</form><br/>");
+
+      //
       purl.setParameter("invalidate", "true");
-      writer.write("<a href=\"" + purl.toString() + "\">invalidate</a><br/>");
+      writer.println("<a href=\"" + purl.toString() + "\">invalidate</a><br/>");
    }
 
-   private void print(PortletSession session, int scope, Writer writer) throws IOException
+   private void print(PortletSession session, int scope, PrintWriter writer)
    {
-      writer.write("<table>");
-      writer.write("<tr><td>name</td><td>value</td>");
+      writer.println("<table>");
+      writer.println("<tr><td>name</td><td>value</td>");
       for (Enumeration e = session.getAttributeNames(scope);e.hasMoreElements();)
       {
          String name = (String)e.nextElement();
          Object value = session.getAttribute(name, scope);
-         writer.write("<tr><td>" + name + "</td><td>" + value + "</td>");
+         writer.println("<tr><td>" + name + "</td><td>" + value + "</td>");
       }
-      writer.write("</table>");
+      writer.println("</table>");
    }
 
 }