diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-12 15:09:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-08-19 14:57:17 +0200 |
| commit | ff0ad0493ee1729c726587f667761b04101d774c (patch) | |
| tree | 8c0f97e8740fbdb2ed0cdbfc5d99d82cae8f7df6 /qadevOOo | |
| parent | be1bb7b1ccee28be616b89cc95e97d656e78bbe3 (diff) | |
java: use 'Integer.valueOf' instead of 'new Integer'
Change-Id: Ia8befb8d69914ce971174fc5f2ffc0e2f506a940
Diffstat (limited to 'qadevOOo')
125 files changed, 269 insertions, 269 deletions
diff --git a/qadevOOo/runner/complexlib/Assurance.java b/qadevOOo/runner/complexlib/Assurance.java index 3c12ca7156ff..3b4d03a64602 100644 --- a/qadevOOo/runner/complexlib/Assurance.java +++ b/qadevOOo/runner/complexlib/Assurance.java @@ -81,7 +81,7 @@ public class Assurance * @param actual specifies the actual int value */ protected void assureEquals( String message, int expected, int actual ) { - assureEquals( message, new Integer( expected ), new Integer( actual ), false ); + assureEquals( message, Integer.valueOf( expected ), Integer.valueOf( actual ), false ); } diff --git a/qadevOOo/runner/convwatch/ReportDesignerTest.java b/qadevOOo/runner/convwatch/ReportDesignerTest.java index 5b059e8ecc4b..6dd5001c3441 100644 --- a/qadevOOo/runner/convwatch/ReportDesignerTest.java +++ b/qadevOOo/runner/convwatch/ReportDesignerTest.java @@ -199,7 +199,7 @@ public class ReportDesignerTest extends ComplexTestCase { private static XMultiServiceFactory m_xXMultiServiceFactory = null; private void startOffice() { - param.put("TimeOut", new Integer(300000)); + param.put("TimeOut", Integer.valueOf(300000)); System.out.println("TimeOut: " + param.getInt("TimeOut")); System.out.println("ThreadTimeOut: " + param.getInt("ThreadTimeOut")); diff --git a/qadevOOo/runner/lib/TestParameters.java b/qadevOOo/runner/lib/TestParameters.java index 38be83489aee..a62565fcbaf4 100644 --- a/qadevOOo/runner/lib/TestParameters.java +++ b/qadevOOo/runner/lib/TestParameters.java @@ -110,7 +110,7 @@ public class TestParameters extends HashMap<String,Object> { else { try { if ( val instanceof String ) { - Integer nr = new Integer((String)val); + Integer nr = Integer.valueOf((String)val); if (nr.intValue() > 0) return nr.intValue(); } } catch ( java.lang.NumberFormatException nfe) {} @@ -150,14 +150,14 @@ public class TestParameters extends HashMap<String,Object> { put(PropertyName.LOGGING_IS_ACTIVE, Boolean.TRUE); put(PropertyName.DEBUG_IS_ACTIVE, Boolean.valueOf(DebugIsActive)); put(PropertyName.OUT_PRODUCER, "stats.SimpleOutProducer"); - put(PropertyName.SHORT_WAIT, new Integer(500)); + put(PropertyName.SHORT_WAIT, Integer.valueOf(500)); put(PropertyName.OFFICE_PROVIDER, "helper.OfficeProvider"); put(PropertyName.LOG_WRITER, "stats.SimpleLogWriter"); put(PropertyName.APP_EXECUTION_COMMAND, ""); - put(PropertyName.TIME_OUT, new Integer(3000000)); - put(PropertyName.THREAD_TIME_OUT, new Integer(3000000)); + put(PropertyName.TIME_OUT, Integer.valueOf(3000000)); + put(PropertyName.THREAD_TIME_OUT, Integer.valueOf(3000000)); put(PropertyName.AUTO_RESTART, Boolean.FALSE); - put(PropertyName.OFFICE_CLOSE_TIME_OUT, new Integer(15000)); + put(PropertyName.OFFICE_CLOSE_TIME_OUT, Integer.valueOf(15000)); // get the operating system put(PropertyName.OPERATING_SYSTEM, getSOCompatibleOSName()); diff --git a/qadevOOo/runner/util/BasicMacroTools.java b/qadevOOo/runner/util/BasicMacroTools.java index 9d48c946ac97..34407cac336d 100644 --- a/qadevOOo/runner/util/BasicMacroTools.java +++ b/qadevOOo/runner/util/BasicMacroTools.java @@ -242,7 +242,7 @@ public class BasicMacroTools { XPropertySet oScriptingSettings = UnoRuntime.queryInterface(XPropertySet.class, oScripting); oScriptingSettings.setPropertyValue("SecureURL", new String[]{secureURL}); - oScriptingSettings.setPropertyValue("OfficeBasic", new Integer(2)); + oScriptingSettings.setPropertyValue("OfficeBasic", Integer.valueOf(2)); XChangesBatch oSecureChange = UnoRuntime.queryInterface(XChangesBatch.class, oSecure); oSecureChange.commitChanges(); diff --git a/qadevOOo/runner/util/DBTools.java b/qadevOOo/runner/util/DBTools.java index f6cd9a865e46..7960a8dac488 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 final static Object[][] TST_TABLE_VALUES = new Object[][] { - {"String1", new Integer(1), null, null, new Double(1.1), + {"String1", Integer.valueOf(1), null, null, new Double(1.1), new Date((short) 1,(short) 1, (short) 2001), null, null, null, Boolean.TRUE, null, null}, - {"String2", new Integer(2), null, null, new Double(1.2), + {"String2", Integer.valueOf(2), null, null, new Double(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/FormTools.java b/qadevOOo/runner/util/FormTools.java index 2de4698877c2..bebd3c3ddd2a 100644 --- a/qadevOOo/runner/util/FormTools.java +++ b/qadevOOo/runner/util/FormTools.java @@ -226,7 +226,7 @@ public class FormTools { XPropertySet formProps = UnoRuntime.queryInterface(XPropertySet.class, the_form); formProps.setPropertyValue("DataSourceName","Bibliography"); formProps.setPropertyValue("Command","biblio"); - formProps.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); + formProps.setPropertyValue("CommandType",Integer.valueOf(com.sun.star.sdb.CommandType.TABLE)); formLoader = UnoRuntime.queryInterface(XLoadable.class, the_form); } catch (Exception ex) { @@ -255,7 +255,7 @@ public class FormTools { XPropertySet formProps = UnoRuntime.queryInterface(XPropertySet.class, the_form); formProps.setPropertyValue("DataSourceName",sourceName); formProps.setPropertyValue("Command",tableName); - formProps.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); + formProps.setPropertyValue("CommandType",Integer.valueOf(com.sun.star.sdb.CommandType.TABLE)); return UnoRuntime.queryInterface(XLoadable.class, the_form); } @@ -281,7 +281,7 @@ public class FormTools { XPropertySet formProps = UnoRuntime.queryInterface(XPropertySet.class, the_form); formProps.setPropertyValue("DataSourceName",sourceName); formProps.setPropertyValue("Command",tableName); - formProps.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); + formProps.setPropertyValue("CommandType",Integer.valueOf(com.sun.star.sdb.CommandType.TABLE)); return UnoRuntime.queryInterface(XLoadable.class, the_form); } diff --git a/qadevOOo/runner/util/FrameDsc.java b/qadevOOo/runner/util/FrameDsc.java index 147ed14a0423..c65738eb9204 100644 --- a/qadevOOo/runner/util/FrameDsc.java +++ b/qadevOOo/runner/util/FrameDsc.java @@ -99,7 +99,7 @@ public class FrameDsc extends InstDescr { try { - oPropSet.setPropertyValue("AnchorType", new Integer(2)); + oPropSet.setPropertyValue("AnchorType", Integer.valueOf(2)); } catch( com.sun.star.beans.UnknownPropertyException upE ){ } diff --git a/qadevOOo/runner/util/SOfficeFactory.java b/qadevOOo/runner/util/SOfficeFactory.java index f086a0d27fb2..54f119b57d31 100644 --- a/qadevOOo/runner/util/SOfficeFactory.java +++ b/qadevOOo/runner/util/SOfficeFactory.java @@ -64,11 +64,11 @@ public class SOfficeFactory { public static SOfficeFactory getFactory(XMultiServiceFactory xMSF) { - SOfficeFactory soFactory = lookup.get(new Integer(xMSF.hashCode()).toString()); + SOfficeFactory soFactory = lookup.get(Integer.valueOf(xMSF.hashCode()).toString()); if (soFactory == null) { soFactory = new SOfficeFactory(xMSF); - lookup.put(new Integer(xMSF.hashCode()).toString(), soFactory); + lookup.put(Integer.valueOf(xMSF.hashCode()).toString(), soFactory); } return soFactory; diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java index 00d6fdffaea2..db95579f162c 100644 --- a/qadevOOo/runner/util/ValueChanger.java +++ b/qadevOOo/runner/util/ValueChanger.java @@ -55,7 +55,7 @@ public class ValueChanger { if (oldValue instanceof Integer) { int oldint = ((Integer) oldValue).intValue(); - newValue = new Integer(oldint+5); + newValue = Integer.valueOf(oldint+5); } else if (oldValue instanceof Long) { diff --git a/qadevOOo/runner/util/WriterTools.java b/qadevOOo/runner/util/WriterTools.java index aec10a16ba4d..d1445cd1b108 100644 --- a/qadevOOo/runner/util/WriterTools.java +++ b/qadevOOo/runner/util/WriterTools.java @@ -93,10 +93,10 @@ public class WriterTools { String fullURL = util.utils.getFullTestURL(pic); oProps.setPropertyValue("GraphicURL", fullURL); - oProps.setPropertyValue("HoriOrientPosition", new Integer(hpos)); - oProps.setPropertyValue("VertOrientPosition", new Integer(vpos)); - oProps.setPropertyValue("Width", new Integer(width)); - oProps.setPropertyValue("Height", new Integer(height)); + oProps.setPropertyValue("HoriOrientPosition", Integer.valueOf(hpos)); + oProps.setPropertyValue("VertOrientPosition", Integer.valueOf(vpos)); + oProps.setPropertyValue("Width", Integer.valueOf(width)); + oProps.setPropertyValue("Height", Integer.valueOf(height)); XNamed the_name = UnoRuntime.queryInterface(XNamed.class, oGObject); diff --git a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java index 5393c4f15121..2a633c08e403 100644 --- a/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java +++ b/qadevOOo/testdocs/backend/org/openoffice/JavaSystemBackend.java @@ -230,7 +230,7 @@ public class JavaSystemBackend implements XSingleLayerStratum, XTypeProvider, PropertyInfo[] pInfo = new PropertyInfo[1]; pInfo[0] = new PropertyInfo(); pInfo[0].Name = "org.openoffice.Office.Common/Undo/Steps"; - pInfo[0].Value = new Integer(12); + pInfo[0].Value = Integer.valueOf(12); pInfo[0].Type = "int"; pInfo[0].Protected = false; xLayerContentDescriber.describeLayer(xLayerHandler, pInfo); 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 a3fdd14658d2..6af61067447d 100644 --- a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java +++ b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java @@ -208,7 +208,7 @@ public class MyPersistObject implements XPersistObject, XTypeProvider, if ( property.equals(props[0].Name)) return new Byte(by); if ( property.equals(props[1].Name)) - return new Integer(i); + return Integer.valueOf(i); if ( property.equals(props[2].Name)) return new Character(c); if ( property.equals(props[3].Name)) 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<algs.length;k++) { log.println("\t Algorythm :" + algs[k]); @@ -145,7 +145,7 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest { boolean res = true; for (int i = 0; i < algorithms.size(); i++) { - String[] names = algorithms.get(new Integer(i)); + String[] names = algorithms.get(Integer.valueOf(i)); log.println("loading algorithms for " + locales[i].Country + "," + locales[i].Language); diff --git a/qadevOOo/tests/java/ifc/script/_XTypeConverter.java b/qadevOOo/tests/java/ifc/script/_XTypeConverter.java index 7f38d055159e..3e42a16d9a2e 100644 --- a/qadevOOo/tests/java/ifc/script/_XTypeConverter.java +++ b/qadevOOo/tests/java/ifc/script/_XTypeConverter.java @@ -97,7 +97,7 @@ public class _XTypeConverter extends MultiMethodTest { * was passed to method and no exceptions were thrown. <p> */ 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); diff --git a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java index 1889fb60ade4..67c479485abd 100644 --- a/qadevOOo/tests/java/mod/_acceptor/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor/Acceptor.java @@ -101,7 +101,7 @@ public class Acceptor extends TestCase { "socket,host=" + sOfficeHost + ",port=" + curPort) ; // adding port number for freeing it. - tEnv.addObjRelation("Acceptor.Port", new Integer(curPort)) ; + tEnv.addObjRelation("Acceptor.Port", Integer.valueOf(curPort)) ; return tEnv ; } diff --git a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java index 209771546eb5..a8239a9fd4bd 100644 --- a/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java +++ b/qadevOOo/tests/java/mod/_acceptor/uno/Acceptor.java @@ -96,7 +96,7 @@ public class Acceptor extends TestCase { "socket,host=" + sOfficeHost + ",port=" + curPort) ; // adding port number for freeing it. - tEnv.addObjRelation("Acceptor.Port", new Integer(curPort)) ; + tEnv.addObjRelation("Acceptor.Port", Integer.valueOf(curPort)) ; return tEnv ; } diff --git a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java index 41e8ce122612..00100fb90364 100644 --- a/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_brdgfctr/BridgeFactory.java @@ -94,7 +94,7 @@ public class BridgeFactory extends TestCase { "socket,host=" + sOfficeHost + ",port=" + curPort) ; // adding port number for freeing it. - tEnv.addObjRelation("Connector.Port", new Integer(curPort)) ; + tEnv.addObjRelation("Connector.Port", Integer.valueOf(curPort)) ; return tEnv ; } diff --git a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java index 1392b6345ab8..295ced13fa76 100644 --- a/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java +++ b/qadevOOo/tests/java/mod/_bridgefac/uno/BridgeFactory.java @@ -92,7 +92,7 @@ public class BridgeFactory extends TestCase { "socket,host=" + sOfficeHost + ",port=" + curPort) ; // adding port number for freeing it. - tEnv.addObjRelation("Connector.Port", new Integer(curPort)) ; + tEnv.addObjRelation("Connector.Port", Integer.valueOf(curPort)) ; return tEnv ; } diff --git a/qadevOOo/tests/java/mod/_connector/uno/Connector.java b/qadevOOo/tests/java/mod/_connector/uno/Connector.java index 341d4ebee8fc..b7920b1d3a47 100644 --- a/qadevOOo/tests/java/mod/_connector/uno/Connector.java +++ b/qadevOOo/tests/java/mod/_connector/uno/Connector.java @@ -97,7 +97,7 @@ public class Connector extends TestCase { "socket,host=" + sOfficeHost + ",port=" + curPort) ; // adding port number for freeing it. - tEnv.addObjRelation("Connector.Port", new Integer(curPort)) ; + tEnv.addObjRelation("Connector.Port", Integer.valueOf(curPort)) ; return tEnv ; } diff --git a/qadevOOo/tests/java/mod/_connectr/Connector.java b/qadevOOo/tests/java/mod/_connectr/Connector.java index 2b5a35ba2eef..b4bd3caf366c 100644 --- a/qadevOOo/tests/java/mod/_connectr/Connector.java +++ b/qadevOOo/tests/java/mod/_connectr/Connector.java @@ -100,7 +100,7 @@ public class Connector extends TestCase { "socket,host=" + sOfficeHost + ",port=" + curPort) ; // adding port number for freeing it. - tEnv.addObjRelation("Connector.Port", new Integer(curPort)) ; + tEnv.addObjRelation("Connector.Port", Integer.valueOf(curPort)) ; return tEnv ; } diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java index bad73b7d8107..128995024f04 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java @@ -245,7 +245,7 @@ public class ODatasourceBrowser extends TestCase { PropertyValue param2 = new PropertyValue(); param2.Name = "CommandType"; - param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE); + param2.Value = Integer.valueOf(com.sun.star.sdb.CommandType.TABLE); params[1] = param2; PropertyValue param3 = new PropertyValue(); diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java index ed6a7ea671ee..86eeeadcb357 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java @@ -208,7 +208,7 @@ public class OQueryDesign extends TestCase { ExceptionParams[1] = ExceptionParam2; PropertyValue ExceptionParam3 = new PropertyValue(); ExceptionParam3.Name = "QueryDesignView"; - ExceptionParam3.Value = new Integer(17);//Boolean.TRUE; + ExceptionParam3.Value = Integer.valueOf(17);//Boolean.TRUE; ExceptionParams[2] = ExceptionParam3; tEnv.addObjRelation("XInitialization.ExceptionArgs", ExceptionParams); diff --git a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java index 6e06a400e511..be7877107b28 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ORowSet.java @@ -301,7 +301,7 @@ public class ORowSet extends TestCase { rowSetProps.setPropertyValue("DataSourceName", dbSourceName); rowSetProps.setPropertyValue("Command", tableName); rowSetProps.setPropertyValue("CommandType", - new Integer(CommandType.TABLE)); + Integer.valueOf(CommandType.TABLE)); final XRowSet rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSet); rowSet.execute(); @@ -407,7 +407,7 @@ public class ORowSet extends TestCase { : "SELECT \"_TEXT\" FROM \"" + tableName + "\" WHERE ( ( \"_TEXT\" = :param1 ) )"; rowSetProps.setPropertyValue( "DataSourceName", dbSourceName ); rowSetProps.setPropertyValue( "Command", sqlCommand ); - rowSetProps.setPropertyValue( "CommandType", new Integer(CommandType.COMMAND) ); + rowSetProps.setPropertyValue( "CommandType", Integer.valueOf(CommandType.COMMAND) ); } catch(Exception e) { diff --git a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java index e8287d43a289..1e3e3f4130b2 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/mod/_dbaccess/OSingleSelectQueryComposer.java @@ -209,7 +209,7 @@ public class OSingleSelectQueryComposer extends TestCase { xSetProp.setPropertyValue("DataSourceName", "Bibliography") ; xSetProp.setPropertyValue("Command", "biblio") ; xSetProp.setPropertyValue("CommandType", - new Integer(CommandType.TABLE)) ; + Integer.valueOf(CommandType.TABLE)) ; com.sun.star.sdbc.XRowSet xORowSet = UnoRuntime.queryInterface(com.sun.star.sdbc.XRowSet.class, oRowSet) ; diff --git a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java index b0c1e31b5598..98ff707de924 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java +++ b/qadevOOo/tests/java/mod/_dbaccess/SbaXGridControl.java @@ -348,7 +348,7 @@ public class SbaXGridControl extends TestCase { //Relations for XSelectionSupplier tEnv.addObjRelation("Selections", new Object[] { - new Object[] { new Integer(0) }, new Object[] { new Integer(1) } + new Object[] { Integer.valueOf(0) }, new Object[] { Integer.valueOf(1) } }); tEnv.addObjRelation("Comparer", new Comparator<Integer>() { diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index df6a42e93a70..a1c93b212b8b 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -623,7 +623,7 @@ public class ODatabaseForm extends TestCase { params.add(Boolean.FALSE) ; params.add(new Byte((byte) 123)) ; params.add(new Short((short) 234)) ; - params.add(new Integer(12345)) ; + params.add(Integer.valueOf(12345)) ; params.add(new Long(23456)) ; params.add(new Float(1.234)) ; params.add(new Double(2.345)) ; @@ -660,7 +660,7 @@ public class ODatabaseForm extends TestCase { } xSetProp.setPropertyValue("CommandType", - new Integer(CommandType.COMMAND)) ; + Integer.valueOf(CommandType.COMMAND)) ; } catch(Exception e) { } @@ -810,7 +810,7 @@ public class ODatabaseForm extends TestCase { log.println("### _XDatabaseParameterBroadcaster.ParameterListenerImpl: Parameter "+i+": "+params.getByIndex(i)); XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, params.getByIndex(i)); log.println("### _XDatabaseParameterBroadcaster.ParameterListenerImpl: Parameter Name: '"+xProp.getPropertyValue("Name") + "' is set to Value '1'"); - xProp.setPropertyValue("Value", new Integer(1)); + xProp.setPropertyValue("Value", Integer.valueOf(1)); listenerWasCalled = true; } } @@ -868,7 +868,7 @@ public class ODatabaseForm extends TestCase { log.println("### _XCompletedExecution.InteractionHandlerImpl: Parameter "+i+": "+params.getByIndex(i)); XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class, params.getByIndex(i)); log.println("### _XCompletedExecution.InteractionHandlerImpl: Parameter Name: '"+xProp.getPropertyValue("Name") + "' is set to Value '1'"); - xProp.setPropertyValue("Value", new Integer(1)); + xProp.setPropertyValue("Value", Integer.valueOf(1)); handlerWasUsed = true; } } diff --git a/qadevOOo/tests/java/mod/_forms/ODateModel.java b/qadevOOo/tests/java/mod/_forms/ODateModel.java index 90ccccdc7c3f..ceb865a9d0e8 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateModel.java +++ b/qadevOOo/tests/java/mod/_forms/ODateModel.java @@ -115,7 +115,7 @@ public class ODateModel extends GenericModelTest { * * NamedValue Date = new NamedValue(); * Date.Name = "Date"; - * Date.Value = new Integer(DBTools.TST_DATE); + * Date.Value = Integer.valueOf(DBTools.TST_DATE); * super.m_propertiesToSet.add(Date); * super.m_LCShape_Type = "FixedText"; * </pre> diff --git a/qadevOOo/tests/java/mod/_forms/OTimeModel.java b/qadevOOo/tests/java/mod/_forms/OTimeModel.java index ff9d4190fb82..e2caa810892c 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeModel.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeModel.java @@ -204,7 +204,7 @@ public class OTimeModel extends GenericModelTest { lastTime = time.intValue() + 150000; } - ps.setPropertyValue("Time", new Integer(lastTime)); + ps.setPropertyValue("Time", Integer.valueOf(lastTime)); } public void commit() throws com.sun.star.sdbc.SQLException { diff --git a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java index 5465a9859b4c..787abf174d06 100644 --- a/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java +++ b/qadevOOo/tests/java/mod/_fwk/UIConfigurationManager.java @@ -86,7 +86,7 @@ public class UIConfigurationManager extends TestCase { XSingleServiceFactory.class, o); Object[] props = new Object[2]; props[0] = deleteCfg; - props[1] = new Integer(ElementModes.READWRITE); + props[1] = Integer.valueOf(ElementModes.READWRITE); XStorage xRootStorage = UnoRuntime.queryInterface(XStorage.class, xSSF.createInstanceWithArguments(props)); xSubStorage = xRootStorage.openStorageElement("Configurations2", ElementModes.READWRITE); diff --git a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java index 4d0bf26fafc2..2ae0772875b7 100644 --- a/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java +++ b/qadevOOo/tests/java/mod/_pcr/ObjectInspectorModel.java @@ -128,8 +128,8 @@ public class ObjectInspectorModel extends TestCase { TestEnvironment tEnv = new TestEnvironment(oInspectorModel); // com.sun.star.inspection.XObjectInspectorModel - tEnv.addObjRelation("minHelpTextLines", new Integer(minHelpTextLines)); - tEnv.addObjRelation("maxHelpTextLines", new Integer(maxHelpTextLines)); + tEnv.addObjRelation("minHelpTextLines", Integer.valueOf(minHelpTextLines)); + tEnv.addObjRelation("maxHelpTextLines", Integer.valueOf(maxHelpTextLines)); return tEnv; } catch (com.sun.star.lang.IllegalArgumentException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java index 917607dc29fc..41f33cc78117 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleCsvRuler.java @@ -129,7 +129,7 @@ public class ScAccessibleCsvRuler extends TestCase { } } - tEnv.addObjRelation("LimitedBounds", new Integer(lastone)); + tEnv.addObjRelation("LimitedBounds", Integer.valueOf(lastone)); tEnv.addObjRelation("PreviousUsed",new int[]{11,22,33,44,55,66,77,88,99}); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java index 84cbd224402e..2ac0c175e414 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupItemObj.java @@ -197,7 +197,7 @@ public class ScDataPilotFieldGroupItemObj extends TestCase oSheet.getCellByPosition (x, y); - new Integer (27); + Integer.valueOf(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java index 17e0d1554f17..a815bb2d2518 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupObj.java @@ -196,7 +196,7 @@ public class ScDataPilotFieldGroupObj extends TestCase oSheet.getCellByPosition (x, y); - new Integer (27); + Integer.valueOf(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java index 46dec68f6496..52a36ed1ad99 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldGroupsObj.java @@ -196,7 +196,7 @@ public class ScDataPilotFieldGroupsObj extends TestCase oSheet.getCellByPosition (x, y); - new Integer (27); + Integer.valueOf(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java index 49f4be3fd369..2c668328a51b 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotFieldObj.java @@ -196,7 +196,7 @@ public class ScDataPilotFieldObj extends TestCase { oSheet.getCellByPosition(x, y); - new Integer(27); + Integer.valueOf(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); throw new StatusException("Couldn't get cells for changing.", e); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java index b23c7dbcfe6f..5c01cf02c933 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemObj.java @@ -197,7 +197,7 @@ public class ScDataPilotItemObj extends TestCase { oSheet.getCellByPosition(x, y); - new Integer(27); + Integer.valueOf(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); throw new StatusException("Couldn't get cells for changing.", e); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java index 8b45056e472e..b9274917425d 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotItemsObj.java @@ -197,7 +197,7 @@ public class ScDataPilotItemsObj extends TestCase { oSheet.getCellByPosition(x, y); - new Integer(27); + Integer.valueOf(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); throw new StatusException("Couldn't get cells for changing.", e); diff --git a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java index 9008e2d82964..03677927043f 100644 --- a/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScDataPilotTableObj.java @@ -262,7 +262,7 @@ public class ScDataPilotTableObj extends TestCase { tEnv.addObjRelation("OUTPUTRANGE", sCellAddress); tEnv.addObjRelation("CELLFORCHANGE", oChangeCell); tEnv.addObjRelation("CELLFORCHECK", oCheckCell); - tEnv.addObjRelation("FIELDSAMOUNT", new Integer(5)); + tEnv.addObjRelation("FIELDSAMOUNT", Integer.valueOf(5)); tEnv.addObjRelation("SHEETDOCUMENT", xSheetDoc); createTable2(oSheet, sCellRangeAddress, tEnv); diff --git a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java index e069a1aabe01..705457967406 100644 --- a/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DataPilotItemsEnumeration.java @@ -199,7 +199,7 @@ public class ScIndexEnumeration_DataPilotItemsEnumeration oSheet.getCellByPosition(x, y); - new Integer(27); + Integer.valueOf(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); throw new StatusException("Couldn't get cells for changing.", e); diff --git a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java index 7be503cfc9f5..5d778e1da650 100644 --- a/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScStyleFamilyObj.java @@ -182,7 +182,7 @@ public class ScStyleFamilyObj extends TestCase { } log.println( "adding XNameReplaceINDEX as mod relation to environment" ); - tEnv.addObjRelation("XNameReplaceINDEX", new Integer(2*THRCNT).toString()); + tEnv.addObjRelation("XNameReplaceINDEX", Integer.valueOf(2*THRCNT).toString()); // INSTANCEn : _XNameContainer; _XNameReplace log.println( "adding INSTANCEn as mod relation to environment" ); diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java index 1e3624e8d3ff..bc656322b9aa 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java @@ -109,7 +109,7 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { TestEnvironment tEnv = new TestEnvironment(oObj); - tEnv.addObjRelation("ExpectedCount", new Integer(4)); + tEnv.addObjRelation("ExpectedCount", Integer.valueOf(4)); return tEnv; } @@ -122,7 +122,7 @@ public class ScUniqueCellFormatsEnumeration extends TestCase { int c2int = 16777216 + c.hashCode(); try { - xPropertySet.setPropertyValue("CellBackColor", new Integer(c2int)); + xPropertySet.setPropertyValue("CellBackColor", Integer.valueOf(c2int)); } catch (com.sun.star.beans.UnknownPropertyException e) { log.println("Couldn't change CellFormat"); } catch (com.sun.star.beans.PropertyVetoException e) { diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java index 5c9376a589e0..94a27645c078 100644 --- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java @@ -116,7 +116,7 @@ public class ScUniqueCellFormatsObj extends TestCase { int c2int = 16777216 + c.hashCode(); try { - xPropertySet.setPropertyValue("CellBackColor", new Integer(c2int)); + xPropertySet.setPropertyValue("CellBackColor", Integer.valueOf(c2int)); } catch (com.sun.star.beans.UnknownPropertyException e) { log.println("Couldn't change CellFormat"); } catch (com.sun.star.beans.PropertyVetoException e) { diff --git a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java index fdc658c5434f..1fd03beb029a 100644 --- a/qadevOOo/tests/java/mod/_sch/ChXDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/ChXDiagram.java @@ -349,8 +349,8 @@ public class ChXDiagram extends TestCase { int cols = da.getColumnDescriptions().length; int rows = da.getRowDescriptions().length; - tEnv.addObjRelation("ROWAMOUNT", new Integer(rows)); - tEnv.addObjRelation("COLAMOUNT", new Integer(cols)); + tEnv.addObjRelation("ROWAMOUNT", Integer.valueOf(rows)); + tEnv.addObjRelation("COLAMOUNT", Integer.valueOf(cols)); SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF()); Object stock = SOF.createDiagram(xChartDoc,"StockDiagram"); diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java index 8f48f000fa3f..58cb45e94cbb 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java @@ -180,7 +180,7 @@ public class SdXCustomPresentationAccess extends TestCase { // INDEX : _XNameContainer log.println( "adding XNameContainerINDEX as mod relation to environment" ); tEnv.addObjRelation("XNameContainerINDEX", - (new Integer(THRCNT)).toString()); + (Integer.valueOf(THRCNT)).toString()); // INSTANCEn : _XNameContainer; _XNameReplace log.println( "adding INSTANCEn as mod relation to environment" ); diff --git a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java index 6c548d67506d..af8a17b46fb2 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java +++ b/qadevOOo/tests/java/mod/_sd/SdXImpressDocument.java @@ -147,7 +147,7 @@ public class SdXImpressDocument extends TestCase { try { xShapeProps.setPropertyValue("FillStyle", com.sun.star.drawing.FillStyle.SOLID); - xShapeProps.setPropertyValue("FillTransparence", new Integer(50)); + xShapeProps.setPropertyValue("FillTransparence", Integer.valueOf(50)); } catch (UnknownPropertyException ex) { ex.printStackTrace(log); throw new StatusException("Couldn't make shape transparent", ex); diff --git a/qadevOOo/tests/java/mod/_sd/SdXShape.java b/qadevOOo/tests/java/mod/_sd/SdXShape.java index 50bf57432843..535d30062fec 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXShape.java +++ b/qadevOOo/tests/java/mod/_sd/SdXShape.java @@ -169,7 +169,7 @@ public class SdXShape extends TestCase { try { aStyle = (XStyle) AnyConverter.toObject( new Type(XStyle.class),oShapeProps.getPropertyValue("Style")); - oShapeProps.setPropertyValue("ZOrder", new Integer(1)); + oShapeProps.setPropertyValue("ZOrder", Integer.valueOf(1)); } catch (com.sun.star.lang.WrappedTargetException e) { e.printStackTrace(log); throw new StatusException("Couldn't set or get property value", e); diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java index 8076fe210503..7a3a5a31864e 100644 --- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java @@ -132,7 +132,7 @@ public class DataInputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java index 85f33e5a67ac..73500ddc95ba 100644 --- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java @@ -109,7 +109,7 @@ public class DataOutputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java index 6b46f4f79d89..289de5cc02ca 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java @@ -132,7 +132,7 @@ public class MarkableOutputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java index 003da99be90a..350ca4d19d63 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java @@ -246,7 +246,7 @@ public class ObjectInputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java index ea937b1145d9..7308371932c6 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java @@ -235,7 +235,7 @@ public class ObjectOutputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java index 790faf054753..6e7f81bfcc14 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java @@ -129,7 +129,7 @@ public class DataInputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java index 2f48ce028e06..f91e967eed39 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java @@ -106,7 +106,7 @@ public class DataOutputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java index 34f89a4a4dd5..94065169be7a 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java @@ -129,7 +129,7 @@ public class MarkableOutputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java index f6b098b04957..a2acc83c62f8 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java @@ -243,7 +243,7 @@ public class ObjectInputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java index c6a250115bba..0a26e9fb1f63 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java @@ -232,7 +232,7 @@ public class ObjectOutputStream extends TestCase { data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; data.add(new Short((short)1234)) ; - data.add(new Integer(123456)) ; + data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; data.add("DataInputStream") ; diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java index 1f2853b2b906..80ae6f99f6c2 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java @@ -142,7 +142,7 @@ public class AccessibleBrowseBox extends TestCase { params[0].Name = "DataSourceName"; params[0].Value = "Bibliography"; params[1].Name = "CommandType"; - params[1].Value = new Integer(com.sun.star.sdb.CommandType.TABLE); + params[1].Value = Integer.valueOf(com.sun.star.sdb.CommandType.TABLE); params[2].Name = "Command"; params[2].Value = "biblio"; diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java index 05edbc4a9bb0..525d81acaea4 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java @@ -163,7 +163,7 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { PropertyValue param2 = new PropertyValue(); param2.Name = "CommandType"; - param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE); + param2.Value = Integer.valueOf(com.sun.star.sdb.CommandType.TABLE); params[1] = param2; PropertyValue param3 = new PropertyValue(); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java index 2b2157bae7e0..71178150c73f 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java @@ -174,7 +174,7 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { params[0] = param1; PropertyValue param2 = new PropertyValue(); param2.Name = "CommandType"; - param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE); + param2.Value = Integer.valueOf(com.sun.star.sdb.CommandType.TABLE); params[1] = param2; PropertyValue param3 = new PropertyValue(); param3.Name = "Command"; diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java index 37ad7e9b99b2..42f8e7136f21 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java @@ -175,7 +175,7 @@ public class AccessibleBrowseBoxTable extends TestCase { PropertyValue param2 = new PropertyValue(); param2.Name = "CommandType"; - param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE); + param2.Value = Integer.valueOf(com.sun.star.sdb.CommandType.TABLE); params[1] = param2; PropertyValue param3 = new PropertyValue(); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java index 0d70e85fed40..34993a1e4d33 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java @@ -171,7 +171,7 @@ public class AccessibleBrowseBoxTableCell extends TestCase { params[0] = param1; PropertyValue param2 = new PropertyValue(); param2.Name = "CommandType"; - param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE); + param2.Value = Integer.valueOf(com.sun.star.sdb.CommandType.TABLE); params[1] = param2; PropertyValue param3 = new PropertyValue(); param3.Name = "Command"; diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java index e4f97cbc67fe..def0a3354a94 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java @@ -192,7 +192,7 @@ public class AccessibleTreeListBox extends TestCase { params[0] = param1; PropertyValue param2 = new PropertyValue(); param2.Name = "CommandType"; - param2.Value = new Integer(com.sun.star.sdb.CommandType.TABLE); + param2.Value = Integer.valueOf(com.sun.star.sdb.CommandType.TABLE); params[1] = param2; PropertyValue param3 = new PropertyValue(); param3.Name = "Command"; diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java index cac287433443..cfcff7355b95 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java @@ -204,7 +204,7 @@ public class AccessibleTreeListBoxEntry extends TestCase { PropertyValue param2 = new PropertyValue(); param2.Name = "CommandType"; - param2.Value = new Integer(com.sun.star.sdb.CommandType.QUERY); + param2.Value = Integer.valueOf(com.sun.star.sdb.CommandType.QUERY); params[1] = param2; PropertyValue param3 = new PropertyValue(); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index ee2fcd7f5974..d7bd1c2d21fe 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -101,7 +101,7 @@ public class AccessiblePageShape extends TestCase { new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { try { - PageProps.setPropertyValue("Height",new Integer(5000)); + PageProps.setPropertyValue("Height",Integer.valueOf(5000)); } catch (com.sun.star.beans.UnknownPropertyException upe) { System.out.println("Don't no the Property Height"); } catch (com.sun.star.beans.PropertyVetoException pve) { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index b7ce8d20e44b..76e0f7846b1d 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -144,7 +144,7 @@ public class SwAccessibleFooterView extends TestCase { public void fireEvent() { try { PropSet.setPropertyValue("FooterLeftMargin", - new Integer(1000)); + Integer.valueOf(1000)); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(); throw new StatusException("Cann't change footer.", e); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java index 7df2c3374bc0..31c24accc71b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java @@ -134,7 +134,7 @@ public class SwAccessibleHeaderView extends TestCase { public void fireEvent() { try { PropSet.setPropertyValue("HeaderLeftMargin", - new Integer(1000)); + Integer.valueOf(1000)); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(); throw new StatusException("Cann't change footer.", e); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index 428bee5106d7..77e5d7181c75 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -195,7 +195,7 @@ public class SwAccessiblePageView extends TestCase { new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer() { public void fireEvent() { Integer old = (Integer) xAccVal.getCurrentValue(); - Integer newValue = new Integer(old.intValue()+10); + Integer newValue = Integer.valueOf(old.intValue()+10); xAccVal.setCurrentValue(newValue); xAccVal.setCurrentValue(old); } diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java index fdcfa94b952d..92623758637f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java +++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java @@ -55,7 +55,7 @@ public class SwXMailMerge extends TestCase { @Override public void initialize( TestParameters Param, PrintWriter log ) { if (! Param.containsKey("uniqueSuffix")){ - Param.put("uniqueSuffix", new Integer(0)); + Param.put("uniqueSuffix", Integer.valueOf(0)); } } @@ -111,7 +111,7 @@ public class SwXMailMerge extends TestCase { try { oRowSetProps.setPropertyValue("DataSourceName",cDataSourceName); oRowSetProps.setPropertyValue("Command",cDataCommand); - oRowSetProps.setPropertyValue("CommandType", new Integer(CommandType.TABLE)); + oRowSetProps.setPropertyValue("CommandType", Integer.valueOf(CommandType.TABLE)); } catch (UnknownPropertyException e) { throw new StatusException("Can't set properties on oRowSet", e); } catch (PropertyVetoException e) { @@ -155,7 +155,7 @@ public class SwXMailMerge extends TestCase { oObjProps.setPropertyValue("ActiveConnection", getLocalXConnection(Param)); oObjProps.setPropertyValue("DataSourceName", cDataSourceName); oObjProps.setPropertyValue("Command", cDataCommand); - oObjProps.setPropertyValue("CommandType", new Integer(CommandType.TABLE)); + oObjProps.setPropertyValue("CommandType", Integer.valueOf(CommandType.TABLE)); oObjProps.setPropertyValue("OutputType", new Short(MailMergeType.FILE)); oObjProps.setPropertyValue("DocumentURL", cTestDoc); oObjProps.setPropertyValue("OutputURL", cOutputURL); @@ -185,7 +185,7 @@ public class SwXMailMerge extends TestCase { // first Arguments vXJobArg0[0] = new NamedValue("DataSourceName", cDataSourceName); vXJobArg0[1] = new NamedValue("Command", cDataCommand); - vXJobArg0[2] = new NamedValue("CommandType",new Integer(CommandType.TABLE)); + vXJobArg0[2] = new NamedValue("CommandType",Integer.valueOf(CommandType.TABLE)); vXJobArg0[3] = new NamedValue("OutputType",new Short(MailMergeType.FILE)); vXJobArg0[4] = new NamedValue("DocumentURL", cTestDoc); vXJobArg0[5] = new NamedValue("OutputURL", cOutputURL); @@ -195,7 +195,7 @@ public class SwXMailMerge extends TestCase { //second Arguments vXJobArg1[0] = new NamedValue("DataSourceName", cDataSourceName); vXJobArg1[1] = new NamedValue("Command", cDataCommand); - vXJobArg1[2] = new NamedValue("CommandType",new Integer(CommandType.TABLE)); + vXJobArg1[2] = new NamedValue("CommandType",Integer.valueOf(CommandType.TABLE)); vXJobArg1[3] = new NamedValue("OutputType", new Short(MailMergeType.PRINTER)); vXJobArg1[4] = new NamedValue("DocumentURL", cTestDoc); @@ -206,7 +206,7 @@ public class SwXMailMerge extends TestCase { vXJobArg2[0] = new NamedValue("ActiveConnection", getLocalXConnection(Param)); vXJobArg2[1] = new NamedValue("DataSourceName", cDataSourceName); vXJobArg2[2] = new NamedValue("Command", cDataCommand); - vXJobArg2[3] = new NamedValue("CommandType",new Integer(CommandType.TABLE)); + vXJobArg2[3] = new NamedValue("CommandType",Integer.valueOf(CommandType.TABLE)); vXJobArg2[4] = new NamedValue("OutputType", new Short(MailMergeType.FILE)); vXJobArg2[5] = new NamedValue("ResultSet", oResultSet); @@ -247,7 +247,7 @@ public class SwXMailMerge extends TestCase { try { oRowSetProps.setPropertyValue("DataSourceName",cDataSourceName); oRowSetProps.setPropertyValue("Command",cDataCommand); - oRowSetProps.setPropertyValue("CommandType", new Integer(CommandType.TABLE)); + oRowSetProps.setPropertyValue("CommandType", Integer.valueOf(CommandType.TABLE)); } catch (UnknownPropertyException e) { throw new StatusException("Can't set properties on oRowSet", e); } catch (PropertyVetoException e) { @@ -337,13 +337,13 @@ public class SwXMailMerge extends TestCase { dbt.reRegisterDB(databaseName, newSource) ; uniqueSuffix++; - Param.put("uniqueSuffix", new Integer(uniqueSuffix)); + Param.put("uniqueSuffix", Integer.valueOf(uniqueSuffix)); return dbt.connectToSource(newSource); } catch( Exception e ) { uniqueSuffix++; - Param.put("uniqueSuffix", new Integer(uniqueSuffix)); + Param.put("uniqueSuffix", Integer.valueOf(uniqueSuffix)); log.println("could not register new database" ); e.printStackTrace(); throw new StatusException("could not register new database", e) ; diff --git a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java index bd6d1f339d35..8d34505ee6db 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java +++ b/qadevOOo/tests/java/mod/_sw/SwXStyleFamily.java @@ -166,7 +166,7 @@ public class SwXStyleFamily extends TestCase { if ((String)Param.get("THRCNT") != null) { THRCNT = Integer.parseInt((String)Param.get("THRCNT")); } - String nr = new Integer(THRCNT+1).toString(); + String nr = Integer.valueOf(THRCNT+1).toString(); log.println( "adding NameReplaceIndex as mod relation to environment" ); tEnv.addObjRelation("XNameReplaceINDEX", nr); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java index 5efc3a1a933e..9017578a1ad3 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java @@ -108,7 +108,7 @@ public class SwXTextFrameText extends TestCase { (XPropertySet.class, oFrame1 ); //AnchorTypes: 0 = paragraph, 1 = as char, 2 = page, // 3 = frame/paragraph 4= at char - oPropSet.setPropertyValue("AnchorType", new Integer(2)); + oPropSet.setPropertyValue("AnchorType", Integer.valueOf(2)); oText = xTextDoc.getText(); oCursor = oText.createTextCursor(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java index 5261ca90f771..d2e661700a95 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java @@ -151,10 +151,10 @@ public class SwXTextGraphicObject extends TestCase { oProps.setPropertyValue("AnchorType", TextContentAnchorType.AT_PARAGRAPH); oProps.setPropertyValue("GraphicURL",wat); - oProps.setPropertyValue("HoriOrientPosition",new Integer(5500)); - oProps.setPropertyValue("VertOrientPosition",new Integer(4200)); - oProps.setPropertyValue("Width",new Integer(4400)); - oProps.setPropertyValue("Height",new Integer(4000)); + oProps.setPropertyValue("HoriOrientPosition",Integer.valueOf(5500)); + oProps.setPropertyValue("VertOrientPosition",Integer.valueOf(4200)); + oProps.setPropertyValue("Width",Integer.valueOf(4400)); + oProps.setPropertyValue("Height",Integer.valueOf(4000)); } catch (Exception e) { System.out.println("Couldn't set property 'GraphicURL'"); e.printStackTrace(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java index 299648662f21..9396a9de37eb 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObjects.java @@ -131,10 +131,10 @@ public class SwXTextGraphicObjects extends TestCase { try { String wat = util.utils.getFullTestURL("space-metal.jpg"); oProps.setPropertyValue("GraphicURL",wat); - oProps.setPropertyValue("HoriOrientPosition",new Integer(5500)); - oProps.setPropertyValue("VertOrientPosition",new Integer(4200)); - oProps.setPropertyValue("Width",new Integer(4400)); - oProps.setPropertyValue("Height",new Integer(4000)); + oProps.setPropertyValue("HoriOrientPosition",Integer.valueOf(5500)); + oProps.setPropertyValue("VertOrientPosition",Integer.valueOf(4200)); + oProps.setPropertyValue("Width",Integer.valueOf(4400)); + oProps.setPropertyValue("Height",Integer.valueOf(4000)); } catch (Exception e) { System.out.println("Couldn't set property 'GraphicURL'"); e.printStackTrace(); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java index 25ea9652aa58..2828479090f6 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java @@ -119,8 +119,8 @@ public class SwXTextTable extends TestCase { //Adding relation for util.XTextTable - tEnv.addObjRelation("NROW", new Integer(nRow)); - tEnv.addObjRelation("NCOL", new Integer(nCol)); + tEnv.addObjRelation("NROW", Integer.valueOf(nRow)); + tEnv.addObjRelation("NCOL", Integer.valueOf(nCol)); //Adding ObjRelation for XCellRangeData Object[][] newData = new Object[6][]; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java index 11f987e73f62..00446d912ad0 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java @@ -128,8 +128,8 @@ public class SwXTextTables extends TestCase { log.println( "adding TextDocument as mod relation to environment" ); tEnv.addObjRelation( "TEXTDOC", xTextDoc ); - tEnv.addObjRelation( "ROW", new Integer( nRow ) ); - tEnv.addObjRelation( "COL", new Integer( nCol ) ); + tEnv.addObjRelation( "ROW", Integer.valueOf( nRow ) ); + tEnv.addObjRelation( "COL", Integer.valueOf( nCol ) ); try { tEnv.addObjRelation( "INST", SOfficeFactory.createTextTable( xTextDoc )); } diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java index b499032646f3..347562e094dd 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java @@ -87,10 +87,10 @@ public class UnoControlDialogModel extends TestCase { // create the dialog model and set the properties XPropertySet xPSetDialog = UnoRuntime.queryInterface( XPropertySet.class, dialogModel); - xPSetDialog.setPropertyValue("PositionX", new Integer(100)); - xPSetDialog.setPropertyValue("PositionY", new Integer(100)); - xPSetDialog.setPropertyValue("Width", new Integer(150)); - xPSetDialog.setPropertyValue("Height", new Integer(100)); + xPSetDialog.setPropertyValue("PositionX", Integer.valueOf(100)); + xPSetDialog.setPropertyValue("PositionY", Integer.valueOf(100)); + xPSetDialog.setPropertyValue("Width", Integer.valueOf(150)); + xPSetDialog.setPropertyValue("Height", Integer.valueOf(100)); xPSetDialog.setPropertyValue("Title", "Runtime Dialog Demo"); // get the service manager from the dialog model @@ -103,10 +103,10 @@ public class UnoControlDialogModel extends TestCase { "com.sun.star.awt.UnoControlButtonModel"); XPropertySet xPSetButton = UnoRuntime.queryInterface( XPropertySet.class, buttonModel); - xPSetButton.setPropertyValue("PositionX", new Integer(50)); - xPSetButton.setPropertyValue("PositionY", new Integer(30)); - xPSetButton.setPropertyValue("Width", new Integer(50)); - xPSetButton.setPropertyValue("Height", new Integer(14)); + xPSetButton.setPropertyValue("PositionX", Integer.valueOf(50)); + xPSetButton.setPropertyValue("PositionY", Integer.valueOf(30)); + xPSetButton.setPropertyValue("Width", Integer.valueOf(50)); + xPSetButton.setPropertyValue("Height", Integer.valueOf(14)); xPSetButton.setPropertyValue("Name", _buttonName); xPSetButton.setPropertyValue("TabIndex", new Short((short) 0)); xPSetButton.setPropertyValue("Label", "Click Me"); @@ -116,10 +116,10 @@ public class UnoControlDialogModel extends TestCase { "com.sun.star.awt.UnoControlFixedTextModel"); XPropertySet xPSetLabel = UnoRuntime.queryInterface( XPropertySet.class, labelModel); - xPSetLabel.setPropertyValue("PositionX", new Integer(40)); - xPSetLabel.setPropertyValue("PositionY", new Integer(60)); - xPSetLabel.setPropertyValue("Width", new Integer(100)); - xPSetLabel.setPropertyValue("Height", new Integer(14)); + xPSetLabel.setPropertyValue("PositionX", Integer.valueOf(40)); + xPSetLabel.setPropertyValue("PositionY", Integer.valueOf(60)); + xPSetLabel.setPropertyValue("Width", Integer.valueOf(100)); + xPSetLabel.setPropertyValue("Height", Integer.valueOf(14)); xPSetLabel.setPropertyValue("Name", _labelName); xPSetLabel.setPropertyValue("TabIndex", new Short((short) 1)); xPSetLabel.setPropertyValue("Label", _labelPrefix); diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java index b281fc10eb4c..7c0645ef4964 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java @@ -97,10 +97,10 @@ public class UnoTreeControl extends TestCase { mxMSF.createInstance("com.sun.star.awt.UnoControlDialogModel")); XPropertySet xDialogPropertySet = UnoRuntime.queryInterface(XPropertySet.class, xDialogModel); - xDialogPropertySet.setPropertyValue( "PositionX", new Integer(50) ); - xDialogPropertySet.setPropertyValue( "PositionY", new Integer(50) ); - xDialogPropertySet.setPropertyValue( "Width", new Integer(256) ); - xDialogPropertySet.setPropertyValue( "Height", new Integer(256) ); + xDialogPropertySet.setPropertyValue( "PositionX", Integer.valueOf(50) ); + xDialogPropertySet.setPropertyValue( "PositionY", Integer.valueOf(50) ); + xDialogPropertySet.setPropertyValue( "Width", Integer.valueOf(256) ); + xDialogPropertySet.setPropertyValue( "Height", Integer.valueOf(256) ); xDialogPropertySet.setPropertyValue( "Title", "Tree Control Test"); XMultiServiceFactory xDialogMSF = UnoRuntime.queryInterface(XMultiServiceFactory.class, xDialogModel); @@ -111,10 +111,10 @@ public class UnoTreeControl extends TestCase { XPropertySet XTreeControlModelSet = UnoRuntime.queryInterface(XPropertySet.class, xTreeControlModel); XTreeControlModelSet.setPropertyValue( "SelectionType",com.sun.star.view.SelectionType.NONE); - XTreeControlModelSet.setPropertyValue( "PositionX", new Integer(3 )); - XTreeControlModelSet.setPropertyValue( "PositionY", new Integer(3 )); - XTreeControlModelSet.setPropertyValue( "Width", new Integer(253)); - XTreeControlModelSet.setPropertyValue( "Height", new Integer(253) ); + XTreeControlModelSet.setPropertyValue( "PositionX", Integer.valueOf(3 )); + XTreeControlModelSet.setPropertyValue( "PositionY", Integer.valueOf(3 )); + XTreeControlModelSet.setPropertyValue( "Width", Integer.valueOf(253)); + XTreeControlModelSet.setPropertyValue( "Height", Integer.valueOf(253) ); XTreeControlModelSet.setPropertyValue( "DataModel", mXTreeDataModel ); XTreeControlModelSet.setPropertyValue( "ShowsRootHandles", Boolean.FALSE); XTreeControlModelSet.setPropertyValue( "ShowsHandles", Boolean.FALSE); diff --git a/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java b/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java index 8f421ab7f3ff..e95aa0cd69ad 100644 --- a/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java +++ b/qadevOOo/tests/java/mod/_uuresolver/UnoUrlResolver.java @@ -61,7 +61,7 @@ public class UnoUrlResolver extends TestCase { if (os.equalsIgnoreCase("unxlngi")) port = 20006; - tEnv.addObjRelation("PORT", new Integer(port)); + tEnv.addObjRelation("PORT", Integer.valueOf(port)); return tEnv; } catch (Exception e) { diff --git a/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java b/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java index ee850a982240..96cccdb7700d 100644 --- a/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java +++ b/qadevOOo/tests/java/mod/_uuresolver/uno/UnoUrlResolver.java @@ -48,7 +48,7 @@ public class UnoUrlResolver extends TestCase { tEnv.addObjRelation("ACCEPTOR", oAcctr); int port = util.utils.getNextFreePort(20004); - tEnv.addObjRelation("PORT", new Integer(port)); + tEnv.addObjRelation("PORT", Integer.valueOf(port)); return tEnv; } catch (Exception e) { |