# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1387524297 -3600
# Node ID 68cecf6c31137697bec4b2b84a9eca18d62f9c48
# Parent  8e8097c4fa2b0be47d942aa74ebc3d3f5a8d7e6b
Updating to most recent version of html4j

diff -r 8e8097c4fa2b -r 68cecf6c3113 words/pom.xml
--- a/words/pom.xml	Wed Sep 25 04:28:19 2013 +0200
+++ b/words/pom.xml	Fri Dec 20 08:24:57 2013 +0100
@@ -26,7 +26,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <net.java.html.version>0.4</net.java.html.version>
+    <net.java.html.version>0.6</net.java.html.version>
     <project.mainclass>org.apidesign.demo.words.Main</project.mainclass>
     <netbeans.compile.on.save>none</netbeans.compile.on.save>
   </properties>
diff -r 8e8097c4fa2b -r 68cecf6c3113 words/src/main/java/org/apidesign/demo/words/DataModel.java
--- a/words/src/main/java/org/apidesign/demo/words/DataModel.java	Wed Sep 25 04:28:19 2013 +0200
+++ b/words/src/main/java/org/apidesign/demo/words/DataModel.java	Fri Dec 20 08:24:57 2013 +0100
@@ -23,6 +23,8 @@
  */
 package org.apidesign.demo.words;
 
+import java.util.ArrayList;
+import java.util.List;
 import net.java.html.json.ComputedProperty;
 import net.java.html.json.Function;
 import net.java.html.json.Model;
@@ -37,11 +39,11 @@
     @Property(name = "on", type = boolean.class)
 })
 final class DataModel {
-    @ComputedProperty static String[] sides(String message) {
-        String[] arr = new String[6];
+    @ComputedProperty static List<String> sides(String message) {
+        List<String> arr = new ArrayList<>();
         String[] words = message == null ? new String[0] : message.split(" ", 6);
         for (int i = 0; i < 6; i++) {
-            arr[i] = words.length > i ? words[i] : "!";
+            arr.add(words.length > i ? words[i] : "!");
         }
         return arr;
     }
diff -r 8e8097c4fa2b -r 68cecf6c3113 words/src/test/java/org/apidesign/demo/words/DataModelTest.java
--- a/words/src/test/java/org/apidesign/demo/words/DataModelTest.java	Wed Sep 25 04:28:19 2013 +0200
+++ b/words/src/test/java/org/apidesign/demo/words/DataModelTest.java	Fri Dec 20 08:24:57 2013 +0100
@@ -23,6 +23,7 @@
  */
 package org.apidesign.demo.words;
 
+import java.util.List;
 import static org.testng.Assert.*;
 import org.testng.annotations.Test;
 
@@ -31,9 +32,9 @@
         Data model = new Data();
         model.setMessage("Hello World!");
         
-        String[] arr = model.getSides();
-        assertEquals(arr.length, 6, "Cube has six sides");
-        assertEquals("Hello", arr[0], "Hello is the first word");
-        assertEquals("World!", arr[1], "World is the second word");
+        List<String> arr = model.getSides();
+        assertEquals(arr.size(), 6, "Cube has six sides");
+        assertEquals("Hello", arr.get(0), "Hello is the first word");
+        assertEquals("World!", arr.get(1), "World is the second word");
     }
 }