1.1 --- a/json/src/main/java/org/netbeans/html/json/impl/RcvrJSON.java	Mon Dec 16 17:39:56 2013 +0100
     1.2 +++ b/json/src/main/java/org/netbeans/html/json/impl/RcvrJSON.java	Fri Jan 03 08:16:39 2014 +0100
     1.3 @@ -42,6 +42,7 @@
     1.4   */
     1.5  package org.netbeans.html.json.impl;
     1.6  
     1.7 +import java.util.ArrayList;
     1.8  import net.java.html.BrwsrCtx;
     1.9  
    1.10  /** Super type for those who wish to receive JSON messages.
    1.11 @@ -73,13 +74,10 @@
    1.12              return new Exception(t);
    1.13          }
    1.14          
    1.15 -        public int dataSize() {
    1.16 -            return -1;
    1.17 +        public Object[] getValues() {
    1.18 +            return null;
    1.19          }
    1.20          
    1.21 -        public <Data> void dataRead(BrwsrCtx ctx, Class<? extends Data> type, Data[] fillTheArray) {
    1.22 -        }
    1.23 -
    1.24          public abstract void dispatch(RcvrJSON r);
    1.25          
    1.26          public static MsgEvnt createError(final Throwable t) {
    1.27 @@ -99,26 +97,8 @@
    1.28          public static MsgEvnt createMessage(final Object value) {
    1.29              return new MsgEvnt() {
    1.30                  @Override
    1.31 -                public int dataSize() {
    1.32 -                    if (value instanceof Object[]) {
    1.33 -                        return ((Object[])value).length;
    1.34 -                    } else {
    1.35 -                        return 1;
    1.36 -                    }
    1.37 -                }
    1.38 -                
    1.39 -                @Override
    1.40 -                public <Data> void dataRead(BrwsrCtx context, Class<? extends Data> type, Data[] arr) {
    1.41 -                    if (value instanceof Object[]) {
    1.42 -                        Object[] data = ((Object[]) value);
    1.43 -                        for (int i = 0; i < data.length && i < arr.length; i++) {
    1.44 -                            arr[i] = org.netbeans.html.json.impl.JSON.read(context, type, data[i]);
    1.45 -                        }
    1.46 -                    } else {
    1.47 -                        if (arr.length > 0) {
    1.48 -                            arr[0] = org.netbeans.html.json.impl.JSON.read(context, type, value);
    1.49 -                        }
    1.50 -                    }
    1.51 +                public Object[] getValues() {
    1.52 +                    return value instanceof Object[] ? (Object[])value : new Object[] { value };
    1.53                  }
    1.54                  
    1.55                  @Override
    1.56 @@ -145,5 +125,4 @@
    1.57                  }
    1.58              };
    1.59          }
    1.60 -    } // end MsgEvnt
    1.61 -}
    1.62 +    } }