[portal-commits] JBoss Portal SVN: r6619 - in trunk/widget/src/main/org/jboss/portal/widget: google/provider and 1 other directory.
Author: julien(a)jboss.com
Date: 2007-03-09 17:04:30 -0500 (Fri, 09 Mar 2007)
New Revision: 6619
Modified:
trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java
trunk/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResult.java
Log:
update widget portlet to use JSP for presentation
Modified: trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java
===================================================================
--- trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-03-09 19:53:29
UTC (rev 6618)
+++ trunk/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-03-09 22:04:30
UTC (rev 6619)
@@ -36,6 +36,7 @@
import javax.portlet.PortletURL;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
+import javax.portlet.PortletRequestDispatcher;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Collection;
@@ -82,9 +83,11 @@
protected void doEdit(RenderRequest req, RenderResponse resp) throws PortletException,
PortletSecurityException, IOException
{
resp.setContentType("text/html");
- PrintWriter writer = resp.getWriter();
//
+ req.setAttribute("provider", provider);
+
+ //
String op = req.getParameter("op");
if ("select".equals(op))
{
@@ -92,50 +95,13 @@
GGWidget 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>");
-
- // Prefs
- writer.println("<form action=\"" + selectURL +
"\" method=\"post\">");
- for (Iterator i =
widget.getPreferencesInfo().getPreferencesInfo().iterator();i.hasNext();)
- {
- GGPreferenceInfo prefInfo = (GGPreferenceInfo)i.next();
- switch (prefInfo.getType().getOrdinal())
- {
- case DataType.ENUM:
- // Todo
- break;
- default:
- writer.println("<div>" + prefInfo.getName() +
": <input type=\"text\" name=\"param." + prefInfo.getName() +
"\"" +
- (prefInfo.getDefaultValue() != null ? (" value=\""
+ prefInfo.getDefaultValue() + "\"") : "") +
"/></div>");
- }
- }
- writer.println("<input type=\"submit\"/>");
- writer.println("</form>");
+ req.setAttribute("selectedWidget", widget);
}
}
//
- GGQueryResult result = provider.search(GGProvider.INITIAL_QUERY);
- writer.print("<ul>");
- int size = 0;
- for (Iterator i = result.getWidgets();i.hasNext() && size < 9;size++)
- {
- Widget widget = (Widget)i.next();
- if (widget != null)
- {
- 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();
+ PortletRequestDispatcher dispatcher =
getPortletContext().getRequestDispatcher("/WEB-INF/jsp/edit.jsp");
+ dispatcher.include(req, resp);
}
public void destroy()
Modified:
trunk/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResult.java
===================================================================
---
trunk/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResult.java 2007-03-09
19:53:29 UTC (rev 6618)
+++
trunk/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResult.java 2007-03-09
22:04:30 UTC (rev 6619)
@@ -60,7 +60,7 @@
return query;
}
- public Iterator getWidgets()
+ public Iterator getWidgetIterator()
{
return new WidgetIterator();
}