svn commit: r990356 - in /pivot/trunk: core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java demos/src/org/apache/pivot/demos/million/LargeData.java

[gb...@apache.org]

Author: gbrown
Date: Sat Aug 28 12:58:23 2010
New Revision: 990356

URL: http://svn.apache.org/viewvc?rev=990356&view=rev
Log:
Update example and test applications to use varargs to set CSVSerializer keys.

Modified:
    pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java
    pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java

Modified: pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java?rev=990356&r1=990355&r2=990356&view=diff
==============================================================================
--- pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java (original)
+++ pivot/trunk/core/test/org/apache/pivot/serialization/test/CSVSerializerTest.java Sat Aug 28 12:58:23 2010
@@ -45,9 +45,7 @@ public class CSVSerializerTest {
         StringReader reader = new StringReader(buf.toString());
 
         CSVSerializer serializer = new CSVSerializer();
-        serializer.getKeys().add("A");
-        serializer.getKeys().add("B");
-        serializer.getKeys().add("C");
+        serializer.setKeys("A", "B", "C");
 
         List<?> result = serializer.readObject(reader);
         Dictionary<String, Object> row;
@@ -86,9 +84,7 @@ public class CSVSerializerTest {
         StringReader reader = new StringReader(buf.toString());
 
         CSVSerializer serializer = new CSVSerializer();
-        serializer.getKeys().add("A");
-        serializer.getKeys().add("B");
-        serializer.getKeys().add("C");
+        serializer.setKeys("A", "B", "C");
 
         List<?> result = serializer.readObject(reader);
 
@@ -107,9 +103,7 @@ public class CSVSerializerTest {
         StringReader reader = new StringReader(buf.toString());
 
         CSVSerializer serializer = new CSVSerializer();
-        serializer.getKeys().add("A");
-        serializer.getKeys().add("B");
-        serializer.getKeys().add("C");
+        serializer.setKeys("A", "B", "C");
 
         List<?> result = serializer.readObject(reader);
 
@@ -128,9 +122,7 @@ public class CSVSerializerTest {
         StringReader reader = new StringReader(buf.toString());
 
         CSVSerializer serializer = new CSVSerializer();
-        serializer.getKeys().add("A");
-        serializer.getKeys().add("B");
-        serializer.getKeys().add("C");
+        serializer.setKeys("A", "B", "C");
 
         List<?> result = serializer.readObject(reader);
 
@@ -158,9 +150,7 @@ public class CSVSerializerTest {
         StringWriter writer = new StringWriter();
 
         CSVSerializer serializer = new CSVSerializer();
-        serializer.getKeys().add("A");
-        serializer.getKeys().add("B");
-        serializer.getKeys().add("C");
+        serializer.setKeys("A", "B", "C");
 
         serializer.writeObject(items, writer);
 
@@ -180,9 +170,7 @@ public class CSVSerializerTest {
         StringWriter writer = new StringWriter();
 
         CSVSerializer serializer = new CSVSerializer();
-        serializer.getKeys().add("A");
-        serializer.getKeys().add("B");
-        serializer.getKeys().add("C");
+        serializer.setKeys("A", "B", "C");
 
         serializer.writeObject(items, writer);
 
@@ -202,9 +190,7 @@ public class CSVSerializerTest {
         StringWriter writer = new StringWriter();
 
         CSVSerializer serializer = new CSVSerializer();
-        serializer.getKeys().add("A");
-        serializer.getKeys().add("B");
-        serializer.getKeys().add("C");
+        serializer.setKeys("A", "B", "C");
 
         serializer.writeObject(items, writer);
 
@@ -224,9 +210,7 @@ public class CSVSerializerTest {
         StringWriter writer = new StringWriter();
 
         CSVSerializer serializer = new CSVSerializer();
-        serializer.getKeys().add("A");
-        serializer.getKeys().add("B");
-        serializer.getKeys().add("C");
+        serializer.setKeys("A", "B", "C");
 
         serializer.writeObject(items, writer);
 

Modified: pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java?rev=990356&r1=990355&r2=990356&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java Sat Aug 28 12:58:23 2010
@@ -80,10 +80,7 @@ public class LargeData implements Applic
                     inputStream = fileURL.openStream();
 
                     CSVSerializer csvSerializer = new CSVSerializer();
-                    csvSerializer.getKeys().add("c0");
-                    csvSerializer.getKeys().add("c1");
-                    csvSerializer.getKeys().add("c2");
-                    csvSerializer.getKeys().add("c3");
+                    csvSerializer.setKeys("c0", "c1", "c2", "c3");
 
                     CSVSerializer.StreamIterator streamIterator = csvSerializer.getStreamIterator(inputStream);
 
@@ -144,21 +141,12 @@ public class LargeData implements Applic
     private Label statusLabel = null;
     private TableView tableView = null;
 
-    private CSVSerializer csvSerializer;
     private int pageSize = 0;
 
     private volatile boolean abort = false;
 
     private static final String BASE_PATH_KEY = "basePath";
 
-    public LargeData() {
-        csvSerializer = new CSVSerializer();
-        csvSerializer.getKeys().add("c0");
-        csvSerializer.getKeys().add("c1");
-        csvSerializer.getKeys().add("c2");
-        csvSerializer.getKeys().add("c3");
-    }
-
     @Override
     public void startup(Display display, Map<String, String> properties)
         throws Exception {