Author: scottbw
Date: Mon Mar 7 11:39:03 2011
New Revision: 1078751
URL: http://svn.apache.org/viewvc?rev=1078751&view=rev
Log:
Ensure that metadata returned from the Widget Instance REST API has the
localized title for the locale specified in the request
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java?rev=1078751&r1=1078750&r2=1078751&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
Mon Mar 7 11:39:03 2011
@@ -43,6 +43,7 @@ public class WidgetInstancesControllerTe
int code = post.getStatusCode();
assertEquals(201,code);
assertTrue(post.getResponseBodyAsString().contains("locales/fr/index.htm"));
+ assertTrue(post.getResponseBodyAsString().contains("tester les
paramètres régionaux"));
post.releaseConnection();
}
catch (Exception e) {
@@ -62,6 +63,8 @@ public class WidgetInstancesControllerTe
int code = post.getStatusCode();
assertEquals(201,code);
assertTrue(post.getResponseBodyAsString().contains("locales/fr/index.htm"));
+ assertFalse(post.getResponseBodyAsString().contains("locale
test"));
+ assertTrue(post.getResponseBodyAsString().contains("tester les
paramètres régionaux"));
post.releaseConnection();
}
catch (Exception e) {
@@ -82,6 +85,8 @@ public class WidgetInstancesControllerTe
assertFalse(post.getResponseBodyAsString().contains("locales/fr/index.htm"));
assertFalse(post.getResponseBodyAsString().contains("locales/en/index.htm"));
assertTrue(post.getResponseBodyAsString().contains("index.htm"));
+ assertTrue(post.getResponseBodyAsString().contains("locale
test"));
+ assertFalse(post.getResponseBodyAsString().contains("tester les
paramètres régionaux"));
post.releaseConnection();
}
catch (Exception e) {
@@ -100,6 +105,8 @@ public class WidgetInstancesControllerTe
int code = post.getStatusCode();
assertEquals(201,code);
assertTrue(post.getResponseBodyAsString().contains("locales/en/index.htm"));
+ assertTrue(post.getResponseBodyAsString().contains("locale
test"));
+ assertFalse(post.getResponseBodyAsString().contains("tester les
paramètres régionaux"));
post.releaseConnection();
}
catch (Exception e) {
Modified:
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java?rev=1078751&r1=1078750&r2=1078751&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetInstancesController.java
Mon Mar 7 11:39:03 2011
@@ -233,7 +233,7 @@ public class WidgetInstancesController e
String url = getUrl(request, instance);
response.setContentType(CONTENT_TYPE);
PrintWriter out = response.getWriter();
-
out.println(WidgetInstanceHelper.createXMLWidgetInstanceDocument(instance,
url));
+
out.println(WidgetInstanceHelper.createXMLWidgetInstanceDocument(instance, url,
locale));
}
public static void cloneSharedData(HttpServletRequest request,
HttpServletResponse response){
Modified:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java?rev=1078751&r1=1078750&r2=1078751&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceHelper.java
Mon Mar 7 11:39:03 2011
@@ -33,7 +33,7 @@ public class WidgetInstanceHelper {
* @param urlWidgetProxyServer the local URL of the proxy service
* @return
*/
- public static String createXMLWidgetInstanceDocument(IWidgetInstance
instance, String url){
+ public static String createXMLWidgetInstanceDocument(IWidgetInstance
instance, String url, String locale){
String xml = XMLDECLARATION;
IWidget widget = instance.getWidget();
@@ -47,7 +47,7 @@ public class WidgetInstanceHelper {
xml += "<widgetdata>"; //$NON-NLS-1$
xml += "\t<url>"+url+"</url>"; //$NON-NLS-1$ //$NON-NLS-2$
xml += "\t<identifier>"+instance.getIdKey()+"</identifier>\n";
//$NON-NLS-1$ //$NON-NLS-2$
- xml += "\t<title>"+widget.getWidgetTitle()+"</title>\n";
//$NON-NLS-1$ //$NON-NLS-2$
+ xml += "\t<title>"+widget.getWidgetTitle(locale)+"</title>\n";
//$NON-NLS-1$ //$NON-NLS-2$
xml += "\t<height>"+height+"</height>\n"; //$NON-NLS-1$
//$NON-NLS-2$
xml += "\t<width>"+width+"</width>\n"; //$NON-NLS-1$
//$NON-NLS-2$
xml += "</widgetdata>"; //$NON-NLS-1$
