'new Double' is deprecated in Java
replace with Double.valueOf
Change-Id: If5be8e500e31ebf9d5fb20ea7dd474677d7c74ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158785
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java
index 0c25714..f5bc4f5 100644
--- a/chart2/qa/TestCaseOldAPI.java
+++ b/chart2/qa/TestCaseOldAPI.java
@@ -356,7 +356,7 @@ public class TestCaseOldAPI extends ComplexTestCase {
double nNewMax = 12.3;
double nNewOrigin = 2.7;
xProp.setPropertyValue( "Max", new Double( nNewMax ));
xProp.setPropertyValue( "Max", Double.valueOf( nNewMax ));
assure( "AutoMax is on", ! AnyConverter.toBoolean( xProp.getPropertyValue( "AutoMax" )) );
assure( "Maximum value invalid",
@@ -367,7 +367,7 @@ public class TestCaseOldAPI extends ComplexTestCase {
xProp.setPropertyValue( "AutoMin", Boolean.TRUE);
assure( "AutoMin is off", AnyConverter.toBoolean( xProp.getPropertyValue( "AutoMin" )) );
xProp.setPropertyValue( "Origin", new Double( nNewOrigin ));
xProp.setPropertyValue( "Origin", Double.valueOf( nNewOrigin ));
assure( "Origin invalid",
utils.approxEqual(
AnyConverter.toDouble( xProp.getPropertyValue( "Origin" )),
@@ -400,7 +400,7 @@ public class TestCaseOldAPI extends ComplexTestCase {
AnyConverter.toInt( xProp.getPropertyValue( "TextRotation" )) == nNewTextRotation );
double fStepMain = 10.0;
xProp.setPropertyValue( "StepMain", new Double( fStepMain ));
xProp.setPropertyValue( "StepMain", Double.valueOf( fStepMain ));
assure( "Property StepMain",
AnyConverter.toDouble( xProp.getPropertyValue( "StepMain" )) == fStepMain );
@@ -408,7 +408,7 @@ public class TestCaseOldAPI extends ComplexTestCase {
// internally, the help-step is stored as an integer number of
// substeps
double fStepHelp = 5.0;
xProp.setPropertyValue( "StepHelp", new Double( fStepHelp ));
xProp.setPropertyValue( "StepHelp", Double.valueOf( fStepHelp ));
assure( "Property StepHelp",
AnyConverter.toDouble( xProp.getPropertyValue( "StepHelp" )) == fStepHelp );
diff --git a/comphelper/qa/complex/comphelper/Map.java b/comphelper/qa/complex/comphelper/Map.java
index d01d1be..51f7317 100644
--- a/comphelper/qa/complex/comphelper/Map.java
+++ b/comphelper/qa/complex/comphelper/Map.java
@@ -461,23 +461,23 @@ public class Map
@Test public void testSpecialValues() throws com.sun.star.uno.Exception
{
final Double[] keys = new Double[] { new Double( 0 ), Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY };
final Double[] values = new Double[] { Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, new Double( 0 ) };
final Double[] keys = new Double[] { Double.valueOf( 0 ), Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY };
final Double[] values = new Double[] { Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.valueOf( 0 ) };
XEnumerableMap map = com.sun.star.container.EnumerableMap.create( connection.getComponentContext(), new Type( Double.class ), new Type( Double.class ) );
impl_putAll( map, keys, values );
assertTrue( "containsKey( Double.+INF failed", map.containsKey( Double.POSITIVE_INFINITY ) );
assertTrue( "containsKey( Double.-INF failed", map.containsKey( Double.NEGATIVE_INFINITY ) );
assertTrue( "containsKey( 0 ) failed", map.containsKey( new Double( 0 ) ) );
assertTrue( "containsKey( 0 ) failed", map.containsKey( Double.valueOf( 0 ) ) );
assertTrue( "containsValue( Double.+INF ) failed", map.containsValue( Double.POSITIVE_INFINITY ) );
assertTrue( "containsValue( Double.-INF ) failed", map.containsValue( Double.NEGATIVE_INFINITY ) );
assertTrue( "containsValue( 0 ) failed", map.containsValue( new Double( 0 ) ) );
assertTrue( "containsValue( 0 ) failed", map.containsValue( Double.valueOf( 0 ) ) );
// put and containsKey should reject Double.NaN as key
//? assureException( "Double.NaN should not be allowed as key in a call to 'put'", map, "put",
//? new Class[] { Object.class, Object.class }, new Object[] { Double.NaN, new Double( 0 ) },
//? new Class[] { Object.class, Object.class }, new Object[] { Double.NaN, Double.valueOf( 0 ) },
//? com.sun.star.lang.IllegalArgumentException.class );
//? assureException( "Double.NaN should not be allowed as key in a call to 'containsKey'", map, "containsKey",
//? new Class[] { Object.class }, new Object[] { Double.NaN },
@@ -485,7 +485,7 @@ public class Map
// ditto for put and containsValue
//? assureException( "Double.NaN should not be allowed as value in a call to 'put'", map, "put",
//? new Class[] { Object.class, Object.class }, new Object[] { new Double( 0 ), Double.NaN },
//? new Class[] { Object.class, Object.class }, new Object[] { Double.valueOf( 0 ), Double.NaN },
//? com.sun.star.lang.IllegalArgumentException.class );
//? assureException( "Double.NaN should not be allowed as key in a call to 'containsValue'", map, "containsValue",
//? new Class[] { Object.class }, new Object[] { Double.NaN },
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
index 4943df7..7cb1af7 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java
@@ -100,7 +100,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropFloatA", value);
assertEquals(cl.getPropertyValue("PropFloatA"), value);
value= new Double(3.145);
value= Double.valueOf(3.145);
cl.setPropertyValue("PropDoubleA",value);
assertEquals(cl.getPropertyValue("PropDoubleA"), value);
@@ -173,7 +173,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropObjectA", value);
assertEquals(cl.getPropertyValue("PropObjectA"), value);
value= new Double(3.145);
value= Double.valueOf(3.145);
cl.setPropertyValue("PropObjectA",value);
assertEquals(cl.getPropertyValue("PropObjectA"), value);
@@ -244,7 +244,7 @@ public class PropertySet_Test
assertTrue(ret instanceof Any);
assertTrue(util.anyEquals(value, ret));
value= new Double(3.145);
value= Double.valueOf(3.145);
cl.setPropertyValue("PropAnyA",value);
ret= cl.getPropertyValue("PropAnyA");
assertTrue(ret instanceof Any);
@@ -324,7 +324,7 @@ public class PropertySet_Test
assertTrue(ret instanceof Float);
assertTrue(util.anyEquals(value, ret));
value= new Any(new Type(double.class),new Double(3.145));
value= new Any(new Type(double.class),Double.valueOf(3.145));
cl.setPropertyValue("PropDoubleA",value);
ret= cl.getPropertyValue("PropDoubleA");
assertTrue(ret instanceof Double);
@@ -404,7 +404,7 @@ public class PropertySet_Test
assertTrue(ret instanceof Any);
assertTrue(util.anyEquals(value, ret));
value= new Any(new Type(double.class),new Double(3.145));
value= new Any(new Type(double.class),Double.valueOf(3.145));
cl.setPropertyValue("PropAnyA",value);
ret= cl.getPropertyValue("PropAnyA");
assertTrue(ret instanceof Any);
@@ -470,7 +470,7 @@ public class PropertySet_Test
cl.setPropertyValue("PropFloatClass", value);
assertEquals(cl.getPropertyValue("PropFloatClass"), value);
value= new Double(3.145);
value= Double.valueOf(3.145);
cl.setPropertyValue("PropDoubleClass",value);
assertEquals(cl.getPropertyValue("PropDoubleClass"), value);
@@ -520,7 +520,7 @@ public class PropertySet_Test
assertTrue(ret instanceof Float);
assertTrue(util.anyEquals(value, ret));
value= new Any(new Type(double.class),new Double(3.145));
value= new Any(new Type(double.class),Double.valueOf(3.145));
cl.setPropertyValue("PropDoubleClass",value);
ret= cl.getPropertyValue("PropDoubleClass");
assertTrue(ret instanceof Double);
@@ -1202,7 +1202,7 @@ class TestClass extends PropertySet
assertTrue(outNewVal[0] instanceof Float);
assertEquals(outNewVal[0], value);
value= new Double(3.145);
value= Double.valueOf(3.145);
assertTrue(convertPropertyValue(propDoubleA, outNewVal, outOldVal, value));
assertTrue(outNewVal[0] instanceof Double);
assertEquals(outNewVal[0], value);
@@ -1358,7 +1358,7 @@ class TestClass extends PropertySet
assertTrue(outNewVal[0] instanceof Float);
assertEquals(outNewVal[0], value);
value= new Double(3.145);
value= Double.valueOf(3.145);
assertTrue(convertPropertyValue(propDoubleA, outNewVal, outOldVal, value));
assertTrue(outNewVal[0] instanceof Double);
assertEquals(outNewVal[0], value);
@@ -1396,7 +1396,7 @@ class TestClass extends PropertySet
setPropertyValueNoBroadcast(propFloatA, value);
assertEquals(floatPropA, ((Float) value).floatValue(), 0.0f);
value= new Double(3.145);
value= Double.valueOf(3.145);
setPropertyValueNoBroadcast(propDoubleA, value);
assertEquals(doublePropA, ((Double) value).doubleValue(), 0.0f);
diff --git a/odk/examples/CLI/CSharp/Spreadsheet/SpreadsheetSample.cs b/odk/examples/CLI/CSharp/Spreadsheet/SpreadsheetSample.cs
index 1dd2f8a..8121210 100644
--- a/odk/examples/CLI/CSharp/Spreadsheet/SpreadsheetSample.cs
+++ b/odk/examples/CLI/CSharp/Spreadsheet/SpreadsheetSample.cs
@@ -1434,7 +1434,7 @@ public class SpreadsheetSample : SpreadsheetDocHelper
unoidl.com.sun.star.sheet.XFunctionAccess xFuncAcc =
(unoidl.com.sun.star.sheet.XFunctionAccess) aFuncInst;
// put the data in a two-dimensional array
Double [][] aData = { new Double [] { 1.0, 2.0, 3.0 } };
Double [][] aData = { Double.valueOf [] { 1.0, 2.0, 3.0 } };
// construct the array of function arguments
uno.Any [] aArgs = new uno.Any [2];
aArgs[0] = new uno.Any( typeof (Double [][]), aData );
diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
index c49dbfd..5b5b0c9 100644
--- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
+++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
@@ -350,7 +350,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
// use the XPropertySet interface merely for reasons of demonstration
xCFModelPSet.setPropertyValue("PrependCurrencySymbol", Boolean.TRUE);
xCFModelPSet.setPropertyValue("CurrencySymbol", "$");
xCFModelPSet.setPropertyValue("Value", new Double(2.93));
xCFModelPSet.setPropertyValue("Value", Double.valueOf(2.93));
// add a textlistener that is notified on each change of the controlvalue...
Object oCFControl = m_xDlgContainer.getControl(sName);
@@ -683,10 +683,10 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
xNFModelPSet = UnoRuntime.queryInterface(XPropertySet.class, oNFModel);
// The following properties may also be set with XMultiPropertySet but we
// use the XPropertySet interface merely for reasons of demonstration
xNFModelPSet.setPropertyValue("ValueMin", new Double(_fValueMin));
xNFModelPSet.setPropertyValue("ValueMax", new Double(_fValueMax));
xNFModelPSet.setPropertyValue("Value", new Double(_fValue));
xNFModelPSet.setPropertyValue("ValueStep", new Double(_fValueStep));
xNFModelPSet.setPropertyValue("ValueMin", Double.valueOf(_fValueMin));
xNFModelPSet.setPropertyValue("ValueMax", Double.valueOf(_fValueMax));
xNFModelPSet.setPropertyValue("Value", Double.valueOf(_fValue));
xNFModelPSet.setPropertyValue("ValueStep", Double.valueOf(_fValueStep));
xNFModelPSet.setPropertyValue("ShowThousandsSeparator", Boolean.TRUE);
xNFModelPSet.setPropertyValue("DecimalAccuracy", Short.valueOf(_nDecimalAccuracy));
} catch (com.sun.star.uno.Exception ex) {
@@ -957,7 +957,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis
// Set the properties at the model - keep in mind to pass the property names in alphabetical order!
xFFModelMPSet.setPropertyValues(
new String[] {"EffectiveValue", "Height", "Name", "PositionX", "PositionY", "StrictFormat", "Spin", "Width"},
new Object[] { new Double(12348), Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Boolean.TRUE, Boolean.TRUE, Integer.valueOf(_nWidth)});
new Object[] { Double.valueOf(12348), Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Boolean.TRUE, Boolean.TRUE, Integer.valueOf(_nWidth)});
xFFModelPSet = UnoRuntime.queryInterface(XPropertySet.class, oFFModel);
// to define a numberformat you always need a locale...
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java
index bbf54af..8ddfa63 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java
+++ b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java
@@ -381,26 +381,26 @@ public class SpreadsheetSample extends SpreadsheetDocHelper
Object[][] aValues =
{
{ "Name", "Fruit", "Quantity" },
{ "Alice", "Apples", new Double( 3.0 ) },
{ "Alice", "Oranges", new Double( 7.0 ) },
{ "Bob", "Apples", new Double( 3.0 ) },
{ "Alice", "Apples", new Double( 9.0 ) },
{ "Bob", "Apples", new Double( 5.0 ) },
{ "Bob", "Oranges", new Double( 6.0 ) },
{ "Alice", "Oranges", new Double( 3.0 ) },
{ "Alice", "Apples", new Double( 8.0 ) },
{ "Alice", "Oranges", new Double( 1.0 ) },
{ "Bob", "Oranges", new Double( 2.0 ) },
{ "Bob", "Oranges", new Double( 7.0 ) },
{ "Bob", "Apples", new Double( 1.0 ) },
{ "Alice", "Apples", new Double( 8.0 ) },
{ "Alice", "Oranges", new Double( 8.0 ) },
{ "Alice", "Apples", new Double( 7.0 ) },
{ "Bob", "Apples", new Double( 1.0 ) },
{ "Bob", "Oranges", new Double( 9.0 ) },
{ "Bob", "Oranges", new Double( 3.0 ) },
{ "Alice", "Oranges", new Double( 4.0 ) },
{ "Alice", "Apples", new Double( 9.0 ) }
{ "Alice", "Apples", Double.valueOf( 3.0 ) },
{ "Alice", "Oranges", Double.valueOf( 7.0 ) },
{ "Bob", "Apples", Double.valueOf( 3.0 ) },
{ "Alice", "Apples", Double.valueOf( 9.0 ) },
{ "Bob", "Apples", Double.valueOf( 5.0 ) },
{ "Bob", "Oranges", Double.valueOf( 6.0 ) },
{ "Alice", "Oranges", Double.valueOf( 3.0 ) },
{ "Alice", "Apples", Double.valueOf( 8.0 ) },
{ "Alice", "Oranges", Double.valueOf( 1.0 ) },
{ "Bob", "Oranges", Double.valueOf( 2.0 ) },
{ "Bob", "Oranges", Double.valueOf( 7.0 ) },
{ "Bob", "Apples", Double.valueOf( 1.0 ) },
{ "Alice", "Apples", Double.valueOf( 8.0 ) },
{ "Alice", "Oranges", Double.valueOf( 8.0 ) },
{ "Alice", "Apples", Double.valueOf( 7.0 ) },
{ "Bob", "Apples", Double.valueOf( 1.0 ) },
{ "Bob", "Oranges", Double.valueOf( 9.0 ) },
{ "Bob", "Oranges", Double.valueOf( 3.0 ) },
{ "Alice", "Oranges", Double.valueOf( 4.0 ) },
{ "Alice", "Apples", Double.valueOf( 9.0 ) }
};
xData.setDataArray( aValues );
@@ -863,20 +863,20 @@ public class SpreadsheetSample extends SpreadsheetDocHelper
// --- Scenarios ---
Object[][] aValues = new Object[2][2];
aValues[0][0] = new Double( 11 );
aValues[0][1] = new Double( 12 );
aValues[0][0] = Double.valueOf( 11 );
aValues[0][1] = Double.valueOf( 12 );
aValues[1][0] = "Test13";
aValues[1][1] = "Test14";
insertScenario( xSheet, "B10:C11", aValues, "First Scenario", "The first scenario." );
aValues[0][0] = "Test21";
aValues[0][1] = "Test22";
aValues[1][0] = new Double( 23 );
aValues[1][1] = new Double( 24 );
aValues[1][0] = Double.valueOf( 23 );
aValues[1][1] = Double.valueOf( 24 );
insertScenario( xSheet, "B10:C11", aValues, "Second Scenario", "The visible scenario." );
aValues[0][0] = new Double( 31 );
aValues[0][1] = new Double( 32 );
aValues[0][0] = Double.valueOf( 31 );
aValues[0][1] = Double.valueOf( 32 );
aValues[1][0] = "Test33";
aValues[1][1] = "Test34";
insertScenario( xSheet, "B10:C11", aValues, "Third Scenario", "The last scenario." );
@@ -972,8 +972,8 @@ public class SpreadsheetSample extends SpreadsheetDocHelper
Object[][] aValues =
{
{ "Apples", "Oranges" },
{ new Double( 5 ), new Double( 7 ) },
{ new Double( 6 ), new Double( 8 ) }
{ Double.valueOf( 5 ), Double.valueOf( 7 ) },
{ Double.valueOf( 6 ), Double.valueOf( 8 ) }
};
xData.setDataArray( aValues );
@@ -1080,27 +1080,27 @@ public class SpreadsheetSample extends SpreadsheetDocHelper
Object[][] aValues =
{
{ "Name", "Year", "Sales" },
{ "Alice", new Double( 2001 ), new Double( 4.0 ) },
{ "Carol", new Double( 1997 ), new Double( 3.0 ) },
{ "Carol", new Double( 1998 ), new Double( 8.0 ) },
{ "Bob", new Double( 1997 ), new Double( 8.0 ) },
{ "Alice", new Double( 2002 ), new Double( 9.0 ) },
{ "Alice", new Double( 1999 ), new Double( 7.0 ) },
{ "Alice", new Double( 1996 ), new Double( 3.0 ) },
{ "Bob", new Double( 2000 ), new Double( 1.0 ) },
{ "Carol", new Double( 1999 ), new Double( 5.0 ) },
{ "Bob", new Double( 2002 ), new Double( 1.0 ) },
{ "Carol", new Double( 2001 ), new Double( 5.0 ) },
{ "Carol", new Double( 2000 ), new Double( 1.0 ) },
{ "Carol", new Double( 1996 ), new Double( 8.0 ) },
{ "Bob", new Double( 1996 ), new Double( 7.0 ) },
{ "Alice", new Double( 1997 ), new Double( 3.0 ) },
{ "Alice", new Double( 2000 ), new Double( 9.0 ) },
{ "Bob", new Double( 1998 ), new Double( 1.0 ) },
{ "Bob", new Double( 1999 ), new Double( 6.0 ) },
{ "Carol", new Double( 2002 ), new Double( 8.0 ) },
{ "Alice", new Double( 1998 ), new Double( 5.0 ) },
{ "Bob", new Double( 2001 ), new Double( 6.0 ) }
{ "Alice", Double.valueOf( 2001 ), Double.valueOf( 4.0 ) },
{ "Carol", Double.valueOf( 1997 ), Double.valueOf( 3.0 ) },
{ "Carol", Double.valueOf( 1998 ), Double.valueOf( 8.0 ) },
{ "Bob", Double.valueOf( 1997 ), Double.valueOf( 8.0 ) },
{ "Alice", Double.valueOf( 2002 ), Double.valueOf( 9.0 ) },
{ "Alice", Double.valueOf( 1999 ), Double.valueOf( 7.0 ) },
{ "Alice", Double.valueOf( 1996 ), Double.valueOf( 3.0 ) },
{ "Bob", Double.valueOf( 2000 ), Double.valueOf( 1.0 ) },
{ "Carol", Double.valueOf( 1999 ), Double.valueOf( 5.0 ) },
{ "Bob", Double.valueOf( 2002 ), Double.valueOf( 1.0 ) },
{ "Carol", Double.valueOf( 2001 ), Double.valueOf( 5.0 ) },
{ "Carol", Double.valueOf( 2000 ), Double.valueOf( 1.0 ) },
{ "Carol", Double.valueOf( 1996 ), Double.valueOf( 8.0 ) },
{ "Bob", Double.valueOf( 1996 ), Double.valueOf( 7.0 ) },
{ "Alice", Double.valueOf( 1997 ), Double.valueOf( 3.0 ) },
{ "Alice", Double.valueOf( 2000 ), Double.valueOf( 9.0 ) },
{ "Bob", Double.valueOf( 1998 ), Double.valueOf( 1.0 ) },
{ "Bob", Double.valueOf( 1999 ), Double.valueOf( 6.0 ) },
{ "Carol", Double.valueOf( 2002 ), Double.valueOf( 8.0 ) },
{ "Alice", Double.valueOf( 1998 ), Double.valueOf( 5.0 ) },
{ "Bob", Double.valueOf( 2001 ), Double.valueOf( 6.0 ) }
};
xData.setDataArray( aValues );
@@ -1285,7 +1285,7 @@ public class SpreadsheetSample extends SpreadsheetDocHelper
// construct the array of function arguments
Object[] aArgs = new Object[2];
aArgs[0] = aData;
aArgs[1] = new Double( 2.0 );
aArgs[1] = Double.valueOf( 2.0 );
Object aResult = xFuncAcc.callFunction( "ZTEST", aArgs );
System.out.println("ZTEST result for data {1,2,3} and value 2 is "
+ ((Double)aResult).doubleValue() );
diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java
index 312ab42..36d0d7e 100644
--- a/odk/examples/java/ToDo/ToDo.java
+++ b/odk/examples/java/ToDo/ToDo.java
@@ -736,11 +736,11 @@ public class ToDo {
// Good Friday
vectorHolidays.add(
new Double( intEasterSunday - 2 ) );
Double.valueOf( intEasterSunday - 2 ) );
// Easter monday
vectorHolidays.add(
new Double( intEasterSunday + 1 ) );
Double.valueOf( intEasterSunday + 1 ) );
// Labour Day
vectorHolidays.add( xfunctionaccess.callFunction(
@@ -751,10 +751,10 @@ public class ToDo {
Integer.valueOf( 1 ) } ));
// Ascension Day
vectorHolidays.add(new Double(intEasterSunday + 39 ));
vectorHolidays.add(Double.valueOf(intEasterSunday + 39 ));
// Pentecost monday
vectorHolidays.add(new Double(intEasterSunday + 50 ));
vectorHolidays.add(Double.valueOf(intEasterSunday + 50 ));
// German Unification
vectorHolidays.add( xfunctionaccess.callFunction(
@@ -863,7 +863,7 @@ public class ToDo {
dHolidayStart );
intHoliday <= (int) Math.round( dHolidayEnd );
intHoliday++ ) {
vectorHolidays.add( new Double( intHoliday ) );
vectorHolidays.add( Double.valueOf( intHoliday ) );
}
}
diff --git a/qadevOOo/runner/util/CalcTools.java b/qadevOOo/runner/util/CalcTools.java
index e9a84cd..05fc41d 100644
--- a/qadevOOo/runner/util/CalcTools.java
+++ b/qadevOOo/runner/util/CalcTools.java
@@ -75,7 +75,7 @@ public class CalcTools {
Object[][] newData = new Object[rangeLengthY][rangeLengthX];
for (int i=0; i<rangeLengthY; i++) {
for (int j=0; j<rangeLengthX; j++) {
newData[i][j] = new Double(10*i +j);
newData[i][j] = Double.valueOf(10*i +j);
}
}
XCellRange xRange = null;
diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java
index 1803395..2b712c1 100644
--- a/qadevOOo/runner/util/DBTools.java
+++ b/qadevOOo/runner/util/DBTools.java
@@ -68,10 +68,10 @@ public class DBTools {
* Values for filling test table.
*/
public static final Object[][] TST_TABLE_VALUES = new Object[][] {
{"String1", Integer.valueOf(1), null, null, new Double(1.1),
{"String1", Integer.valueOf(1), null, null, Double.valueOf(1.1),
new Date((short) 1,(short) 1, (short) 2001), null, null, null,
Boolean.TRUE, null, null},
{"String2", Integer.valueOf(2), null, null, new Double(1.2),
{"String2", Integer.valueOf(2), null, null, Double.valueOf(1.2),
new Date((short) 2, (short) 1,(short) 2001), null, null, null,
Boolean.FALSE, null, null},
{null, null, null, null, null,
diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java
index 3d043f6..998bd9fc 100644
--- a/qadevOOo/runner/util/ValueChanger.java
+++ b/qadevOOo/runner/util/ValueChanger.java
@@ -81,7 +81,7 @@ public class ValueChanger {
newValue = Float.valueOf((float) (oldfloat + 16.7));
} else if (oldValue instanceof Double) {
double olddouble = ((Double) oldValue).doubleValue();
newValue = new Double(olddouble + 17.8);
newValue = Double.valueOf(olddouble + 17.8);
} else if (oldValue instanceof String) {
String oldString = (String) oldValue;
newValue = oldString + "New";
diff --git a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
index 4838716..635dded 100644
--- a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
+++ b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java
@@ -212,7 +212,7 @@ public class MyPersistObject implements XPersistObject, XTypeProvider,
if ( property.equals(props[2].Name))
return new Character(c);
if ( property.equals(props[3].Name))
return new Double(d);
return Double.valueOf(d);
if ( property.equals(props[4].Name))
return Float.valueOf(f);
if ( property.equals(props[5].Name))
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
index e9e84bb..865e888 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java
@@ -326,7 +326,7 @@ public class _XAccessibleValue extends MultiMethodTest {
return Float.valueOf((float)val);
}
else if (clazz.equals(Double.class)) {
return new Double(val);
return Double.valueOf(val);
}
else {
throw new StatusException
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java
index a4daa13..5698cab 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java
@@ -121,7 +121,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest {
testProperty("Value", new PropertyTester() {
@Override
protected Object getNewValue(String prop, Object old) {
return utils.isVoid(old) ? new Double(777) :
return utils.isVoid(old) ? Double.valueOf(777) :
super.getNewValue(prop, old) ;
}
}) ;
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
index 3538eb6..4ab1a03 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java
@@ -137,7 +137,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
* new value must be specified.
*/
public void _EffectiveDefault() {
testProperty("EffectiveDefault", new Double(5.8),new Double(2.3)) ;
testProperty("EffectiveDefault", Double.valueOf(5.8),Double.valueOf(2.3)) ;
}
/**
@@ -145,7 +145,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
* new value must be specified.
*/
public void _EffectiveValue() {
testProperty("EffectiveValue", new Double(5.8),new Double(2.3)) ;
testProperty("EffectiveValue", Double.valueOf(5.8),Double.valueOf(2.3)) ;
}
/**
@@ -156,7 +156,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
testProperty("EffectiveMax", new PropertyTester() {
@Override
protected Object getNewValue(String p, Object v) {
return utils.isVoid(v) ? new Double(123.8) :
return utils.isVoid(v) ? Double.valueOf(123.8) :
super.getNewValue(p,v) ;
}
}) ;
@@ -190,7 +190,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest {
testProperty("EffectiveMin", new PropertyTester() {
@Override
protected Object getNewValue(String p, Object v) {
return utils.isVoid(v) ? new Double(0.1) :
return utils.isVoid(v) ? Double.valueOf(0.1) :
super.getNewValue(p,v) ;
}
}) ;
diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java
index 2186966..f305c58 100644
--- a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java
+++ b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java
@@ -121,7 +121,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest {
testProperty("Value", new PropertyTester() {
@Override
protected Object getNewValue(String p, Object old) {
return utils.isVoid(old) ? new Double(234.89) :
return utils.isVoid(old) ? Double.valueOf(234.89) :
super.getNewValue(p, old) ;
}
}) ;
diff --git a/qadevOOo/tests/java/ifc/chart/_ChartAxis.java b/qadevOOo/tests/java/ifc/chart/_ChartAxis.java
index 2a295c2..0528158 100644
--- a/qadevOOo/tests/java/ifc/chart/_ChartAxis.java
+++ b/qadevOOo/tests/java/ifc/chart/_ChartAxis.java
@@ -151,7 +151,7 @@ public class _ChartAxis extends MultiPropertyTest {
Double ValueToSet = (Double) ValueChanger.changePValue(oldValue);
double stm = ValueToSet.doubleValue();
stm = stm / 5;
return new Double(stm);
return Double.valueOf(stm);
}
};
diff --git a/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java b/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java
index ae1d7de..422e447 100644
--- a/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java
+++ b/qadevOOo/tests/java/ifc/form/component/_CurrencyField.java
@@ -40,7 +40,7 @@ public class _CurrencyField extends MultiPropertyTest {
testProperty("DefaultValue", new PropertyTester() {
@Override
protected Object getNewValue(String p, Object old) {
return util.utils.isVoid(old) ? new Double(17.5) :
return util.utils.isVoid(old) ? Double.valueOf(17.5) :
super.getNewValue(p, old) ;
}
}) ;
diff --git a/qadevOOo/tests/java/ifc/form/component/_NumericField.java b/qadevOOo/tests/java/ifc/form/component/_NumericField.java
index 463e780..987ba4d 100644
--- a/qadevOOo/tests/java/ifc/form/component/_NumericField.java
+++ b/qadevOOo/tests/java/ifc/form/component/_NumericField.java
@@ -40,7 +40,7 @@ public class _NumericField extends MultiPropertyTest {
testProperty("DefaultValue", new PropertyTester() {
@Override
protected Object getNewValue(String prop, Object old) {
return util.utils.isVoid(old) ? new Double(111.11) :
return util.utils.isVoid(old) ? Double.valueOf(111.11) :
super.getNewValue(prop, old) ;
}
}) ;
diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java
index 18d8ca0..6e556bb 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java
@@ -52,7 +52,7 @@ public class _XCellRangeData extends MultiMethodTest {
newData = new Object[maCRData.length][maCRData[0].length];
for (int i=0; i<newData.length; i++) {
for (int j=0; j<newData[i].length; j++) {
newData[i][j] = new Double(10*i +j);
newData[i][j] = Double.valueOf(10*i +j);
}
}
}
diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java
index fed0b5d..5a117d1 100644
--- a/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OCurrencyModel.java
@@ -122,7 +122,7 @@ public class OCurrencyModel extends GenericModelTest {
super.m_propertiesToSet.add(myProp);
super.m_ChangePropertyName = "Value";
super.m_ChangePropertyValue = new Double(0);
super.m_ChangePropertyValue = Double.valueOf(0);
super.m_LCShape_Type = "FixedText";
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 71a26c0..66e4642 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -594,7 +594,7 @@ public class ODatabaseForm extends TestCase {
params.add(Integer.valueOf(12345)) ;
params.add(Long.valueOf(23456)) ;
params.add(Float.valueOf(1.234f)) ;
params.add(new Double(2.345)) ;
params.add(Double.valueOf(2.345)) ;
params.add(new byte[] {1, 2, 3}) ;
Date d = new Date();
d.Day = 26; d.Month = 1; d.Year = 2001;
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java
index c37e040..a4cbdeb 100644
--- a/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java
@@ -183,7 +183,7 @@ public class ScCellRangeObj extends TestCase {
/* Object[][] newData = new Object[5][4];
for (int i=0; i<newData.length; i++) {
for (int j=0; j<newData[i].length; j++) {
newData[i][j] = new Double(i*10+j);
newData[i][j] = Double.valueOf(i*10+j);
}
}
tEnv.addObjRelation("NewData", newData); */
diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java
index 73213f0..bbb9579 100644
--- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java
@@ -116,7 +116,7 @@ public class DataInputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java
index fba607c..10a93b2 100644
--- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java
@@ -105,7 +105,7 @@ public class DataOutputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java
index a71b201..214d294 100644
--- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java
@@ -128,7 +128,7 @@ public class MarkableOutputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java
index 91ec8dd..c8e6ad8 100644
--- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java
@@ -217,7 +217,7 @@ public class ObjectInputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java
index 5fd3612..014f1b6 100644
--- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java
+++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java
@@ -209,7 +209,7 @@ public class ObjectOutputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java
index a07c7fe..c237efc 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java
@@ -115,7 +115,7 @@ public class DataInputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java
index 07ea9bf..4acded6 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java
@@ -104,7 +104,7 @@ public class DataOutputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java
index a3b461f..0aa943c 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java
@@ -127,7 +127,7 @@ public class MarkableOutputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java
index de91ef8..7f82f51 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java
@@ -223,7 +223,7 @@ public class ObjectInputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java
index 492cfac..f0416a3 100644
--- a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java
+++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java
@@ -208,7 +208,7 @@ public class ObjectOutputStream extends TestCase {
data.add(Short.valueOf((short)1234)) ;
data.add(Integer.valueOf(123456)) ;
data.add(Float.valueOf(1.234f)) ;
data.add(new Double(1.23456)) ;
data.add(Double.valueOf(1.23456)) ;
data.add("DataInputStream") ;
// information for writing to the pipe
byte[] byteData = new byte[] {
diff --git a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
index 7b60a1f..9a9d271 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java
@@ -115,15 +115,15 @@ public class SwXCellRange extends TestCase {
Object[][] NewData = new Object[5][];
NewData[0] = new Double[]
{new Double(2.5),new Double(5),new Double(2.5),new Double(5)};
{Double.valueOf(2.5),Double.valueOf(5),Double.valueOf(2.5),Double.valueOf(5)};
NewData[1] = new Double[]
{new Double(4),new Double(9),new Double(2.5),new Double(5)};
{Double.valueOf(4),Double.valueOf(9),Double.valueOf(2.5),Double.valueOf(5)};
NewData[2] = new Double[]
{new Double(2.5),new Double(5),new Double(2.5),new Double(5)};
{Double.valueOf(2.5),Double.valueOf(5),Double.valueOf(2.5),Double.valueOf(5)};
NewData[3] = new Double[]
{new Double(2.5),new Double(5),new Double(2.5),new Double(5)};
{Double.valueOf(2.5),Double.valueOf(5),Double.valueOf(2.5),Double.valueOf(5)};
NewData[4] = new Double[]
{new Double(4),new Double(9),new Double(2.5),new Double(5)};
{Double.valueOf(4),Double.valueOf(9),Double.valueOf(2.5),Double.valueOf(5)};
tEnv.addObjRelation("NewData",NewData);
// com::sun::star::chart::XChartDataArray
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
index 2ff21ff..fe44aacc 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java
@@ -112,8 +112,8 @@ public class SwXTextTable extends TestCase {
//Adding ObjRelation for XCellRangeData
Object[][] newData = new Object[6][];
Object[] line = new Object[2];
line[0] = new Double(1.5);
line[1] = new Double(2.5);
line[0] = Double.valueOf(1.5);
line[1] = Double.valueOf(2.5);
newData[0] = line;
newData[1] = line;
newData[2] = line;
diff --git a/ridljar/com/sun/star/lib/uno/helper/PropertySet.java b/ridljar/com/sun/star/lib/uno/helper/PropertySet.java
index ea89e10..2d9fadf 100644
--- a/ridljar/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/ridljar/com/sun/star/lib/uno/helper/PropertySet.java
@@ -749,7 +749,7 @@ XMultiPropertySet
else if (cl.equals(float.class))
retVal= Float.valueOf(AnyConverter.toFloat(obj));
else if (cl.equals(double.class))
retVal= new Double(AnyConverter.toDouble(obj));
retVal= Double.valueOf(AnyConverter.toDouble(obj));
else if (cl.equals(String.class))
retVal= AnyConverter.toString(obj);
else if (cl.isArray())
@@ -771,7 +771,7 @@ XMultiPropertySet
else if (cl.equals(Float.class))
retVal= Float.valueOf(AnyConverter.toFloat(obj));
else if (cl.equals(Double.class))
retVal= new Double(AnyConverter.toDouble(obj));
retVal= Double.valueOf(AnyConverter.toDouble(obj));
else if (XInterface.class.isAssignableFrom(cl))
retVal= AnyConverter.toObject(new Type(cl), obj);
else if (com.sun.star.uno.Enum.class.isAssignableFrom(cl))
diff --git a/ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java b/ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
index bf82072..40d5fb3 100644
--- a/ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
+++ b/ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java
@@ -259,7 +259,7 @@ final class Unmarshal {
}
private Double readDoubleValue() throws IOException {
return new Double(input.readDouble());
return Double.valueOf(input.readDouble());
}
private Character readCharValue() throws IOException {
diff --git a/ridljar/com/sun/star/uno/AnyConverter.java b/ridljar/com/sun/star/uno/AnyConverter.java
index e44425d..b37eab2 100644
--- a/ridljar/com/sun/star/uno/AnyConverter.java
+++ b/ridljar/com/sun/star/uno/AnyConverter.java
@@ -609,13 +609,13 @@ public class AnyConverter
case TypeClass.DOUBLE_value:
switch (tc) {
case TypeClass.BYTE_value:
return new Double( ((Byte)object).byteValue() );
return Double.valueOf( ((Byte)object).byteValue() );
case TypeClass.SHORT_value:
return new Double( ((Short)object).shortValue() );
return Double.valueOf( ((Short)object).shortValue() );
case TypeClass.LONG_value:
return new Double( ((Integer)object).intValue() );
return Double.valueOf( ((Integer)object).intValue() );
case TypeClass.FLOAT_value:
return new Double( ((Float)object).floatValue() );
return Double.valueOf( ((Float)object).floatValue() );
case TypeClass.DOUBLE_value:
return object;
}
diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java
index a054b40..d4cf864 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -334,7 +334,7 @@ public class UnoRuntime {
case TypeClass.FLOAT_value:
return Float.valueOf(0.0f);
case TypeClass.DOUBLE_value:
return new Double(0.0);
return Double.valueOf(0.0);
case TypeClass.CHAR_value:
return new Character('\u0000');
case TypeClass.STRING_value:
diff --git a/ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java b/ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
index a1ad705..6ffc7577 100644
--- a/ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
+++ b/ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
@@ -38,7 +38,7 @@ public final class Marshaling_Test {
TestObject testObject = new TestObject();
TestPrimitiveSeqStruct x = new TestPrimitiveSeqStruct();
x.zAny = new Object[]{Integer.valueOf(1), new Double(2) };
x.zAny = new Object[]{Integer.valueOf(1), Double.valueOf(2) };
Object data[] = new Object[] {
@@ -47,7 +47,7 @@ public final class Marshaling_Test {
Boolean.TRUE,
Byte.valueOf((byte)47),
new Character('k'),
new Double(0.12345),
Double.valueOf(0.12345),
TestEnum.B,
Float.valueOf(0.5678f),
Integer.valueOf(0),
diff --git a/ridljar/test/com/sun/star/uno/AnyConverter_Test.java b/ridljar/test/com/sun/star/uno/AnyConverter_Test.java
index 5b1a5b3..5f04531 100644
--- a/ridljar/test/com/sun/star/uno/AnyConverter_Test.java
+++ b/ridljar/test/com/sun/star/uno/AnyConverter_Test.java
@@ -62,7 +62,7 @@ public final class AnyConverter_Test {
aInt= Integer.valueOf( 1111111);
aLong= Long.valueOf( 0xffffffff);
aFloat= Float.valueOf( 3.14f);
aDouble= new Double( 3.145);
aDouble= Double.valueOf( 3.145);
aObj= new ATypeProvider();
aStr= "I am a string";
aType= new Type(String.class);
diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java b/sfx2/qa/complex/sfx2/DocumentProperties.java
index c5f84b1..fe830f118 100644
--- a/sfx2/qa/complex/sfx2/DocumentProperties.java
+++ b/sfx2/qa/complex/sfx2/DocumentProperties.java
@@ -334,7 +334,7 @@ public class DocumentProperties
udpc.addProperty("FrobDuration2", PropertyAttribute.REMOVABLE, t);
udpc.addProperty("FrobEndDate", PropertyAttribute.REMOVABLE, date);
udpc.addProperty("FrobStartTime", PropertyAttribute.REMOVABLE, dt);
udpc.addProperty("Pi", PropertyAttribute.REMOVABLE, new Double(d));
udpc.addProperty("Pi", PropertyAttribute.REMOVABLE, Double.valueOf(d));
udpc.addProperty("Foo", PropertyAttribute.REMOVABLE, "bar");
udpc.addProperty("Removed", PropertyAttribute.REMOVABLE, "bar");
// #i94175#: empty property name is valid ODF 1.1
diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java
index 0660f93..0348f72 100644
--- a/testtools/com/sun/star/comp/bridge/TestComponent.java
+++ b/testtools/com/sun/star/comp/bridge/TestComponent.java
@@ -1212,7 +1212,7 @@ public class TestComponent {
Long.valueOf(Long.MIN_VALUE),
new Any(Type.UNSIGNED_HYPER, Long.valueOf(-1L)),
Float.valueOf(0.123f),
new Double(0.456),
Double.valueOf(0.456),
new Character('X'),
"test",
Type.ANY,
@@ -1269,7 +1269,7 @@ public class TestComponent {
new TestPolyStruct(new Character('X')),
new TestPolyStruct("test"),
new TestPolyStruct(Float.valueOf(0.123f)),
new TestPolyStruct(new Double(0.456)),
new TestPolyStruct(Double.valueOf(0.456)),
new TestPolyStruct(new com.sun.star.lib.uno.helper.ComponentBase()),
new TestPolyStruct(new com.sun.star.lib.uno.helper.ComponentBase()),
new TestPolyStruct(TestEnum.TWO),
diff --git a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
index 1623af8..83878e1 100644
--- a/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
+++ b/toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java
@@ -288,7 +288,7 @@ public class TMutableGridDataModel
final Object[][] modifyValues = new Object[][] {
new Object[] { 2, 1, "text" },
new Object[] { 3, 0, null },
new Object[] { 0, 4, new Double( 33.0 ) }
new Object[] { 0, 4, Double.valueOf( 33.0 ) }
};
for ( int i = 0; i < modifyValues.length; ++i )
{
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index b15d4af..082a2a7 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -203,7 +203,7 @@ public class NumericalHelper
break;
case TypeClass.DOUBLE_value:
aTypeObject.iType = DOUBLE_TYPE;
aTypeObject.aValue = new Double(AnyConverter.toDouble(aValue));
aTypeObject.aValue = Double.valueOf(AnyConverter.toDouble(aValue));
break;
case TypeClass.STRING_value:
aTypeObject.iType = STRING_TYPE;
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index bb35b04..e4295e4 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -97,11 +97,11 @@ public class RecordParser extends QueryMetaData
Double DblValue;
if (bisDate)
{
DblValue = new Double(xResultSetRow.getDouble(ColIndex) + super.getNullDateCorrection());
DblValue = Double.valueOf(xResultSetRow.getDouble(ColIndex) + super.getNullDateCorrection());
}
else
{
DblValue = new Double(xResultSetRow.getDouble(ColIndex));
DblValue = Double.valueOf(xResultSetRow.getDouble(ColIndex));
}
if (!xResultSetRow.wasNull())
{
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index 5731aa7..73f91b7 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -280,11 +280,11 @@ public class Control extends Shape
if (dblEffMax == 0)
{
// This is relevant for decimal fields
xPropertySet.setPropertyValue("EffectiveValue", new Double(99999));
xPropertySet.setPropertyValue("EffectiveValue", Double.valueOf(99999));
}
else
{
xPropertySet.setPropertyValue("EffectiveValue", new Double(dblEffMax)); //new Double(100000.2));
xPropertySet.setPropertyValue("EffectiveValue", Double.valueOf(dblEffMax)); //Double.valueOf(100000.2));
}
aPreferredSize = getPeer().getPreferredSize();
xPropertySet.setPropertyValue("EffectiveValue", com.sun.star.uno.Any.VOID);
diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java
index a90cc84..fc756fa 100644
--- a/wizards/com/sun/star/wizards/document/DatabaseControl.java
+++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java
@@ -169,20 +169,20 @@ public class DatabaseControl extends Control
switch (getFieldType())
{
case DataType.BIGINT:
xPropertySet.setPropertyValue("EffectiveMax", new Double(Long.MAX_VALUE));
xPropertySet.setPropertyValue("EffectiveMin", new Double(Long.MIN_VALUE));
xPropertySet.setPropertyValue("EffectiveMax", Double.valueOf(Long.MAX_VALUE));
xPropertySet.setPropertyValue("EffectiveMin", Double.valueOf(Long.MIN_VALUE));
break;
case DataType.INTEGER:
xPropertySet.setPropertyValue("EffectiveMax", new Double(Integer.MAX_VALUE));
xPropertySet.setPropertyValue("EffectiveMin", new Double(Integer.MIN_VALUE));
xPropertySet.setPropertyValue("EffectiveMax", Double.valueOf(Integer.MAX_VALUE));
xPropertySet.setPropertyValue("EffectiveMin", Double.valueOf(Integer.MIN_VALUE));
break;
case DataType.SMALLINT:
xPropertySet.setPropertyValue("EffectiveMax", new Double(Short.MAX_VALUE));
xPropertySet.setPropertyValue("EffectiveMin", new Double(Short.MIN_VALUE));
xPropertySet.setPropertyValue("EffectiveMax", Double.valueOf(Short.MAX_VALUE));
xPropertySet.setPropertyValue("EffectiveMin", Double.valueOf(Short.MIN_VALUE));
break;
case DataType.TINYINT:
xPropertySet.setPropertyValue("EffectiveMax", new Double(Byte.MAX_VALUE));
xPropertySet.setPropertyValue("EffectiveMin", new Double(Byte.MIN_VALUE));
xPropertySet.setPropertyValue("EffectiveMax", Double.valueOf(Byte.MAX_VALUE));
xPropertySet.setPropertyValue("EffectiveMin", Double.valueOf(Byte.MIN_VALUE));
break;
case DataType.FLOAT:
case DataType.REAL:
