You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by ps...@apache.org on 2012/03/16 10:50:44 UTC
svn commit: r1301404 - in /incubator/wookie/trunk:
src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
src/org/apache/wookie/helpers/WidgetImportHelper.java
Author: psharples
Date: Fri Mar 16 09:50:44 2012
New Revision: 1301404
URL: http://svn.apache.org/viewvc?rev=1301404&view=rev
Log:
Fix for where the default icon was missing from the <icon> element if it was found during parsing. See WOOKIE-324.
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetImportHelper.java
Modified: incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java?rev=1301404&r1=1301403&r2=1301404&view=diff
==============================================================================
--- incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java (original)
+++ incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java Fri Mar 16 09:50:44 2012
@@ -220,13 +220,12 @@ public class WidgetsControllerTest exten
client.executeMethod(post);
int code = post.getStatusCode();
assertEquals(201,code);
-
//
// Lets take a look at the metadata...
//
SAXBuilder builder = new SAXBuilder();
Document doc = builder.build(post.getResponseBodyAsStream());
- Element iconElement = doc.getRootElement().getChild("icon");
+ Element iconElement = doc.getRootElement().getChild("icon", doc.getRootElement().getNamespace());
assertNotNull(iconElement);
assertEquals("http://localhost:8080/wookie/wservices/uploadtest_2/icon.png", iconElement.getAttributeValue("src"));
post.releaseConnection();
Modified: incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetImportHelper.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetImportHelper.java?rev=1301404&r1=1301403&r2=1301404&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetImportHelper.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetImportHelper.java Fri Mar 16 09:50:44 2012
@@ -73,20 +73,22 @@ public class WidgetImportHelper {
if(id == null || !id.equals(generatedId)){
widget.setAttribute("id", widgetModel.getIdentifier());
}
+ int idx = 0;
tempElement = widget.getChild("icon", widget.getNamespace());
if(tempElement != null){
- int idx = widget.indexOf(tempElement);
+ idx = widget.indexOf(tempElement);
//remove original icon entries
widget.removeChildren("icon", widget.getNamespace());
// get the model icons
- List<IIconEntity> generatedIcons = widgetModel.getIconsList();
- for(IIconEntity icon : generatedIcons){
- String parserSrc = icon.getSrc();
- icon.setSrc(localPath + parserSrc);
- widget.addContent(idx++ , icon.toXml());
- icon.setSrc(parserSrc);
- }
}
+ List<IIconEntity> generatedIcons = widgetModel.getIconsList();
+ for(IIconEntity icon : generatedIcons){
+ String parserSrc = icon.getSrc();
+ icon.setSrc(localPath + parserSrc);
+ widget.addContent(idx++ , icon.toXml());
+ icon.setSrc(parserSrc);
+ }
+
XMLOutputter outputter = new XMLOutputter(Format.getPrettyFormat());
updatedConfigXml = outputter.outputString(doc);
} catch (JDOMException e) {