Kaydet (Commit) c552aac9 authored tarafından Noel Grandin's avatar Noel Grandin

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

Change-Id: Ia99765a6226317ee41ffb02a1b0dd7e6fd944a90
üst 0764292c
...@@ -58,16 +58,16 @@ public final class PolyStructTest extends ComplexTestCase { ...@@ -58,16 +58,16 @@ public final class PolyStructTest extends ComplexTestCase {
t.transportBoolean(new TestPolyStruct(Boolean.TRUE)).member); t.transportBoolean(new TestPolyStruct(Boolean.TRUE)).member);
assertEquals( assertEquals(
new Byte((byte) 0), Byte.valueOf((byte) 0),
t.transportByte(new TestPolyStruct()).member); t.transportByte(new TestPolyStruct()).member);
assertEquals( assertEquals(
new Byte(Byte.MIN_VALUE), Byte.valueOf(Byte.MIN_VALUE),
t.transportByte( t.transportByte(
new TestPolyStruct(new Byte(Byte.MIN_VALUE))).member); new TestPolyStruct(Byte.valueOf(Byte.MIN_VALUE))).member);
assertEquals( assertEquals(
new Byte(Byte.MAX_VALUE), Byte.valueOf(Byte.MAX_VALUE),
t.transportByte( t.transportByte(
new TestPolyStruct(new Byte(Byte.MAX_VALUE))).member); new TestPolyStruct(Byte.valueOf(Byte.MAX_VALUE))).member);
assertEquals( assertEquals(
Short.valueOf((short) 0), Short.valueOf((short) 0),
......
...@@ -123,20 +123,20 @@ final class TestAny { ...@@ -123,20 +123,20 @@ final class TestAny {
new CompareUnboxed()); new CompareUnboxed());
// BYTE: // BYTE:
success &= testMapAny(transport, new Byte((byte) -128), success &= testMapAny(transport, Byte.valueOf((byte) -128),
new CompareBoxed()); new CompareBoxed());
success &= testMapAny(transport, new Byte((byte) 0), success &= testMapAny(transport, Byte.valueOf((byte) 0),
new CompareBoxed()); new CompareBoxed());
success &= testMapAny(transport, new Byte((byte) 127), success &= testMapAny(transport, Byte.valueOf((byte) 127),
new CompareBoxed()); new CompareBoxed());
success &= testMapAny(transport, success &= testMapAny(transport,
new Any(Type.BYTE, new Byte((byte) -128)), new Any(Type.BYTE, Byte.valueOf((byte) -128)),
new CompareUnboxed()); new CompareUnboxed());
success &= testMapAny(transport, success &= testMapAny(transport,
new Any(Type.BYTE, new Byte((byte) 0)), new Any(Type.BYTE, Byte.valueOf((byte) 0)),
new CompareUnboxed()); new CompareUnboxed());
success &= testMapAny(transport, success &= testMapAny(transport,
new Any(Type.BYTE, new Byte((byte) 127)), new Any(Type.BYTE, Byte.valueOf((byte) 127)),
new CompareUnboxed()); new CompareUnboxed());
// SHORT: // SHORT:
......
...@@ -576,7 +576,7 @@ XMultiPropertySet ...@@ -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 * value of the property is to be stored in a member variable of type int with name intProp. Then setPropertyValue is
* called: * called:
* <pre> * <pre>
* set.setPropertyValue( "PropA", new Byte( (byte)111)); * set.setPropertyValue( "PropA", Byte.valueOf( (byte)111));
* </pre> * </pre>
* At some point setPropertyValue will call convertPropertyValue and pass in the Byte object. Since we allow * 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) * 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 ...@@ -735,7 +735,7 @@ XMultiPropertySet
else if (cl.equals(char.class)) else if (cl.equals(char.class))
retVal= new Character(AnyConverter.toChar(obj)); retVal= new Character(AnyConverter.toChar(obj));
else if (cl.equals(byte.class)) else if (cl.equals(byte.class))
retVal= new Byte(AnyConverter.toByte(obj)); retVal= Byte.valueOf(AnyConverter.toByte(obj));
else if (cl.equals(short.class)) else if (cl.equals(short.class))
retVal= Short.valueOf(AnyConverter.toShort(obj)); retVal= Short.valueOf(AnyConverter.toShort(obj));
else if (cl.equals(int.class)) else if (cl.equals(int.class))
...@@ -757,7 +757,7 @@ XMultiPropertySet ...@@ -757,7 +757,7 @@ XMultiPropertySet
else if (cl.equals(Character.class)) else if (cl.equals(Character.class))
retVal= new Character(AnyConverter.toChar(obj)); retVal= new Character(AnyConverter.toChar(obj));
else if (cl.equals(Byte.class)) else if (cl.equals(Byte.class))
retVal= new Byte(AnyConverter.toByte(obj)); retVal= Byte.valueOf(AnyConverter.toByte(obj));
else if (cl.equals(Short.class)) else if (cl.equals(Short.class))
retVal= Short.valueOf(AnyConverter.toShort(obj)); retVal= Short.valueOf(AnyConverter.toShort(obj));
else if (cl.equals(Integer.class)) else if (cl.equals(Integer.class))
......
...@@ -210,7 +210,7 @@ final class Unmarshal { ...@@ -210,7 +210,7 @@ final class Unmarshal {
private Byte readByteValue() { private Byte readByteValue() {
try { try {
return new Byte(input.readByte()); return Byte.valueOf(input.readByte());
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e.toString()); throw new RuntimeException(e.toString());
} }
......
...@@ -44,7 +44,7 @@ public final class Marshaling_Test { ...@@ -44,7 +44,7 @@ public final class Marshaling_Test {
new com.sun.star.uno.RuntimeException("testRuntimeException"), new com.sun.star.uno.RuntimeException("testRuntimeException"),
new com.sun.star.uno.Exception("testException"), new com.sun.star.uno.Exception("testException"),
Boolean.TRUE, Boolean.TRUE,
new Byte((byte)47), Byte.valueOf((byte)47),
new Character('k'), new Character('k'),
new Double(0.12345), new Double(0.12345),
TestEnum.B, TestEnum.B,
......
...@@ -39,7 +39,7 @@ public final class AnyConverter_Test { ...@@ -39,7 +39,7 @@ public final class AnyConverter_Test {
Boolean aBool= Boolean.TRUE; Boolean aBool= Boolean.TRUE;
Character aChar= new Character('A'); Character aChar= new Character('A');
Byte aByte= new Byte((byte) 111); Byte aByte= Byte.valueOf((byte) 111);
Short aShort= Short.valueOf((short) 11111); Short aShort= Short.valueOf((short) 11111);
Integer aInt= Integer.valueOf( 1111111); Integer aInt= Integer.valueOf( 1111111);
Long aLong= Long.valueOf( 0xffffffff); Long aLong= Long.valueOf( 0xffffffff);
......
...@@ -70,7 +70,7 @@ public class ValueChanger { ...@@ -70,7 +70,7 @@ public class ValueChanger {
if (oldValue instanceof Byte) { if (oldValue instanceof Byte) {
byte oldbyte = ((Byte) oldValue).byteValue(); byte oldbyte = ((Byte) oldValue).byteValue();
newValue = new Byte((byte) (oldbyte + 1)); newValue = Byte.valueOf((byte) (oldbyte + 1));
} else } else
if (oldValue instanceof Float) { if (oldValue instanceof Float) {
......
...@@ -206,7 +206,7 @@ public class MyPersistObject implements XPersistObject, XTypeProvider, ...@@ -206,7 +206,7 @@ public class MyPersistObject implements XPersistObject, XTypeProvider,
*/ */
public Object getPropertyValue(String property) { public Object getPropertyValue(String property) {
if ( property.equals(props[0].Name)) if ( property.equals(props[0].Name))
return new Byte(by); return Byte.valueOf(by);
if ( property.equals(props[1].Name)) if ( property.equals(props[1].Name))
return Integer.valueOf(i); return Integer.valueOf(i);
if ( property.equals(props[2].Name)) if ( property.equals(props[2].Name))
......
...@@ -313,8 +313,8 @@ public class _CharacterProperties extends MultiPropertyTest { ...@@ -313,8 +313,8 @@ public class _CharacterProperties extends MultiPropertyTest {
* so ist must be treated special * so ist must be treated special
*/ */
public void _CharEscapementHeight() { public void _CharEscapementHeight() {
Byte aByte = new Byte((byte)75); Byte aByte = Byte.valueOf((byte)75);
Byte max = new Byte((byte)100); Byte max = Byte.valueOf((byte)100);
testProperty("CharEscapementHeight", aByte, max) ; testProperty("CharEscapementHeight", aByte, max) ;
} }
......
...@@ -621,7 +621,7 @@ public class ODatabaseForm extends TestCase { ...@@ -621,7 +621,7 @@ public class ODatabaseForm extends TestCase {
values must be added here as relation. */ values must be added here as relation. */
params.add("SAU99") ; params.add("SAU99") ;
params.add(Boolean.FALSE) ; params.add(Boolean.FALSE) ;
params.add(new Byte((byte) 123)) ; params.add(Byte.valueOf((byte) 123)) ;
params.add(Short.valueOf((short) 234)) ; params.add(Short.valueOf((short) 234)) ;
params.add(Integer.valueOf(12345)) ; params.add(Integer.valueOf(12345)) ;
params.add(Long.valueOf(23456)) ; params.add(Long.valueOf(23456)) ;
......
...@@ -129,7 +129,7 @@ public class DataInputStream extends TestCase { ...@@ -129,7 +129,7 @@ public class DataInputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>(); ArrayList<Object> data = new ArrayList<Object>();
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -106,7 +106,7 @@ public class DataOutputStream extends TestCase { ...@@ -106,7 +106,7 @@ public class DataOutputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ; ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -129,7 +129,7 @@ public class MarkableOutputStream extends TestCase { ...@@ -129,7 +129,7 @@ public class MarkableOutputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ; ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -243,7 +243,7 @@ public class ObjectInputStream extends TestCase { ...@@ -243,7 +243,7 @@ public class ObjectInputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ; ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -232,7 +232,7 @@ public class ObjectOutputStream extends TestCase { ...@@ -232,7 +232,7 @@ public class ObjectOutputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ; ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -126,7 +126,7 @@ public class DataInputStream extends TestCase { ...@@ -126,7 +126,7 @@ public class DataInputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ; ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -103,7 +103,7 @@ public class DataOutputStream extends TestCase { ...@@ -103,7 +103,7 @@ public class DataOutputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ; ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -126,7 +126,7 @@ public class MarkableOutputStream extends TestCase { ...@@ -126,7 +126,7 @@ public class MarkableOutputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ; ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -240,7 +240,7 @@ public class ObjectInputStream extends TestCase { ...@@ -240,7 +240,7 @@ public class ObjectInputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ; ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -229,7 +229,7 @@ public class ObjectOutputStream extends TestCase { ...@@ -229,7 +229,7 @@ public class ObjectOutputStream extends TestCase {
// all data types for writing to an XDataInputStream // all data types for writing to an XDataInputStream
ArrayList<Object> data = new ArrayList<Object>() ; ArrayList<Object> data = new ArrayList<Object>() ;
data.add(Boolean.TRUE) ; data.add(Boolean.TRUE) ;
data.add(new Byte((byte)123)) ; data.add(Byte.valueOf((byte)123)) ;
data.add(new Character((char)1234)) ; data.add(new Character((char)1234)) ;
data.add(Short.valueOf((short)1234)) ; data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ; data.add(Integer.valueOf(123456)) ;
......
...@@ -306,7 +306,7 @@ public class UnoRuntime { ...@@ -306,7 +306,7 @@ public class UnoRuntime {
case TypeClass.BOOLEAN_value: case TypeClass.BOOLEAN_value:
return Boolean.FALSE; return Boolean.FALSE;
case TypeClass.BYTE_value: case TypeClass.BYTE_value:
return new Byte((byte) 0); return Byte.valueOf((byte) 0);
case TypeClass.SHORT_value: case TypeClass.SHORT_value:
case TypeClass.UNSIGNED_SHORT_value: case TypeClass.UNSIGNED_SHORT_value:
return Short.valueOf((short) 0); return Short.valueOf((short) 0);
......
...@@ -1165,7 +1165,7 @@ public class TestComponent { ...@@ -1165,7 +1165,7 @@ public class TestComponent {
null); null);
Constructors.create2(context, new Object[] { Constructors.create2(context, new Object[] {
Boolean.TRUE, Boolean.TRUE,
new Byte(Byte.MIN_VALUE), Byte.valueOf(Byte.MIN_VALUE),
Short.valueOf(Short.MIN_VALUE), Short.valueOf(Short.MIN_VALUE),
new Any(Type.UNSIGNED_SHORT, Short.valueOf((short) -1)), new Any(Type.UNSIGNED_SHORT, Short.valueOf((short) -1)),
Integer.valueOf(Integer.MIN_VALUE), Integer.valueOf(Integer.MIN_VALUE),
...@@ -1223,7 +1223,7 @@ public class TestComponent { ...@@ -1223,7 +1223,7 @@ public class TestComponent {
new TestPolyStruct(Type.LONG), new TestPolyStruct(Type.LONG),
new TestPolyStruct(new Any(Type.BOOLEAN, Boolean.TRUE)), new TestPolyStruct(new Any(Type.BOOLEAN, Boolean.TRUE)),
new TestPolyStruct(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(Short.valueOf(Short.MIN_VALUE)),
new TestPolyStruct(Integer.valueOf(Integer.MIN_VALUE)), new TestPolyStruct(Integer.valueOf(Integer.MIN_VALUE)),
new TestPolyStruct(Long.valueOf(Long.MIN_VALUE)), new TestPolyStruct(Long.valueOf(Long.MIN_VALUE)),
......
...@@ -249,7 +249,7 @@ public class NumericalHelper ...@@ -249,7 +249,7 @@ public class NumericalHelper
break; break;
case TypeClass.BYTE_value: case TypeClass.BYTE_value:
aTypeObject.iType = BYTE_TYPE; aTypeObject.iType = BYTE_TYPE;
aTypeObject.aValue = new Byte(AnyConverter.toByte(aValue)); aTypeObject.aValue = Byte.valueOf(AnyConverter.toByte(aValue));
break; break;
case TypeClass.SHORT_value: case TypeClass.SHORT_value:
aTypeObject.iType = SHORT_TYPE; aTypeObject.iType = SHORT_TYPE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment