From ff0ad0493ee1729c726587f667761b04101d774c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 12 Aug 2014 15:09:06 +0200 Subject: java: use 'Integer.valueOf' instead of 'new Integer' Change-Id: Ia8befb8d69914ce971174fc5f2ffc0e2f506a940 --- .../java/ifc/accessibility/_XAccessibleEditableText.java | 2 +- .../tests/java/ifc/accessibility/_XAccessibleValue.java | 6 +++--- qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java | 6 +++--- qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java | 10 +++++----- qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java | 12 ++++++------ qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java | 6 +++--- .../tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java | 8 ++++---- qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java | 14 +++++++------- qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java | 6 +++--- qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java | 12 ++++++------ .../tests/java/ifc/awt/_UnoControlFileControlModel.java | 8 ++++---- qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java | 4 ++-- qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java | 12 ++++++------ .../tests/java/ifc/awt/_UnoControlFormattedFieldModel.java | 10 +++++----- qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java | 8 ++++---- .../tests/java/ifc/awt/_UnoControlImageControlModel.java | 4 ++-- qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java | 12 ++++++------ .../tests/java/ifc/awt/_UnoControlNumericFieldModel.java | 8 ++++---- .../tests/java/ifc/awt/_UnoControlPatternFieldModel.java | 8 ++++---- .../tests/java/ifc/awt/_UnoControlProgressBarModel.java | 6 +++--- .../tests/java/ifc/awt/_UnoControlRadioButtonModel.java | 10 +++++----- qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java | 10 +++++----- .../tests/java/ifc/awt/_UnoControlSpinButtonModel.java | 6 +++--- qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java | 10 +++++----- qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java | 2 +- qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java | 2 +- qadevOOo/tests/java/ifc/chart/_BarDiagram.java | 4 ++-- .../tests/java/ifc/chart/_ChartDataPointProperties.java | 2 +- qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java | 2 +- qadevOOo/tests/java/ifc/chart/_ChartTitle.java | 2 +- qadevOOo/tests/java/ifc/chart/_LineDiagram.java | 12 ++++++------ .../java/ifc/configuration/backend/_XLayerHandler.java | 2 +- .../java/ifc/configuration/backend/_XUpdateHandler.java | 2 +- .../java/ifc/drawing/_DimensioningShapeDescriptor.java | 2 +- qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java | 2 +- qadevOOo/tests/java/ifc/drawing/_Shape.java | 2 +- qadevOOo/tests/java/ifc/form/component/_DateField.java | 2 +- qadevOOo/tests/java/ifc/form/component/_GridControl.java | 6 +++--- .../tests/java/ifc/form/component/_NavigationToolBar.java | 4 ++-- qadevOOo/tests/java/ifc/form/component/_TimeField.java | 2 +- .../ifc/form/validation/_XValidatableFormComponent.java | 2 +- qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java | 2 +- .../tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java | 6 +++--- qadevOOo/tests/java/ifc/script/_XTypeConverter.java | 2 +- qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java | 4 ++-- qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java | 2 +- qadevOOo/tests/java/ifc/text/_BaseFrame.java | 2 +- qadevOOo/tests/java/ifc/text/_TextColumns.java | 2 +- qadevOOo/tests/java/ifc/util/_XURLTransformer.java | 12 ++++++------ 49 files changed, 141 insertions(+), 141 deletions(-) (limited to 'qadevOOo/tests/java/ifc') diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java index ce54ea09c6b9..0b5f401437ef 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleEditableText.java @@ -464,7 +464,7 @@ public class _XAccessibleEditableText extends MultiMethodTest { //change old attributes set for(int i = 0; i < attrs.length; i++) { if (attrs[i].Name.equals("CharColor")) { - attrs[i].Value = new Integer(-2); + attrs[i].Value = Integer.valueOf(-2); } } diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index 783ba99252a4..c1b700e29bc3 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -80,7 +80,7 @@ public class _XAccessibleValue extends MultiMethodTest { double curVal ; val = oObj.getCurrentValue() ; if (util.utils.isVoid(val)) { - val = new Integer(0); + val = Integer.valueOf(0); curVal = 0; } else { curVal = getDoubleValue(val); @@ -211,7 +211,7 @@ public class _XAccessibleValue extends MultiMethodTest { curValAnother); log.println("Set value of base component to " + curValAnother); if (tEnv.getTestCase().getObjectName().equals("AccessibleRadioButton")) { - anotherFromGroup.setCurrentValue(new Integer(curValBase)); + anotherFromGroup.setCurrentValue(Integer.valueOf(curValBase)); } else { oObj.setCurrentValue(valAnotherFromGroup); } @@ -317,7 +317,7 @@ public class _XAccessibleValue extends MultiMethodTest { private Object getObjectValue(double val, Class clazz) { if (clazz.equals(Integer.class)) { - return new Integer((int)val); + return Integer.valueOf((int)val); } else if (clazz.equals(Short.class)) { return new Short((short)val); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java index d9a3d5424eee..d49fdb62cca1 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java @@ -44,10 +44,10 @@ public class _UnoControlButtonModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java index 263205974388..74906e8bf0c7 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlCheckBoxModel.java @@ -45,10 +45,10 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; @@ -60,7 +60,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -87,7 +87,7 @@ public class _UnoControlCheckBoxModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - if (utils.isVoid(old)) return new Integer(12345) ; + if (utils.isVoid(old)) return Integer.valueOf(12345) ; else return null ; } }) ; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java index 2f61348e09f7..1d1bf7880bd0 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java @@ -53,7 +53,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -66,7 +66,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -79,7 +79,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -114,10 +114,10 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java index 92d820caf1f0..a57e92986e81 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlContainerModel.java @@ -44,10 +44,10 @@ public class _UnoControlContainerModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java index cedc9274c009..a4daa1315add 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlCurrencyFieldModel.java @@ -56,7 +56,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return utils.isVoid(old) ? new Integer(6543) : null ; + return utils.isVoid(old) ? Integer.valueOf(6543) : null ; } }) ; } @@ -82,7 +82,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -95,7 +95,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return utils.isVoid(old) ? new Integer(123) : null ; + return utils.isVoid(old) ? Integer.valueOf(123) : null ; } }) ; } @@ -108,7 +108,7 @@ public class _UnoControlCurrencyFieldModel extends MultiPropertyTest { testProperty("TextLineColor", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return utils.isVoid(old) ? new Integer(123) : null ; + return utils.isVoid(old) ? Integer.valueOf(123) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java index cbbf2e2592cb..e0918f9e9461 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlDateFieldModel.java @@ -55,7 +55,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return utils.isVoid(old) ? new Integer(6543) : null ; + return utils.isVoid(old) ? Integer.valueOf(6543) : null ; } }) ; } @@ -68,7 +68,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -82,7 +82,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { testProperty("Date", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return utils.isVoid(old) ? new Integer(6543) : + return utils.isVoid(old) ? Integer.valueOf(6543) : super.getNewValue(prop, old) ; } }) ; @@ -109,7 +109,7 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return utils.isVoid(old) ? new Integer(123) : null ; + return utils.isVoid(old) ? Integer.valueOf(123) : null ; } }) ; } @@ -120,10 +120,10 @@ public class _UnoControlDateFieldModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java index 7d4216d39cd3..e3fbbed11a0e 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlDialogModel.java @@ -47,7 +47,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -60,7 +60,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -73,7 +73,7 @@ public class _UnoControlDialogModel extends MultiPropertyTest { testProperty("TextLineColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java index 38a888e65325..6d2617ccb739 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlEditModel.java @@ -57,7 +57,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -70,7 +70,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -83,7 +83,7 @@ public class _UnoControlEditModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -107,10 +107,10 @@ public class _UnoControlEditModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java index 54fddfe7715c..4e4e3ae7f1f8 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFileControlModel.java @@ -53,7 +53,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -66,7 +66,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -79,7 +79,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -92,7 +92,7 @@ public class _UnoControlFileControlModel extends MultiPropertyTest { testProperty("TextLineColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java index 52bf9fd262c8..bea4e906f876 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedLineModel.java @@ -48,7 +48,7 @@ public class _UnoControlFixedLineModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -61,7 +61,7 @@ public class _UnoControlFixedLineModel extends MultiPropertyTest { testProperty("TextLineColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java index dd4ee692761a..3b2ed525f838 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFixedTextModel.java @@ -50,7 +50,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -63,7 +63,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -76,7 +76,7 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -87,10 +87,10 @@ public class _UnoControlFixedTextModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java index a119eee6a55b..742aa7ef5508 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlFormattedFieldModel.java @@ -85,7 +85,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -98,7 +98,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object v) { - return utils.isVoid(v) ? new Integer(123) : + return utils.isVoid(v) ? Integer.valueOf(123) : super.getNewValue(p,v) ; } }) ; @@ -112,7 +112,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { testProperty("TextLineColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object v) { - return utils.isVoid(v) ? new Integer(123) : + return utils.isVoid(v) ? Integer.valueOf(123) : super.getNewValue(p,v) ; } }) ; @@ -126,7 +126,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object v) { - return utils.isVoid(v) ? new Integer(123) : + return utils.isVoid(v) ? Integer.valueOf(123) : super.getNewValue(p,v) ; } }) ; @@ -202,7 +202,7 @@ public class _UnoControlFormattedFieldModel extends MultiPropertyTest { testProperty("FormatKey", new PropertyTester() { @Override protected Object getNewValue(String p, Object v) { - return utils.isVoid(v) ? new Integer(0) : + return utils.isVoid(v) ? Integer.valueOf(0) : super.getNewValue(p,v) ; } }) ; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java index 965b96aa2eb5..0b4899d8bb3f 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlGroupBoxModel.java @@ -46,7 +46,7 @@ public class _UnoControlGroupBoxModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : + return utils.isVoid(old) ? Integer.valueOf(4321) : super.getNewValue(p, old) ; } }) ; @@ -58,10 +58,10 @@ public class _UnoControlGroupBoxModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java index cc9094a34432..8b58c6284ffd 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlImageControlModel.java @@ -67,7 +67,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - return utils.isVoid(oldValue) ? new Integer(8945) : + return utils.isVoid(oldValue) ? Integer.valueOf(8945) : super.getNewValue(propName, oldValue) ; } }) ; @@ -81,7 +81,7 @@ public class _UnoControlImageControlModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java index 7c2a3f2d72e5..4c9b682f1d60 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlListBoxModel.java @@ -53,7 +53,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -66,7 +66,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -79,7 +79,7 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -103,10 +103,10 @@ public class _UnoControlListBoxModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java index f0985238f1a1..218696664d2a 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlNumericFieldModel.java @@ -56,7 +56,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -69,7 +69,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -82,7 +82,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -95,7 +95,7 @@ public class _UnoControlNumericFieldModel extends MultiPropertyTest { testProperty("TextLineColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java index 4b7abedf8448..cd1814f30d9c 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlPatternFieldModel.java @@ -52,7 +52,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -65,7 +65,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -78,7 +78,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -91,7 +91,7 @@ public class _UnoControlPatternFieldModel extends MultiPropertyTest { testProperty("TextLineColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java index cc1bca447949..9e998c85475e 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlProgressBarModel.java @@ -50,7 +50,7 @@ public class _UnoControlProgressBarModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -63,7 +63,7 @@ public class _UnoControlProgressBarModel extends MultiPropertyTest { testProperty("FillColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -76,7 +76,7 @@ public class _UnoControlProgressBarModel extends MultiPropertyTest { testProperty("ProgressValue", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(10) : null ; + return utils.isVoid(old) ? Integer.valueOf(10) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java index e4b228f85dee..373c2f603e04 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlRadioButtonModel.java @@ -47,7 +47,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -71,10 +71,10 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { protected PropertyTester ColorTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if (util.ValueComparer.equalValue(oldValue, new Integer(17))) - return new Integer(25); + if (util.ValueComparer.equalValue(oldValue, Integer.valueOf(17))) + return Integer.valueOf(25); else - return new Integer(17); + return Integer.valueOf(17); } }; @@ -95,7 +95,7 @@ public class _UnoControlRadioButtonModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java index 77d75160716e..cc083692fa3d 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlScrollBarModel.java @@ -51,7 +51,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(32768) : null ; + return utils.isVoid(old) ? Integer.valueOf(32768) : null ; } }) ; } @@ -64,7 +64,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -77,7 +77,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { testProperty("SymbolColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(65324) : null ; + return utils.isVoid(old) ? Integer.valueOf(65324) : null ; } }) ; } @@ -90,7 +90,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { testProperty("ScrollValue", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(10) : new Integer(15) ; + return utils.isVoid(old) ? Integer.valueOf(10) : Integer.valueOf(15) ; } }) ; } @@ -103,7 +103,7 @@ public class _UnoControlScrollBarModel extends MultiPropertyTest { testProperty("VisibleSize", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(10) : null ; + return utils.isVoid(old) ? Integer.valueOf(10) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java index 7c4fd15a288f..2aa70a45c9ae 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlSpinButtonModel.java @@ -31,7 +31,7 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(32768) : null ; + return utils.isVoid(old) ? Integer.valueOf(32768) : null ; } }) ; } @@ -44,7 +44,7 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -57,7 +57,7 @@ public class _UnoControlSpinButtonModel extends MultiPropertyTest { testProperty("SymbolColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(65324) : null ; + return utils.isVoid(old) ? Integer.valueOf(65324) : null ; } }) ; } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java index ec072aa23f81..fcc6b7246cf2 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlTimeFieldModel.java @@ -60,7 +60,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { testProperty("BackgroundColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -73,7 +73,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(1234) : null ; + return utils.isVoid(old) ? Integer.valueOf(1234) : null ; } }) ; } @@ -86,7 +86,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -99,7 +99,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { testProperty("TextLineColor", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : null ; + return utils.isVoid(old) ? Integer.valueOf(4321) : null ; } }) ; } @@ -112,7 +112,7 @@ public class _UnoControlTimeFieldModel extends MultiPropertyTest { testProperty("Time", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : + return utils.isVoid(old) ? Integer.valueOf(4321) : super.getNewValue(p, old) ; } }) ; diff --git a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java index c30fc2bcfbc0..94ee21466660 100644 --- a/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java +++ b/qadevOOo/tests/java/ifc/beans/_XFastPropertySet.java @@ -173,7 +173,7 @@ public class _XFastPropertySet extends MultiMethodTest { if ( isWritable && isNotNull ) canChange = isChangeable(handle); if ( isWritable && isNotNull && canChange) - handles.add(new Integer(handle)); + handles.add(Integer.valueOf(handle)); } // endfor Random rnd = new Random(); diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java index 0b05dbea4fe4..bfffa27d5384 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyAccess.java @@ -147,7 +147,7 @@ public class _XPropertyAccess extends MultiMethodTest { PropertyValue[] newProps = new PropertyValue[1]; PropertyValue failedProp = new PropertyValue(); failedProp.Name = propertyToChange.Name; - failedProp.Value = new Integer(10); + failedProp.Value = Integer.valueOf(10); newProps[0] = failedProp; oObj.setPropertyValues(newProps); } catch (PropertyVetoException ex) { diff --git a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java index caf2f5ddc4e1..4d7637623ab5 100644 --- a/qadevOOo/tests/java/ifc/chart/_BarDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_BarDiagram.java @@ -111,8 +111,8 @@ public class _BarDiagram extends MultiPropertyTest { int a = 0; int b = 2; if ( ((Integer) oldValue).intValue() == a) - return new Integer(b); else - return new Integer(a); + return Integer.valueOf(b); else + return Integer.valueOf(a); } } ; diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java index acf8e50b19bc..fbf59aa5dac6 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartDataPointProperties.java @@ -83,7 +83,7 @@ public class _ChartDataPointProperties extends MultiPropertyTest { try { oObj.setPropertyValue( "SymbolType", - new Integer(com.sun.star.chart.ChartSymbolType.BITMAPURL) ); + Integer.valueOf(com.sun.star.chart.ChartSymbolType.BITMAPURL) ); } catch(com.sun.star.lang.WrappedTargetException e) { log.println("Exception while set property value"); e.printStackTrace(log); diff --git a/qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java b/qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java index 221b8be338fc..5cd275f76635 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartDataRowProperties.java @@ -42,7 +42,7 @@ public class _ChartDataRowProperties extends MultiPropertyTest { } else { newValue = 2; } - oObj.setPropertyValue("Axis", new Integer(newValue)); + oObj.setPropertyValue("Axis", Integer.valueOf(newValue)); axis = (Integer) oObj.getPropertyValue("Axis"); tRes.tested("Axis",axis.intValue()==newValue); } catch (Exception e) { diff --git a/qadevOOo/tests/java/ifc/chart/_ChartTitle.java b/qadevOOo/tests/java/ifc/chart/_ChartTitle.java index 29078ec3fb6d..a8bf068cfc2c 100644 --- a/qadevOOo/tests/java/ifc/chart/_ChartTitle.java +++ b/qadevOOo/tests/java/ifc/chart/_ChartTitle.java @@ -41,7 +41,7 @@ public class _ChartTitle extends MultiPropertyTest { protected Object getNewValue(String propName, Object oldValue) { Object ValueToSet = ValueChanger.changePValue(oldValue); int ro = ((Integer) ValueToSet).intValue() * 100; - return new Integer( ro ); + return Integer.valueOf( ro ); } } ); } diff --git a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java index 20c99b952c09..d461844513cc 100644 --- a/qadevOOo/tests/java/ifc/chart/_LineDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_LineDiagram.java @@ -104,8 +104,8 @@ public class _LineDiagram extends MultiPropertyTest { int a = com.sun.star.chart.ChartSymbolType.AUTO; int b = com.sun.star.chart.ChartSymbolType.NONE; if ( ((Integer) oldValue).intValue() == a) - return new Integer(b); else - return new Integer(a); + return Integer.valueOf(b); else + return Integer.valueOf(a); } } ; @@ -117,8 +117,8 @@ public class _LineDiagram extends MultiPropertyTest { int a = 0; int b = 2; if ( ((Integer) oldValue).intValue() == a) - return new Integer(b); else - return new Integer(a); + return Integer.valueOf(b); else + return Integer.valueOf(a); } } ; @@ -129,7 +129,7 @@ public class _LineDiagram extends MultiPropertyTest { log.println("Testing with custom Property tester") ; testProperty("SymbolType", SymbolTester) ; try { - oObj.setPropertyValue("SymbolType",new Integer(-2)); + oObj.setPropertyValue("SymbolType",Integer.valueOf(-2)); } catch(com.sun.star.lang.WrappedTargetException e) { log.println("Exception while set property value"); e.printStackTrace(log); @@ -164,7 +164,7 @@ public class _LineDiagram extends MultiPropertyTest { log.println("Testing with custom Property tester") ; try { oObj.setPropertyValue("SymbolType", - new Integer(com.sun.star.chart.ChartSymbolType.BITMAPURL)); + Integer.valueOf(com.sun.star.chart.ChartSymbolType.BITMAPURL)); } catch(com.sun.star.lang.WrappedTargetException e) { log.println("Exception while set property value"); e.printStackTrace(log); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java index 39ca600a0185..609d1c9a83c3 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XLayerHandler.java @@ -56,7 +56,7 @@ public class _XLayerHandler extends MultiMethodTest { oObj.endProperty(); oObj.overrideProperty("ooSetupFactoryIcon", (short) 0, new Type(java.lang.Long.class), false); - oObj.setPropertyValue(new Integer(13)); + oObj.setPropertyValue(Integer.valueOf(13)); oObj.endProperty(); oObj.overrideProperty("ooSetupFactoryShortName", (short) 0, new Type(String.class), false); diff --git a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java index f999d981ca43..4c35cc70d236 100644 --- a/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java +++ b/qadevOOo/tests/java/ifc/configuration/backend/_XUpdateHandler.java @@ -56,7 +56,7 @@ public class _XUpdateHandler extends MultiMethodTest { xLayerHandler.overrideProperty("ooSetupFactoryIcon", (short) 0, new Type(java.lang.Long.class), false); - xLayerHandler.setPropertyValue(new Integer(13)); + xLayerHandler.setPropertyValue(Integer.valueOf(13)); xLayerHandler.endProperty(); xLayerHandler.overrideProperty("ooSetupFactoryShortName", (short) 0, diff --git a/qadevOOo/tests/java/ifc/drawing/_DimensioningShapeDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_DimensioningShapeDescriptor.java index d2a20da9a7eb..ef55d860e724 100644 --- a/qadevOOo/tests/java/ifc/drawing/_DimensioningShapeDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_DimensioningShapeDescriptor.java @@ -29,7 +29,7 @@ public class _DimensioningShapeDescriptor extends MultiPropertyTest { throws java.lang.IllegalArgumentException { int val = ((Integer)oldValue).intValue() ; - return new Integer(val + 100) ; + return Integer.valueOf(val + 100) ; } } ; */ diff --git a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java index 863f4246ae20..760446d2e022 100644 --- a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java @@ -40,7 +40,7 @@ public class _RotationDescriptor extends MultiPropertyTest { @Override protected Object getNewValue(String propName, Object oldValue) { int val = ((Integer)oldValue).intValue() ; - return new Integer(val + 200) ; + return Integer.valueOf(val + 200) ; } } ; diff --git a/qadevOOo/tests/java/ifc/drawing/_Shape.java b/qadevOOo/tests/java/ifc/drawing/_Shape.java index 8150098386aa..9ef654283b86 100644 --- a/qadevOOo/tests/java/ifc/drawing/_Shape.java +++ b/qadevOOo/tests/java/ifc/drawing/_Shape.java @@ -124,7 +124,7 @@ public class _Shape extends MultiPropertyTest { log.println("Therefore this property can't be changed"); tRes.tested("ZOrder",true); } else { - testProperty("ZOrder", new Integer(0), new Integer(1)); + testProperty("ZOrder", Integer.valueOf(0), Integer.valueOf(1)); } } diff --git a/qadevOOo/tests/java/ifc/form/component/_DateField.java b/qadevOOo/tests/java/ifc/form/component/_DateField.java index b88490bd15e5..4a0688a226cc 100644 --- a/qadevOOo/tests/java/ifc/form/component/_DateField.java +++ b/qadevOOo/tests/java/ifc/form/component/_DateField.java @@ -38,7 +38,7 @@ public class _DateField extends MultiPropertyTest { testProperty("DefaultDate", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return util.utils.isVoid(old) ? new Integer(20010507) : + return util.utils.isVoid(old) ? Integer.valueOf(20010507) : super.getNewValue(prop, old) ; } }) ; diff --git a/qadevOOo/tests/java/ifc/form/component/_GridControl.java b/qadevOOo/tests/java/ifc/form/component/_GridControl.java index 04f3442eb933..de773f4d2662 100644 --- a/qadevOOo/tests/java/ifc/form/component/_GridControl.java +++ b/qadevOOo/tests/java/ifc/form/component/_GridControl.java @@ -44,7 +44,7 @@ public class _GridControl extends MultiPropertyTest { testProperty("RowHeight", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return util.utils.isVoid(old) ? new Integer(11) : + return util.utils.isVoid(old) ? Integer.valueOf(11) : super.getNewValue(prop, old) ; } }) ; @@ -72,7 +72,7 @@ public class _GridControl extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return util.utils.isVoid(old) ? new Integer(342) : + return util.utils.isVoid(old) ? Integer.valueOf(342) : super.getNewValue(prop, old) ; } }) ; @@ -86,7 +86,7 @@ public class _GridControl extends MultiPropertyTest { testProperty("BorderColor", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return util.utils.isVoid(old) ? new Integer(342) : + return util.utils.isVoid(old) ? Integer.valueOf(342) : super.getNewValue(prop, old) ; } }) ; diff --git a/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java b/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java index 6f75545afc52..23e3473c128c 100644 --- a/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java +++ b/qadevOOo/tests/java/ifc/form/component/_NavigationToolBar.java @@ -26,7 +26,7 @@ public class _NavigationToolBar extends MultiPropertyTest { testProperty("TextColor", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return util.utils.isVoid(old) ? new Integer(20010507) : + return util.utils.isVoid(old) ? Integer.valueOf(20010507) : super.getNewValue(prop, old) ; } }) ; @@ -36,7 +36,7 @@ public class _NavigationToolBar extends MultiPropertyTest { testProperty("TextLineColor", new PropertyTester() { @Override protected Object getNewValue(String prop, Object old) { - return util.utils.isVoid(old) ? new Integer(20050507) : + return util.utils.isVoid(old) ? Integer.valueOf(20050507) : super.getNewValue(prop, old) ; } }) ; diff --git a/qadevOOo/tests/java/ifc/form/component/_TimeField.java b/qadevOOo/tests/java/ifc/form/component/_TimeField.java index 06a924fa08c9..1faa5d9590b9 100644 --- a/qadevOOo/tests/java/ifc/form/component/_TimeField.java +++ b/qadevOOo/tests/java/ifc/form/component/_TimeField.java @@ -40,7 +40,7 @@ public class _TimeField extends MultiPropertyTest { testProperty("DefaultTime", new PropertyTester() { @Override protected Object getNewValue(String p, Object old) { - return utils.isVoid(old) ? new Integer(4321) : + return utils.isVoid(old) ? Integer.valueOf(4321) : super.getNewValue(p, old) ; } }) ; diff --git a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java index de425ec8dd05..d33772b10622 100644 --- a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java +++ b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java @@ -113,7 +113,7 @@ public class _XValidatableFormComponent extends MultiMethodTest || testPropsNames[i].equals("EffectiveValue") ) { - oldValue = new Integer(10); + oldValue = Integer.valueOf(10); } else if (testPropsNames[i].equals("Time")) { diff --git a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java index 7c6194d80e2e..81777db051d5 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java +++ b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java @@ -355,7 +355,7 @@ public class _XBreakIterator extends MultiMethodTest { public void _beginOfSentence() { int iPos = 0; while( iPos < UnicodeString.length() ) { - Integer start = new Integer( oObj.beginOfSentence(UnicodeString, + Integer start = Integer.valueOf( oObj.beginOfSentence(UnicodeString, iPos, locale) ); if (start.intValue() >= 0 && !vSentenceStart.contains(start) ) { vSentenceStart.add( start ); diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java index 2664c0422241..afb317ed738c 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java +++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java @@ -55,7 +55,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { for (int i = 0; i < locales.length; i++) { String[] algNames = oObj.getAlgorithmList(locales[i]); - algorithms.put(new Integer(i), algNames); + algorithms.put(Integer.valueOf(i), algNames); locResult = algNames != null && algNames.length > 0; System.out.println("Locale " + i + ": " + locales[i].Country+","+locales[i].Language); @@ -83,7 +83,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { log.println("Language: " + locales[i].Language); for (int j = 0; j < algorithms.size(); j++) { - String[] algs = algorithms.get(new Integer(j)); + String[] algs = algorithms.get(Integer.valueOf(j)); for (int k=0;k */ public void _convertToSimpleType() { - Object value = new Integer(123) ; + Object value = Integer.valueOf(123) ; Object destValue = null ; try { diff --git a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java index 83bfe72a665d..f540d77db610 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java +++ b/qadevOOo/tests/java/ifc/sheet/_SheetSortDescriptor.java @@ -106,8 +106,8 @@ public class _SheetSortDescriptor extends MultiMethodTest { sValue = props[nr].Value; if ( name.equals("OutputPosition")) { sInt = ((CellAddress) sValue).Row; - gValue = new Integer(gInt); - sValue = new Integer(sInt); + gValue = Integer.valueOf(gInt); + sValue = Integer.valueOf(sInt); } //check get-set methods diff --git a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java index 9192a1ef38c8..9845349dd83c 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java +++ b/qadevOOo/tests/java/ifc/sheet/_XDataPilotTable2.java @@ -434,7 +434,7 @@ public class _XDataPilotTable2 extends MultiMethodTest (DataPilotFieldOrientation)propSet.getPropertyValue("Orientation"); if (orient == DataPilotFieldOrientation.DATA) { - Integer item = new Integer(i); + Integer item = Integer.valueOf(i); mDataFieldDims.add(item); } } diff --git a/qadevOOo/tests/java/ifc/text/_BaseFrame.java b/qadevOOo/tests/java/ifc/text/_BaseFrame.java index 0852668b2340..8bfd80dc51e2 100644 --- a/qadevOOo/tests/java/ifc/text/_BaseFrame.java +++ b/qadevOOo/tests/java/ifc/text/_BaseFrame.java @@ -109,7 +109,7 @@ public class _BaseFrame extends MultiPropertyTest { * value must be defined. */ public void _BackColorTransparency() { - testProperty("BackColorTransparency", new Integer(10), new Integer(50)) ; + testProperty("BackColorTransparency", Integer.valueOf(10), Integer.valueOf(50)) ; } } //finish class _BaseFrame diff --git a/qadevOOo/tests/java/ifc/text/_TextColumns.java b/qadevOOo/tests/java/ifc/text/_TextColumns.java index b6c9868529e9..93ef30505f72 100644 --- a/qadevOOo/tests/java/ifc/text/_TextColumns.java +++ b/qadevOOo/tests/java/ifc/text/_TextColumns.java @@ -54,7 +54,7 @@ public class _TextColumns extends MultiPropertyTest { (XTextColumns.class,tEnv.getTestObject()); int ref = xTC.getReferenceValue(); int setting = ( ( (Integer) oldValue).intValue() + ref) / 2; - return new Integer(setting); + return Integer.valueOf(setting); } }); } diff --git a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java index aee159b66017..d827f963744d 100644 --- a/qadevOOo/tests/java/ifc/util/_XURLTransformer.java +++ b/qadevOOo/tests/java/ifc/util/_XURLTransformer.java @@ -72,7 +72,7 @@ public class _XURLTransformer extends MultiMethodTest { url[0].Protocol = "http://"; url[0].Server = server; - url[0].Port = new Integer(port).shortValue(); + url[0].Port = Integer.valueOf(port).shortValue(); url[0].Path = path; url[0].Name = name; url[0].Arguments = arguments; @@ -99,7 +99,7 @@ public class _XURLTransformer extends MultiMethodTest { url[0].User = user; url[0].Password = password; url[0].Server = server; - url[0].Port = new Integer(port).shortValue(); + url[0].Port = Integer.valueOf(port).shortValue(); url[0].Path = path; url[0].Name = name; url[0].Main = "ftp://" + user + ":" + password + "@" + server + ":" + @@ -164,7 +164,7 @@ public class _XURLTransformer extends MultiMethodTest { res = false; } - if (url[0].Port != new Integer(port).shortValue()) { + if (url[0].Port != Integer.valueOf(port).shortValue()) { log.println("parseStrict works wrong"); log.println("port field : " + url[0].Port); log.println("expected : " + port); @@ -235,7 +235,7 @@ public class _XURLTransformer extends MultiMethodTest { res = false; } - if (url[0].Port != new Integer(port).shortValue()) { + if (url[0].Port != Integer.valueOf(port).shortValue()) { log.println("parseStrict works wrong"); log.println("port field : " + url[0].Port); log.println("expected : " + port); @@ -304,7 +304,7 @@ public class _XURLTransformer extends MultiMethodTest { res = false; } - if (url[0].Port != new Integer(port).shortValue()) { + if (url[0].Port != Integer.valueOf(port).shortValue()) { log.println("parseSmart works wrong"); log.println("port field : " + url[0].Port); log.println("expected : " + port); @@ -377,7 +377,7 @@ public class _XURLTransformer extends MultiMethodTest { res = false; } - if (url[0].Port != new Integer(port).shortValue()) { + if (url[0].Port != Integer.valueOf(port).shortValue()) { log.println("parseSmart works wrong"); log.println("port field : " + url[0].Port); log.println("expected : " + port); -- cgit