Author: chris.laprun(a)jboss.com
Date: 2008-02-08 15:30:51 -0500 (Fri, 08 Feb 2008)
New Revision: 9873
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleClippingPortlet.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleWeatherClippingPortlet.java
Log:
- Removed change location link (handled by edit mode).
- Improved processing of HTML.
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleClippingPortlet.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleClippingPortlet.java 2008-02-08
18:30:24 UTC (rev 9872)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleClippingPortlet.java 2008-02-08
20:30:51 UTC (rev 9873)
@@ -29,7 +29,6 @@
import javax.portlet.PortletException;
import javax.portlet.PortletMode;
import javax.portlet.PortletPreferences;
-import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import java.io.BufferedInputStream;
@@ -85,10 +84,6 @@
renderResponse.setContentType("text/html");
PrintWriter printWriter = renderResponse.getWriter();
printWriter.print(html);
-
- PortletURL edit = renderResponse.createRenderURL();
- edit.setPortletMode(PortletMode.EDIT);
- printWriter.print("<p><a href='" + edit +
"'>Change location</a></p>");
}
}
@@ -141,19 +136,17 @@
protected String postProcessHTML(String html)
{
- String tmp = new String(html);
-
// links should open in new windows
- tmp = tmp.replaceAll(A, A_TARGET_BLANK);
+ html = html.replaceAll(A, A_TARGET_BLANK);
// src attributes should be absolute
- tmp = tmp.replaceAll("src=/", "src=http://google.com/");
- tmp = tmp.replaceAll("src=\"/",
"src=\"http://google.com/");
+ html = html.replaceAll("src=/", "src=http://google.com/");
+ html = html.replaceAll("src=\"/",
"src=\"http://google.com/");
// forms should open in new windows and have an absolute action URL
- tmp = tmp.replaceAll("action=\"/", "target='_blank'
action=\"http://google.com/");
+ html = html.replaceAll("action=\"/", "target='_blank'
action=\"http://google.com/");
- return tmp;
+ return html;
}
protected String getQueryString(String zip)
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleWeatherClippingPortlet.java
===================================================================
---
modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleWeatherClippingPortlet.java 2008-02-08
18:30:24 UTC (rev 9872)
+++
modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleWeatherClippingPortlet.java 2008-02-08
20:30:51 UTC (rev 9873)
@@ -42,16 +42,14 @@
int begIndex;
int endIndex;
- String tmp = new String(html);
-
// remove add to iGoogle link
begIndex = html.indexOf(A);
if (begIndex != -1)
{
endIndex = html.indexOf(A_END, begIndex);
- tmp = tmp.substring(0, begIndex) + html.substring(endIndex + A_END.length());
+ html = html.substring(0, begIndex) + html.substring(endIndex + A_END.length());
}
- return super.postProcessHTML(tmp);
+ return super.postProcessHTML(html);
}
}