java: use 'Byte.valueOf' instead of 'new Byte'

Change-Id: Ia99765a6226317ee41ffb02a1b0dd7e6fd944a90
This commit is contained in:
Noel Grandin
2014-08-12 15:13:30 +02:00
parent 0764292c5d
commit c552aac9f8
24 changed files with 58 additions and 58 deletions

View File

@@ -58,16 +58,16 @@ public final class PolyStructTest extends ComplexTestCase {
t.transportBoolean(new TestPolyStruct(Boolean.TRUE)).member);
assertEquals(
new Byte((byte) 0),
Byte.valueOf((byte) 0),
t.transportByte(new TestPolyStruct()).member);
assertEquals(
new Byte(Byte.MIN_VALUE),
Byte.valueOf(Byte.MIN_VALUE),
t.transportByte(
new TestPolyStruct(new Byte(Byte.MIN_VALUE))).member);
new TestPolyStruct(Byte.valueOf(Byte.MIN_VALUE))).member);
assertEquals(
new Byte(Byte.MAX_VALUE),
Byte.valueOf(Byte.MAX_VALUE),
t.transportByte(
new TestPolyStruct(new Byte(Byte.MAX_VALUE))).member);
new TestPolyStruct(Byte.valueOf(Byte.MAX_VALUE))).member);
assertEquals(
Short.valueOf((short) 0),

View File

@@ -123,20 +123,20 @@ final class TestAny {
new CompareUnboxed());
// BYTE:
success &= testMapAny(transport, new Byte((byte) -128),
success &= testMapAny(transport, Byte.valueOf((byte) -128),
new CompareBoxed());
success &= testMapAny(transport, new Byte((byte) 0),
success &= testMapAny(transport, Byte.valueOf((byte) 0),
new CompareBoxed());
success &= testMapAny(transport, new Byte((byte) 127),
success &= testMapAny(transport, Byte.valueOf((byte) 127),
new CompareBoxed());
success &= testMapAny(transport,
new Any(Type.BYTE, new Byte((byte) -128)),
new Any(Type.BYTE, Byte.valueOf((byte) -128)),
new CompareUnboxed());
success &= testMapAny(transport,
new Any(Type.BYTE, new Byte((byte) 0)),
new Any(Type.BYTE, Byte.valueOf((byte) 0)),
new CompareUnboxed());
success &= testMapAny(transport,
new Any(Type.BYTE, new Byte((byte) 127)),
new Any(Type.BYTE, Byte.valueOf((byte) 127)),
new CompareUnboxed());
// SHORT:

View File

@@ -576,7 +576,7 @@ XMultiPropertySet
* value of the property is to be stored in a member variable of type int with name intProp. Then setPropertyValue is
* called:
* <pre>
* set.setPropertyValue( "PropA", new Byte( (byte)111));
* set.setPropertyValue( "PropA", Byte.valueOf( (byte)111));
* </pre>
* At some point setPropertyValue will call convertPropertyValue and pass in the Byte object. Since we allow
* that Byte values can be used with the property and know that the value is to be stored in intProp (type int)
@@ -735,7 +735,7 @@ XMultiPropertySet
else if (cl.equals(char.class))
retVal= new Character(AnyConverter.toChar(obj));
else if (cl.equals(byte.class))
retVal= new Byte(AnyConverter.toByte(obj));
retVal= Byte.valueOf(AnyConverter.toByte(obj));
else if (cl.equals(short.class))
retVal= Short.valueOf(AnyConverter.toShort(obj));
else if (cl.equals(int.class))
@@ -757,7 +757,7 @@ XMultiPropertySet
else if (cl.equals(Character.class))
retVal= new Character(AnyConverter.toChar(obj));
else if (cl.equals(Byte.class))
retVal= new Byte(AnyConverter.toByte(obj));
retVal= Byte.valueOf(AnyConverter.toByte(obj));
else if (cl.equals(Short.class))
retVal= Short.valueOf(AnyConverter.toShort(obj));
else if (cl.equals(Integer.class))

View File

@@ -105,7 +105,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropCharA",value);
ret= cl.getPropertyValue("PropCharA");
r[i++]= ((Character) ret).equals(value);
value= new Byte((byte) 111);
value= Byte.valueOf((byte) 111);
cl.setPropertyValue("PropByteA",value);
ret= cl.getPropertyValue("PropByteA");
r[i++]= ((Byte) ret).equals(value);
@@ -180,7 +180,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropObjectA",value);
ret= cl.getPropertyValue("PropObjectA");
r[i++]= ((Character) ret).equals(value);
value= new Byte((byte) 111);
value= Byte.valueOf((byte) 111);
cl.setPropertyValue("PropObjectA",value);
ret= cl.getPropertyValue("PropObjectA");
r[i++]= ((Byte) ret).equals(value);
@@ -224,7 +224,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropObjectA", value);
ret= cl.getPropertyValue("PropObjectA");
r[i++]= ((Type) ret).equals(value);
cl.setPropertyValue("PropObjectA", new Any( new Type(byte.class), new Byte((byte)1)));
cl.setPropertyValue("PropObjectA", new Any( new Type(byte.class), Byte.valueOf((byte)1)));
ret= cl.getPropertyValue("PropObjectA");
r[i++]= ((Byte) ret).byteValue() == 1;
@@ -237,7 +237,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropAnyA",value);
ret= cl.getPropertyValue("PropAnyA");
r[i++]= ret instanceof Any && util.anyEquals(value, ret);
value= new Byte((byte) 111);
value= Byte.valueOf((byte) 111);
cl.setPropertyValue("PropAnyA",value);
ret= cl.getPropertyValue("PropAnyA");
r[i++]= ret instanceof Any && util.anyEquals(value, ret);
@@ -291,7 +291,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropCharA",value);
ret= cl.getPropertyValue("PropCharA");
r[i++]= ret instanceof Character && util.anyEquals(value, ret);
value= new Any(new Type(byte.class), new Byte((byte) 111));
value= new Any(new Type(byte.class), Byte.valueOf((byte) 111));
cl.setPropertyValue("PropByteA",value);
ret= cl.getPropertyValue("PropByteA");
r[i++]= ret instanceof Byte && util.anyEquals(value, ret);
@@ -346,7 +346,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropAnyA",value);
ret= cl.getPropertyValue("PropAnyA");
r[i++]= ret instanceof Any && util.anyEquals(value, ret);
value= new Any(new Type(byte.class), new Byte((byte) 111));
value= new Any(new Type(byte.class), Byte.valueOf((byte) 111));
cl.setPropertyValue("PropAnyA",value);
ret= cl.getPropertyValue("PropAnyA");
r[i++]= ret instanceof Any && util.anyEquals(value, ret);
@@ -402,7 +402,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropCharClass",value);
ret= cl.getPropertyValue("PropCharClass");
r[i++]= ((Character) ret).equals(value);
value= new Byte((byte) 111);
value= Byte.valueOf((byte) 111);
cl.setPropertyValue("PropByteClass",value);
ret= cl.getPropertyValue("PropByteClass");
r[i++]= ((Byte) ret).equals(value);
@@ -438,7 +438,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropCharClass",value);
ret= cl.getPropertyValue("PropCharClass");
r[i++]= ret instanceof Character && util.anyEquals(value, ret);
value= new Any(new Type(byte.class), new Byte((byte) 111));
value= new Any(new Type(byte.class), Byte.valueOf((byte) 111));
cl.setPropertyValue("PropByteClass",value);
ret= cl.getPropertyValue("PropByteClass");
r[i++]= ret instanceof Byte && util.anyEquals(value, ret);
@@ -536,7 +536,7 @@ public class PropertySet_Test
r[i++]= cl.anyPropA.getType().equals(new Type(void.class)) &&
cl.anyPropA.getObject() == null;
cl.anyPropA= new Any(new Type(byte.class),new Byte((byte) 111));
cl.anyPropA= new Any(new Type(byte.class),Byte.valueOf((byte) 111));
cl.setPropertyValue("PropAnyA", null);
r[i++]= cl.anyPropA.getType().equals(new Type(byte.class)) &&
cl.anyPropA.getObject() == null;
@@ -601,12 +601,12 @@ public class PropertySet_Test
TestClass cl= new TestClass();
Listener li= new Listener();
cl.addPropertyChangeListener("PropByteA", li);
Byte val1= new Byte((byte)115);
Byte val1= Byte.valueOf((byte)115);
cl.setPropertyValue("PropByteA", val1);
r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 0;
cl.propByteA.Attributes = PropertyAttribute.BOUND;
cl.addPropertyChangeListener("PropByteA", li);
Byte val2= new Byte((byte)116);
Byte val2= Byte.valueOf((byte)116);
cl.setPropertyValue("PropByteA", val2);
r[i++]= li.nChangeCalled == 1 && li.nVetoCalled == 0;
r[i++]= li.evt.OldValue.equals(val1) && li.evt.NewValue.equals(val2) && li.evt.Source == cl;
@@ -614,7 +614,7 @@ public class PropertySet_Test
li.reset();
Listener li2= new Listener();
cl.addPropertyChangeListener("PropByteA", li2);
Byte val3= new Byte((byte) 117);
Byte val3= Byte.valueOf((byte) 117);
cl.setPropertyValue("PropByteA", val3);
r[i++]= li.nChangeCalled == 1 && li.nVetoCalled == 0
&& li2.nChangeCalled == 1 && li2.nVetoCalled == 0;
@@ -624,7 +624,7 @@ public class PropertySet_Test
li.reset();
li2.reset();
Listener li3= new Listener();
val1= new Byte((byte)118);
val1= Byte.valueOf((byte)118);
cl.addPropertyChangeListener("", li3);
cl.setPropertyValue("PropByteA", val1);
r[i++]= li.nChangeCalled == 1 && li.nVetoCalled == 0
@@ -680,12 +680,12 @@ public class PropertySet_Test
li2.reset();
li3.reset();
cl.addVetoableChangeListener("PropByteA", li);
val1= new Byte((byte)115);
val1= Byte.valueOf((byte)115);
cl.setPropertyValue("PropByteA", val1);
r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 0;
cl.propByteA.Attributes = PropertyAttribute.CONSTRAINED;
cl.addVetoableChangeListener("PropByteA", li);
val2= new Byte((byte)116);
val2= Byte.valueOf((byte)116);
li.reset();
cl.setPropertyValue("PropByteA", val2);
r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 1;
@@ -695,7 +695,7 @@ public class PropertySet_Test
li2.reset();
li3.reset();
cl.addVetoableChangeListener("PropByteA", li2);
val3= new Byte((byte) 117);
val3= Byte.valueOf((byte) 117);
cl.setPropertyValue("PropByteA", val3);
r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 1
&& li2.nChangeCalled == 0 && li2.nVetoCalled == 1;
@@ -705,7 +705,7 @@ public class PropertySet_Test
li.reset();
li2.reset();
li3.reset();
val1= new Byte((byte)118);
val1= Byte.valueOf((byte)118);
cl.addVetoableChangeListener("", li3);
cl.setPropertyValue("PropByteA", val1);
r[i++]= li.nChangeCalled == 0 && li.nVetoCalled == 1
@@ -904,7 +904,7 @@ public class PropertySet_Test
String[] arNames= new String[] {"PropCharA","PropIntClass","PropObjectA"};
Character aChar= new Character('A');
Integer aInt= Integer.valueOf(111);
Byte aByte= new Byte((byte)11);
Byte aByte= Byte.valueOf((byte)11);
Object[] values= new Object[]{aChar, aInt, aByte};
cl.setPropertyValues(arNames, values);
r[i++]= cl.charPropA == 'A' && cl.intClassProp.intValue() == 111 && ((Byte)cl.objectPropA).byteValue() == 11;
@@ -937,7 +937,7 @@ public class PropertySet_Test
try {
cl.charPropA= 'A';
cl.intClassProp= Integer.valueOf(111);
cl.objectPropA= new Byte((byte)11);
cl.objectPropA= Byte.valueOf((byte)11);
Object[] values= cl.getPropertyValues(new String[] {"PropCharA","PropIntClass","PropObjectA"});
r[i++]= ((Character) values[0]).charValue() == 'A' && ((Integer) values[1]).intValue() == 111
@@ -1210,7 +1210,7 @@ class TestClass extends PropertySet
charPropA= 'B';
r[i++]= convertPropertyValue(propCharA, outNewVal, outOldVal, value);
r[i++]= outNewVal[0] instanceof Character && outNewVal[0].equals(value) && outOldVal[0].equals(new Character('B'));
value= new Byte((byte) 111);
value= Byte.valueOf((byte) 111);
r[i++]= convertPropertyValue(propByteA, outNewVal, outOldVal, value);
r[i++]= outNewVal[0] instanceof Byte && outNewVal[0].equals(value);
value= Short.valueOf((short) 112);
@@ -1321,7 +1321,7 @@ class TestClass extends PropertySet
value= new Character('A');
r[i++]= convertPropertyValue(propCharClass, outNewVal, outOldVal, value);
r[i++]= outNewVal[0] instanceof Character && outNewVal[0].equals(value);
value= new Byte((byte) 111);
value= Byte.valueOf((byte) 111);
r[i++]= convertPropertyValue(propByteClass, outNewVal, outOldVal, value);
r[i++]= outNewVal[0] instanceof Byte && outNewVal[0].equals(value);
value= Short.valueOf((short) 112);
@@ -1362,7 +1362,7 @@ class TestClass extends PropertySet
value= new Character('A');
setPropertyValueNoBroadcast(propCharA, value);
r[i++]= charPropA == ((Character) value).charValue();
value= new Byte((byte) 111);
value= Byte.valueOf((byte) 111);
setPropertyValueNoBroadcast(propByteA, value);
r[i++]= bytePropA == ((Byte)value).byteValue();
value= Short.valueOf((short) 112);

View File

@@ -210,7 +210,7 @@ final class Unmarshal {
private Byte readByteValue() {
try {
return new Byte(input.readByte());
return Byte.valueOf(input.readByte());
} catch (IOException e) {
throw new RuntimeException(e.toString());
}

View File

@@ -44,7 +44,7 @@ public final class Marshaling_Test {
new com.sun.star.uno.RuntimeException("testRuntimeException"),
new com.sun.star.uno.Exception("testException"),
Boolean.TRUE,
new Byte((byte)47),
Byte.valueOf((byte)47),
new Character('k'),
new Double(0.12345),
TestEnum.B,

View File

@@ -39,7 +39,7 @@ public final class AnyConverter_Test {
Boolean aBool= Boolean.TRUE;
Character aChar= new Character('A');
Byte aByte= new Byte((byte) 111);
Byte aByte= Byte.valueOf((byte) 111);
Short aShort= Short.valueOf((short) 11111);
Integer aInt= Integer.valueOf( 1111111);
Long aLong= Long.valueOf( 0xffffffff);

View File

@@ -70,7 +70,7 @@ public class ValueChanger {
if (oldValue instanceof Byte) {
byte oldbyte = ((Byte) oldValue).byteValue();
newValue = new Byte((byte) (oldbyte + 1));
newValue = Byte.valueOf((byte) (oldbyte + 1));
} else
if (oldValue instanceof Float) {

View File

@@ -206,7 +206,7 @@ public class MyPersistObject implements XPersistObject, XTypeProvider,
*/
public Object getPropertyValue(String property) {
if ( property.equals(props[0].Name))
return new Byte(by);
return Byte.valueOf(by);
if ( property.equals(props[1].Name))
return Integer.valueOf(i);
if ( property.equals(props[2].Name))

View File

@@ -313,8 +313,8 @@ public class _CharacterProperties extends MultiPropertyTest {
* so ist must be treated special
*/
public void _CharEscapementHeight() {
Byte aByte = new Byte((byte)75);
Byte max = new Byte((byte)100);
Byte aByte = Byte.valueOf((byte)75);
Byte max = Byte.valueOf((byte)100);
testProperty("CharEscapementHeight", aByte, max) ;
}

View File

@@ -621,7 +621,7 @@ public class ODatabaseForm extends TestCase {
values must be added here as relation. */
params.add("SAU99") ;
params.add(Boolean.FALSE) ;
params.add(new Byte((byte) 123)) ;
params.add(Byte.valueOf((byte) 123)) ;
params.add(Short.valueOf((short) 234)) ;
params.add(Integer.valueOf(12345)) ;
params.add(Long.valueOf(23456)) ;

View File

@@ -129,7 +129,7 @@ public class DataInputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>();
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -106,7 +106,7 @@ public class DataOutputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -129,7 +129,7 @@ public class MarkableOutputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -243,7 +243,7 @@ public class ObjectInputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -232,7 +232,7 @@ public class ObjectOutputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -126,7 +126,7 @@ public class DataInputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -103,7 +103,7 @@ public class DataOutputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -126,7 +126,7 @@ public class MarkableOutputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -240,7 +240,7 @@ public class ObjectInputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -229,7 +229,7 @@ public class ObjectOutputStream extends TestCase {
// all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ;
data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;

View File

@@ -306,7 +306,7 @@ public class UnoRuntime {
case TypeClass.BOOLEAN_value:
return Boolean.FALSE;
case TypeClass.BYTE_value:
return new Byte((byte) 0);
return Byte.valueOf((byte) 0);
case TypeClass.SHORT_value:
case TypeClass.UNSIGNED_SHORT_value:
return Short.valueOf((short) 0);

View File

@@ -1165,7 +1165,7 @@ public class TestComponent {
null);
Constructors.create2(context, new Object[] {
Boolean.TRUE,
new Byte(Byte.MIN_VALUE),
Byte.valueOf(Byte.MIN_VALUE),
Short.valueOf(Short.MIN_VALUE),
new Any(Type.UNSIGNED_SHORT, Short.valueOf((short) -1)),
Integer.valueOf(Integer.MIN_VALUE),
@@ -1223,7 +1223,7 @@ public class TestComponent {
new TestPolyStruct(Type.LONG),
new TestPolyStruct(new Any(Type.BOOLEAN, Boolean.TRUE)),
new TestPolyStruct(Boolean.TRUE),
new TestPolyStruct(new Byte(Byte.MIN_VALUE)),
new TestPolyStruct(Byte.valueOf(Byte.MIN_VALUE)),
new TestPolyStruct(Short.valueOf(Short.MIN_VALUE)),
new TestPolyStruct(Integer.valueOf(Integer.MIN_VALUE)),
new TestPolyStruct(Long.valueOf(Long.MIN_VALUE)),

View File

@@ -249,7 +249,7 @@ public class NumericalHelper
break;
case TypeClass.BYTE_value:
aTypeObject.iType = BYTE_TYPE;
aTypeObject.aValue = new Byte(AnyConverter.toByte(aValue));
aTypeObject.aValue = Byte.valueOf(AnyConverter.toByte(aValue));
break;
case TypeClass.SHORT_value:
aTypeObject.iType = SHORT_TYPE;