chart2/qa/TestCaseOldAPI.java | 18 - comphelper/qa/complex/comphelper/Map.java | 12 - javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java | 40 +-- odk/examples/CLI/CSharp/Spreadsheet/SpreadsheetSample.cs | 2 odk/examples/DevelopersGuide/Charts/ChartInCalc.java | 6 odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java | 2 odk/examples/DevelopersGuide/GUI/UnoDialogSample.java | 12 - odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java | 2 odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java | 104 +++++----- odk/examples/DevelopersGuide/Text/TextDocuments.java | 2 odk/examples/java/Drawing/SDraw.java | 3 odk/examples/java/NotesAccess/NotesAccess.java | 2 odk/examples/java/Spreadsheet/ChartTypeChange.java | 2 odk/examples/java/Spreadsheet/SCalc.java | 2 odk/examples/java/Text/HardFormatting.java | 2 odk/examples/java/Text/StyleCreation.java | 4 odk/examples/java/Text/TextDocumentStructure.java | 2 odk/examples/java/ToDo/ToDo.java | 10 qadevOOo/runner/util/CalcTools.java | 2 qadevOOo/runner/util/DBTools.java | 4 qadevOOo/runner/util/ValueChanger.java | 4 qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java | 4 qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java | 4 qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java | 2 qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java | 8 qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java | 2 qadevOOo/tests/java/ifc/chart/_ChartAxis.java | 2 qadevOOo/tests/java/ifc/form/component/_CurrencyField.java | 2 qadevOOo/tests/java/ifc/form/component/_NumericField.java | 2 qadevOOo/tests/java/ifc/sheet/_XCellRangeData.java | 2 qadevOOo/tests/java/ifc/style/_CharacterProperties.java | 8 qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian.java | 4 qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java | 4 qadevOOo/tests/java/mod/_forms/OCurrencyModel.java | 2 qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 4 qadevOOo/tests/java/mod/_sc/ScCellRangeObj.java | 2 qadevOOo/tests/java/mod/_stm/DataInputStream.java | 4 qadevOOo/tests/java/mod/_stm/DataOutputStream.java | 4 qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java | 4 qadevOOo/tests/java/mod/_stm/ObjectInputStream.java | 4 qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java | 4 qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java | 4 qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java | 4 qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java | 4 qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java | 4 qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java | 4 qadevOOo/tests/java/mod/_sw/SwXCellRange.java | 10 qadevOOo/tests/java/mod/_sw/SwXTextTable.java | 4 ridljar/com/sun/star/lib/uno/helper/PropertySet.java | 8 ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java | 4 ridljar/com/sun/star/uno/AnyConverter.java | 12 - ridljar/com/sun/star/uno/UnoRuntime.java | 4 ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java | 6 ridljar/test/com/sun/star/uno/AnyConverter_Test.java | 4 scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh | 2 scripting/examples/beanshell/Highlight/highlighter.bsh | 4 scripting/examples/java/Highlight/HighlightText.java | 2 sfx2/qa/complex/sfx2/DocumentProperties.java | 2 testtools/com/sun/star/comp/bridge/TestComponent.java | 8 toolkit/qa/complex/toolkit/awtgrid/TMutableGridDataModel.java | 2 wizards/com/sun/star/wizards/common/NumericalHelper.java | 4 wizards/com/sun/star/wizards/db/RecordParser.java | 4 wizards/com/sun/star/wizards/document/Control.java | 4 wizards/com/sun/star/wizards/document/DatabaseControl.java | 16 - wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java | 2 wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java | 2 66 files changed, 216 insertions(+), 217 deletions(-)
New commits: commit 41d9584179ef7b4e18eda47c2c0a955df8c087a5 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Nov 2 09:52:08 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Nov 2 12:00:34 2023 +0100 '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.gran...@collabora.co.uk> diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index 0c2571436a21..f5bc4f571c4c 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 d01d1bef362b..51f731732071 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 4943df7d29f8..7cb1af74c7e3 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 1dd2f8a03c9c..812121043e9f 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 c49dbfd77ff4..5b5b0c9ac0b0 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 bbf54af0eb22..8ddfa630e007 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 312ab42d3fd0..36d0d7eece6a 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 e9a84cdbc2e3..05fc41defe90 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 1803395793ea..2b712c17f4d0 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 3d043f6f051a..998bd9fce131 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 4838716a2b1a..635dded0776b 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 e9e84bbb3429..865e8884d53f 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 a4daa1315add..5698cab3f363 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 3538eb6afe10..4ab1a03bdfc5 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 218696664d2a..f305c5823e9a 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 2a295c20886f..0528158b21b4 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 ae1d7de26fd4..422e447c348a 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 463e780c908f..987ba4daa327 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 18d8ca0f981a..6e556bbd7518 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 fed0b5d57e9b..5a117d1dc4ed 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 71a26c0eea32..66e46427f62d 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 c37e04015c31..a4cbdeb5499c 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 73213f0fc5e2..bbb9579a67c4 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 fba607c63d34..10a93b29745b 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 a71b2016821f..214d294561d6 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 91ec8ddc88f2..c8e6ad8fd797 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 5fd361273d81..014f1b6da493 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 a07c7fe903b1..c237efcb6ebb 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 07ea9bfac002..4acded624c99 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 a3b461f3d286..0aa943ce5889 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 de91ef8a07af..7f82f51474d3 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 492cfaccb6a0..f0416a37adfc 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 7b60a1f6c770..9a9d271ab551 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 2ff21ff52e45..fe44aaccdd96 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 ea89e102b836..2d9fadf5101a 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 bf820729c2c9..40d5fb3ee02c 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 e44425d71999..b37eab254e76 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 a054b406fe79..d4cf86424907 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 a1ad705b26a7..6ffc7577d145 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 5b1a5b34d4f4..5f045315db08 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 c5f84b1b79de..fe830f118d6d 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 0660f930f0fb..0348f7224a2c 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 1623af8b68f2..83878e18c7f3 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 b15d4af02bfc..082a2a7733a9 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 bb35b041fe97..e4295e473424 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 5731aa7cf26f..73f91b75e872 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 a90cc849fb7f..fc756fa4c049 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: commit cb982f14796aa4dc4362bc6fde74161afa11777b Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Nov 2 09:47:02 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Nov 2 12:00:24 2023 +0100 'new Float' is deprecated in Java replace with Float.valueOf Change-Id: Ib6408b24dac2953789d0ec67e73b8be8aefca252 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158784 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index 613ba480e7be..0c2571436a21 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -162,7 +162,7 @@ public class TestCaseOldAPI extends ComplexTestCase { float fHeight = (float)17.0; xTitleProp.setPropertyValue( "String", aTitle ); - xTitleProp.setPropertyValue( "CharHeight", new Float( fHeight ) ); + xTitleProp.setPropertyValue( "CharHeight", Float.valueOf( fHeight ) ); float fNewHeight = AnyConverter.toFloat( xTitleProp.getPropertyValue( "CharHeight" ) ); assure( "Changing CharHeight via old API failed", fNewHeight == fHeight ); @@ -213,8 +213,8 @@ public class TestCaseOldAPI extends ComplexTestCase { float fHeight = (float)14.0; xTitleProp.setPropertyValue( "CharColor", Integer.valueOf( nColor ) ); - xTitleProp.setPropertyValue( "CharWeight", new Float( fWeight )); - xTitleProp.setPropertyValue( "CharHeight", new Float( fHeight ) ); + xTitleProp.setPropertyValue( "CharWeight", Float.valueOf( fWeight )); + xTitleProp.setPropertyValue( "CharHeight", Float.valueOf( fHeight ) ); int nNewColor = AnyConverter.toInt( xTitleProp.getPropertyValue( "CharColor" ) ); assure( "Changing CharColor via old API failed", nNewColor == nColor ); @@ -390,7 +390,7 @@ public class TestCaseOldAPI extends ComplexTestCase { assure( "Property LineColor", AnyConverter.toInt( xProp.getPropertyValue( "LineColor" )) == nNewColor ); float fNewCharHeight = (float)(16.0); - xProp.setPropertyValue( "CharHeight", new Float( fNewCharHeight )); + xProp.setPropertyValue( "CharHeight", Float.valueOf( fNewCharHeight )); assure( "Property CharHeight", AnyConverter.toFloat( xProp.getPropertyValue( "CharHeight" )) == fNewCharHeight ); @@ -444,7 +444,7 @@ public class TestCaseOldAPI extends ComplexTestCase { xLegendProp.getPropertyValue( "Alignment" )) == eNewPos ); float fNewCharHeight = (float)(11.0); - xLegendProp.setPropertyValue( "CharHeight", new Float( fNewCharHeight )); + xLegendProp.setPropertyValue( "CharHeight", Float.valueOf( fNewCharHeight )); assure( "Property CharHeight", AnyConverter.toFloat( xLegendProp.getPropertyValue( "CharHeight" )) == fNewCharHeight ); 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 41149ba61a18..4943df7d29f8 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 @@ -96,7 +96,7 @@ public class PropertySet_Test cl.setPropertyValue("PropLongA", value); assertEquals(cl.getPropertyValue("PropLongA"), value); - value= new Float(3.14); + value= Float.valueOf(3.14f); cl.setPropertyValue("PropFloatA", value); assertEquals(cl.getPropertyValue("PropFloatA"), value); @@ -169,7 +169,7 @@ public class PropertySet_Test cl.setPropertyValue("PropObjectA", value); assertEquals(cl.getPropertyValue("PropObjectA"), value); - value= new Float(3.14); + value= Float.valueOf(3.14f); cl.setPropertyValue("PropObjectA", value); assertEquals(cl.getPropertyValue("PropObjectA"), value); @@ -238,7 +238,7 @@ public class PropertySet_Test assertTrue(ret instanceof Any); assertTrue(util.anyEquals(value, ret)); - value= new Float(3.14); + value= Float.valueOf(3.14f); cl.setPropertyValue("PropAnyA", value); ret= cl.getPropertyValue("PropAnyA"); assertTrue(ret instanceof Any); @@ -318,7 +318,7 @@ public class PropertySet_Test assertTrue(ret instanceof Long); assertTrue(util.anyEquals(value, ret)); - value= new Any(new Type(float.class), new Float(3.14)); + value= new Any(new Type(float.class), Float.valueOf(3.14f)); cl.setPropertyValue("PropFloatA", value); ret= cl.getPropertyValue("PropFloatA"); assertTrue(ret instanceof Float); @@ -398,7 +398,7 @@ public class PropertySet_Test assertTrue(ret instanceof Any); assertTrue(util.anyEquals(value, ret)); - value= new Any(new Type(float.class), new Float(3.14)); + value= new Any(new Type(float.class), Float.valueOf(3.14f)); cl.setPropertyValue("PropAnyA", value); ret= cl.getPropertyValue("PropAnyA"); assertTrue(ret instanceof Any); @@ -466,7 +466,7 @@ public class PropertySet_Test cl.setPropertyValue("PropLongClass", value); assertEquals(cl.getPropertyValue("PropLongClass"), value); - value= new Float(3.14); + value= Float.valueOf(3.14f); cl.setPropertyValue("PropFloatClass", value); assertEquals(cl.getPropertyValue("PropFloatClass"), value); @@ -514,7 +514,7 @@ public class PropertySet_Test assertTrue(ret instanceof Long); assertTrue(util.anyEquals(value, ret)); - value= new Any(new Type(float.class), new Float(3.14)); + value= new Any(new Type(float.class), Float.valueOf(3.14f)); cl.setPropertyValue("PropFloatClass", value); ret= cl.getPropertyValue("PropFloatClass"); assertTrue(ret instanceof Float); @@ -1197,7 +1197,7 @@ class TestClass extends PropertySet assertTrue(outNewVal[0] instanceof Long); assertEquals(outNewVal[0], value); - value= new Float(3.14); + value= Float.valueOf(3.14f); assertTrue(convertPropertyValue(propFloatA, outNewVal, outOldVal, value)); assertTrue(outNewVal[0] instanceof Float); assertEquals(outNewVal[0], value); @@ -1353,7 +1353,7 @@ class TestClass extends PropertySet assertTrue(outNewVal[0] instanceof Long); assertEquals(outNewVal[0], value); - value= new Float(3.14); + value= Float.valueOf(3.14f); assertTrue(convertPropertyValue(propFloatClass, outNewVal, outOldVal, value)); assertTrue(outNewVal[0] instanceof Float); assertEquals(outNewVal[0], value); @@ -1392,7 +1392,7 @@ class TestClass extends PropertySet setPropertyValueNoBroadcast(propLongA, value); assertEquals(longPropA, ((Long) value).longValue()); - value= new Float(3.14); + value= Float.valueOf(3.14f); setPropertyValueNoBroadcast(propFloatA, value); assertEquals(floatPropA, ((Float) value).floatValue(), 0.0f); diff --git a/odk/examples/DevelopersGuide/Charts/ChartInCalc.java b/odk/examples/DevelopersGuide/Charts/ChartInCalc.java index d974d6e45e95..2ca6546f5a66 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInCalc.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInCalc.java @@ -260,9 +260,9 @@ public class ChartInCalc // add a label text with bold font, bordeaux red 14pt aPointProp.setPropertyValue( "DataCaption", Integer.valueOf( ChartDataCaption.VALUE )); - aPointProp.setPropertyValue( "CharHeight", new Float( 14.0 )); + aPointProp.setPropertyValue( "CharHeight", Float.valueOf( 14.0f )); aPointProp.setPropertyValue( "CharColor", Integer.valueOf( 0x993366 )); - aPointProp.setPropertyValue( "CharWeight", new Float( FontWeight.BOLD )); + aPointProp.setPropertyValue( "CharWeight", Float.valueOf( FontWeight.BOLD )); } catch( IndexOutOfBoundsException ex ) { @@ -318,7 +318,7 @@ public class ChartInCalc if( aTitleProp != null ) { aTitleProp.setPropertyValue( "String", "Random Scatter Chart" ); - aTitleProp.setPropertyValue( "CharHeight", new Float(14.0) ); + aTitleProp.setPropertyValue( "CharHeight", Float.valueOf(14.0f) ); } // align title with y axis diff --git a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java index 2dd4e9c0e68d..66bb2d8d6420 100644 --- a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java +++ b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java @@ -319,7 +319,7 @@ public class HelloTextTableShape { xCursorProps.setPropertyValue("CharPosture", com.sun.star.awt.FontSlant.ITALIC); xCursorProps.setPropertyValue("CharWeight", - new Float(com.sun.star.awt.FontWeight.BOLD)); + Float.valueOf(com.sun.star.awt.FontWeight.BOLD)); // add more text at the end of the text using insertString xTextCursor.gotoEnd(false); diff --git a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java index 0696a866cdc3..872337013c26 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java @@ -244,7 +244,7 @@ public class SpreadsheetDocHelper xCell.setFormula( aHeadline ); xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCell ); xPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0x003399 ) ); - xPropSet.setPropertyValue( "CharWeight", new Float( com.sun.star.awt.FontWeight.BOLD ) ); + xPropSet.setPropertyValue( "CharWeight", Float.valueOf( com.sun.star.awt.FontWeight.BOLD ) ); } diff --git a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java index ce65555289fc..bbf54af0eb22 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java @@ -263,7 +263,7 @@ public class SpreadsheetSample extends SpreadsheetDocHelper xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCell ); // from styles.CharacterProperties xPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0x003399 ) ); - xPropSet.setPropertyValue( "CharHeight", new Float( 20.0 ) ); + xPropSet.setPropertyValue( "CharHeight", Float.valueOf( 20.0f ) ); // from styles.ParagraphProperties xPropSet.setPropertyValue( "ParaLeftMargin", Integer.valueOf( 500 ) ); // from table.CellProperties @@ -314,7 +314,7 @@ public class SpreadsheetSample extends SpreadsheetDocHelper xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCellRange ); // from com.sun.star.styles.CharacterProperties xPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0x003399 ) ); - xPropSet.setPropertyValue( "CharHeight", new Float( 20.0 ) ); + xPropSet.setPropertyValue( "CharHeight", Float.valueOf( 20.0f ) ); // from com.sun.star.styles.ParagraphProperties xPropSet.setPropertyValue( "ParaLeftMargin", Integer.valueOf( 500 ) ); // from com.sun.star.table.CellProperties diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java index 1a1a82762612..2ccd270e281d 100644 --- a/odk/examples/DevelopersGuide/Text/TextDocuments.java +++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java @@ -533,7 +533,7 @@ public class TextDocuments { XPropertySet xCursorProps = UnoRuntime.queryInterface( XPropertySet.class, mxDocCursor ); xCursorProps.setPropertyValue ( "CharWeight", - new Float(com.sun.star.awt.FontWeight.BOLD) ); + Float.valueOf(com.sun.star.awt.FontWeight.BOLD) ); // replace the '.' at the end of the sentence with a new string xSentenceCursor.gotoEndOfSentence( false ); diff --git a/odk/examples/java/Drawing/SDraw.java b/odk/examples/java/Drawing/SDraw.java index 5d2f9a52e941..a02d41ee01d9 100644 --- a/odk/examples/java/Drawing/SDraw.java +++ b/odk/examples/java/Drawing/SDraw.java @@ -221,8 +221,7 @@ public class SDraw { size.Height = height; size.Width = width; position.X = (x+(i*40)); - position.Y = - (new Float(y+(Math.sin((i*Math.PI)/180))*5000)).intValue(); + position.Y = (int)(y+(Math.sin((i*Math.PI)/180))*5000); xShape.setSize(size); xShape.setPosition(position); diff --git a/odk/examples/java/NotesAccess/NotesAccess.java b/odk/examples/java/NotesAccess/NotesAccess.java index 0d0a0bb5ee60..8945a9e9984e 100644 --- a/odk/examples/java/NotesAccess/NotesAccess.java +++ b/odk/examples/java/NotesAccess/NotesAccess.java @@ -271,7 +271,7 @@ public class NotesAccess implements Runnable { System.out.println( "Could not get Cell" ); } if ( stringFlag.equals( "V" )) { - xCell.setValue((new Float(stringValue)).floatValue()); + xCell.setValue((Float.valueOf(stringValue)).floatValue()); } else { xCell.setFormula(stringValue); diff --git a/odk/examples/java/Spreadsheet/ChartTypeChange.java b/odk/examples/java/Spreadsheet/ChartTypeChange.java index d436b388925e..78f8b14bb417 100644 --- a/odk/examples/java/Spreadsheet/ChartTypeChange.java +++ b/odk/examples/java/Spreadsheet/ChartTypeChange.java @@ -336,7 +336,7 @@ public class ChartTypeChange { System.out.println( "Could not get cell." ); } if ( stringFlag.equals( "V" ) ) { - xcell.setValue( ( new Float( stringValue ) ).floatValue() ); + xcell.setValue( ( Float.valueOf( stringValue ) ).floatValue() ); } else { xcell.setFormula( stringValue ); diff --git a/odk/examples/java/Spreadsheet/SCalc.java b/odk/examples/java/Spreadsheet/SCalc.java index 90c5ce00f41d..db1bee8a803a 100644 --- a/odk/examples/java/Spreadsheet/SCalc.java +++ b/odk/examples/java/Spreadsheet/SCalc.java @@ -374,7 +374,7 @@ public class SCalc { } if (flag.equals("V")) { - xCell.setValue((new Float(theValue)).floatValue()); + xCell.setValue((Float.valueOf(theValue)).floatValue()); } else { xCell.setFormula(theValue); } diff --git a/odk/examples/java/Text/HardFormatting.java b/odk/examples/java/Text/HardFormatting.java index 81a294c86320..2dcc7b084e36 100644 --- a/odk/examples/java/Text/HardFormatting.java +++ b/odk/examples/java/Text/HardFormatting.java @@ -119,7 +119,7 @@ public class HardFormatting { xPropertySet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xWordCursor); xPropertySet.setPropertyValue("CharWeight", - new Float(com.sun.star.awt.FontWeight.BOLD)); + Float.valueOf(com.sun.star.awt.FontWeight.BOLD)); xPropertySet.setPropertyValue("CharColor", Integer.valueOf( 255 ) ); System.out.println( diff --git a/odk/examples/java/Text/StyleCreation.java b/odk/examples/java/Text/StyleCreation.java index d5151eca7c29..5ad1c9498a26 100644 --- a/odk/examples/java/Text/StyleCreation.java +++ b/odk/examples/java/Text/StyleCreation.java @@ -93,11 +93,11 @@ public class StyleCreation { xPropertySet.setPropertyValue("CharFontName", "Helvetica" ); System.out.println( "set name of the font to 'Helvetica'" ); - xPropertySet.setPropertyValue("CharHeight", new Float( 36 ) ); + xPropertySet.setPropertyValue("CharHeight", Float.valueOf( 36 ) ); System.out.println( "Change the height of th font to 36" ); xPropertySet.setPropertyValue("CharWeight", - new Float( com.sun.star.awt.FontWeight.BOLD ) ); + Float.valueOf( com.sun.star.awt.FontWeight.BOLD ) ); System.out.println( "set the font attribute 'Bold'" ); xPropertySet.setPropertyValue("CharAutoKerning", Boolean.TRUE ); diff --git a/odk/examples/java/Text/TextDocumentStructure.java b/odk/examples/java/Text/TextDocumentStructure.java index 7f284556d3f5..a1043a44775f 100644 --- a/odk/examples/java/Text/TextDocumentStructure.java +++ b/odk/examples/java/Text/TextDocumentStructure.java @@ -186,7 +186,7 @@ public class TextDocumentStructure { UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xWordCursor ); xPropertySet.setPropertyValue("CharWeight", - new Float( com.sun.star.awt.FontWeight.BOLD )); + Float.valueOf( com.sun.star.awt.FontWeight.BOLD )); System.out.println("create example data"); } diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java index 8a6c51936863..3d043f6f051a 100644 --- a/qadevOOo/runner/util/ValueChanger.java +++ b/qadevOOo/runner/util/ValueChanger.java @@ -78,7 +78,7 @@ public class ValueChanger { newValue = Byte.valueOf((byte) (oldbyte + 1)); } else if (oldValue instanceof Float) { float oldfloat = ((Float) oldValue).floatValue(); - newValue = new Float((float) (oldfloat + 16.7)); + newValue = Float.valueOf((float) (oldfloat + 16.7)); } else if (oldValue instanceof Double) { double olddouble = ((Double) oldValue).doubleValue(); newValue = new Double(olddouble + 17.8); 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 7ce7a80b618d..4838716a2b1a 100644 --- a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java +++ b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java @@ -214,7 +214,7 @@ public class MyPersistObject implements XPersistObject, XTypeProvider, if ( property.equals(props[3].Name)) return new Double(d); if ( property.equals(props[4].Name)) - return new Float(f); + return Float.valueOf(f); if ( property.equals(props[5].Name)) return Short.valueOf(s); if ( property.equals(props[6].Name)) diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index b72874768ab2..e9e84bbb3429 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -323,7 +323,7 @@ public class _XAccessibleValue extends MultiMethodTest { return Short.valueOf((short)val); } else if (clazz.equals(Float.class)) { - return new Float((float)val); + return Float.valueOf((float)val); } else if (clazz.equals(Double.class)) { return new Double(val); diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java index fea9da4e4a3d..90f6b85315f3 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java @@ -109,9 +109,9 @@ public class _CharacterProperties extends MultiPropertyTest { @Override protected Object getNewValue(String propName, Object old) { if (utils.isVoid(old)) { - return new Float(10) ; + return Float.valueOf(10) ; } else { - return new Float(((Float) old).floatValue() + 10) ; + return Float.valueOf(((Float) old).floatValue() + 10) ; } } }) ; @@ -143,8 +143,8 @@ public class _CharacterProperties extends MultiPropertyTest { } public void _CharWeight() { - testProperty("CharWeight", new Float(com.sun.star.awt.FontWeight.BOLD), - new Float(com.sun.star.awt.FontWeight.THIN)) ; + testProperty("CharWeight", Float.valueOf(com.sun.star.awt.FontWeight.BOLD), + Float.valueOf(com.sun.star.awt.FontWeight.THIN)) ; } public void _CharPosture() { diff --git a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian.java b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian.java index 96578c3bc77c..d14b7edbc76c 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesAsian.java @@ -50,8 +50,8 @@ public class _CharacterPropertiesAsian extends MultiPropertyTest { } public void _CharWeightAsian() { - testProperty("CharWeightAsian", new Float(FontWeight.NORMAL), - new Float(FontWeight.BOLD)); + testProperty("CharWeightAsian", Float.valueOf(FontWeight.NORMAL), + Float.valueOf(FontWeight.BOLD)); } public void _ParaIsCharacterDistance() { diff --git a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java index 2582ff8c5bec..557f6edcf7aa 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterPropertiesComplex.java @@ -40,8 +40,8 @@ import lib.MultiPropertyTest; public class _CharacterPropertiesComplex extends MultiPropertyTest { public void _CharWeightComplex() { - testProperty("CharWeightComplex", new Float(com.sun.star.awt.FontWeight.BOLD), - new Float(com.sun.star.awt.FontWeight.THIN)) ; + testProperty("CharWeightComplex", Float.valueOf(com.sun.star.awt.FontWeight.BOLD), + Float.valueOf(com.sun.star.awt.FontWeight.THIN)) ; } public void _CharPostureComplex() { diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 0683ab01cffa..71a26c0eea32 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -593,7 +593,7 @@ public class ODatabaseForm extends TestCase { params.add(Short.valueOf((short) 234)) ; params.add(Integer.valueOf(12345)) ; params.add(Long.valueOf(23456)) ; - params.add(new Float(1.234)) ; + params.add(Float.valueOf(1.234f)) ; params.add(new Double(2.345)) ; params.add(new byte[] {1, 2, 3}) ; Date d = new Date(); diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java index ee55f57fa99d..73213f0fc5e2 100644 --- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java @@ -115,7 +115,7 @@ public class DataInputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java index ead4fc671bb2..fba607c63d34 100644 --- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java @@ -104,7 +104,7 @@ public class DataOutputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java index 6765ba721ef0..a71b2016821f 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java @@ -127,7 +127,7 @@ public class MarkableOutputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java index e40f2a12e187..91ec8ddc88f2 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java @@ -216,7 +216,7 @@ public class ObjectInputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java index 37f091b9f0ad..5fd361273d81 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java @@ -208,7 +208,7 @@ public class ObjectOutputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java index a1c4a49d9bfc..a07c7fe903b1 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java @@ -114,7 +114,7 @@ public class DataInputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java index fad95930a81d..07ea9bfac002 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java @@ -103,7 +103,7 @@ public class DataOutputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java index f08b20f175c3..a3b461f3d286 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java @@ -126,7 +126,7 @@ public class MarkableOutputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java index 6be959ed9fd2..de91ef8a07af 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java @@ -222,7 +222,7 @@ public class ObjectInputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java index 98ffcbcb32ee..492cfaccb6a0 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java @@ -207,7 +207,7 @@ public class ObjectOutputStream extends TestCase { data.add(new Character((char)1234)) ; data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; - data.add(new Float(1.234)) ; + data.add(Float.valueOf(1.234f)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; // information for writing to the pipe diff --git a/ridljar/com/sun/star/lib/uno/helper/PropertySet.java b/ridljar/com/sun/star/lib/uno/helper/PropertySet.java index 67a4f0c98062..ea89e102b836 100644 --- a/ridljar/com/sun/star/lib/uno/helper/PropertySet.java +++ b/ridljar/com/sun/star/lib/uno/helper/PropertySet.java @@ -747,7 +747,7 @@ XMultiPropertySet else if (cl.equals(long.class)) retVal= Long.valueOf(AnyConverter.toLong(obj)); else if (cl.equals(float.class)) - retVal= new Float(AnyConverter.toFloat(obj)); + retVal= Float.valueOf(AnyConverter.toFloat(obj)); else if (cl.equals(double.class)) retVal= new Double(AnyConverter.toDouble(obj)); else if (cl.equals(String.class)) @@ -769,7 +769,7 @@ XMultiPropertySet else if (cl.equals(Long.class)) retVal= Long.valueOf(AnyConverter.toLong(obj)); else if (cl.equals(Float.class)) - retVal= new Float(AnyConverter.toFloat(obj)); + retVal= Float.valueOf(AnyConverter.toFloat(obj)); else if (cl.equals(Double.class)) retVal= new Double(AnyConverter.toDouble(obj)); else if (XInterface.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 c16d19291356..bf820729c2c9 100644 --- a/ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java +++ b/ridljar/com/sun/star/lib/uno/protocols/urp/Unmarshal.java @@ -255,7 +255,7 @@ final class Unmarshal { } private Float readFloatValue() throws IOException { - return new Float(input.readFloat()); + return Float.valueOf(input.readFloat()); } private Double readDoubleValue() throws IOException { diff --git a/ridljar/com/sun/star/uno/AnyConverter.java b/ridljar/com/sun/star/uno/AnyConverter.java index d36542e1a67a..e44425d71999 100644 --- a/ridljar/com/sun/star/uno/AnyConverter.java +++ b/ridljar/com/sun/star/uno/AnyConverter.java @@ -599,9 +599,9 @@ public class AnyConverter case TypeClass.FLOAT_value: switch (tc) { case TypeClass.BYTE_value: - return new Float( ((Byte)object).byteValue() ); + return Float.valueOf( ((Byte)object).byteValue() ); case TypeClass.SHORT_value: - return new Float( ((Short)object).shortValue() ); + return Float.valueOf( ((Short)object).shortValue() ); case TypeClass.FLOAT_value: return object; } diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java index 1f011aa77050..a054b406fe79 100644 --- a/ridljar/com/sun/star/uno/UnoRuntime.java +++ b/ridljar/com/sun/star/uno/UnoRuntime.java @@ -332,7 +332,7 @@ public class UnoRuntime { case TypeClass.UNSIGNED_HYPER_value: return Long.valueOf(0); case TypeClass.FLOAT_value: - return new Float(0.0f); + return Float.valueOf(0.0f); case TypeClass.DOUBLE_value: return new Double(0.0); case TypeClass.CHAR_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 5cf5f73e6554..a1ad705b26a7 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 @@ -49,7 +49,7 @@ public final class Marshaling_Test { new Character('k'), new Double(0.12345), TestEnum.B, - new Float(0.5678), + Float.valueOf(0.5678f), Integer.valueOf(0), Integer.valueOf(128), Integer.valueOf(0x0f00), diff --git a/ridljar/test/com/sun/star/uno/AnyConverter_Test.java b/ridljar/test/com/sun/star/uno/AnyConverter_Test.java index faa955a96582..5b1a5b34d4f4 100644 --- a/ridljar/test/com/sun/star/uno/AnyConverter_Test.java +++ b/ridljar/test/com/sun/star/uno/AnyConverter_Test.java @@ -61,7 +61,7 @@ public final class AnyConverter_Test { aShort= Short.valueOf((short) 11111); aInt= Integer.valueOf( 1111111); aLong= Long.valueOf( 0xffffffff); - aFloat= new Float( 3.14); + aFloat= Float.valueOf( 3.14f); aDouble= new Double( 3.145); aObj= new ATypeProvider(); aStr= "I am a string"; diff --git a/scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh b/scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh index ac6efacce5d3..74f00ca1efa1 100644 --- a/scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh +++ b/scripting/examples/beanshell/Highlight/ButtonPressHandler.bsh @@ -80,7 +80,7 @@ else // Sets the replaced text property fontweight value to Bold PropertyValue wv = new PropertyValue("CharWeight", -1, - new Float(com.sun.star.awt.FontWeight.BOLD), + Float.valueOf(com.sun.star.awt.FontWeight.BOLD), com.sun.star.beans.PropertyState.DIRECT_VALUE); // Sets the replaced text property color value to RGB parameter diff --git a/scripting/examples/beanshell/Highlight/highlighter.bsh b/scripting/examples/beanshell/Highlight/highlighter.bsh index a69f76e1a113..576650392c41 100644 --- a/scripting/examples/beanshell/Highlight/highlighter.bsh +++ b/scripting/examples/beanshell/Highlight/highlighter.bsh @@ -44,12 +44,12 @@ int replaceText(searchKey, color, bold) { wv = null; if (bold) { wv = new PropertyValue("CharWeight", -1, - new Float(com.sun.star.awt.FontWeight.BOLD), + Float.valueOf(com.sun.star.awt.FontWeight.BOLD), com.sun.star.beans.PropertyState.DIRECT_VALUE); } else { wv = new PropertyValue("CharWeight", -1, - new Float(com.sun.star.awt.FontWeight.NORMAL), + Float.valueOf(com.sun.star.awt.FontWeight.NORMAL), com.sun.star.beans.PropertyState.DIRECT_VALUE); } diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java index f39ccbfa22bf..cc381cec8e59 100644 --- a/scripting/examples/java/Highlight/HighlightText.java +++ b/scripting/examples/java/Highlight/HighlightText.java @@ -142,7 +142,7 @@ public class HighlightText implements com.sun.star.awt.XActionListener { // Sets the replaced text property fontweight value to Bold PropertyValue wv = new PropertyValue("CharWeight", -1, - new Float(com.sun.star.awt.FontWeight.BOLD), + Float.valueOf(com.sun.star.awt.FontWeight.BOLD), com.sun.star.beans.PropertyState.DIRECT_VALUE); // Sets the replaced text property color value to RGB parameter diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java index 271b139565fb..0660f930f0fb 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponent.java +++ b/testtools/com/sun/star/comp/bridge/TestComponent.java @@ -1211,7 +1211,7 @@ public class TestComponent { new Any(Type.UNSIGNED_LONG, Integer.valueOf(-1)), Long.valueOf(Long.MIN_VALUE), new Any(Type.UNSIGNED_HYPER, Long.valueOf(-1L)), - new Float(0.123f), + Float.valueOf(0.123f), new Double(0.456), new Character('X'), "test", @@ -1268,7 +1268,7 @@ public class TestComponent { new TestPolyStruct(Long.valueOf(Long.MIN_VALUE)), new TestPolyStruct(new Character('X')), new TestPolyStruct("test"), - new TestPolyStruct(new Float(0.123f)), + new TestPolyStruct(Float.valueOf(0.123f)), new TestPolyStruct(new Double(0.456)), new TestPolyStruct(new com.sun.star.lib.uno.helper.ComponentBase()), new TestPolyStruct(new com.sun.star.lib.uno.helper.ComponentBase()), diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index af74704df4a2..b15d4af02bfc 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -199,7 +199,7 @@ public class NumericalHelper break; case TypeClass.FLOAT_value: aTypeObject.iType = FLOAT_TYPE; - aTypeObject.aValue = new Float(AnyConverter.toFloat(aValue)); + aTypeObject.aValue = Float.valueOf(AnyConverter.toFloat(aValue)); break; case TypeClass.DOUBLE_value: aTypeObject.iType = DOUBLE_TYPE; diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java index a7343d9010f7..54f0c492b02d 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java @@ -142,7 +142,7 @@ public class DesignTemplate { a = SectionEmptyObject.create(); // an empty group has to use bold font - a.setPropertyValue("CharWeight", new Float(com.sun.star.awt.FontWeight.BOLD)); + a.setPropertyValue("CharWeight", Float.valueOf(com.sun.star.awt.FontWeight.BOLD)); } return a; } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java index c6d3887cccaf..f39cc47174ed 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/SectionObject.java @@ -60,7 +60,7 @@ abstract public class SectionObject public void setFontToBold() { - setPropertyValue("CharWeight", new Float(com.sun.star.awt.FontWeight.BOLD)); + setPropertyValue("CharWeight", Float.valueOf(com.sun.star.awt.FontWeight.BOLD)); } public void setPropertyValue(String _sKey, Object _nValue)