Author: julien(a)jboss.com Date: 2007-03-07 11:20:57 -0500 (Wed, 07 Mar 2007) New Revision: 6577 Modified: trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java trunk/widget/src/main/org/jboss/portal/widget/google/type/EnumType.java Log: add widget selection in the edit content mode Modified: trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java =================================================================== --- trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-03-07 16:07:04 UTC (rev 6576) +++ trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-03-07 16:20:57 UTC (rev 6577) @@ -86,6 +86,24 @@ { resp.setContentType("text/html"); PrintWriter writer = resp.getWriter(); + + // + String op = req.getParameter("op"); + if ("select".equals(op)) + { + String uri = req.getParameter("uri"); + Widget widget = provider.getWidget(uri); + if (widget != null) + { + PortletURL selectURL = resp.createActionURL(); + selectURL.setParameter("meta_action", "select"); + selectURL.setParameter("uri", uri); + writer.println("<p>You selected widget " + widget.getTitle() + "</p>"); + writer.println("<p><a href=\"" + selectURL + "\">Select</a> widget</p>"); + } + } + + // Collection widgets = provider.getKeys(); writer.print("<ul>"); int size = 0; @@ -95,12 +113,13 @@ Widget widget = provider.getWidget(key); if (widget != null) { - PortletURL url = resp.createActionURL(); - url.setParameter("meta_action", "select"); + PortletURL url = resp.createRenderURL(); + url.setParameter("op", "select"); url.setParameter("uri", widget.getId()); writer.print("<li><a href=\"" + url + "\">" + widget.getTitle().getDefaultString() + "</a></li>"); } } + writer.print("/<ul>"); writer.close(); } Modified: trunk/widget/src/main/org/jboss/portal/widget/google/type/EnumType.java =================================================================== --- trunk/widget/src/main/org/jboss/portal/widget/google/type/EnumType.java 2007-03-07 16:07:04 UTC (rev 6576) +++ trunk/widget/src/main/org/jboss/portal/widget/google/type/EnumType.java 2007-03-07 16:20:57 UTC (rev 6577) @@ -44,7 +44,7 @@ for (Iterator i = values.iterator();i.hasNext();) { Value value = (Value)i.next(); - values.add(value); + this.values.add(value); } }