[portal-commits] JBoss Portal SVN: r9157 - in branches/JBoss_Portal_Branch_2_6/widget/src: main/org/jboss/portal/widget/netvibes/provider and 2 other directories.

[portal-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2007-11-28 03:53:11 -0500 (Wed, 28 Nov 2007)
New Revision: 9157

Modified:
   branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQuery.java
   branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java
   branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp
   branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
Log:
- proper query term encoding

Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQuery.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQuery.java	2007-11-28 08:40:39 UTC (rev 9156)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQuery.java	2007-11-28 08:53:11 UTC (rev 9157)
@@ -26,6 +26,7 @@
 import java.net.URL;
 import java.util.Locale;
 
+import org.jboss.portal.common.text.FastURLEncoder;
 import org.jboss.portal.widget.WidgetQuery;
 
 /**
@@ -153,7 +154,7 @@
       }
       if (q != null)
       {
-         buffer.append("&q=").append(q);
+         buffer.append("&q=").append( FastURLEncoder.getUTF8Instance().encode(q) );
       }
       if (locale != null && locale.getLanguage().length() > 0)
       {

Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java	2007-11-28 08:40:39 UTC (rev 9156)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java	2007-11-28 08:53:11 UTC (rev 9157)
@@ -24,8 +24,8 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Locale;
 
+import org.jboss.portal.common.text.FastURLEncoder;
 import org.jboss.portal.widget.WidgetQuery;
 
 /**
@@ -152,7 +152,7 @@
       }
       if (q != null)
       {
-         buffer.append("&q=").append(q);
+         buffer.append("&q=").append(FastURLEncoder.getUTF8Instance().encode(q));
       }
       return new URL(buffer.toString());
    }

Modified: branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp	2007-11-28 08:40:39 UTC (rev 9156)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-netvibes-war/WEB-INF/jsp/edit_content.jsp	2007-11-28 08:53:11 UTC (rev 9157)
@@ -106,7 +106,7 @@
                      {
                         WidgetFailure failure = (WidgetFailure) selWidget;
       %>
-      <p style="color: red;">
+      <p class="portlet-msg-error">
          <%= failure.getLocalizedErrorMessage( request.getLocale() ) %>
       </p>
       <%
@@ -161,7 +161,7 @@
                      {
                         WidgetFailure failure = (WidgetFailure) selWidget;
       %>
-      <p style="color: red;">
+      <p class="portlet-msg-error">
          <%= failure.getLocalizedErrorMessage( request.getLocale() ) %>
       </p>
       <%
@@ -182,7 +182,7 @@
    	{
    		DirectoryResultFailure resultFailure = (DirectoryResultFailure) queryResults;
    	   %>
-   	   <p style="color: red;"><%= resultFailure.getLocalizedErrorMessage( request.getLocale() ) %></p>
+   	   <p class="portlet-msg-error"><%= resultFailure.getLocalizedErrorMessage( request.getLocale() ) %></p>
    	   <%
    	}
    	else

Modified: branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp	2007-11-28 08:40:39 UTC (rev 9156)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp	2007-11-28 08:53:11 UTC (rev 9157)
@@ -107,7 +107,7 @@
                      {
                         WidgetFailure failure = (WidgetFailure) selWidget;
       %>
-      <p style="color: red;">
+      <p class="portlet-msg-error">
          <%= failure.getLocalizedErrorMessage( request.getLocale() ) %>
       </p>
       <%
@@ -165,7 +165,7 @@
                      {
                         WidgetFailure failure = (WidgetFailure) selWidget;
       %>
-      <p style="color: red;">
+      <p class="portlet-msg-error">
          <%= failure.getLocalizedErrorMessage( request.getLocale() ) %>
       </p>
       <%
@@ -188,7 +188,7 @@
    	{
    		DirectoryResultFailure resultFailure = (DirectoryResultFailure) queryResults;
    	   %>
-   	   <p style="color: red;"><%= resultFailure.getLocalizedErrorMessage( request.getLocale() ) %></p>
+   	   <p class="portlet-msg-error"><%= resultFailure.getLocalizedErrorMessage( request.getLocale() ) %></p>
    	   <%
    	}
    	else