@@ -156,37 +156,37 @@ Object doit(PByteArray bytes,
156156 }
157157 }
158158
159- private final static char TYPE_NULL = '0' ;
160- private final static char TYPE_NONE = 'N' ;
161- private final static char TYPE_NOVALUE = 'n' ;
162- private final static char TYPE_FALSE = 'F' ;
163- private final static char TYPE_TRUE = 'T' ;
164- private final static char TYPE_STOPITER = 'S' ;
165- private final static char TYPE_ELLIPSIS = '.' ;
166- private final static char TYPE_INT = 'i' ;
167- private final static char TYPE_INT64 = 'I' ; // just for backward compatibility with CPython
168- private final static char TYPE_FLOAT = 'f' ;
159+ private static final char TYPE_NULL = '0' ;
160+ private static final char TYPE_NONE = 'N' ;
161+ private static final char TYPE_NOVALUE = 'n' ;
162+ private static final char TYPE_FALSE = 'F' ;
163+ private static final char TYPE_TRUE = 'T' ;
164+ private static final char TYPE_STOPITER = 'S' ;
165+ private static final char TYPE_ELLIPSIS = '.' ;
166+ private static final char TYPE_INT = 'i' ;
167+ private static final char TYPE_INT64 = 'I' ; // just for backward compatibility with CPython
168+ private static final char TYPE_FLOAT = 'f' ;
169169 // private final static char TYPE_BINARY_FLOAT = 'g';
170- private final static char TYPE_COMPLEX = 'x' ;
170+ private static final char TYPE_COMPLEX = 'x' ;
171171 // private final static char TYPE_BINARY_COMPLEX = 'y';
172- private final static char TYPE_LONG = 'l' ;
173- private final static char TYPE_PINT = 'L' ;
174- private final static char TYPE_STRING = 's' ;
172+ private static final char TYPE_LONG = 'l' ;
173+ private static final char TYPE_PINT = 'L' ;
174+ private static final char TYPE_STRING = 's' ;
175175 // private final static char TYPE_INTERNED = 't';
176176 // private final static char TYPE_STRINGREF = 'R';
177- private final static char TYPE_BYTESLIKE = 'b' ;
178- private final static char TYPE_TUPLE = '(' ;
179- private final static char TYPE_LIST = '[' ;
180- private final static char TYPE_DICT = '{' ;
181- private final static char TYPE_CODE = 'c' ;
177+ private static final char TYPE_BYTESLIKE = 'b' ;
178+ private static final char TYPE_TUPLE = '(' ;
179+ private static final char TYPE_LIST = '[' ;
180+ private static final char TYPE_DICT = '{' ;
181+ private static final char TYPE_CODE = 'c' ;
182182 // private final static char TYPE_UNICODE = 'u';
183- private final static char TYPE_UNKNOWN = '?' ;
184- private final static char TYPE_SET = '<' ;
185- private final static char TYPE_FROZENSET = '>' ;
186- private final static int MAX_MARSHAL_STACK_DEPTH = 2000 ;
187- private final static int CURRENT_VERSION = 1 ;
183+ private static final char TYPE_UNKNOWN = '?' ;
184+ private static final char TYPE_SET = '<' ;
185+ private static final char TYPE_FROZENSET = '>' ;
186+ private static final int MAX_MARSHAL_STACK_DEPTH = 2000 ;
187+ private static final int CURRENT_VERSION = 1 ;
188188
189- public static abstract class MarshallerNode extends PNodeWithContext {
189+ public abstract static class MarshallerNode extends PNodeWithContext {
190190
191191 public abstract void execute (Object x , int version , DataOutputStream buffer );
192192
@@ -456,7 +456,7 @@ public static MarshallerNode create() {
456456 }
457457 }
458458
459- public static abstract class UnmarshallerNode extends PNodeWithContext {
459+ public abstract static class UnmarshallerNode extends PNodeWithContext {
460460 public abstract Object execute (byte [] dataBytes , int version );
461461
462462 @ Child private HashingStorageNodes .SetItemNode setItemNode ;
@@ -559,7 +559,7 @@ private PList readList(int depth) {
559559 if (n < 0 ) {
560560 throw raise (ValueError , "bad marshal data" );
561561 }
562- Object items [] = new Object [n ];
562+ Object [] items = new Object [n ];
563563 for (int i = 0 ; i < n ; i ++) {
564564 Object item = readObject (depth + 1 );
565565 if (item == null ) {
@@ -646,7 +646,7 @@ private Object readObject(int depth) {
646646 if (n < 0 ) {
647647 throw raise (ValueError , "bad marshal data" );
648648 }
649- Object items [] = new Object [n ];
649+ Object [] items = new Object [n ];
650650 for (int i = 0 ; i < n ; i ++) {
651651 items [i ] = readObject (depth + 1 );
652652 }
0 commit comments