1.1 --- a/words/pom.xml Wed Sep 25 04:28:19 2013 +0200
1.2 +++ b/words/pom.xml Fri Dec 20 08:24:57 2013 +0100
1.3 @@ -26,7 +26,7 @@
1.4
1.5 <properties>
1.6 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1.7 - <net.java.html.version>0.4</net.java.html.version>
1.8 + <net.java.html.version>0.6</net.java.html.version>
1.9 <project.mainclass>org.apidesign.demo.words.Main</project.mainclass>
1.10 <netbeans.compile.on.save>none</netbeans.compile.on.save>
1.11 </properties>
2.1 --- a/words/src/main/java/org/apidesign/demo/words/DataModel.java Wed Sep 25 04:28:19 2013 +0200
2.2 +++ b/words/src/main/java/org/apidesign/demo/words/DataModel.java Fri Dec 20 08:24:57 2013 +0100
2.3 @@ -23,6 +23,8 @@
2.4 */
2.5 package org.apidesign.demo.words;
2.6
2.7 +import java.util.ArrayList;
2.8 +import java.util.List;
2.9 import net.java.html.json.ComputedProperty;
2.10 import net.java.html.json.Function;
2.11 import net.java.html.json.Model;
2.12 @@ -37,11 +39,11 @@
2.13 @Property(name = "on", type = boolean.class)
2.14 })
2.15 final class DataModel {
2.16 - @ComputedProperty static String[] sides(String message) {
2.17 - String[] arr = new String[6];
2.18 + @ComputedProperty static List<String> sides(String message) {
2.19 + List<String> arr = new ArrayList<>();
2.20 String[] words = message == null ? new String[0] : message.split(" ", 6);
2.21 for (int i = 0; i < 6; i++) {
2.22 - arr[i] = words.length > i ? words[i] : "!";
2.23 + arr.add(words.length > i ? words[i] : "!");
2.24 }
2.25 return arr;
2.26 }
3.1 --- a/words/src/test/java/org/apidesign/demo/words/DataModelTest.java Wed Sep 25 04:28:19 2013 +0200
3.2 +++ b/words/src/test/java/org/apidesign/demo/words/DataModelTest.java Fri Dec 20 08:24:57 2013 +0100
3.3 @@ -23,6 +23,7 @@
3.4 */
3.5 package org.apidesign.demo.words;
3.6
3.7 +import java.util.List;
3.8 import static org.testng.Assert.*;
3.9 import org.testng.annotations.Test;
3.10
3.11 @@ -31,9 +32,9 @@
3.12 Data model = new Data();
3.13 model.setMessage("Hello World!");
3.14
3.15 - String[] arr = model.getSides();
3.16 - assertEquals(arr.length, 6, "Cube has six sides");
3.17 - assertEquals("Hello", arr[0], "Hello is the first word");
3.18 - assertEquals("World!", arr[1], "World is the second word");
3.19 + List<String> arr = model.getSides();
3.20 + assertEquals(arr.size(), 6, "Cube has six sides");
3.21 + assertEquals("Hello", arr.get(0), "Hello is the first word");
3.22 + assertEquals("World!", arr.get(1), "World is the second word");
3.23 }
3.24 }