Author: scottbw
Date: Tue Feb 15 14:43:40 2011
New Revision: 1070925
URL: http://svn.apache.org/viewvc?rev=1070925&view=rev
Log:
Switched two JSP scripts to UTF-8 and use a helper method for getting unicode
Widget titles; this addresses issue WOOKIE-178.
Modified:
incubator/wookie/trunk/WebContent/admin/listall.jsp
incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
Modified: incubator/wookie/trunk/WebContent/admin/listall.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/listall.jsp?rev=1070925&r1=1070924&r2=1070925&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/listall.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/listall.jsp Tue Feb 15 14:43:40 2011
@@ -15,13 +15,14 @@
*/
--%>
<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.helpers.WidgetHelper' %>
<%@ page
import='org.apache.wookie.beans.IWidget,org.apache.wookie.beans.IWidgetType,java.util.Collection,java.util.Hashtable;'
%>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=utf-8"
pageEncoding="utf-8"%>
<% String errors = FlashMessage.getErrors(session, request);%>
<% String messages = FlashMessage.getMessages(session, request);%>
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Current Widgets</title>
<link type="text/css"
href="/wookie/shared/js/jquery/themes/redmond/jquery-ui-1.7.1.custom.css"
rel="stylesheet" />
<link type="text/css" href="../layout.css" rel="stylesheet" />
@@ -139,7 +140,7 @@ var answer = confirm("Are you sure you w
if(widgets!=null){
for (int i = 1; i < widgets.length; i++) {
IWidget widget = (IWidget) widgets[i];
-
+ String localWidgetTitle =
WidgetHelper.getEncodedWidgetTitle(widget, null);
%>
<h3><a href="#"><img height="20" width="20" border="0"
src="<%=widget.getWidgetIconLocation()%>"/> <%=widget.getWidgetTitle()%></a></h3>
<div>
@@ -265,18 +266,18 @@ var answer = confirm("Are you sure you w
if(widgetHashDefaults.containsKey(widgetTypes[j].getWidgetContext())){
// if it does contain
this service then is it this widget that is default?
if(widgetHashDefaults.get(widgetTypes[j].getWidgetContext()).equals(widget.getId())){
//###
-
%>(<font color="red"><%=widgetTypes[j].getWidgetContext()%></font><a
class="opendialog"
href="./WidgetAdminServlet?operation=REMOVESINGLEWIDGETTYPE&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=widget.getWidgetTitle()%>','<%=widgetTypes[j].getWidgetContext()%>',false);"><img
src="../shared/images/delete_1.gif" width="16" height="16" border="0"></a>)<%
+
%>(<font color="red"><%=widgetTypes[j].getWidgetContext()%></font><a
class="opendialog"
href="./WidgetAdminServlet?operation=REMOVESINGLEWIDGETTYPE&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=localWidgetTitle%>','<%=widgetTypes[j].getWidgetContext()%>',false);"><img
src="../shared/images/delete_1.gif" width="16" height="16" border="0"></a>)<%
}
else{
-
%>(<a class="opendialog"
href="./WidgetAdminServlet?operation=SETDEFAULTWIDGET&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=widget.getWidgetTitle()%>','<%=widgetTypes[j].getWidgetContext()%>',true);"><%=widgetTypes[j].getWidgetContext()%></a>
+
%>(<a class="opendialog"
href="./WidgetAdminServlet?operation=SETDEFAULTWIDGET&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=localWidgetTitle%>','<%=widgetTypes[j].getWidgetContext()%>',true);"><%=widgetTypes[j].getWidgetContext()%></a>
-
<a class="opendialog"
href="./WidgetAdminServlet?operation=REMOVESINGLEWIDGETTYPE&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=widget.getWidgetTitle()%>','<%=widgetTypes[j].getWidgetContext()%>',false);"><img
src="../shared/images/delete_1.gif" width="16" height="16" border="0"></a>)<%
+
<a class="opendialog"
href="./WidgetAdminServlet?operation=REMOVESINGLEWIDGETTYPE&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=localWidgetTitle%>','<%=widgetTypes[j].getWidgetContext()%>',false);"><img
src="../shared/images/delete_1.gif" width="16" height="16" border="0"></a>)<%
}
}
else{
- %>(<a
class="opendialog"
href="./WidgetAdminServlet?operation=SETDEFAULTWIDGET&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=widget.getWidgetTitle()%>','<%=widgetTypes[j].getWidgetContext()%>',true);"><%=widgetTypes[j].getWidgetContext()%></a><a
class="opendialog"
href="./WidgetAdminServlet?operation=REMOVESINGLEWIDGETTYPE&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=widget.getWidgetTitle()%>','<%=widgetTypes[j].getWidgetContext()%>',false);"><img
src="../shared/images/delete_1.gif" width="16" height="16" border="0"></a>)<%
+ %>(<a
class="opendialog"
href="./WidgetAdminServlet?operation=SETDEFAULTWIDGET&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=localWidgetTitle%>','<%=widgetTypes[j].getWidgetContext()%>',true);"><%=widgetTypes[j].getWidgetContext()%></a><a
class="opendialog"
href="./WidgetAdminServlet?operation=REMOVESINGLEWIDGETTYPE&widgetId=<%=widget.getId()%>&widgetType=<%=widgetTypes[j].getWidgetContext()%>"
onclick="updateDialogText('<%=localWidgetTitle%>','<%=widgetTypes[j].getWidgetContext()%>',false);"><img
src="../shared/images/delete_1.gif" width="16" height="16" border="0"></a>)<%
}
}
%>
Modified: incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp?rev=1070925&r1=1070924&r2=1070925&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp Tue Feb 15
14:43:40 2011
@@ -14,12 +14,13 @@
*/
--%>
<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
+<%@ page import='org.apache.wookie.helpers.WidgetHelper' %>
<%@ page
import='org.apache.wookie.beans.IWidget,org.apache.wookie.beans.IWidgetType;' %>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=utf-8"
pageEncoding="utf-8"%>
<!DOCTYPE html>
<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link type="text/css"
href="/wookie/shared/js/jquery/themes/redmond/jquery-ui-1.7.1.custom.css"
rel="stylesheet" />
<link type="text/css" href="../layout.css" rel="stylesheet" />
<script type="text/javascript"
src="/wookie/shared/js/jquery/jquery-1.3.2.min.js"></script>
@@ -99,6 +100,7 @@ $(document).ready(function(){
<%
for (int i = 1; i < widgets.length; i++) {
IWidget widget = (IWidget) widgets[i];
+ String localWidgetTitle =
WidgetHelper.getEncodedWidgetTitle(widget, null);
%>
<table width="500" class="ui-widget ui-widget-content"
align="center">
<tr class="ui-widget-header"><td colspan="2"><img
height="16" width="16" border="0"
src="<%=widget.getWidgetIconLocation()%>"/> <%=widget.getWidgetTitle()%></td></tr>
@@ -108,7 +110,7 @@ $(document).ready(function(){
<tr><td>Author</td><td><%=widget.getWidgetAuthor()%></td></tr>
<tr><td colspan="2" align="center">
<a class="opendialog"
href="./WidgetAdminServlet?operation=REMOVEWIDGET&widgetId=<%=widget.getId()%>"
-
onclick="updateDialogText('<%=widget.getWidgetTitle()%>');">
+
onclick="updateDialogText('<%=localWidgetTitle%>');">
<img
src="../shared/images/delete_1.gif" width="16" height="16"
border="0"> Delete this widget
</a>
</td></tr>
Modified: incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java?rev=1070925&r1=1070924&r2=1070925&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java Tue
Feb 15 14:43:40 2011
@@ -23,6 +23,8 @@ import org.apache.wookie.beans.IPreferen
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetIcon;
import org.apache.wookie.beans.IWidgetType;
+import org.apache.wookie.util.WidgetFormattingUtils;
+import org.apache.wookie.w3c.IW3CXMLConfiguration;
import org.apache.wookie.w3c.util.LocalizationUtils;
/**
@@ -202,5 +204,18 @@ public class WidgetHelper {
}
return out;
}
+
+ /**
+ * Get the widget title in unicode for the specified locale. Note that
this
+ * uses unicode control characters rather than <span dir..> tags
+ * @param widget the widget to get the title for
+ * @param locale the required locale, or null to use the default system
locale
+ * @return a unicode string
+ */
+ public static String getEncodedWidgetTitle(IWidget widget, String
locale){
+ IName[] names = widget.getNames().toArray(new
IName[widget.getNames().size()]);
+ IName name = (IName)LocalizationUtils.getLocalizedElement(names, new
String[]{locale});
+ return ((name != null) ?
WidgetFormattingUtils.getEncoded(name.getDir(), name.getName()) :
IW3CXMLConfiguration.UNKNOWN);
+ }
}
