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 | |
| parent | be1bb7b1ccee28be616b89cc95e97d656e78bbe3 (diff) | |
java: use 'Integer.valueOf' instead of 'new Integer'
Change-Id: Ia8befb8d69914ce971174fc5f2ffc0e2f506a940
322 files changed, 1128 insertions, 1128 deletions
diff --git a/bean/com/sun/star/beans/JavaWindowPeerFake.java b/bean/com/sun/star/beans/JavaWindowPeerFake.java index a30fb146cd1d..efd57d02bd71 100644 --- a/bean/com/sun/star/beans/JavaWindowPeerFake.java +++ b/bean/com/sun/star/beans/JavaWindowPeerFake.java @@ -48,7 +48,7 @@ import com.sun.star.awt.*; { if (SystemType == localSystemType) { - return new Integer((int)hWindow); + return Integer.valueOf((int)hWindow); } else return null; } diff --git a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java index 8f8727256d82..8a60beec4c46 100644 --- a/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java +++ b/bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java @@ -157,7 +157,7 @@ public final class JNI_proxy implements java.lang.reflect.InvocationHandler if (method_name.equals( "hashCode" )) { // int hashCode() - return new Integer( m_oid.hashCode() ); + return Integer.valueOf( m_oid.hashCode() ); } else if (method_name.equals( "equals" )) { diff --git a/bridges/test/java_remote/PolyStructTest.java b/bridges/test/java_remote/PolyStructTest.java index c0b2e9b22a44..337a061d1d09 100644 --- a/bridges/test/java_remote/PolyStructTest.java +++ b/bridges/test/java_remote/PolyStructTest.java @@ -82,15 +82,15 @@ public final class PolyStructTest extends ComplexTestCase { new TestPolyStruct(new Short(Short.MAX_VALUE))).member); assertEquals( - new Integer(0), t.transportLong(new TestPolyStruct()).member); + Integer.valueOf(0), t.transportLong(new TestPolyStruct()).member); assertEquals( - new Integer(Integer.MIN_VALUE), + Integer.valueOf(Integer.MIN_VALUE), t.transportLong( - new TestPolyStruct(new Integer(Integer.MIN_VALUE))).member); + new TestPolyStruct(Integer.valueOf(Integer.MIN_VALUE))).member); assertEquals( - new Integer(Integer.MAX_VALUE), + Integer.valueOf(Integer.MAX_VALUE), t.transportLong( - new TestPolyStruct(new Integer(Integer.MAX_VALUE))).member); + new TestPolyStruct(Integer.valueOf(Integer.MAX_VALUE))).member); assertEquals( new Long(0L), t.transportHyper(new TestPolyStruct()).member); @@ -161,10 +161,10 @@ public final class PolyStructTest extends ComplexTestCase { Any.VOID, t.transportAny(new TestPolyStruct(Any.VOID)).member); assertEquals(null, t.transportAny(new TestPolyStruct(null)).member); assertEquals( - new Any(Type.UNSIGNED_LONG, new Integer(5)), + new Any(Type.UNSIGNED_LONG, Integer.valueOf(5)), t.transportAny( new TestPolyStruct( - new Any(Type.UNSIGNED_LONG, new Integer(5)))).member); + new Any(Type.UNSIGNED_LONG, Integer.valueOf(5)))).member); assertEquals( TestEnum.VALUE1, t.transportEnum(new TestPolyStruct()).member); diff --git a/bridges/test/java_uno/any/TestAny.java b/bridges/test/java_uno/any/TestAny.java index d77e866f64a6..2c1575fcf555 100644 --- a/bridges/test/java_uno/any/TestAny.java +++ b/bridges/test/java_uno/any/TestAny.java @@ -168,29 +168,29 @@ final class TestAny { new CompareBoxed()); // LONG: - success &= testMapAny(transport, new Integer(-2147483648), + success &= testMapAny(transport, Integer.valueOf(-2147483648), new CompareBoxed()); - success &= testMapAny(transport, new Integer(0), + success &= testMapAny(transport, Integer.valueOf(0), new CompareBoxed()); - success &= testMapAny(transport, new Integer(2147483647), + success &= testMapAny(transport, Integer.valueOf(2147483647), new CompareBoxed()); success &= testMapAny(transport, - new Any(Type.LONG, new Integer(-2147483648)), + new Any(Type.LONG, Integer.valueOf(-2147483648)), new CompareUnboxed()); success &= testMapAny(transport, - new Any(Type.LONG, new Integer(0)), + new Any(Type.LONG, Integer.valueOf(0)), new CompareUnboxed()); success &= testMapAny(transport, - new Any(Type.LONG, new Integer(2147483647)), + new Any(Type.LONG, Integer.valueOf(2147483647)), new CompareUnboxed()); // UNSIGNED LONG: success &= testMapAny(transport, - new Any(Type.UNSIGNED_LONG, new Integer(0)), + new Any(Type.UNSIGNED_LONG, Integer.valueOf(0)), new CompareBoxed()); success &= testMapAny(transport, new Any(Type.UNSIGNED_LONG, - new Integer(-2147483648)), + Integer.valueOf(-2147483648)), new CompareBoxed()); // HYPER: diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index 53b6ac30edc6..fec6430ca002 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -213,7 +213,7 @@ public class TestCaseOldAPI extends ComplexTestCase { float fWeight = FontWeight.BOLD; float fHeight = (float)14.0; - xTitleProp.setPropertyValue( "CharColor", new Integer( nColor ) ); + xTitleProp.setPropertyValue( "CharColor", Integer.valueOf( nColor ) ); xTitleProp.setPropertyValue( "CharWeight", new Float( fWeight )); xTitleProp.setPropertyValue( "CharHeight", new Float( fHeight ) ); @@ -253,7 +253,7 @@ public class TestCaseOldAPI extends ComplexTestCase { if( xProp != null ) { int nColor = 0xffe1ff; // thistle1 - xProp.setPropertyValue( "FillColor", new Integer( nColor ) ); + xProp.setPropertyValue( "FillColor", Integer.valueOf( nColor ) ); int nNewColor = AnyConverter.toInt( xProp.getPropertyValue( "FillColor" ) ); assure( "Changing FillColor via old API failed", nNewColor == nColor ); } @@ -387,7 +387,7 @@ public class TestCaseOldAPI extends ComplexTestCase { ! AnyConverter.toBoolean( xProp.getPropertyValue( "Logarithmic" )) ); int nNewColor = 0xcd853f; // peru - xProp.setPropertyValue( "LineColor", new Integer( nNewColor )); + xProp.setPropertyValue( "LineColor", Integer.valueOf( nNewColor )); assure( "Property LineColor", AnyConverter.toInt( xProp.getPropertyValue( "LineColor" )) == nNewColor ); float fNewCharHeight = (float)(16.0); @@ -396,7 +396,7 @@ public class TestCaseOldAPI extends ComplexTestCase { AnyConverter.toFloat( xProp.getPropertyValue( "CharHeight" )) == fNewCharHeight ); int nNewTextRotation = 700; // in 1/100 degrees - xProp.setPropertyValue( "TextRotation", new Integer( nNewTextRotation )); + xProp.setPropertyValue( "TextRotation", Integer.valueOf( nNewTextRotation )); assure( "Property TextRotation", AnyConverter.toInt( xProp.getPropertyValue( "TextRotation" )) == nNewTextRotation ); @@ -481,7 +481,7 @@ public class TestCaseOldAPI extends ComplexTestCase { try { int nColor = 0xf5fffa; // mint cream - xArea.setPropertyValue( "FillColor", new Integer( nColor ) ); + xArea.setPropertyValue( "FillColor", Integer.valueOf( nColor ) ); xArea.setPropertyValue( "FillStyle", FillStyle.SOLID ); int nNewColor = AnyConverter.toInt( xArea.getPropertyValue( "FillColor" ) ); @@ -582,7 +582,7 @@ public class TestCaseOldAPI extends ComplexTestCase { // FillColor XPropertySet xProp = xDia.getDataRowProperties( 0 ); int nColor = 0xffd700; // gold - xProp.setPropertyValue( "FillColor", new Integer( nColor )); + xProp.setPropertyValue( "FillColor", Integer.valueOf( nColor )); int nNewColor = AnyConverter.toInt( xProp.getPropertyValue( "FillColor" ) ); assure( "Changing FillColor of Data Series failed", nNewColor == nColor ); @@ -778,7 +778,7 @@ public class TestCaseOldAPI extends ComplexTestCase { assure( "No MinMaxLine", xMinMaxProp != null ); int nLineColor = 0x458b00; // chartreuse4 - xMinMaxProp.setPropertyValue( "LineColor", new Integer( nLineColor )); + xMinMaxProp.setPropertyValue( "LineColor", Integer.valueOf( nLineColor )); int nNewColor = AnyConverter.toInt( xMinMaxProp.getPropertyValue( "LineColor" ) ); assure( "Changing LineColor of MinMax Line", nNewColor == nLineColor ); } diff --git a/codemaker/test/javamaker/Test.java b/codemaker/test/javamaker/Test.java index 8b506a2d80f5..cc95099ecf21 100644 --- a/codemaker/test/javamaker/Test.java +++ b/codemaker/test/javamaker/Test.java @@ -222,7 +222,7 @@ public final class Test extends ComplexTestCase { //TODO: Struct2 s = new Struct2( true, (byte) 1, (short) 2, (short) 3, 4, 5, 6L, 7L, 0.8f, 0.9, 'A', - "BCD", Type.UNSIGNED_HYPER, new Integer(22), Enum2.VALUE4, + "BCD", Type.UNSIGNED_HYPER, Integer.valueOf(22), Enum2.VALUE4, new Struct1(1), null, null, false, (byte) 0, (short) 0, (short) 0, 0, 0, 0L, 0L, 0.0f, 0.0, '\u0000', "", Type.VOID, Any.VOID, Enum2.VALUE0, new Struct1(), null, null, @@ -255,7 +255,7 @@ public final class Test extends ComplexTestCase { assure(s.p11 == 'A'); assure(s.p12.equals("BCD")); assure(s.p13.equals(Type.UNSIGNED_HYPER)); - assure(s.p14.equals(new Integer(22))); + assure(s.p14.equals(Integer.valueOf(22))); assure(s.p15 == Enum2.VALUE4); assure(s.p16.member1 == 1); assure(s.p17 == null); diff --git a/comphelper/qa/complex/comphelper/Map.java b/comphelper/qa/complex/comphelper/Map.java index 6d622a7dfb1e..a615c8f86323 100644 --- a/comphelper/qa/complex/comphelper/Map.java +++ b/comphelper/qa/complex/comphelper/Map.java @@ -236,7 +236,7 @@ public class Map /* extends complexlib.ComplexTestCase */ { case 0: someValue = Boolean.FALSE; break; case 1: someValue = new Short( (short)0 ); break; - case 2: someValue = new Integer( 0 ); break; + case 2: someValue = Integer.valueOf( 0 ); break; case 3: someValue = new Long( 0 ); break; case 4: someValue = UnoRuntime.queryInterface( XInterface.class, new DummyInterface() ); break; case 5: someValue = UnoRuntime.queryInterface( XSet.class, new DummySet() ); break; diff --git a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java index 73f0a8d5bbe7..992619b7c675 100644 --- a/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java +++ b/connectivity/qa/connectivity/tools/HsqlTableDescriptor.java @@ -79,7 +79,7 @@ public class HsqlTableDescriptor try { columnDesc.setPropertyValue( "Name", myColumns[i].getName() ); - columnDesc.setPropertyValue( "IsNullable", new Integer( myColumns[i].isRequired() ? ColumnValue.NO_NULLS : ColumnValue.NULLABLE) ); + columnDesc.setPropertyValue( "IsNullable", Integer.valueOf( myColumns[i].isRequired() ? ColumnValue.NO_NULLS : ColumnValue.NULLABLE) ); columnDesc.setPropertyValue( "TypeName", myColumns[i].getTypeName() ); if ( myColumns[i].isPrimaryKey() || myColumns[i].isForeignKey() ) // not yet implemented diff --git a/connectivity/qa/connectivity/tools/RowSet.java b/connectivity/qa/connectivity/tools/RowSet.java index 40c07c7968d1..e5b2545c2c53 100644 --- a/connectivity/qa/connectivity/tools/RowSet.java +++ b/connectivity/qa/connectivity/tools/RowSet.java @@ -50,7 +50,7 @@ public class RowSet implements XRowSet, XRow { m_rowSetProps = UnoRuntime.queryInterface( XPropertySet.class, _orb.createInstance( "com.sun.star.sdb.RowSet" ) ); m_rowSetProps.setPropertyValue( "DataSourceName", _dataSource ); - m_rowSetProps.setPropertyValue( "CommandType", new Integer( _commandType ) ); + m_rowSetProps.setPropertyValue( "CommandType", Integer.valueOf( _commandType ) ); m_rowSetProps.setPropertyValue( "Command", _command ); m_rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSetProps ); diff --git a/embeddedobj/test/Container1/EmbedContApp.java b/embeddedobj/test/Container1/EmbedContApp.java index 54f824c4957c..b0b2708d5467 100644 --- a/embeddedobj/test/Container1/EmbedContApp.java +++ b/embeddedobj/test/Container1/EmbedContApp.java @@ -1453,7 +1453,7 @@ public class EmbedContApp extends Applet { Object aArgs[] = new Object[2]; aArgs[0] = aFileURI; - aArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE ); + aArgs[1] = Integer.valueOf( ElementModes.ELEMENT_READWRITE ); Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs ); XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage ); @@ -1503,7 +1503,7 @@ public class EmbedContApp extends Applet oStorageFactory ); Object aArgs[] = new Object[2]; aArgs[0] = aFileURI; - aArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE ); + aArgs[1] = Integer.valueOf( ElementModes.ELEMENT_READWRITE ); Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs ); XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage ); @@ -1631,7 +1631,7 @@ public class EmbedContApp extends Applet { Object aArgs[] = new Object[2]; aArgs[0] = aFileURI; - aArgs[1] = new Integer( ElementModes.ELEMENT_READWRITE ); + aArgs[1] = Integer.valueOf( ElementModes.ELEMENT_READWRITE ); Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs ); XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage ); diff --git a/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java index a28a17d9ea85..dcc4b6b8fca6 100644 --- a/embeddedobj/test/Container1/NativeView.java +++ b/embeddedobj/test/Container1/NativeView.java @@ -137,7 +137,7 @@ public class NativeView extends java.awt.Canvas { if( maHandle == null ) { - maHandle = new Integer( (int )getNativeWindow() ); + maHandle = Integer.valueOf( (int )getNativeWindow() ); maSystem = getNativeWindowSystemType(); } return maHandle; diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index e2dd6e86a400..170feb9d1c0a 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -509,7 +509,7 @@ public class CellBinding extends complexlib.ComplexTestCase XAccessibleValue xValue = UnoRuntime.queryInterface( XAccessibleValue.class, accessible.getAccessibleContext() ); - Integer newValue = new Integer( 1 ); + Integer newValue = Integer.valueOf( 1 ); xValue.setCurrentValue( newValue ); } diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index bf741e0a8de4..323b15f74715 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -532,13 +532,13 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE xCheckBox.setPropertyValue( "TriState", Boolean.TRUE ); xCheckBox.setPropertyValue( "DefaultState", new Short( (short)2 ) ); xTimeField.setPropertyValue( "TimeFormat", new Short( (short)1 ) ); - xTimeField.setPropertyValue( "TimeMax", new Integer( 23595999 ) ); + xTimeField.setPropertyValue( "TimeMax", Integer.valueOf( 23595999 ) ); xReqField.setPropertyValue( "ConvertEmptyToNull", Boolean.FALSE ); // the logical form m_masterForm = (XPropertySet)dbfTools.getParent( xIDField, XPropertySet.class ); m_masterForm.setPropertyValue( "DataSourceName", m_dataSourceProps.getPropertyValue( "Name" ) ); - m_masterForm.setPropertyValue( "CommandType", new Integer( CommandType.TABLE ) ); + m_masterForm.setPropertyValue( "CommandType", Integer.valueOf( CommandType.TABLE ) ); m_masterForm.setPropertyValue( "Command", s_tableName ); insertRadio( 3, "none", "none" ); diff --git a/forms/qa/integration/forms/FormLayer.java b/forms/qa/integration/forms/FormLayer.java index ca142896418d..ed684be68bae 100644 --- a/forms/qa/integration/forms/FormLayer.java +++ b/forms/qa/integration/forms/FormLayer.java @@ -219,7 +219,7 @@ public class FormLayer { xFieldModel.setPropertyValue( "Border", new Short( VisualEffect.FLAT ) ); if ( xFieldModel.getPropertySetInfo().hasPropertyByName( "BorderColor" ) ) - xFieldModel.setPropertyValue( "BorderColor", new Integer( 0x00C0C0C0 ) ); + xFieldModel.setPropertyValue( "BorderColor", Integer.valueOf( 0x00C0C0C0 ) ); } // knit it to it's label component xFieldModel.setPropertyValue( "LabelControl", xLabelModel ); diff --git a/forms/qa/integration/forms/FormPropertyBags.java b/forms/qa/integration/forms/FormPropertyBags.java index 8d6781b78aaa..4a3966acd5c7 100644 --- a/forms/qa/integration/forms/FormPropertyBags.java +++ b/forms/qa/integration/forms/FormPropertyBags.java @@ -102,7 +102,7 @@ public class FormPropertyBags extends complexlib.ComplexTestCase implements XPro propContainer.addProperty( "SomeBoundText", PropertyAttribute.BOUND, "InitialBoundText" ); propContainer.addProperty( "SomeTransientText", PropertyAttribute.TRANSIENT, "InitialTransientProperty" ); propContainer.addProperty( "SomeReadonlyText", PropertyAttribute.READONLY, "InitialReadonlyText" ); - propContainer.addProperty( "SomeNumericValue", PropertyAttribute.BOUND, new Integer( 42 ) ); + propContainer.addProperty( "SomeNumericValue", PropertyAttribute.BOUND, Integer.valueOf( 42 ) ); XPropertySetInfo propertyInfo = textFieldModel.getPropertySetInfo(); assure( "Per service definition, dynamic properties are expected to be forced to be removable", @@ -171,7 +171,7 @@ public class FormPropertyBags extends complexlib.ComplexTestCase implements XPro // all persistent properties should have the expected values assure( "persistent properties did not survive reload (1)!", ((String)textFieldModel.getPropertyValue( "SomeBoundText" )).equals( "ChangedBoundText" ) ); assure( "persistent properties did not survive reload (2)!", ((String)textFieldModel.getPropertyValue( "SomeReadonlyText" )).equals( "InitialReadonlyText" ) ); -// assure( "persistent properties did not survive reload (3)!", ((Integer)textFieldModel.getPropertyValue( "SomeNumericValue" )).equals( new Integer( 42 ) ) ); +// assure( "persistent properties did not survive reload (3)!", ((Integer)textFieldModel.getPropertyValue( "SomeNumericValue" )).equals( Integer.valueOf( 42 ) ) ); // cannot check this until the types really survice - at the moment, integers are converted to doubles ... // the transient property should not have survived diff --git a/forms/qa/integration/forms/MasterDetailForms.java b/forms/qa/integration/forms/MasterDetailForms.java index 48868bce8397..3117c3661f98 100644 --- a/forms/qa/integration/forms/MasterDetailForms.java +++ b/forms/qa/integration/forms/MasterDetailForms.java @@ -119,14 +119,14 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com { m_masterForm = dbfTools.queryPropertySet( m_orb.createInstance( "com.sun.star.form.component.DataForm" ) ); m_masterForm.setPropertyValue( "ActiveConnection", _databaseDocument.defaultConnection().getXConnection() ); - m_masterForm.setPropertyValue( "CommandType", new Integer( com.sun.star.sdb.CommandType.TABLE ) ); + m_masterForm.setPropertyValue( "CommandType", Integer.valueOf( com.sun.star.sdb.CommandType.TABLE ) ); m_masterForm.setPropertyValue( "Command", "master" ); m_masterResult = new ResultSet( m_masterForm ); m_detailForm = dbfTools.queryPropertySet( m_orb.createInstance( "com.sun.star.form.component.DataForm" ) ); m_detailForm.setPropertyValue( "ActiveConnection", _databaseDocument.defaultConnection().getXConnection() ); - m_detailForm.setPropertyValue( "CommandType", new Integer( com.sun.star.sdb.CommandType.TABLE ) ); + m_detailForm.setPropertyValue( "CommandType", Integer.valueOf( com.sun.star.sdb.CommandType.TABLE ) ); m_detailForm.setPropertyValue( "Command", "detail" ); m_detailResult = new ResultSet( m_detailForm ); @@ -241,12 +241,12 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com m_masterForm = (XPropertySet)dbfTools.getParent( controlModel, XPropertySet.class ); m_masterForm.setPropertyValue( "Command", "categories" ); - m_masterForm.setPropertyValue( "CommandType", new Integer( CommandType.TABLE ) ); + m_masterForm.setPropertyValue( "CommandType", Integer.valueOf( CommandType.TABLE ) ); // create a detail form m_detailForm = UnoRuntime.queryInterface( XPropertySet.class, subDocument.createSubForm( m_masterForm, "products" ) ); m_detailForm.setPropertyValue( "Command", "SELECT \"ID\", \"Name\", \"CategoryID\" FROM \"products\"" ); - m_detailForm.setPropertyValue( "CommandType", new Integer( CommandType.COMMAND ) ); + m_detailForm.setPropertyValue( "CommandType", Integer.valueOf( CommandType.COMMAND ) ); m_detailForm.setPropertyValue( "MasterFields", new String[] { "ID" } ); m_detailForm.setPropertyValue( "DetailFields", new String[] { "CategoryID" } ); @@ -256,7 +256,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com XIndexContainer gridColumns = UnoRuntime.queryInterface( XIndexContainer.class, gridControlModel ); impl_createGridColumn( gridColumns, "TextField", "ID" ); XPropertySet nameColumn = impl_createGridColumn( gridColumns, "TextField", "Name" ); - nameColumn.setPropertyValue( "Width", new Integer( 600 ) ); // 6 cm + nameColumn.setPropertyValue( "Width", Integer.valueOf( 600 ) ); // 6 cm nameColumn.setPropertyValue( "DefaultText", "default text" ); // go live diff --git a/forms/qa/integration/forms/SingleControlValidation.java b/forms/qa/integration/forms/SingleControlValidation.java index 160d23e867c9..044af2f22afe 100644 --- a/forms/qa/integration/forms/SingleControlValidation.java +++ b/forms/qa/integration/forms/SingleControlValidation.java @@ -155,7 +155,7 @@ public class SingleControlValidation implements XFormComponentValidityListener boolean isValid = xComp.isValid(); m_statusField.setPropertyValue("Label", isValid ? "valid" : "invalid" ); - m_statusField.setPropertyValue( "TextColor", new Integer( isValid ? 0x008000 : 0x800000 ) ); + m_statusField.setPropertyValue( "TextColor", Integer.valueOf( isValid ? 0x008000 : 0x800000 ) ); String validityMessage = ""; if ( !isValid ) diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java index 6b2ff6f0c51c..45d0c675ec56 100644 --- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java +++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java @@ -565,7 +565,7 @@ public class AcceleratorsConfigurationTest Object aArgs[] = new Object[2]; aArgs[0] = sDocCfgName; - aArgs[1] = new Integer(com.sun.star.embed.ElementModes.READ); + aArgs[1] = Integer.valueOf(com.sun.star.embed.ElementModes.READ); XStorage xRootStorage = UnoRuntime.queryInterface(XStorage.class, xStorageFactory.createInstanceWithArguments(aArgs)); XStorage xUIConfig = xRootStorage.openStorageElement("Configurations2", com.sun.star.embed.ElementModes.READ); @@ -601,7 +601,7 @@ public class AcceleratorsConfigurationTest Object aArgs[] = new Object[2]; aArgs[0] = sDocCfgName; - aArgs[1] = new Integer(com.sun.star.embed.ElementModes.WRITE); + aArgs[1] = Integer.valueOf(com.sun.star.embed.ElementModes.WRITE); XStorage xRootStorage = UnoRuntime.queryInterface(XStorage.class, xStorageFactory.createInstanceWithArguments(aArgs)); XStorage xUIConfig = xRootStorage.openStorageElement("Configurations2", com.sun.star.embed.ElementModes.WRITE); diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java index 9f6494394037..dd50de5741d3 100644 --- a/framework/qa/complex/framework/autosave/AutoSave.java +++ b/framework/qa/complex/framework/autosave/AutoSave.java @@ -196,7 +196,7 @@ public class AutoSave // make sure it will be started every 1 min ConfigHelper aConfig = new ConfigHelper(connection.getComponentContext(), "org.openoffice.Office.Recovery", false); aConfig.writeRelativeKey("AutoSave", "Enabled" , Boolean.TRUE ); - aConfig.writeRelativeKey("AutoSave", "TimeIntervall", new Integer(1)); // 1 min + aConfig.writeRelativeKey("AutoSave", "TimeIntervall", Integer.valueOf(1)); // 1 min aConfig.flush(); aConfig = null; diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java index 988d00a7d860..463f748ba206 100644 --- a/framework/qa/complex/framework/recovery/RecoveryTest.java +++ b/framework/qa/complex/framework/recovery/RecoveryTest.java @@ -250,7 +250,7 @@ public class RecoveryTest extends ComplexTestCase { assure(msg, expectedDocumentCount == documents.length); log.println("disable automatically launch of Office"); - oUITools.setCheckBoxValue("Launch StarOffice automatically", new Integer(0)); + oUITools.setCheckBoxValue("Launch StarOffice automatically", Integer.valueOf(0)); log.println("start saving..."); oUITools.clickButton("OK"); diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index 86d4107072de..327145f624ab 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -216,7 +216,7 @@ XMultiPropertySet */ protected Property getPropertyByHandle(int nHandle) { - return _handleToPropertyMap.get(new Integer(nHandle)); + return _handleToPropertyMap.get(Integer.valueOf(nHandle)); } /** Returns an array of all Property objects or an array of length null if there @@ -246,7 +246,7 @@ XMultiPropertySet { _nameToPropertyMap.put(prop.Name, prop); if (prop.Handle != -1) - _handleToPropertyMap.put(new Integer(prop.Handle), prop); + _handleToPropertyMap.put(Integer.valueOf(prop.Handle), prop); } /** Assigns an identifyer object to a Property object so that the identifyer @@ -739,7 +739,7 @@ XMultiPropertySet else if (cl.equals(short.class)) retVal= new Short(AnyConverter.toShort(obj)); else if (cl.equals(int.class)) - retVal= new Integer(AnyConverter.toInt(obj)); + retVal= Integer.valueOf(AnyConverter.toInt(obj)); else if (cl.equals(long.class)) retVal= new Long(AnyConverter.toLong(obj)); else if (cl.equals(float.class)) @@ -761,7 +761,7 @@ XMultiPropertySet else if (cl.equals(Short.class)) retVal= new Short(AnyConverter.toShort(obj)); else if (cl.equals(Integer.class)) - retVal= new Integer(AnyConverter.toInt(obj)); + retVal= Integer.valueOf(AnyConverter.toInt(obj)); else if (cl.equals(Long.class)) retVal= new Long(AnyConverter.toLong(obj)); else if (cl.equals(Float.class)) diff --git a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java index 7847a86a26ec..7e2523f2db43 100644 --- a/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java +++ b/javaunohelper/test/com/sun/star/comp/helper/ComponentContext_Test.java @@ -29,12 +29,12 @@ public class ComponentContext_Test { public static void main(String args[]) { try { HashMap<String,Object> table = new HashMap<String,Object>(); - table.put( "bla1", new ComponentContextEntry( null, new Integer( 1 ) ) ); + table.put( "bla1", new ComponentContextEntry( null, Integer.valueOf( 1 ) ) ); XComponentContext xInitialContext = Bootstrap.createInitialComponentContext( table ); table = new HashMap<String,Object>(); - table.put( "bla2", new ComponentContextEntry( new Integer( 2 ) ) ); - table.put( "bla3", new Integer( 3 ) ); + table.put( "bla2", new ComponentContextEntry( Integer.valueOf( 2 ) ) ); + table.put( "bla3", Integer.valueOf( 3 ) ); XComponentContext xContext = new ComponentContext( table, xInitialContext ); XMultiComponentFactory xSMgr = xContext.getServiceManager(); diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java index 460b55d38b5c..55617e7e038b 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/PropertySet_Test.java @@ -113,7 +113,7 @@ public class PropertySet_Test cl.setPropertyValue("PropShortA", value); ret= cl.getPropertyValue("PropShortA"); r[i++]= ((Short) ret).equals(value); - value= new Integer(113); + value= Integer.valueOf(113); cl.setPropertyValue("PropIntA", value); ret= cl.getPropertyValue("PropIntA"); r[i++]= ((Integer) ret).equals(value); @@ -188,7 +188,7 @@ public class PropertySet_Test cl.setPropertyValue("PropObjectA", value); ret= cl.getPropertyValue("PropObjectA"); r[i++]= ((Short) ret).equals(value); - value= new Integer(113); + value= Integer.valueOf(113); cl.setPropertyValue("PropObjectA", value); ret= cl.getPropertyValue("PropObjectA"); r[i++]= ((Integer) ret).equals(value); @@ -245,7 +245,7 @@ public class PropertySet_Test cl.setPropertyValue("PropAnyA", value); ret= cl.getPropertyValue("PropAnyA"); r[i++]= ret instanceof Any && util.anyEquals(value, ret); - value= new Integer(113); + value= Integer.valueOf(113); cl.setPropertyValue("PropAnyA", value); ret= cl.getPropertyValue("PropAnyA"); r[i++]= ret instanceof Any && util.anyEquals(value, ret); @@ -299,7 +299,7 @@ public class PropertySet_Test cl.setPropertyValue("PropShortA", value); ret= cl.getPropertyValue("PropShortA"); r[i++]= ret instanceof Short && util.anyEquals(value, ret); - value= new Any(new Type(int.class), new Integer(113)); + value= new Any(new Type(int.class), Integer.valueOf(113)); cl.setPropertyValue("PropIntA", value); ret= cl.getPropertyValue("PropIntA"); r[i++]= ret instanceof Integer && util.anyEquals(value, ret); @@ -354,7 +354,7 @@ public class PropertySet_Test cl.setPropertyValue("PropAnyA", value); ret= cl.getPropertyValue("PropAnyA"); r[i++]= ret instanceof Any && util.anyEquals(value, ret); - value= new Any(new Type(int.class), new Integer(113)); + value= new Any(new Type(int.class), Integer.valueOf(113)); cl.setPropertyValue("PropAnyA", value); ret= cl.getPropertyValue("PropAnyA"); r[i++]= ret instanceof Any && util.anyEquals(value, ret); @@ -410,7 +410,7 @@ public class PropertySet_Test cl.setPropertyValue("PropShortClass", value); ret= cl.getPropertyValue("PropShortClass"); r[i++]= ((Short) ret).equals(value); - value= new Integer(113); + value= Integer.valueOf(113); cl.setPropertyValue("PropIntClass", value); ret= cl.getPropertyValue("PropIntClass"); r[i++]= ((Integer) ret).equals(value); @@ -446,7 +446,7 @@ public class PropertySet_Test cl.setPropertyValue("PropShortClass", value); ret= cl.getPropertyValue("PropShortClass"); r[i++]= ret instanceof Short && util.anyEquals(value, ret); - value= new Any(new Type(int.class), new Integer(113)); + value= new Any(new Type(int.class), Integer.valueOf(113)); cl.setPropertyValue("PropIntClass", value); ret= cl.getPropertyValue("PropIntClass"); r[i++]= ret instanceof Integer && util.anyEquals(value, ret); @@ -843,10 +843,10 @@ public class PropertySet_Test TestClass cl= new TestClass(); try { - cl.setFastPropertyValue(5, new Integer(111)); + cl.setFastPropertyValue(5, Integer.valueOf(111)); r[i++]= cl.intPropA == 111; try { - cl.setFastPropertyValue(-1, new Integer(1)); i++; + cl.setFastPropertyValue(-1, Integer.valueOf(1)); i++; } catch(UnknownPropertyException e) { r[i++]= true; @@ -874,7 +874,7 @@ public class PropertySet_Test TestClass cl= new TestClass(); try { - cl.setFastPropertyValue(5, new Integer(111)); + cl.setFastPropertyValue(5, Integer.valueOf(111)); Integer aInt= (Integer) cl.getFastPropertyValue(5); r[i++]= aInt.intValue() == 111; }catch(java.lang.Exception e){ @@ -903,7 +903,7 @@ public class PropertySet_Test cl.setPropertyValues(new String[0], new Object[0]); String[] arNames= new String[] {"PropCharA","PropIntClass","PropObjectA"}; Character aChar= new Character('A'); - Integer aInt= new Integer(111); + Integer aInt= Integer.valueOf(111); Byte aByte= new Byte((byte)11); Object[] values= new Object[]{aChar, aInt, aByte}; cl.setPropertyValues(arNames, values); @@ -936,7 +936,7 @@ public class PropertySet_Test TestClass cl= new TestClass(); try { cl.charPropA= 'A'; - cl.intClassProp= new Integer(111); + cl.intClassProp= Integer.valueOf(111); cl.objectPropA= new Byte((byte)11); Object[] values= cl.getPropertyValues(new String[] {"PropCharA","PropIntClass","PropObjectA"}); @@ -1007,7 +1007,7 @@ public class PropertySet_Test TestClass cl= new TestClass(); try { Listener li1= new Listener(); - cl.intClassProp= new Integer(111); + cl.intClassProp= Integer.valueOf(111); cl.charPropA= 'A'; cl.firePropertiesChangeEvent(new String[]{"PropCharA","PropIntClass"}, li1); r[i++]= li1.nPropertiesChange == 1; @@ -1216,7 +1216,7 @@ class TestClass extends PropertySet value= new Short((short) 112); r[i++]= convertPropertyValue(propShortA, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Short && outNewVal[0].equals(value); - value= new Integer( 113); + value= Integer.valueOf( 113); r[i++]= convertPropertyValue(propIntA, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Integer && outNewVal[0].equals(value); value= new Long(114); @@ -1244,13 +1244,13 @@ class TestClass extends PropertySet value= new Object(); // TypeClass.VOID r[i++]= convertPropertyValue(propObjectA, outNewVal, outOldVal, value); r[i++]= outNewVal[0].equals(value); - value= new Integer(111); + value= Integer.valueOf(111); r[i++]= convertPropertyValue(propObjectA, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Integer && outNewVal[0].equals(value); value= new ComponentBase(); r[i++]= convertPropertyValue(propObjectA, outNewVal, outOldVal, value); r[i++]= outNewVal[0].equals(value); - value= new Integer(111); + value= Integer.valueOf(111); r[i++]= convertPropertyValue(propAnyA, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Any && ((Any)outNewVal[0]).getType().equals(new Type(Integer.class)) && ((Any)outNewVal[0]).getObject().equals(value); @@ -1271,7 +1271,7 @@ class TestClass extends PropertySet r[i++]= outNewVal[0] instanceof com.sun.star.uno.Enum && outNewVal[0].equals(value); // Any arguments ------------------------------------------------------------------ - value= new Any( new Type(Integer.class),new Integer(111)); + value= new Any( new Type(Integer.class),Integer.valueOf(111)); r[i++]= convertPropertyValue(propIntA, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Integer && ((Integer)outNewVal[0]).equals( ((Any)value).getObject()); value= new Any(new Type(Boolean.class), Boolean.TRUE); @@ -1282,7 +1282,7 @@ class TestClass extends PropertySet value= new Any(new Type(Object.class), new Object()); r[i++]= convertPropertyValue(propObjectA, outNewVal, outOldVal, value); r[i++]= convertPropertyValue(propAnyA, outNewVal, outOldVal, value); - value= new Any(new Type(Integer.class), new Integer(111)); + value= new Any(new Type(Integer.class), Integer.valueOf(111)); r[i++]= convertPropertyValue(propObjectA, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Integer && outNewVal[0].equals( ((Any)value).getObject()); r[i++]= convertPropertyValue(propAnyA, outNewVal, outOldVal, value); @@ -1327,7 +1327,7 @@ class TestClass extends PropertySet value= new Short((short) 112); r[i++]= convertPropertyValue(propShortClass, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Short && outNewVal[0].equals(value); - value= new Integer( 113); + value= Integer.valueOf( 113); r[i++]= convertPropertyValue(propIntClass, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Integer && outNewVal[0].equals(value); value= new Long(114); @@ -1368,7 +1368,7 @@ class TestClass extends PropertySet value= new Short((short) 112); setPropertyValueNoBroadcast(propShortA, value); r[i++]= shortPropA == ((Short) value).shortValue(); - value= new Integer( 113); + value= Integer.valueOf( 113); setPropertyValueNoBroadcast(propIntA, value); r[i++]= intPropA == ((Integer) value).intValue(); value= new Long(114); @@ -1389,13 +1389,13 @@ class TestClass extends PropertySet value= new Type(XInterface.class); setPropertyValueNoBroadcast(propTypeA, value); r[i++]= typePropA.equals(value); - value= new Integer(111); + value= Integer.valueOf(111); setPropertyValueNoBroadcast(propObjectA, value); r[i++]= objectPropA.equals(value); value= new ComponentBase(); setPropertyValueNoBroadcast(propObjectA, value); r[i++]= objectPropA.equals(value); - value= new Any( new Type(Integer.TYPE), new Integer(111)); + value= new Any( new Type(Integer.TYPE), Integer.valueOf(111)); setPropertyValueNoBroadcast(propAnyA, value); r[i++]= util.anyEquals(anyPropA, value); value= new ComponentBase(); @@ -1554,7 +1554,7 @@ class TestClass2 extends PropertySet setPropertyValue("charClassB",val); ret= getPropertyValue("charClassB"); r[i++]= val.equals(ret); - val= new Integer(111); + val= Integer.valueOf(111); setPropertyValue("IntProp",val); ret= getPropertyValue("IntProp"); r[i++]= val.equals(ret); diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java index 465769be3768..edcceca44757 100644 --- a/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java +++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory.java @@ -107,7 +107,7 @@ final class ProxyFactory { return Boolean.valueOf(args[0] != null && oid.equals(UnoRuntime.generateOid(args[0]))); } else if (method.equals(METHOD_HASH_CODE)) { - return new Integer(oid.hashCode()); + return Integer.valueOf(oid.hashCode()); } else if (method.equals(METHOD_TO_STRING)) { return "[Proxy:" + System.identityHashCode(proxy) + "," + oid + "," + type + "]"; diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java index 2a4c9d5029a9..b2776e23b66d 100644 --- a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java +++ b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java @@ -226,7 +226,7 @@ final class Unmarshal { private Integer readLongValue() { try { - return new Integer(input.readInt()); + return Integer.valueOf(input.readInt()); } catch (IOException e) { throw new RuntimeException(e.toString()); } diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java b/jurt/com/sun/star/lib/uno/protocols/urp/urp.java index 08e7ef3380a2..f60f697ead51 100644 --- a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java +++ b/jurt/com/sun/star/lib/uno/protocols/urp/urp.java @@ -204,7 +204,7 @@ public final class urp implements IProtocol { true, PROPERTIES_OID, TypeDescription.getTypeDescription(XProtocolProperties.class), PROPERTIES_FUN_REQUEST_CHANGE, propertiesTid, - new Object[] { new Integer(random) }); + new Object[] { Integer.valueOf(random) }); state = STATE_REQUESTED; } @@ -225,7 +225,7 @@ public final class urp implements IProtocol { case STATE_INITIAL0: case STATE_INITIAL: writeReply( - false, message.getThreadId(), new Integer(1)); + false, message.getThreadId(), Integer.valueOf(1)); state = STATE_WAIT; break; case STATE_REQUESTED: @@ -233,16 +233,16 @@ public final class urp implements IProtocol { = ((Integer) message.getArguments()[0]).intValue(); if (random < n) { writeReply( - false, message.getThreadId(), new Integer(1)); + false, message.getThreadId(), Integer.valueOf(1)); state = STATE_WAIT; } else if (random == n) { writeReply( - false, message.getThreadId(), new Integer(-1)); + false, message.getThreadId(), Integer.valueOf(-1)); state = STATE_INITIAL; sendRequestChange(); } else { writeReply( - false, message.getThreadId(), new Integer(0)); + false, message.getThreadId(), Integer.valueOf(0)); } break; default: diff --git a/jurt/com/sun/star/uno/AnyConverter.java b/jurt/com/sun/star/uno/AnyConverter.java index 873deb157da2..9acdb1622e16 100644 --- a/jurt/com/sun/star/uno/AnyConverter.java +++ b/jurt/com/sun/star/uno/AnyConverter.java @@ -555,10 +555,10 @@ public class AnyConverter case TypeClass.LONG_value: switch (tc) { case TypeClass.BYTE_value: - return new Integer( ((Byte)object).byteValue() ); + return Integer.valueOf( ((Byte)object).byteValue() ); case TypeClass.SHORT_value: case TypeClass.UNSIGNED_SHORT_value: - return new Integer( ((Short)object).shortValue() ); + return Integer.valueOf( ((Short)object).shortValue() ); case TypeClass.LONG_value: return object; } @@ -566,7 +566,7 @@ public class AnyConverter case TypeClass.UNSIGNED_LONG_value: switch (tc) { case TypeClass.UNSIGNED_SHORT_value: - return new Integer( ((Short)object).shortValue() ); + return Integer.valueOf( ((Short)object).shortValue() ); case TypeClass.UNSIGNED_LONG_value: return object; } diff --git a/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java b/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java index fc03dc8ca56d..0b343ed4338e 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java +++ b/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java @@ -27,7 +27,7 @@ public final class java_environment_Test { @Test public void test() { java_environment env = new java_environment(null); - Object obj = new Integer(3); + Object obj = Integer.valueOf(3); String[] oid = new String[1]; Object obj2 = env.registerInterface(obj, oid, diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java index 390c775a7a34..73919da886c9 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java +++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java @@ -37,7 +37,7 @@ public final class Marshaling_Test { TestObject testObject = new TestObject(); TestPrimitiveSeqStruct x = new TestPrimitiveSeqStruct(); - x.zAny = new Object[]{new Integer(1), new Double(2) }; + x.zAny = new Object[]{Integer.valueOf(1), new Double(2) }; Object data[] = new Object[] { @@ -49,28 +49,28 @@ public final class Marshaling_Test { new Double(0.12345), TestEnum.B, new Float(0.5678), - new Integer(0), - new Integer(128), - new Integer(0x0f00), - new Integer(0x0f0000), - new Integer(0x0f000000), - new Integer(-128), - new Integer(0xff00), - new Integer(0xff0000), - new Integer(0xff000000), + Integer.valueOf(0), + Integer.valueOf(128), + Integer.valueOf(0x0f00), + Integer.valueOf(0x0f0000), + Integer.valueOf(0x0f000000), + Integer.valueOf(-128), + Integer.valueOf(0xff00), + Integer.valueOf(0xff0000), + Integer.valueOf(0xff000000), new Long(666L), new Short((short)444), new String("blabla"), - new Integer(10), // Any as object - new Integer(10), // Any as object - new Any(new Type(Integer.class), new Integer(10)), // Any as Any - new Any(new Type(Integer.class), new Integer(10)), // Any as Any + Integer.valueOf(10), // Any as object + Integer.valueOf(10), // Any as object + new Any(new Type(Integer.class), Integer.valueOf(10)), // Any as Any + new Any(new Type(Integer.class), Integer.valueOf(10)), // Any as Any null, new TestPrimitiveStruct(), x, new byte[]{1,2,3,4,5,6,7}, // primitive sequence new int[]{7,6,5,4,3,2,1}, // primitive sequence - new Object[]{new Integer(123), new String("hallo")}, // any sequence + new Object[]{Integer.valueOf(123), new String("hallo")}, // any sequence new TestPrimitiveStruct[]{new TestPrimitiveStruct(), new TestPrimitiveStruct()}, // sequence of primitive structs new TestPrimitiveSeqStruct[]{new TestPrimitiveSeqStruct(), new TestPrimitiveSeqStruct()}, // sequence of primitive structs new TestNestedStruct(), diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java b/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java index a7ee1e511c6d..1ded133b09b5 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java +++ b/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java @@ -243,7 +243,7 @@ public final class Protocol_Test { iReceiver.readMessage(); // send a reply iReceiver.writeReply( - false, new ThreadId(new byte[] { 0, 1 }), new Integer(501)); + false, new ThreadId(new byte[] { 0, 1 }), Integer.valueOf(501)); iMessage = iSender.readMessage(); result = iMessage.getResult(); assertEquals(501, result); diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java b/jurt/test/com/sun/star/uno/AnyConverter_Test.java index c4c93261d3f8..ce6316578f68 100644 --- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java +++ b/jurt/test/com/sun/star/uno/AnyConverter_Test.java @@ -41,7 +41,7 @@ public final class AnyConverter_Test { Character aChar= new Character('A'); Byte aByte= new Byte((byte) 111); Short aShort= new Short((short) 11111); - Integer aInt= new Integer( 1111111); + Integer aInt= Integer.valueOf( 1111111); Long aLong= new Long( 0xffffffff); Float aFloat= new Float( 3.14); Double aDouble= new Double( 3.145); @@ -315,7 +315,7 @@ public final class AnyConverter_Test { Any a = new Any( Type.UNSIGNED_SHORT, new Short((short)5) ); assertEquals(5, AnyConverter.toInt(a)); assertEquals(5, AnyConverter.toUnsignedInt(a)); - a = new Any( Type.UNSIGNED_LONG, new Integer(5) ); + a = new Any( Type.UNSIGNED_LONG, Integer.valueOf(5) ); assertEquals(5, AnyConverter.toUnsignedInt(a)); // must fail @@ -386,7 +386,7 @@ public final class AnyConverter_Test { Any a = new Any( Type.UNSIGNED_SHORT, new Short((short)5) ); assertEquals(5, AnyConverter.toLong(a)); assertEquals(5, AnyConverter.toUnsignedLong(a)); - a = new Any( Type.UNSIGNED_LONG, new Integer(5) ); + a = new Any( Type.UNSIGNED_LONG, Integer.valueOf(5) ); assertEquals(5, AnyConverter.toUnsignedLong(a)); assertEquals(5, AnyConverter.toLong(a)); a = new Any( Type.UNSIGNED_HYPER, new Long(5) ); @@ -808,7 +808,7 @@ public final class AnyConverter_Test { assertTrue(AnyConverter.isInt(aInt)); assertTrue(AnyConverter.isInt(anyInt)); assertEquals(Type.LONG, AnyConverter.getType(anyInt)); - Any a = new Any(Type.UNSIGNED_LONG, new Integer(5)); + Any a = new Any(Type.UNSIGNED_LONG, Integer.valueOf(5)); assertEquals(Type.UNSIGNED_LONG, AnyConverter.getType(a)); assertFalse(AnyConverter.isInt(a)); assertFalse(Type.LONG.equals(AnyConverter.getType(a))); diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java index 6277ba0125c9..2af5b1176046 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java @@ -122,13 +122,13 @@ public abstract class BaseControl { // <editor-fold defaultstate="collapsed" desc="Uno Properties"> public void setPosition(int x, int y) { - setProperty("PositionX", new Integer(x)); - setProperty("PositionY", new Integer(y)); + setProperty("PositionX", Integer.valueOf(x)); + setProperty("PositionY", Integer.valueOf(y)); } public void setSize(int width, int height) { - setProperty("Width", new Integer(width)); - setProperty("Height", new Integer(height)); + setProperty("Width", Integer.valueOf(width)); + setProperty("Height", Integer.valueOf(height)); } public void setEnabled(boolean enabled) { diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Label.java b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Label.java index 5b7fdf348888..689350ce297b 100644 --- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Label.java +++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Label.java @@ -61,7 +61,7 @@ public class Label extends LabeledControl { public void setTextColor(int RGB) { - setProperty("TextColor", new Integer(RGB)); + setProperty("TextColor", Integer.valueOf(RGB)); } public int getTextColor() { diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java index 1e3fd149ee12..f7479b26a8ca 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java @@ -147,10 +147,10 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor "com.sun.star.awt.UnoControlDialogModel", _xComponentContext ); XPropertySet xPSetDialog = ( XPropertySet )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", new String( "Runtime Dialog Demo" ) ); // get the service manager from the dialog model @@ -162,10 +162,10 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor "com.sun.star.awt.UnoControlButtonModel" ); XPropertySet xPSetButton = ( XPropertySet )UnoRuntime.queryInterface( XPropertySet.class, buttonModel ); - xPSetButton.setPropertyValue( "PositionX", new Integer( 20 ) ); - xPSetButton.setPropertyValue( "PositionY", new Integer( 70 ) ); - xPSetButton.setPropertyValue( "Width", new Integer( 50 ) ); - xPSetButton.setPropertyValue( "Height", new Integer( 14 ) ); + xPSetButton.setPropertyValue( "PositionX", Integer.valueOf( 20 ) ); + xPSetButton.setPropertyValue( "PositionY", Integer.valueOf( 70 ) ); + 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", new String( "Click Me" ) ); @@ -175,10 +175,10 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor "com.sun.star.awt.UnoControlFixedTextModel" ); XPropertySet xPSetLabel = ( XPropertySet )UnoRuntime.queryInterface( XPropertySet.class, labelModel ); - xPSetLabel.setPropertyValue( "PositionX", new Integer( 40 ) ); - xPSetLabel.setPropertyValue( "PositionY", new Integer( 30 ) ); - xPSetLabel.setPropertyValue( "Width", new Integer( 100 ) ); - xPSetLabel.setPropertyValue( "Height", new Integer( 14 ) ); + xPSetLabel.setPropertyValue( "PositionX", Integer.valueOf( 40 ) ); + xPSetLabel.setPropertyValue( "PositionY", Integer.valueOf( 30 ) ); + 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 ); @@ -188,10 +188,10 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor "com.sun.star.awt.UnoControlButtonModel" ); XPropertySet xPSetCancelButton = ( XPropertySet )UnoRuntime.queryInterface( XPropertySet.class, cancelButtonModel ); - xPSetCancelButton.setPropertyValue( "PositionX", new Integer( 80 ) ); - xPSetCancelButton.setPropertyValue( "PositionY", new Integer( 70 ) ); - xPSetCancelButton.setPropertyValue( "Width", new Integer( 50 ) ); - xPSetCancelButton.setPropertyValue( "Height", new Integer( 14 ) ); + xPSetCancelButton.setPropertyValue( "PositionX", Integer.valueOf( 80 ) ); + xPSetCancelButton.setPropertyValue( "PositionY", Integer.valueOf( 70 ) ); + xPSetCancelButton.setPropertyValue( "Width", Integer.valueOf( 50 ) ); + xPSetCancelButton.setPropertyValue( "Height", Integer.valueOf( 14 ) ); xPSetCancelButton.setPropertyValue( "Name", _cancelButtonName ); xPSetCancelButton.setPropertyValue( "TabIndex", new Short( (short)2 ) ); xPSetCancelButton.setPropertyValue( "PushButtonType", new Short( (short)2 ) ); diff --git a/odk/examples/DevelopersGuide/Charts/ChartHelper.java b/odk/examples/DevelopersGuide/Charts/ChartHelper.java index 7208c58b30f5..90dccd153800 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartHelper.java +++ b/odk/examples/DevelopersGuide/Charts/ChartHelper.java @@ -113,9 +113,9 @@ public class ChartHelper aAny = new Any(new Type(Short.class), new Short(com.sun.star.text.HoriOrientation.NONE)); xPropSet.setPropertyValue("HoriOrient", aAny ); - aAny = new Any(new Type(Integer.class), new Integer(aUpperLeft.Y)); + aAny = new Any(new Type(Integer.class), Integer.valueOf(aUpperLeft.Y)); xPropSet.setPropertyValue("VertOrientPosition", aAny ); - aAny = new Any(new Type(Integer.class), new Integer(aUpperLeft.X)); + aAny = new Any(new Type(Integer.class), Integer.valueOf(aUpperLeft.X)); xPropSet.setPropertyValue("HoriOrientPosition", aAny ); // retrieve the chart document as model of the OLE shape diff --git a/odk/examples/DevelopersGuide/Charts/ChartInCalc.java b/odk/examples/DevelopersGuide/Charts/ChartInCalc.java index ee493144f98a..76791e3bb9f9 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInCalc.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInCalc.java @@ -176,7 +176,7 @@ public class ChartInCalc // change attributes for all series // set line width to 0.5mm - aDiaProp.setPropertyValue( "LineWidth", new Integer( 50 )); + aDiaProp.setPropertyValue( "LineWidth", Integer.valueOf( 50 )); } } @@ -193,7 +193,7 @@ public class ChartInCalc for( int i = 1; i <= 3; i++ ) { aSeriesProp = maDiagram.getDataRowProperties( i ); - aSeriesProp.setPropertyValue( "LineColor", new Integer( + aSeriesProp.setPropertyValue( "LineColor", Integer.valueOf( 0x400000 * i + 0x005000 * i + 0x0000ff - 0x40 * i )); @@ -209,12 +209,12 @@ public class ChartInCalc } // set a bitmap via URL as symbol for the first series - aSeriesProp.setPropertyValue( "SymbolType", new Integer( ChartSymbolType.BITMAPURL )); + aSeriesProp.setPropertyValue( "SymbolType", Integer.valueOf( ChartSymbolType.BITMAPURL )); aSeriesProp.setPropertyValue( "SymbolBitmapURL", sUrl.toString() ); } else { - aSeriesProp.setPropertyValue( "SymbolType", new Integer( ChartSymbolType.SYMBOL1 )); + aSeriesProp.setPropertyValue( "SymbolType", Integer.valueOf( ChartSymbolType.SYMBOL1 )); aSeriesProp.setPropertyValue( "SymbolSize", new Size( 250, 250 )); } } @@ -254,13 +254,13 @@ public class ChartInCalc XPropertySet aPointProp = maDiagram.getDataPointProperties( 0, 1 ); // set a different, larger symbol - aPointProp.setPropertyValue( "SymbolType", new Integer( ChartSymbolType.SYMBOL6 )); + aPointProp.setPropertyValue( "SymbolType", Integer.valueOf( ChartSymbolType.SYMBOL6 )); aPointProp.setPropertyValue( "SymbolSize", new Size( 600, 600 )); // add a label text with bold font, bordeaux red 14pt - aPointProp.setPropertyValue( "DataCaption", new Integer( ChartDataCaption.VALUE )); + aPointProp.setPropertyValue( "DataCaption", Integer.valueOf( ChartDataCaption.VALUE )); aPointProp.setPropertyValue( "CharHeight", new Float( 14.0 )); - aPointProp.setPropertyValue( "CharColor", new Integer( 0x993366 )); + aPointProp.setPropertyValue( "CharColor", Integer.valueOf( 0x993366 )); aPointProp.setPropertyValue( "CharWeight", new Float( FontWeight.BOLD )); } catch( IndexOutOfBoundsException ex ) @@ -281,7 +281,7 @@ public class ChartInCalc { // change background color of entire chart aArea.setPropertyValue( "FillStyle", FillStyle.SOLID ); - aArea.setPropertyValue( "FillColor", new Integer( 0xeeeeee )); + aArea.setPropertyValue( "FillColor", Integer.valueOf( 0xeeeeee )); } } @@ -296,7 +296,7 @@ public class ChartInCalc // change background color of area aWall.setPropertyValue( "FillStyle", FillStyle.SOLID ); - aWall.setPropertyValue( "FillColor", new Integer( 0xcccccc )); + aWall.setPropertyValue( "FillColor", Integer.valueOf( 0xcccccc )); } @@ -346,8 +346,8 @@ public class ChartInCalc XAxisXSupplier.class, maDiagram ).getXAxis(); if( aAxisProp != null ) { - aAxisProp.setPropertyValue( "Max", new Integer( 24 )); - aAxisProp.setPropertyValue( "StepMain", new Integer( 3 )); + aAxisProp.setPropertyValue( "Max", Integer.valueOf( 24 )); + aAxisProp.setPropertyValue( "StepMain", Integer.valueOf( 3 )); } // change number format for y axis @@ -370,7 +370,7 @@ public class ChartInCalc if( aAxisProp != null ) { - aAxisProp.setPropertyValue( "NumberFormat", new Integer( nNewNumberFormat )); + aAxisProp.setPropertyValue( "NumberFormat", Integer.valueOf( nNewNumberFormat )); } } @@ -396,10 +396,10 @@ public class ChartInCalc aDash.DashLen = 200; aDash.Distance = 100; - aGridProp.setPropertyValue( "LineColor", new Integer( 0x999999 )); + aGridProp.setPropertyValue( "LineColor", Integer.valueOf( 0x999999 )); aGridProp.setPropertyValue( "LineStyle", LineStyle.DASH ); aGridProp.setPropertyValue( "LineDash", aDash ); - aGridProp.setPropertyValue( "LineWidth", new Integer( 30 )); + aGridProp.setPropertyValue( "LineWidth", Integer.valueOf( 30 )); } } diff --git a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java index ee9e05d49d79..19e4855461e5 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInDraw.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInDraw.java @@ -143,7 +143,7 @@ public class ChartInDraw { // change background color of entire chart aArea.setPropertyValue( "FillStyle", FillStyle.SOLID ); - aArea.setPropertyValue( "FillColor", new Integer( 0xeeeeee )); + aArea.setPropertyValue( "FillColor", Integer.valueOf( 0xeeeeee )); } } @@ -157,7 +157,7 @@ public class ChartInDraw X3DDisplay.class, maDiagram ).getWall(); // change background color of area - aWall.setPropertyValue( "FillColor", new Integer( 0xcccccc )); + aWall.setPropertyValue( "FillColor", Integer.valueOf( 0xcccccc )); aWall.setPropertyValue( "FillStyle", FillStyle.SOLID ); } @@ -193,7 +193,7 @@ public class ChartInDraw aLegendProp.setPropertyValue( "Alignment", ChartLegendPosition.LEFT ); aLegendProp.setPropertyValue( "FillStyle", FillStyle.SOLID ); - aLegendProp.setPropertyValue( "FillColor", new Integer( 0xeeddee )); + aLegendProp.setPropertyValue( "FillColor", Integer.valueOf( 0xeeddee )); } @@ -208,12 +208,12 @@ public class ChartInDraw aDiaProp.setPropertyValue( "Dim3D", aTrue ); aDiaProp.setPropertyValue( "Deep", aTrue ); // from Chart3DBarProperties: - aDiaProp.setPropertyValue( "SolidType", new Integer( ChartSolidType.CYLINDER )); + aDiaProp.setPropertyValue( "SolidType", Integer.valueOf( ChartSolidType.CYLINDER )); // change floor color to Magenta6 XPropertySet aFloor = UnoRuntime.queryInterface( X3DDisplay.class, maDiagram ).getFloor(); - aFloor.setPropertyValue( "FillColor", new Integer( 0x6b2394 )); + aFloor.setPropertyValue( "FillColor", Integer.valueOf( 0x6b2394 )); // apply changes to get a 3d scene unlockControllers(); @@ -268,7 +268,7 @@ public class ChartInDraw // in a chart by default only the second (non-specular) light source is switched on // light source 1 is a specular light source - aDiaProp.setPropertyValue( "D3DSceneLightColor1", new Integer( 0xff3333 )); + aDiaProp.setPropertyValue( "D3DSceneLightColor1", Integer.valueOf( 0xff3333 )); // set direction com.sun.star.drawing.Direction3D aDirection = new com.sun.star.drawing.Direction3D(); diff --git a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java index d9585c31ff6c..124616db46be 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartInWriter.java +++ b/odk/examples/DevelopersGuide/Charts/ChartInWriter.java @@ -146,7 +146,7 @@ public class ChartInWriter X3DDisplay.class, maDiagram ).getWall(); // change background color of area - aWall.setPropertyValue( "FillColor", new Integer( 0xeecc99 )); + aWall.setPropertyValue( "FillColor", Integer.valueOf( 0xeecc99 )); aWall.setPropertyValue( "FillStyle", FillStyle.SOLID ); } diff --git a/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java b/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java index 1af68e7cf570..8d15ff9d95d5 100644 --- a/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java +++ b/odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java @@ -167,8 +167,8 @@ public class JavaSampleChartAddIn extends WeakBase implements XPropertySet aShapeProp = UnoRuntime.queryInterface( XPropertySet.class, maTopLine ); - aShapeProp.setPropertyValue( "LineColor", new Integer( 0xe01010 )); - aShapeProp.setPropertyValue( "LineWidth", new Integer( 50 )); + aShapeProp.setPropertyValue( "LineColor", Integer.valueOf( 0xe01010 )); + aShapeProp.setPropertyValue( "LineWidth", Integer.valueOf( 50 )); aShapeProp.setPropertyValue( "Name", "top" ); } } @@ -190,8 +190,8 @@ public class JavaSampleChartAddIn extends WeakBase implements XPropertySet aShapeProp = UnoRuntime.queryInterface( XPropertySet.class, maBottomLine ); - aShapeProp.setPropertyValue( "LineColor", new Integer( 0x10e010 )); - aShapeProp.setPropertyValue( "LineWidth", new Integer( 50 )); + aShapeProp.setPropertyValue( "LineColor", Integer.valueOf( 0x10e010 )); + aShapeProp.setPropertyValue( "LineWidth", Integer.valueOf( 50 )); aShapeProp.setPropertyValue( "Name", "bottom" ); } } diff --git a/odk/examples/DevelopersGuide/Config/ConfigExamples.java b/odk/examples/DevelopersGuide/Config/ConfigExamples.java index 687fb4c8cd0e..5f786fe165f4 100644 --- a/odk/examples/DevelopersGuide/Config/ConfigExamples.java +++ b/odk/examples/DevelopersGuide/Config/ConfigExamples.java @@ -757,7 +757,7 @@ public class ConfigExamples int nNew = 9999 - nOld; System.out.println("Replacing integer value: " + aItemNames [i]); - aReplace.replaceByName( aItemNames [i], new Integer( nNew ) ); + aReplace.replaceByName( aItemNames [i], Integer.valueOf( nNew ) ); } // and booleans by their negated value @@ -898,7 +898,7 @@ public class ConfigExamples xDataSourceProperties.setPropertyValue("URL", sDataSourceURL ); xDataSourceProperties.setPropertyValue("User", sUser ); xDataSourceProperties.setPropertyValue("IsPasswordRequired", Boolean.valueOf( bNeedsPassword ) ); - xDataSourceProperties.setPropertyValue("LoginTimeout", new Integer( nTimeout ) ); + xDataSourceProperties.setPropertyValue("LoginTimeout", Integer.valueOf( nTimeout ) ); if ( aTableFilter != null ) xDataSourceProperties.setPropertyValue("TableFilter", aTableFilter ); diff --git a/odk/examples/DevelopersGuide/Database/OpenQuery.java b/odk/examples/DevelopersGuide/Database/OpenQuery.java index 92b0413c7723..77490f8dbf8f 100644 --- a/odk/examples/DevelopersGuide/Database/OpenQuery.java +++ b/odk/examples/DevelopersGuide/Database/OpenQuery.java @@ -96,7 +96,7 @@ public class OpenQuery { xProp.setPropertyValue("DataSourceName","Bibliography"); // the CommandType must be TABLE, QUERY or COMMAND, here we use COMMAND - xProp.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.COMMAND)); + xProp.setPropertyValue("CommandType",Integer.valueOf(com.sun.star.sdb.CommandType.COMMAND)); // the Command could be a table or query name or a SQL command, depending on the CommandType xProp.setPropertyValue("Command","SELECT IDENTIFIER, AUTHOR FROM biblio ORDER BY IDENTIFIER"); diff --git a/odk/examples/DevelopersGuide/Database/RowSet.java b/odk/examples/DevelopersGuide/Database/RowSet.java index 2fd6de38de9e..3f18f35797bb 100644 --- a/odk/examples/DevelopersGuide/Database/RowSet.java +++ b/odk/examples/DevelopersGuide/Database/RowSet.java @@ -87,7 +87,7 @@ public class RowSet XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,xRowRes); xProp.setPropertyValue("DataSourceName","Bibliography"); xProp.setPropertyValue("Command","biblio"); - xProp.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); + xProp.setPropertyValue("CommandType",Integer.valueOf(com.sun.star.sdb.CommandType.TABLE)); xRowRes.execute(); System.out.println("RowSet executed!"); @@ -110,7 +110,7 @@ public class RowSet XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,xRowRes); xProp.setPropertyValue("DataSourceName","Bibliography"); xProp.setPropertyValue("Command","biblio"); - xProp.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); + xProp.setPropertyValue("CommandType",Integer.valueOf(com.sun.star.sdb.CommandType.TABLE)); xRowRes.execute(); System.out.println("RowSet executed!"); @@ -144,7 +144,7 @@ public class RowSet XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,xRowRes); xProp.setPropertyValue("DataSourceName","Bibliography"); xProp.setPropertyValue("Command","biblio"); - xProp.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); + xProp.setPropertyValue("CommandType",Integer.valueOf(com.sun.star.sdb.CommandType.TABLE)); xRowRes.execute(); System.out.println("RowSet executed!"); @@ -183,7 +183,7 @@ public class RowSet XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,xRowRes); xProp.setPropertyValue("DataSourceName","Bibliography"); xProp.setPropertyValue("Command","biblio"); - xProp.setPropertyValue("CommandType",new Integer(com.sun.star.sdb.CommandType.TABLE)); + xProp.setPropertyValue("CommandType",Integer.valueOf(com.sun.star.sdb.CommandType.TABLE)); xRowRes.execute(); System.out.println("RowSet executed!"); diff --git a/odk/examples/DevelopersGuide/Database/Sales.java b/odk/examples/DevelopersGuide/Database/Sales.java index 7a983c727ec9..1733d21930b0 100644 --- a/odk/examples/DevelopersGuide/Database/Sales.java +++ b/odk/examples/DevelopersGuide/Database/Sales.java @@ -112,8 +112,8 @@ public class Sales { XStatement stmt = con.createStatement(); XPropertySet xProp = UnoRuntime.queryInterface(XPropertySet.class,stmt); - xProp.setPropertyValue("ResultSetType", new java.lang.Integer(ResultSetType.SCROLL_INSENSITIVE)); - xProp.setPropertyValue("ResultSetConcurrency", new java.lang.Integer(ResultSetConcurrency.READ_ONLY)); + xProp.setPropertyValue("ResultSetType", Integer.valueOf(ResultSetType.SCROLL_INSENSITIVE)); + xProp.setPropertyValue("ResultSetConcurrency", Integer.valueOf(ResultSetConcurrency.READ_ONLY)); XResultSet rs = stmt.executeQuery("SELECT NAME, PRICE FROM SALES"); XResultSetMetaDataSupplier xRsMetaSup = UnoRuntime.queryInterface(XResultSetMetaDataSupplier.class,rs); XResultSetMetaData xRsMetaData = xRsMetaSup.getMetaData(); diff --git a/odk/examples/DevelopersGuide/Database/sdbcx.java b/odk/examples/DevelopersGuide/Database/sdbcx.java index 4f73c8bb8286..fb498591f2ac 100644 --- a/odk/examples/DevelopersGuide/Database/sdbcx.java +++ b/odk/examples/DevelopersGuide/Database/sdbcx.java @@ -342,42 +342,42 @@ public class sdbcx XPropertySet xCol = xColFac.createDataDescriptor(); // create first column and append xCol.setPropertyValue("Name","SNR"); - xCol.setPropertyValue("Type",new Integer(DataType.INTEGER)); - xCol.setPropertyValue("IsNullable",new Integer(ColumnValue.NO_NULLS)); + xCol.setPropertyValue("Type",Integer.valueOf(DataType.INTEGER)); + xCol.setPropertyValue("IsNullable",Integer.valueOf(ColumnValue.NO_NULLS)); xAppend.appendByDescriptor(xCol); // 2nd only set the properties which differs xCol.setPropertyValue("Name","FIRSTNAME"); - xCol.setPropertyValue("Type",new Integer(DataType.VARCHAR)); - xCol.setPropertyValue("IsNullable",new Integer(ColumnValue.NULLABLE)); - xCol.setPropertyValue("Precision",new Integer(50)); + xCol.setPropertyValue("Type",Integer.valueOf(DataType.VARCHAR)); + xCol.setPropertyValue("IsNullable",Integer.valueOf(ColumnValue.NULLABLE)); + xCol.setPropertyValue("Precision",Integer.valueOf(50)); xAppend.appendByDescriptor(xCol); // 3nd only set the properties which differs xCol.setPropertyValue("Name","LASTNAME"); - xCol.setPropertyValue("Precision",new Integer(100)); + xCol.setPropertyValue("Precision",Integer.valueOf(100)); xAppend.appendByDescriptor(xCol); // 4nd only set the properties which differs xCol.setPropertyValue("Name","STREET"); - xCol.setPropertyValue("Precision",new Integer(50)); + xCol.setPropertyValue("Precision",Integer.valueOf(50)); xAppend.appendByDescriptor(xCol); // 5nd only set the properties which differs xCol.setPropertyValue("Name","STATE"); xAppend.appendByDescriptor(xCol); // 6nd only set the properties which differs xCol.setPropertyValue("Name","ZIP"); - xCol.setPropertyValue("Type",new Integer(DataType.INTEGER)); - xCol.setPropertyValue("Precision",new Integer(10)); // default value integer + xCol.setPropertyValue("Type",Integer.valueOf(DataType.INTEGER)); + xCol.setPropertyValue("Precision",Integer.valueOf(10)); // default value integer xAppend.appendByDescriptor(xCol); // 7nd only set the properties which differs xCol.setPropertyValue("Name","BIRTHDATE"); - xCol.setPropertyValue("Type",new Integer(DataType.DATE)); - xCol.setPropertyValue("Precision",new Integer(10)); // default value integer + xCol.setPropertyValue("Type",Integer.valueOf(DataType.DATE)); + xCol.setPropertyValue("Precision",Integer.valueOf(10)); // default value integer xAppend.appendByDescriptor(xCol); // now we create the primary key XKeysSupplier xKeySup = UnoRuntime.queryInterface(XKeysSupplier.class,xTable); XDataDescriptorFactory xKeyFac = UnoRuntime.queryInterface(XDataDescriptorFactory.class,xKeySup.getKeys()); XAppend xKeyAppend = UnoRuntime.queryInterface(XAppend.class,xKeyFac); XPropertySet xKey = xKeyFac.createDataDescriptor(); - xKey.setPropertyValue("Type",new Integer(KeyType.PRIMARY)); + xKey.setPropertyValue("Type",Integer.valueOf(KeyType.PRIMARY)); // now append the columns to key XColumnsSupplier xKeyColumSup = UnoRuntime.queryInterface(XColumnsSupplier.class,xKey); XDataDescriptorFactory xKeyColFac = UnoRuntime.queryInterface(XDataDescriptorFactory.class,xKeyColumSup.getColumns()); diff --git a/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java b/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java index 1def8ad4a131..cc3d614e7339 100644 --- a/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java @@ -98,8 +98,8 @@ public class ChangeOrderDemo int nOrderOfShape1 = ((Integer)xPropSet1.getPropertyValue( "ZOrder" )).intValue(); int nOrderOfShape2 = ((Integer)xPropSet2.getPropertyValue( "ZOrder" )).intValue(); - xPropSet1.setPropertyValue( "ZOrder", new Integer( nOrderOfShape2 ) ); - xPropSet2.setPropertyValue( "ZOrder", new Integer( nOrderOfShape1 ) ); + xPropSet1.setPropertyValue( "ZOrder", Integer.valueOf( nOrderOfShape2 ) ); + xPropSet2.setPropertyValue( "ZOrder", Integer.valueOf( nOrderOfShape1 ) ); } catch( Exception ex ) { diff --git a/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java b/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java index 926a34a3eba1..1c0eb18d68fd 100644 --- a/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/DrawingDemo.java @@ -342,7 +342,7 @@ public class DrawingDemo xShapeProperties.setPropertyValue( "PolyPolygonBezier", aCoords ); // move the shape to the back by changing the ZOrder - xShapeProperties.setPropertyValue( "ZOrder", new Integer( 1 ) ); + xShapeProperties.setPropertyValue( "ZOrder", Integer.valueOf( 1 ) ); } catch ( Exception ex ) { diff --git a/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java b/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java index f7c50a4bedbc..932747cbef51 100644 --- a/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java @@ -116,8 +116,8 @@ public class FillAndLineStyleDemo aLineDash.DashLen = 300; aLineDash.Distance = 150; xPropSet.setPropertyValue( "LineDash", aLineDash ); - xPropSet.setPropertyValue( "LineColor", new Integer( 0x0000ff ) ); - xPropSet.setPropertyValue( "LineWidth", new Integer( 200 ) ); + xPropSet.setPropertyValue( "LineColor", Integer.valueOf( 0x0000ff ) ); + xPropSet.setPropertyValue( "LineWidth", Integer.valueOf( 200 ) ); } catch( Exception ex ) diff --git a/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java b/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java index fc34da6fdfcf..6f75c921473a 100644 --- a/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/GluePointDemo.java @@ -119,11 +119,11 @@ public class GluePointDemo // if there is a shape to connect xConnectorPropSet.setPropertyValue( "StartShape", xShape1 ); xConnectorPropSet.setPropertyValue( "StartGluePointIndex", - new Integer( nStartIndex ) ); + Integer.valueOf( nStartIndex ) ); xConnectorPropSet.setPropertyValue( "EndShape", xShape2 ); xConnectorPropSet.setPropertyValue( "EndGluePointIndex", - new Integer( nEndIndex ) ); + Integer.valueOf( nEndIndex ) ); XGluePointsSupplier xGluePointsSupplier; XIndexContainer xIndexContainer; @@ -162,11 +162,11 @@ public class GluePointDemo xConnector2PropSet.setPropertyValue( "StartShape", xShape1 ); xConnector2PropSet.setPropertyValue( "StartGluePointIndex", - new Integer( nIndexOfGluePoint1 ) ); + Integer.valueOf( nIndexOfGluePoint1 ) ); xConnector2PropSet.setPropertyValue( "EndShape", xShape2 ); xConnector2PropSet.setPropertyValue( "EndGluePointIndex", - new Integer( nIndexOfGluePoint2 ) ); + Integer.valueOf( nIndexOfGluePoint2 ) ); } diff --git a/odk/examples/DevelopersGuide/Drawing/Organigram.java b/odk/examples/DevelopersGuide/Drawing/Organigram.java index 362f38a2e6f8..67d183cf61a4 100644 --- a/odk/examples/DevelopersGuide/Drawing/Organigram.java +++ b/odk/examples/DevelopersGuide/Drawing/Organigram.java @@ -169,9 +169,9 @@ public class Organigram { xConnectorProps.setPropertyValue("StartShape", xStartShape); xConnectorProps.setPropertyValue("EndShape", xShape); xConnectorProps.setPropertyValue("StartGluePointIndex", - new Integer(2)); // 2 = bottom glue point + Integer.valueOf(2)); // 2 = bottom glue point xConnectorProps.setPropertyValue("EndGluePointIndex", - new Integer(0)); // 0 = top glue point + Integer.valueOf(0)); // 0 = top glue point } } } diff --git a/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java b/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java index bfa352016488..82f3cf3cd072 100644 --- a/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/PresentationDemo.java @@ -118,7 +118,7 @@ public class PresentationDemo after the animation has been finished */ xShapePropSet.setPropertyValue( "DimHide", Boolean.FALSE ); xShapePropSet.setPropertyValue( "DimPrevious", Boolean.TRUE ); - xShapePropSet.setPropertyValue( "DimColor", new Integer( 0xff0000 ) ); + xShapePropSet.setPropertyValue( "DimColor", Integer.valueOf( 0xff0000 ) ); // set the slide transition for the second page @@ -189,7 +189,7 @@ public class PresentationDemo XPropertySet xPresPropSet = UnoRuntime.queryInterface( XPropertySet.class, xPresentation ); xPresPropSet.setPropertyValue( "IsEndless", Boolean.TRUE ); xPresPropSet.setPropertyValue( "IsAlwaysOnTop", Boolean.TRUE ); - xPresPropSet.setPropertyValue( "Pause", new Integer( 0 ) ); + xPresPropSet.setPropertyValue( "Pause", Integer.valueOf( 0 ) ); xPresentation.start(); } catch( Exception ex ) @@ -218,8 +218,8 @@ public class PresentationDemo XPropertySet xPropSet = UnoRuntime.queryInterface( XPropertySet.class, xPage ); xPropSet.setPropertyValue( "Effect", eEffect ); xPropSet.setPropertyValue( "Speed", eSpeed ); - xPropSet.setPropertyValue( "Change", new Integer( nChange ) ); - xPropSet.setPropertyValue( "Duration", new Integer( nDuration ) ); + xPropSet.setPropertyValue( "Change", Integer.valueOf( nChange ) ); + xPropSet.setPropertyValue( "Duration", Integer.valueOf( nDuration ) ); } catch( Exception ex ) { diff --git a/odk/examples/DevelopersGuide/Drawing/StyleDemo.java b/odk/examples/DevelopersGuide/Drawing/StyleDemo.java index 945b7a78c6f6..e494e296f987 100644 --- a/odk/examples/DevelopersGuide/Drawing/StyleDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/StyleDemo.java @@ -123,7 +123,7 @@ public class StyleDemo if ( xStylePropSetInfo.hasPropertyByName( "CharColor" ) ) { xStylePropSet.setPropertyValue( "CharColor", - new Integer( 0xff0000 ) ); + Integer.valueOf( 0xff0000 ) ); } } } diff --git a/odk/examples/DevelopersGuide/Drawing/TextDemo.java b/odk/examples/DevelopersGuide/Drawing/TextDemo.java index 3dd22e4bd0ed..012432a3fc38 100644 --- a/odk/examples/DevelopersGuide/Drawing/TextDemo.java +++ b/odk/examples/DevelopersGuide/Drawing/TextDemo.java @@ -102,16 +102,16 @@ public class TextDemo // first paragraph xTextPropSet = ShapeHelper.addPortion( xRectangle, "Portion1", false ); - xTextPropSet.setPropertyValue( "CharColor", new Integer( 0xff0000 ) ); + xTextPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0xff0000 ) ); xTextPropSet = ShapeHelper.addPortion( xRectangle, "Portion2", false ); - xTextPropSet.setPropertyValue( "CharColor", new Integer( 0x8080ff ) ); + xTextPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0x8080ff ) ); aLineSpacing.Height = 100; ShapeHelper.setPropertyForLastParagraph( xRectangle, "ParaLineSpacing", aLineSpacing ); // second paragraph xTextPropSet = ShapeHelper.addPortion( xRectangle, "Portion3", true ); - xTextPropSet.setPropertyValue( "CharColor", new Integer( 0xff ) ); + xTextPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0xff ) ); aLineSpacing.Height = 200; ShapeHelper.setPropertyForLastParagraph( xRectangle, "ParaLineSpacing", aLineSpacing ); @@ -127,18 +127,18 @@ public class TextDemo xShapePropSet = UnoRuntime.queryInterface( XPropertySet.class, xRectangle ); xShapePropSet.setPropertyValue( "TextFitToSize", TextFitToSizeType.PROPORTIONAL ); - xShapePropSet.setPropertyValue( "TextLeftDistance", new Integer(2500)); - xShapePropSet.setPropertyValue( "TextRightDistance", new Integer(2500)); - xShapePropSet.setPropertyValue( "TextUpperDistance", new Integer(2500)); - xShapePropSet.setPropertyValue( "TextLowerDistance", new Integer(2500)); + xShapePropSet.setPropertyValue( "TextLeftDistance", Integer.valueOf(2500)); + xShapePropSet.setPropertyValue( "TextRightDistance", Integer.valueOf(2500)); + xShapePropSet.setPropertyValue( "TextUpperDistance", Integer.valueOf(2500)); + xShapePropSet.setPropertyValue( "TextLowerDistance", Integer.valueOf(2500)); xTextPropSet = ShapeHelper.addPortion( xRectangle, "using TextFitToSize", false ); xTextPropSet.setPropertyValue( "ParaAdjust", ParagraphAdjust.CENTER ); - xTextPropSet.setPropertyValue( "CharColor", new Integer(0xff00)); + xTextPropSet.setPropertyValue( "CharColor", Integer.valueOf(0xff00)); xTextPropSet = ShapeHelper.addPortion(xRectangle, "and a Border distance of 2,5 cm", true ); - xTextPropSet.setPropertyValue( "CharColor", new Integer( 0xff0000 ) ); + xTextPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0xff0000 ) ); } catch( Exception ex ) diff --git a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java index 9d27e66a5d42..1818418d5766 100644 --- a/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java +++ b/odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java @@ -188,7 +188,7 @@ public class HelloTextTableShape { table = xIndexedTables.getByIndex(i); xTableProps = (XPropertySet) UnoRuntime.queryInterface( XPropertySet.class, table); - xTableProps.setPropertyValue("BackColor", new Integer(0xC8FFB9)); + xTableProps.setPropertyValue("BackColor", Integer.valueOf(0xC8FFB9)); } */ } @@ -371,7 +371,7 @@ public class HelloTextTableShape { XPropertySet.class, xCellRange); } // set cell background color - xCellProps.setPropertyValue(backColorPropertyName, new Integer(0x99CCFF)); + xCellProps.setPropertyValue(backColorPropertyName, Integer.valueOf(0x99CCFF)); // set table borders // create description for blue line, width 10 @@ -399,14 +399,14 @@ public class HelloTextTableShape { protected void manipulateShape(XShape xShape) throws com.sun.star.uno.Exception { XPropertySet xShapeProps = UnoRuntime.queryInterface(XPropertySet.class, xShape); - xShapeProps.setPropertyValue("FillColor", new Integer(0x99CCFF)); - xShapeProps.setPropertyValue("LineColor", new Integer(0x000099)); - xShapeProps.setPropertyValue("RotateAngle", new Integer(3000)); - - xShapeProps.setPropertyValue("TextLeftDistance", new Integer(0)); - xShapeProps.setPropertyValue("TextRightDistance", new Integer(0)); - xShapeProps.setPropertyValue("TextUpperDistance", new Integer(0)); - xShapeProps.setPropertyValue("TextLowerDistance", new Integer(0)); + xShapeProps.setPropertyValue("FillColor", Integer.valueOf(0x99CCFF)); + xShapeProps.setPropertyValue("LineColor", Integer.valueOf(0x000099)); + xShapeProps.setPropertyValue("RotateAngle", Integer.valueOf(3000)); + + xShapeProps.setPropertyValue("TextLeftDistance", Integer.valueOf(0)); + xShapeProps.setPropertyValue("TextRightDistance", Integer.valueOf(0)); + xShapeProps.setPropertyValue("TextUpperDistance", Integer.valueOf(0)); + xShapeProps.setPropertyValue("TextLowerDistance", Integer.valueOf(0)); } diff --git a/odk/examples/DevelopersGuide/Forms/DataAwareness.java b/odk/examples/DevelopersGuide/Forms/DataAwareness.java index 6c5cc5154709..e7401c13bb34 100644 --- a/odk/examples/DevelopersGuide/Forms/DataAwareness.java +++ b/odk/examples/DevelopersGuide/Forms/DataAwareness.java @@ -662,7 +662,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan xColProps.setPropertyValue( "Name", sDataField ); if ( nWidth > 0 ) - xColProps.setPropertyValue( "Width", new Integer( nWidth * 10 ) ); + xColProps.setPropertyValue( "Width", Integer.valueOf( nWidth * 10 ) ); // insert xColumnContainer.insertByIndex( xColumnContainer.getCount(), xNewCol ); @@ -720,7 +720,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan // set the data source signature at the form m_xMasterForm.setPropertyValue( "DataSourceName", m_database.getDocumentURL() ); - m_xMasterForm.setPropertyValue( "CommandType", new Integer( CommandType.TABLE ) ); + m_xMasterForm.setPropertyValue( "CommandType", Integer.valueOf( CommandType.TABLE ) ); m_xMasterForm.setPropertyValue( "Command", "SALESMEN" ); @@ -743,7 +743,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan XPropertySet xSalesFormProps = UNO.queryPropertySet( xSalesForm ); xSalesFormProps.setPropertyValue( "DataSourceName", m_database.getDocumentURL() ); - xSalesFormProps.setPropertyValue( "CommandType", new Integer( CommandType.COMMAND ) ); + xSalesFormProps.setPropertyValue( "CommandType", Integer.valueOf( CommandType.COMMAND ) ); String sCommand = new String( "SELECT * FROM " ); sCommand += s_tableNameSales; diff --git a/odk/examples/DevelopersGuide/Forms/FormLayer.java b/odk/examples/DevelopersGuide/Forms/FormLayer.java index b582ee4fe701..0e8ebb88eb44 100644 --- a/odk/examples/DevelopersGuide/Forms/FormLayer.java +++ b/odk/examples/DevelopersGuide/Forms/FormLayer.java @@ -123,7 +123,7 @@ public class FormLayer xModelProps.setPropertyValue( "VisualEffect", new Short( com.sun.star.awt.VisualEffect.FLAT ) ); if ( m_document.classify() != DocumentType.CALC ) if ( xPSI.hasPropertyByName( "BorderColor" ) ) - xModelProps.setPropertyValue( "BorderColor", new Integer( 0x00C0C0C0 ) ); + xModelProps.setPropertyValue( "BorderColor", Integer.valueOf( 0x00C0C0C0 ) ); } catch( com.sun.star.uno.Exception e ) { diff --git a/odk/examples/DevelopersGuide/Forms/RowSet.java b/odk/examples/DevelopersGuide/Forms/RowSet.java index c37ce1448037..8c0a1534a294 100644 --- a/odk/examples/DevelopersGuide/Forms/RowSet.java +++ b/odk/examples/DevelopersGuide/Forms/RowSet.java @@ -48,7 +48,7 @@ public class RowSet implements XRowSet, XRow m_rowSetProps = UnoRuntime.queryInterface( XPropertySet.class, _context.getServiceManager().createInstanceWithContext( "com.sun.star.sdb.RowSet", _context ) ); m_rowSetProps.setPropertyValue( "DataSourceName", _dataSource ); - m_rowSetProps.setPropertyValue( "CommandType", new Integer( _commandType ) ); + m_rowSetProps.setPropertyValue( "CommandType", Integer.valueOf( _commandType ) ); m_rowSetProps.setPropertyValue( "Command", _command ); m_rowSet = UnoRuntime.queryInterface( XRowSet.class, m_rowSetProps ); diff --git a/odk/examples/DevelopersGuide/Forms/SalesFilter.java b/odk/examples/DevelopersGuide/Forms/SalesFilter.java index 2506f16a3666..2a6ed6a66c35 100644 --- a/odk/examples/DevelopersGuide/Forms/SalesFilter.java +++ b/odk/examples/DevelopersGuide/Forms/SalesFilter.java @@ -175,7 +175,7 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis nDate = nDate * 100 + aCalDate.get( Calendar.MONTH ) + 1; nDate = nDate * 100 + aCalDate.get( Calendar.DAY_OF_MONTH ); - aReturn = new Integer( nDate ); + aReturn = Integer.valueOf( nDate ); } else if ( aDate.getClass().equals( Class.forName( "java.lang.Integer" ) ) ) { @@ -215,19 +215,19 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis aCal.setTime( (java.util.Date)aDate ); sOdbcDate += new String( "{D '" ); - sOdbcDate += (new Integer( aCal.get( Calendar.YEAR ) ) ).toString(); + sOdbcDate += (Integer.valueOf( aCal.get( Calendar.YEAR ) ) ).toString(); sOdbcDate += "-"; int nMonth = aCal.get( Calendar.MONTH ) + 1; if ( nMonth < 10 ) sOdbcDate += "0"; - sOdbcDate += (new Integer( nMonth ) ).toString(); + sOdbcDate += (Integer.valueOf( nMonth ) ).toString(); sOdbcDate += "-"; int nDay = aCal.get( Calendar.DAY_OF_MONTH ); if ( nDay < 10 ) sOdbcDate += "0"; - sOdbcDate += (new Integer( nDay ) ).toString(); + sOdbcDate += (Integer.valueOf( nDay ) ).toString(); sOdbcDate += "'}"; } } diff --git a/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java b/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java index c22054b46f37..f4c2e0fba29f 100644 --- a/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java +++ b/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java @@ -151,7 +151,7 @@ public class SingleControlValidation implements XFormComponentValidityListener boolean isValid = xComp.isValid(); m_statusField.setPropertyValue("Label", isValid ? "valid" : "invalid" ); - m_statusField.setPropertyValue( "TextColor", new Integer( isValid ? 0x008000 : 0x800000 ) ); + m_statusField.setPropertyValue( "TextColor", Integer.valueOf( isValid ? 0x008000 : 0x800000 ) ); String validityMessage = ""; if ( !isValid ) diff --git a/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java b/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java index 1eab64cd08ae..d599eeef54ae 100644 --- a/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java +++ b/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java @@ -45,7 +45,7 @@ public class SpreadsheetValueBinding extends DocumentBasedExample final short sheet = (short)0; final short exchangeColumn = (short)1; // B final short exchangeRow = (short)1; // 2 - final Integer backColor = new Integer( 0x00E0E0E0 ); + final Integer backColor = Integer.valueOf( 0x00E0E0E0 ); // a numeric control diff --git a/odk/examples/DevelopersGuide/GUI/DialogDocument.java b/odk/examples/DevelopersGuide/GUI/DialogDocument.java index 9db851852006..8ec7681cab38 100644 --- a/odk/examples/DevelopersGuide/GUI/DialogDocument.java +++ b/odk/examples/DevelopersGuide/GUI/DialogDocument.java @@ -65,13 +65,13 @@ public class DialogDocument extends UnoDialogSample { XMultiComponentFactory xMCF = xContext.getServiceManager(); oDialogDocument = new DialogDocument(xContext, xMCF); oDialogDocument.initialize( new String[] {"Height", "Moveable", "Name","PositionX","PositionY", "Step", "TabIndex","Title","Width"}, - new Object[] { new Integer(400), Boolean.TRUE, "Dialog1", new Integer(102),new Integer(41), new Integer(1), new Short((short) 0), "Document-Dialog", new Integer(300)}); + new Object[] { Integer.valueOf(400), Boolean.TRUE, "Dialog1", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(1), new Short((short) 0), "Document-Dialog", Integer.valueOf(300)}); oDialogDocument.createWindowPeer(); Object oFTHeaderModel = oDialogDocument.m_xMSFDialogModel.createInstance("com.sun.star.awt.UnoControlFixedTextModel"); XMultiPropertySet xFTHeaderModelMPSet = UnoRuntime.queryInterface(XMultiPropertySet.class, oFTHeaderModel); xFTHeaderModelMPSet.setPropertyValues( new String[] {"Height", "Label", "Name", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(8), "This code-sample demonstrates how to display an office document in a dialog window", "HeaderLabel", new Integer(6), new Integer(6), new Integer(300)}); + new Object[] { Integer.valueOf(8), "This code-sample demonstrates how to display an office document in a dialog window", "HeaderLabel", Integer.valueOf(6), Integer.valueOf(6), Integer.valueOf(300)}); // add the model to the NameContainer of the dialog model oDialogDocument.m_xDlgModelNameContainer.insertByName("Headerlabel", oFTHeaderModel); oDialogDocument.showDocumentinDialogWindow(oDialogDocument.m_xWindowPeer, new Rectangle(40, 50, 420, 550), "private:factory/swriter"); diff --git a/odk/examples/DevelopersGuide/GUI/ImageControlSample.java b/odk/examples/DevelopersGuide/GUI/ImageControlSample.java index c22e6701394b..ac2bf2791930 100644 --- a/odk/examples/DevelopersGuide/GUI/ImageControlSample.java +++ b/odk/examples/DevelopersGuide/GUI/ImageControlSample.java @@ -69,12 +69,12 @@ public class ImageControlSample extends UnoDialogSample{ XMultiComponentFactory xMCF = xContext.getServiceManager(); oImageControlSample = new ImageControlSample(xContext, xMCF); oImageControlSample.initialize( new String[] {"Height", "Moveable", "Name","PositionX","PositionY", "Step", "TabIndex","Title","Width"}, - new Object[] { new Integer(100), Boolean.TRUE, "MyTestDialog", new Integer(102),new Integer(41), new Integer(0), new Short((short) 0), "OpenOffice", new Integer(230)}); + new Object[] { Integer.valueOf(100), Boolean.TRUE, "MyTestDialog", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(0), new Short((short) 0), "OpenOffice", Integer.valueOf(230)}); Object oFTHeaderModel = oImageControlSample.m_xMSFDialogModel.createInstance("com.sun.star.awt.UnoControlFixedTextModel"); XMultiPropertySet xFTHeaderModelMPSet = UnoRuntime.queryInterface(XMultiPropertySet.class, oFTHeaderModel); xFTHeaderModelMPSet.setPropertyValues( new String[] {"Height", "Label", "MultiLine", "Name", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(16), "This code-sample demonstrates how to create an ImageControlSample within a dialog", Boolean.TRUE, "HeaderLabel", new Integer(6), new Integer(6), new Integer(210)}); + new Object[] { Integer.valueOf(16), "This code-sample demonstrates how to create an ImageControlSample within a dialog", Boolean.TRUE, "HeaderLabel", Integer.valueOf(6), Integer.valueOf(6), Integer.valueOf(210)}); // add the model to the NameContainer of the dialog model oImageControlSample.m_xDlgModelNameContainer.insertByName("Headerlabel", oFTHeaderModel); XPropertySet xICModelPropertySet = oImageControlSample.insertImageControl(68, 30, 32, 90); @@ -116,7 +116,7 @@ public class ImageControlSample extends UnoDialogSample{ // The image is not scaled xICModelMPSet.setPropertyValues( new String[] {"Border", "Height", "Name", "PositionX", "PositionY", "ScaleImage", "Width"}, - new Object[] { new Short((short) 1), new Integer(_nHeight), sName, new Integer(_nPosX), new Integer(_nPosY), Boolean.FALSE, new Integer(_nWidth)}); + new Object[] { new Short((short) 1), Integer.valueOf(_nHeight), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Boolean.FALSE, Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oICModel); diff --git a/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java b/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java index 4f084d629df6..61fbf5f6958b 100644 --- a/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java +++ b/odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java @@ -54,7 +54,7 @@ public class RoadmapItemStateChangeListener implements XItemListener { // in the following line "ID" and "Step" are mixed together. // In fact in this case they denot the same if (nNewID != nOldStep){ - xDialogModelPropertySet.setPropertyValue("Step", new Integer(nNewID)); + xDialogModelPropertySet.setPropertyValue("Step", Integer.valueOf(nNewID)); } } catch (com.sun.star.uno.Exception exception) { exception.printStackTrace(System.err); diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java index 750b4a5d4a59..6a0f6fab85dd 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java @@ -134,12 +134,12 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis XMultiComponentFactory xMCF = xContext.getServiceManager(); oUnoDialogSample = new UnoDialogSample(xContext, xMCF); oUnoDialogSample.initialize( new String[] {"Height", "Moveable", "Name","PositionX","PositionY", "Step", "TabIndex","Title","Width"}, - new Object[] { new Integer(380), Boolean.TRUE, "MyTestDialog", new Integer(102),new Integer(41), new Integer(0), new Short((short) 0), "OpenOffice", new Integer(380)}); + new Object[] { Integer.valueOf(380), Boolean.TRUE, "MyTestDialog", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(0), new Short((short) 0), "OpenOffice", Integer.valueOf(380)}); Object oFTHeaderModel = oUnoDialogSample.m_xMSFDialogModel.createInstance("com.sun.star.awt.UnoControlFixedTextModel"); XMultiPropertySet xFTHeaderModelMPSet = UnoRuntime.queryInterface(XMultiPropertySet.class, oFTHeaderModel); xFTHeaderModelMPSet.setPropertyValues( new String[] {"Height", "Label", "Name", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(8), "This code-sample demonstrates how to create various controls in a dialog", "HeaderLabel", new Integer(106), new Integer(6), new Integer(300)}); + new Object[] { Integer.valueOf(8), "This code-sample demonstrates how to create various controls in a dialog", "HeaderLabel", Integer.valueOf(106), Integer.valueOf(6), Integer.valueOf(300)}); // add the model to the NameContainer of the dialog model oUnoDialogSample.m_xDlgModelNameContainer.insertByName("Headerlabel", oFTHeaderModel); oUnoDialogSample.insertFixedText(oUnoDialogSample, 106, 18, 100, 0, "My ~Label"); @@ -297,7 +297,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis xFTModelMPSet.setPropertyValues( new String[] {"Height", "Name", "PositionX", "PositionY", "Step", "Width"}, - new Object[] { new Integer(8), sName, new Integer(_nPosX), new Integer(_nPosY), new Integer(_nStep), new Integer(_nWidth)}); + new Object[] { Integer.valueOf(8), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(_nStep), Integer.valueOf(_nWidth)}); // add the model to the NameContainer of the dialog model m_xDlgModelNameContainer.insertByName(sName, oFTModel); @@ -340,7 +340,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xCFModelMPSet.setPropertyValues( new String[] {"Height", "Name", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(12), sName, new Integer(_nPositionX), new Integer(_nPositionY), new Integer(_nWidth)}); + new Object[] { Integer.valueOf(12), sName, Integer.valueOf(_nPositionX), Integer.valueOf(_nPositionY), Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oCFModel); @@ -386,7 +386,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xPBModelMPSet.setPropertyValues( new String[] {"Height", "Name", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(8), sName, new Integer(_nPosX), new Integer(_nPosY), new Integer(_nWidth)}); + new Object[] { Integer.valueOf(8), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oPBModel); @@ -394,8 +394,8 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // The following properties may also be set with XMultiPropertySet but we // use the XPropertySet interface merely for reasons of demonstration - xPBModelPSet.setPropertyValue("ProgressValueMin", new Integer(0)); - xPBModelPSet.setPropertyValue("ProgressValueMax", new Integer(_nProgressMax)); + xPBModelPSet.setPropertyValue("ProgressValueMin", Integer.valueOf(0)); + xPBModelPSet.setPropertyValue("ProgressValueMax", Integer.valueOf(_nProgressMax)); } catch (com.sun.star.uno.Exception ex) { /* perform individual exception handling here. * Possible exception types are: @@ -425,7 +425,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xFLModelMPSet.setPropertyValues( new String[] {"Height", "Name", "Orientation", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(8), sName, new Integer(0), new Integer(_nPosX), new Integer(_nPosY), new Integer(_nWidth)}); + new Object[] { Integer.valueOf(8), sName, Integer.valueOf(0), Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oFLModel); @@ -462,7 +462,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xGBModelMPSet.setPropertyValues( new String[] {"Height", "Name", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(_nHeight), sName, new Integer(_nPosX), new Integer(_nPosY), new Integer(_nWidth)}); + new Object[] { Integer.valueOf(_nHeight), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oGBModel); @@ -500,7 +500,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xTFModelMPSet.setPropertyValues( new String[] {"Height", "Name", "PositionX", "PositionY", "Text", "Width"}, - new Object[] { new Integer(12), sName, new Integer(_nPosX), new Integer(_nPosY), "MyText", new Integer(_nWidth)}); + new Object[] { Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), "MyText", Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oTFModel); @@ -545,7 +545,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xTFModelMPSet.setPropertyValues( new String[] {"Height", "Name", "PositionX", "PositionY", "Spin", "Width"}, - new Object[] { new Integer(12), sName, new Integer(_nPosX), new Integer(_nPosY), Boolean.TRUE, new Integer(_nWidth)}); + new Object[] { Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Boolean.TRUE, Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oTFModel); @@ -587,7 +587,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xDFModelMPSet.setPropertyValues( new String[] {"Dropdown", "Height", "Name", "PositionX", "PositionY", "Width"}, - new Object[] {Boolean.TRUE, new Integer(12), sName, new Integer(_nPosX), new Integer(_nPosY), new Integer(_nWidth)}); + new Object[] {Boolean.TRUE, Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oDFModel); @@ -633,7 +633,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xPFModelMPSet.setPropertyValues( new String[] {"Height", "Name", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(12), sName, new Integer(_nPosX), new Integer(_nPosY), new Integer(_nWidth)}); + new Object[] { Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oPFModel); @@ -676,7 +676,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xNFModelMPSet.setPropertyValues( new String[] {"Height", "Name", "PositionX", "PositionY", "Spin", "StrictFormat", "Width"}, - new Object[] { new Integer(12), sName, new Integer(_nPosX), new Integer(_nPosY), Boolean.TRUE, Boolean.TRUE, new Integer(_nWidth)}); + new Object[] { Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Boolean.TRUE, Boolean.TRUE, Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oNFModel); @@ -712,7 +712,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // create a unique name by means of an own implementation... String sName = createUniqueName(m_xDlgModelNameContainer, "ScrollBar"); - Integer NOrientation = new Integer(com.sun.star.awt.ScrollBarOrientation.VERTICAL); + Integer NOrientation = Integer.valueOf(com.sun.star.awt.ScrollBarOrientation.VERTICAL); // create a controlmodel at the multiservicefactory of the dialog model... Object oSBModel = m_xMSFDialogModel.createInstance("com.sun.star.awt.UnoControlScrollBarModel"); @@ -720,7 +720,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xSBModelMPSet.setPropertyValues( new String[] {"Height", "Name", "Orientation", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(_nHeight), sName, NOrientation, new Integer(_nPosX), new Integer(_nPosY), new Integer(8)}); + new Object[] { Integer.valueOf(_nHeight), sName, NOrientation, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(8)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oSBModel); @@ -728,11 +728,11 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis xSBModelPSet = UnoRuntime.queryInterface(XPropertySet.class, oSBModel); // The following properties may also be set with XMultiPropertySet but we // use the XPropertySet interface merely for reasons of demonstration - xSBModelPSet.setPropertyValue("ScrollValueMin", new Integer(0)); - xSBModelPSet.setPropertyValue("ScrollValueMax", new Integer(100)); - xSBModelPSet.setPropertyValue("ScrollValue", new Integer(5)); - xSBModelPSet.setPropertyValue("LineIncrement", new Integer(2)); - xSBModelPSet.setPropertyValue("BlockIncrement", new Integer(10)); + xSBModelPSet.setPropertyValue("ScrollValueMin", Integer.valueOf(0)); + xSBModelPSet.setPropertyValue("ScrollValueMax", Integer.valueOf(100)); + xSBModelPSet.setPropertyValue("ScrollValue", Integer.valueOf(5)); + xSBModelPSet.setPropertyValue("LineIncrement", Integer.valueOf(2)); + xSBModelPSet.setPropertyValue("BlockIncrement", Integer.valueOf(10)); // Add an Adjustment that will listen to changes of the scrollbar... XControl xSBControl = m_xDlgContainer.getControl(sName); @@ -787,7 +787,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis XMultiPropertySet xCBMPSet = UnoRuntime.queryInterface(XMultiPropertySet.class, oCBModel); xCBMPSet.setPropertyValues( new String[] {"Height", "Label", "Name", "PositionX", "PositionY", "Width" } , - new Object[] {new Integer(8), "~Include page number", sName, new Integer(_nPosX), new Integer(_nPosY), new Integer(_nWidth)}); + new Object[] {Integer.valueOf(8), "~Include page number", sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(_nWidth)}); // The following property may also be set with XMultiPropertySet but we // use the XPropertySet interface merely for reasons of demonstration @@ -830,7 +830,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xRBMPSet.setPropertyValues( new String[] {"Height", "Label", "Name", "PositionX", "PositionY", "State", "TabIndex", "Width" } , - new Object[] {new Integer(8), "~First Option", sName, new Integer(_nPosX), new Integer(_nPosY), new Short((short) 1), new Short(_nTabIndex++),new Integer(_nWidth)}); + new Object[] {Integer.valueOf(8), "~First Option", sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), new Short((short) 1), new Short(_nTabIndex++),Integer.valueOf(_nWidth)}); // add the model to the NameContainer of the dialog model m_xDlgModelNameContainer.insertByName(sName, oRBModel); @@ -842,7 +842,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xRBMPSet.setPropertyValues( new String[] {"Height", "Label", "Name", "PositionX", "PositionY", "TabIndex", "Width" } , - new Object[] {new Integer(8), "~Second Option", sName, new Integer(130), new Integer(214), new Short(_nTabIndex), new Integer(150)}); + new Object[] {Integer.valueOf(8), "~Second Option", sName, Integer.valueOf(130), Integer.valueOf(214), new Short(_nTabIndex), Integer.valueOf(150)}); // add the model to the NameContainer of the dialog model m_xDlgModelNameContainer.insertByName(sName, oRBModel); } catch (com.sun.star.uno.Exception ex) { @@ -872,7 +872,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xLBModelMPSet.setPropertyValues( new String[] {"Dropdown", "Height", "Name", "PositionX", "PositionY", "Step", "StringItemList", "Width" } , - new Object[] {Boolean.TRUE, new Integer(12), sName, new Integer(_nPosX), new Integer(_nPosY), new Integer(_nStep), _sStringItemList, new Integer(_nWidth)}); + new Object[] {Boolean.TRUE, Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(_nStep), _sStringItemList, Integer.valueOf(_nWidth)}); // The following property may also be set with XMultiPropertySet but we // use the XPropertySet interface merely for reasons of demonstration XPropertySet xLBModelPSet = UnoRuntime.queryInterface(XPropertySet.class, xLBModelMPSet); @@ -914,7 +914,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xCbBModelMPSet.setPropertyValues( new String[] {"Dropdown", "Height", "Name", "PositionX", "PositionY", "StringItemList", "Width" } , - new Object[] {Boolean.TRUE, new Integer(12), sName, new Integer(_nPosX), new Integer(_nPosY), sStringItemList, new Integer(_nWidth)}); + new Object[] {Boolean.TRUE, Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), sStringItemList, Integer.valueOf(_nWidth)}); // The following property may also be set with XMultiPropertySet but we // use the XPropertySet interface merely for reasons of demonstration @@ -957,7 +957,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xFFModelMPSet.setPropertyValues( new String[] {"EffectiveValue", "Height", "Name", "PositionX", "PositionY", "StrictFormat", "Spin", "Width"}, - new Object[] { new Double(12348), new Integer(12), sName, new Integer(_nPosX), new Integer(_nPosY), Boolean.TRUE, Boolean.TRUE, new Integer(_nWidth)}); + new Object[] { new Double(12348), Integer.valueOf(12), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Boolean.TRUE, Boolean.TRUE, Integer.valueOf(_nWidth)}); xFFModelPSet = UnoRuntime.queryInterface(XPropertySet.class, oFFModel); // to define a numberformat you always need a locale... @@ -981,7 +981,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // The following property may also be set with XMultiPropertySet but we // use the XPropertySet interface merely for reasons of demonstration xFFModelPSet.setPropertyValue("FormatsSupplier", xNumberFormatsSupplier); - xFFModelPSet.setPropertyValue("FormatKey", new Integer(nFormatKey)); + xFFModelPSet.setPropertyValue("FormatKey", Integer.valueOf(nFormatKey)); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oFFModel); @@ -1033,7 +1033,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis XMultiPropertySet xFCModelMPSet = UnoRuntime.queryInterface(XMultiPropertySet.class, oFCModel); xFCModelMPSet.setPropertyValues( new String[] {"Height", "Name", "PositionX", "PositionY", "Text", "Width"}, - new Object[] { new Integer(14), sName, new Integer(_nPosX), new Integer(_nPosY), sSystemWorkPath, new Integer(_nWidth)}); + new Object[] { Integer.valueOf(14), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), sSystemWorkPath, Integer.valueOf(_nWidth)}); // The controlmodel is not really available until inserted to the Dialog container m_xDlgModelNameContainer.insertByName(sName, oFCModel); @@ -1072,7 +1072,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xButtonMPSet.setPropertyValues( new String[] {"Height", "Label", "Name", "PositionX", "PositionY", "PushButtonType", "Width" } , - new Object[] {new Integer(14), _sLabel, sName, new Integer(_nPosX), new Integer(_nPosY), new Short(_nPushButtonType), new Integer(_nWidth)}); + new Object[] {Integer.valueOf(14), _sLabel, sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), new Short(_nPushButtonType), Integer.valueOf(_nWidth)}); // add the model to the NameContainer of the dialog model m_xDlgModelNameContainer.insertByName(sName, oButtonModel); @@ -1320,7 +1320,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // define the properties of the roadmapmodel XMultiPropertySet xRMMPSet = UnoRuntime.queryInterface(XMultiPropertySet.class, oRoadmapModel); xRMMPSet.setPropertyValues( new String[] {"Complete", "Height", "Name", "PositionX", "PositionY", "Text", "Width" }, - new Object[] {Boolean.FALSE, new Integer(nDialogHeight - 26), sRoadmapName, new Integer(0), new Integer(0), "Steps", new Integer(85)}); + new Object[] {Boolean.FALSE, Integer.valueOf(nDialogHeight - 26), sRoadmapName, Integer.valueOf(0), Integer.valueOf(0), "Steps", Integer.valueOf(85)}); m_xRMPSet = UnoRuntime.queryInterface(XPropertySet.class, oRoadmapModel); // add the roadmapmodel to the dialog container.. @@ -1354,7 +1354,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // sometimes steps are supposed to be set disabled depending on the program logic... xRMItemPSet.setPropertyValue("Enabled", Boolean.valueOf(_bEnabled)); // in this context the "ID" is meant to refer to a step of the dialog - xRMItemPSet.setPropertyValue("ID", new Integer(_ID)); + xRMItemPSet.setPropertyValue("ID", Integer.valueOf(_ID)); m_xRMIndexCont.insertByIndex(Index, oRoadmapItem); } catch (com.sun.star.uno.Exception exception) { exception.printStackTrace(System.err); diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java index 225262732e49..a73362a53a87 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java @@ -100,7 +100,7 @@ public class UnoDialogSample2 extends UnoDialogSample { final int nListBoxHeight = nDialogHeight - 4*nControlMargin - nButtonHeight; oUnoDialogSample2 = new UnoDialogSample2(xContext, xMCF, oUnoObject); oUnoDialogSample2.initialize( new String[] {"Height", "Moveable", "Name","PositionX","PositionY", "Step", "TabIndex","Title","Width"}, - new Object[] { new Integer(nDialogHeight), Boolean.TRUE, "Dialog1", new Integer(102),new Integer(41), new Integer(1), new Short((short) 0), "Inspect a Uno-Object", new Integer(nDialogWidth)}); + new Object[] { Integer.valueOf(nDialogHeight), Boolean.TRUE, "Dialog1", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(1), new Short((short) 0), "Inspect a Uno-Object", Integer.valueOf(nDialogWidth)}); String sIntroLabel = "This Dialog lists information about a given Uno-Object.\nIt offers a view to inspect all suppported servicenames, exported interfaces, methods and properties."; oUnoDialogSample2.insertMultiLineFixedText(nControlPosX, 27, nControlWidth, 4, 1, sIntroLabel); // get the data from the UNO object... @@ -220,7 +220,7 @@ public class UnoDialogSample2 extends UnoDialogSample { // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xLBModelMPSet.setPropertyValues( new String[] {"Dropdown", "Height", "Name", "PositionX", "PositionY", "ReadOnly", "Step", "StringItemList", "Width" } , - new Object[] {Boolean.FALSE, new Integer(_nHeight), sName, new Integer(_nPosX), new Integer(_nPosY), Boolean.TRUE, new Integer(_nStep), _sStringItemList, new Integer(_nWidth)}); + new Object[] {Boolean.FALSE, Integer.valueOf(_nHeight), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Boolean.TRUE, Integer.valueOf(_nStep), _sStringItemList, Integer.valueOf(_nWidth)}); m_xDlgModelNameContainer.insertByName(sName, xLBModelMPSet); }catch (com.sun.star.uno.Exception ex) { throw new java.lang.RuntimeException("cannot happen..."); @@ -240,7 +240,7 @@ public class UnoDialogSample2 extends UnoDialogSample { // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xFTModelMPSet.setPropertyValues( new String[] {"Height", "Label", "MultiLine", "Name", "PositionX", "PositionY", "Step", "Width"}, - new Object[] { new Integer(nHeight), _sLabel, Boolean.TRUE, sName, new Integer(_nPosX), new Integer(_nPosY), new Integer(_nStep), new Integer(_nWidth)}); + new Object[] { Integer.valueOf(nHeight), _sLabel, Boolean.TRUE, sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Integer.valueOf(_nStep), Integer.valueOf(_nWidth)}); // add the model to the NameContainer of the dialog model m_xDlgModelNameContainer.insertByName(sName, oFTModel); }catch (com.sun.star.uno.Exception ex){ diff --git a/odk/examples/DevelopersGuide/GUI/UnoMenu2.java b/odk/examples/DevelopersGuide/GUI/UnoMenu2.java index 24b0aabab04e..8869cf4394e3 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoMenu2.java +++ b/odk/examples/DevelopersGuide/GUI/UnoMenu2.java @@ -42,13 +42,13 @@ public UnoMenu2(XComponentContext _xContext, XMultiComponentFactory _xMCF) { XMultiComponentFactory xMCF = xContext.getServiceManager(); oUnoMenu2 = new UnoMenu2(xContext, xMCF); oUnoMenu2.initialize( new String[] {"Height", "Moveable", "Name","PositionX","PositionY", "Step", "TabIndex","Title","Width"}, - new Object[] { new Integer(140), Boolean.TRUE, "Dialog1", new Integer(102),new Integer(41), new Integer(1), new Short((short) 0), "Menu-Dialog", new Integer(200)}); + new Object[] { Integer.valueOf(140), Boolean.TRUE, "Dialog1", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(1), new Short((short) 0), "Menu-Dialog", Integer.valueOf(200)}); Object oFTHeaderModel = oUnoMenu2.m_xMSFDialogModel.createInstance("com.sun.star.awt.UnoControlFixedTextModel"); XMultiPropertySet xFTHeaderModelMPSet = UnoRuntime.queryInterface(XMultiPropertySet.class, oFTHeaderModel); xFTHeaderModelMPSet.setPropertyValues( new String[] {"Height", "Label", "Name", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(8), "This code-sample demonstrates the creation of a popup-menu", "HeaderLabel", new Integer(6), new Integer(6), new Integer(200)}); + new Object[] { Integer.valueOf(8), "This code-sample demonstrates the creation of a popup-menu", "HeaderLabel", Integer.valueOf(6), Integer.valueOf(6), Integer.valueOf(200)}); // add the model to the NameContainer of the dialog model oUnoMenu2.m_xDlgModelNameContainer.insertByName("Headerlabel", oFTHeaderModel); oUnoMenu2.addLabelForPopupMenu(); @@ -75,7 +75,7 @@ public UnoMenu2(XComponentContext _xContext, XMultiComponentFactory _xMCF) { // Set the properties at the model - keep in mind to pass the property names in alphabetical order! xFTModelMPSet.setPropertyValues( new String[] {"Height", "Label", "Name", "PositionX", "PositionY", "Width"}, - new Object[] { new Integer(8), "Right-click here", sName, new Integer(50), new Integer(50), new Integer(100)}); + new Object[] { Integer.valueOf(8), "Right-click here", sName, Integer.valueOf(50), Integer.valueOf(50), Integer.valueOf(100)}); // add the model to the NameContainer of the dialog model m_xDlgModelNameContainer.insertByName(sName, oFTModel); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, m_xDlgContainer.getControl(sName)); diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java index 712abb91fcc3..63fc3cd8392c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java @@ -155,7 +155,7 @@ public class NativeView extends java.awt.Canvas { if(maHandle==null) { - maHandle = new Integer((int)getNativeWindow()); + maHandle = Integer.valueOf((int)getNativeWindow()); maSystem = getNativeWindowSystemType(); } return maHandle; diff --git a/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java b/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java index 0f7e25851a4d..f6a8f8c035d8 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java @@ -114,7 +114,7 @@ public class Number_Formats com.sun.star.beans.XPropertySet.class, xCellRange ); // Set number format to default currency - xCellProp.setPropertyValue( "NumberFormat", new Integer(nCurrencyKey) ); + xCellProp.setPropertyValue( "NumberFormat", Integer.valueOf(nCurrencyKey) ); // Get cell B3 com.sun.star.table.XCell xCell = maSheet.getCellByPosition( 1, 2 ); @@ -158,7 +158,7 @@ public class Number_Formats // Set the new format at the cell if ( nIndexKey != -1 ) - xCellProp.setPropertyValue( "NumberFormat", new Integer(nIndexKey) ); + xCellProp.setPropertyValue( "NumberFormat", Integer.valueOf(nIndexKey) ); // Set column containing the example values to optimal width to show diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java index e72861db0233..593e8e572f48 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java @@ -269,12 +269,12 @@ class ExampleLevel implements public com.sun.star.sheet.MemberResult[] getResults() { int nDimensions = 0; - int nPosition = aSettings.aColDimensions.indexOf( new Integer(nDimension)); + int nPosition = aSettings.aColDimensions.indexOf( Integer.valueOf(nDimension)); if ( nPosition >= 0 ) nDimensions = aSettings.aColDimensions.size(); else { - nPosition = aSettings.aRowDimensions.indexOf( new Integer(nDimension)); + nPosition = aSettings.aRowDimensions.indexOf( Integer.valueOf(nDimension)); if ( nPosition >= 0 ) nDimensions = aSettings.aRowDimensions.size(); } @@ -604,7 +604,7 @@ class ExampleDimension implements eNewOrient != com.sun.star.sheet.DataPilotFieldOrientation.DATA ) { // remove from list for old orientation and add for new one - Integer aDimInt = new Integer(nDimension); + Integer aDimInt = Integer.valueOf(nDimension); if ( eOrientation == com.sun.star.sheet.DataPilotFieldOrientation.COLUMN ) aSettings.aColDimensions.remove( aDimInt ); else if ( eOrientation == com.sun.star.sheet.DataPilotFieldOrientation.ROW ) @@ -621,7 +621,7 @@ class ExampleDimension implements else if ( aPropertyName.equals( "Position" ) ) { int nNewPos = ((Integer) aValue).intValue(); - Integer aDimInt = new Integer(nDimension); + Integer aDimInt = Integer.valueOf(nDimension); if ( eOrientation == com.sun.star.sheet.DataPilotFieldOrientation.COLUMN ) { aSettings.aColDimensions.remove( aDimInt ); @@ -655,17 +655,17 @@ class ExampleDimension implements { int nPosition; if ( eOrientation == com.sun.star.sheet.DataPilotFieldOrientation.COLUMN ) - nPosition = aSettings.aColDimensions.indexOf( new Integer(nDimension) ); + nPosition = aSettings.aColDimensions.indexOf( Integer.valueOf(nDimension) ); else if ( eOrientation == com.sun.star.sheet.DataPilotFieldOrientation.ROW ) - nPosition = aSettings.aRowDimensions.indexOf( new Integer(nDimension) ); + nPosition = aSettings.aRowDimensions.indexOf( Integer.valueOf(nDimension) ); else nPosition = nDimension; - return new Integer( nPosition ); + return Integer.valueOf( nPosition ); } else if ( aPropertyName.equals( "Function" ) ) return com.sun.star.sheet.GeneralFunction.SUM; else if ( aPropertyName.equals( "UsedHierarchy" ) ) - return new Integer(0); + return Integer.valueOf(0); else if ( aPropertyName.equals( "Filter" ) ) return new com.sun.star.sheet.TableFilterField[0]; else diff --git a/odk/examples/DevelopersGuide/Spreadsheet/GeneralTableSample.java b/odk/examples/DevelopersGuide/Spreadsheet/GeneralTableSample.java index f25a9cfded8f..a40722f5e625 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/GeneralTableSample.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/GeneralTableSample.java @@ -106,7 +106,7 @@ public class GeneralTableSample extends SpreadsheetDocHelper // *** Change cell properties *** int nValue = bValid ? 0x00FF00 : 0xFF4040; xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCell ); - xPropSet.setPropertyValue( "CellBackColor", new Integer( nValue ) ); + xPropSet.setPropertyValue( "CellBackColor", Integer.valueOf( nValue ) ); // *** Accessing a CELL RANGE *** @@ -117,14 +117,14 @@ public class GeneralTableSample extends SpreadsheetDocHelper // Change properties of the range. xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCellRange ); - xPropSet.setPropertyValue( "CellBackColor", new Integer( 0x8080FF ) ); + xPropSet.setPropertyValue( "CellBackColor", Integer.valueOf( 0x8080FF ) ); // Accessing a cell range over its name. xCellRange = xSheet.getCellRangeByName( "C4:D5" ); // Change properties of the range. xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCellRange ); - xPropSet.setPropertyValue( "CellBackColor", new Integer( 0xFFFF80 ) ); + xPropSet.setPropertyValue( "CellBackColor", Integer.valueOf( 0xFFFF80 ) ); // *** Using the CELL CURSOR to add some data below of the filled area *** @@ -155,7 +155,7 @@ public class GeneralTableSample extends SpreadsheetDocHelper // Get column C by index (interface XIndexAccess). Object aColumnObj = xColumns.getByIndex( 2 ); xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, aColumnObj ); - xPropSet.setPropertyValue( "Width", new Integer( 5000 ) ); + xPropSet.setPropertyValue( "Width", Integer.valueOf( 5000 ) ); // Get the name of the column. com.sun.star.container.XNamed xNamed = UnoRuntime.queryInterface( com.sun.star.container.XNamed.class, aColumnObj ); @@ -172,7 +172,7 @@ public class GeneralTableSample extends SpreadsheetDocHelper // Get row 7 by index (interface XIndexAccess) Object aRowObj = xRows.getByIndex( 6 ); xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, aRowObj ); - xPropSet.setPropertyValue( "Height", new Integer( 5000 ) ); + xPropSet.setPropertyValue( "Height", Integer.valueOf( 5000 ) ); xSheet.getCellByPosition( 2, 6 ).setFormula( "What a big cell." ); diff --git a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java index dbdbc8004df2..4416440b10b4 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java @@ -202,7 +202,7 @@ public class SpreadsheetDocHelper com.sun.star.util.NumberFormat.DATE, new com.sun.star.lang.Locale() ); com.sun.star.beans.XPropertySet xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCell ); - xPropSet.setPropertyValue( "NumberFormat", new Integer( nFormat ) ); + xPropSet.setPropertyValue( "NumberFormat", Integer.valueOf( nFormat ) ); } /** Draws a colored border around the range and writes the headline in the @@ -237,12 +237,12 @@ public class SpreadsheetDocHelper xCellRange = xSheet.getCellRangeByPosition( aAddr.StartColumn, aAddr.StartRow, aAddr.EndColumn, aAddr.StartRow ); xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCellRange ); - xPropSet.setPropertyValue( "CellBackColor", new Integer( 0x99CCFF ) ); + xPropSet.setPropertyValue( "CellBackColor", Integer.valueOf( 0x99CCFF ) ); // write headline com.sun.star.table.XCell xCell = xCellRange.getCellByPosition( 0, 0 ); xCell.setFormula( aHeadline ); xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCell ); - xPropSet.setPropertyValue( "CharColor", new Integer( 0x003399 ) ); + xPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0x003399 ) ); xPropSet.setPropertyValue( "CharWeight", new Float( com.sun.star.awt.FontWeight.BOLD ) ); } diff --git a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java index 4438f880440e..467f3b5e91be 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java @@ -261,13 +261,13 @@ public class SpreadsheetSample extends SpreadsheetDocHelper // --- Change cell properties. --- xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCell ); // from styles.CharacterProperties - xPropSet.setPropertyValue( "CharColor", new Integer( 0x003399 ) ); + xPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0x003399 ) ); xPropSet.setPropertyValue( "CharHeight", new Float( 20.0 ) ); // from styles.ParagraphProperties - xPropSet.setPropertyValue( "ParaLeftMargin", new Integer( 500 ) ); + xPropSet.setPropertyValue( "ParaLeftMargin", Integer.valueOf( 500 ) ); // from table.CellProperties xPropSet.setPropertyValue( "IsCellBackgroundTransparent", Boolean.FALSE ); - xPropSet.setPropertyValue( "CellBackColor", new Integer( 0x99CCFF ) ); + xPropSet.setPropertyValue( "CellBackColor", Integer.valueOf( 0x99CCFF ) ); // --- Get cell address. --- @@ -312,13 +312,13 @@ public class SpreadsheetSample extends SpreadsheetDocHelper // --- Change cell range properties. --- xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xCellRange ); // from com.sun.star.styles.CharacterProperties - xPropSet.setPropertyValue( "CharColor", new Integer( 0x003399 ) ); + xPropSet.setPropertyValue( "CharColor", Integer.valueOf( 0x003399 ) ); xPropSet.setPropertyValue( "CharHeight", new Float( 20.0 ) ); // from com.sun.star.styles.ParagraphProperties - xPropSet.setPropertyValue( "ParaLeftMargin", new Integer( 500 ) ); + xPropSet.setPropertyValue( "ParaLeftMargin", Integer.valueOf( 500 ) ); // from com.sun.star.table.CellProperties xPropSet.setPropertyValue( "IsCellBackgroundTransparent", Boolean.FALSE ); - xPropSet.setPropertyValue( "CellBackColor", new Integer( 0x99CCFF ) ); + xPropSet.setPropertyValue( "CellBackColor", Integer.valueOf( 0x99CCFF ) ); // --- Replace text in all cells. --- @@ -366,7 +366,7 @@ public class SpreadsheetSample extends SpreadsheetDocHelper Object aColumnObj = xColumns.getByIndex( 0 ); xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, aColumnObj ); - xPropSet.setPropertyValue( "Width", new Integer( 6000 ) ); + xPropSet.setPropertyValue( "Width", Integer.valueOf( 6000 ) ); com.sun.star.container.XNamed xNamed = UnoRuntime.queryInterface( com.sun.star.container.XNamed.class, aColumnObj ); System.out.println( "The name of the wide column is " + xNamed.getName() + "." ); @@ -647,7 +647,7 @@ public class SpreadsheetSample extends SpreadsheetDocHelper // modify properties of the new style xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, aCellStyle ); - xPropSet.setPropertyValue( "CellBackColor", new Integer( 0x888888 ) ); + xPropSet.setPropertyValue( "CellBackColor", Integer.valueOf( 0x888888 ) ); xPropSet.setPropertyValue( "IsCellBackgroundTransparent", Boolean.FALSE ); @@ -741,7 +741,7 @@ public class SpreadsheetSample extends SpreadsheetDocHelper Object aFieldObj = xAutoFormatIA.getByIndex( 4 * nRow + nColumn ); xPropSet = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, aFieldObj ); - xPropSet.setPropertyValue( "CellBackColor", new Integer( nColor ) ); + xPropSet.setPropertyValue( "CellBackColor", Integer.valueOf( nColor ) ); } } @@ -1208,7 +1208,7 @@ public class SpreadsheetSample extends SpreadsheetDocHelper com.sun.star.table.XCellRange xResultRange = xRef.getReferredCells(); com.sun.star.beans.XPropertySet xResultProp = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xResultRange ); xResultProp.setPropertyValue( "IsCellBackgroundTransparent", Boolean.FALSE ); - xResultProp.setPropertyValue( "CellBackColor", new Integer( 0xFFFFCC ) ); + xResultProp.setPropertyValue( "CellBackColor", Integer.valueOf( 0xFFFFCC ) ); } } } diff --git a/odk/examples/DevelopersGuide/Spreadsheet/ViewSample.java b/odk/examples/DevelopersGuide/Spreadsheet/ViewSample.java index c313fa193d18..71b39d20a672 100644 --- a/odk/examples/DevelopersGuide/Spreadsheet/ViewSample.java +++ b/odk/examples/DevelopersGuide/Spreadsheet/ViewSample.java @@ -90,13 +90,13 @@ public class ViewSample extends SpreadsheetDocHelper com.sun.star.table.XCellRange xRange = xRefer.getReferredCells(); com.sun.star.beans.XPropertySet xRangeProp = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xRange ); xRangeProp.setPropertyValue( "IsCellBackgroundTransparent", Boolean.FALSE ); - xRangeProp.setPropertyValue( "CellBackColor", new Integer( 0xFFFFCC ) ); + xRangeProp.setPropertyValue( "CellBackColor", Integer.valueOf( 0xFFFFCC ) ); // --- View settings --- // change the view to display green grid lines com.sun.star.beans.XPropertySet xProp = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xController ); xProp.setPropertyValue( "ShowGrid", Boolean.TRUE ); - xProp.setPropertyValue( "GridColor", new Integer(0x00CC00) ); + xProp.setPropertyValue( "GridColor", Integer.valueOf(0x00CC00) ); // --- Range selection --- // let the user select a range and use it as the view's selection diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java index 92b5504f536b..dc767f3d7494 100644 --- a/odk/examples/DevelopersGuide/Text/TextDocuments.java +++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java @@ -591,7 +591,7 @@ public class TextDocuments { // Set the name and value of the FieldMaster xMasterPropSet.setPropertyValue ( "Name", "UserEmperor" ); - xMasterPropSet.setPropertyValue ( "Value", new Integer ( 42 ) ); + xMasterPropSet.setPropertyValue ( "Value", Integer.valueOf( 42 ) ); // Attach the field master to the user field xUserField.attachTextFieldMaster ( xMasterPropSet ); @@ -682,7 +682,7 @@ public class TextDocuments { try { // Set the colour of the text to white - xCellCursorProps.setPropertyValue( "CharColor", new Integer(16777215)); + xCellCursorProps.setPropertyValue( "CharColor", Integer.valueOf(16777215)); } catch ( Exception e) { @@ -719,7 +719,7 @@ public class TextDocuments { // If BackTransparant is false, then the background color is visible xRow.setPropertyValue( "BackTransparent", Boolean.FALSE); // Specify the color of the background to be dark blue - xRow.setPropertyValue( "BackColor", new Integer(6710932)); + xRow.setPropertyValue( "BackColor", Integer.valueOf(6710932)); // Access the property set of the whole table XPropertySet xTableProps = UnoRuntime.queryInterface( @@ -727,7 +727,7 @@ public class TextDocuments { // We want visible background colors xTableProps.setPropertyValue( "BackTransparent", Boolean.FALSE); // Set the background colour to light blue - xTableProps.setPropertyValue( "BackColor", new Integer(13421823)); + xTableProps.setPropertyValue( "BackColor", Integer.valueOf(13421823)); // set the text (and text colour) of all the cells in the first row // of the table @@ -866,7 +866,7 @@ public class TextDocuments { Boolean.FALSE); // We want the background to be light blue - xTableProps.setPropertyValue( "BackColor", new Integer(13421823)); + xTableProps.setPropertyValue( "BackColor", Integer.valueOf(13421823)); // Inser the table into the document mxDocText.insertTextContent( mxDocCursor, xTable, false); @@ -882,7 +882,7 @@ public class TextDocuments { xRow.setPropertyValue( "BackTransparent", Boolean.FALSE); // And let's make it dark blue - xRow.setPropertyValue( "BackColor", new Integer(6710932)); + xRow.setPropertyValue( "BackColor", Integer.valueOf(6710932)); // Put a description of the table contents into the first cell insertIntoCell( "A1", "AutoText Groups", xTable); @@ -1380,7 +1380,7 @@ public class TextDocuments { XPropertySet.class, xStyle ); // Give the new style a light blue background - xStyleProps.setPropertyValue ( "ParaBackColor", new Integer (13421823)); + xStyleProps.setPropertyValue ( "ParaBackColor", Integer.valueOf(13421823)); // Get the StyleFamiliesSupplier interface of the document XStyleFamiliesSupplier xSupplier = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, mxDoc); @@ -1628,7 +1628,7 @@ public class TextDocuments { XPropertySet xChildProps = UnoRuntime.queryInterface( XPropertySet.class, xChildNamed ); // Set the Child_Section's background colour to blue - xChildProps.setPropertyValue( "BackColor", new Integer(13421823)); + xChildProps.setPropertyValue( "BackColor", Integer.valueOf(13421823)); // Refresh the document, so the linked section matches the Child_Section XRefreshable xRefresh = UnoRuntime.queryInterface( diff --git a/odk/examples/java/Drawing/SDraw.java b/odk/examples/java/Drawing/SDraw.java index 54404e244de6..73a05022147a 100644 --- a/odk/examples/java/Drawing/SDraw.java +++ b/odk/examples/java/Drawing/SDraw.java @@ -182,7 +182,7 @@ public class SDraw { com.sun.star.beans.XPropertySet.class, xShape); try { - xSPS.setPropertyValue("FillColor", new Integer(col)); + xSPS.setPropertyValue("FillColor", Integer.valueOf(col)); } catch (Exception e) { System.err.println("Can't change colors " + e); e.printStackTrace(System.err); @@ -237,7 +237,7 @@ public class SDraw { xShape); try { - xSPS.setPropertyValue("FillColor", new Integer(getCol(r,g,b))); + xSPS.setPropertyValue("FillColor", Integer.valueOf(getCol(r,g,b))); xSPS.setPropertyValue("Shadow", Boolean.TRUE); } catch (Exception e) { System.err.println("Can't change colors " + e); diff --git a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java index d419063b6879..52ec8ce47d33 100644 --- a/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java +++ b/odk/examples/java/EmbedDocument/Container1/EmbedContApp.java @@ -891,7 +891,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie { Object aArgs[] = new Object[2]; aArgs[0] = aFileURI; - aArgs[1] = new Integer( ElementModes.READWRITE ); + aArgs[1] = Integer.valueOf( ElementModes.READWRITE ); Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs ); XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage ); @@ -926,7 +926,7 @@ public class EmbedContApp extends Applet implements MouseListener, XEmbeddedClie oStorageFactory ); Object aArgs[] = new Object[2]; aArgs[0] = aFileURI; - aArgs[1] = new Integer( ElementModes.READWRITE ); + aArgs[1] = Integer.valueOf( ElementModes.READWRITE ); Object oStorage = xStorageFactory.createInstanceWithArguments( aArgs ); XStorage xTargetStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oStorage ); diff --git a/odk/examples/java/Inspector/Introspector.java b/odk/examples/java/Inspector/Introspector.java index 4498e5257368..1d04e8dc21cf 100644 --- a/odk/examples/java/Inspector/Introspector.java +++ b/odk/examples/java/Inspector/Introspector.java @@ -172,7 +172,7 @@ public class Introspector extends WeakBase{ XIdlMethod mMethod = xIntrospectionAccessObject.getMethod("getByIndex", com.sun.star.beans.MethodConcept.INDEXCONTAINER); for ( int i = 0; i < xIndexAccess.getCount(); i++ ) { Object[][] aParamInfo = new Object[1][1]; - aParamInfo[0] = new Integer[] { new Integer(i) }; + aParamInfo[0] = new Integer[] { Integer.valueOf(i) }; oRetComponentsVector.add(mMethod.invoke(_oUnoParentObject, aParamInfo)); } } diff --git a/odk/examples/java/PropertySet/PropTest.java b/odk/examples/java/PropertySet/PropTest.java index fd77886a6678..148c000d9938 100644 --- a/odk/examples/java/PropertySet/PropTest.java +++ b/odk/examples/java/PropertySet/PropTest.java @@ -152,9 +152,9 @@ public class PropTest extends PropertySet implements XServiceInfo // readonly public int roIntA= 100; - public Integer roIntClassA= new Integer(100); - public Object roObjectA= new Integer(101); - public Any roAnyA= new Any( new Type(int.class), new Integer(102)); + public Integer roIntClassA= Integer.valueOf(100); + public Object roObjectA= Integer.valueOf(101); + public Any roAnyA= new Any( new Type(int.class), Integer.valueOf(102)); // BOUND & CONSTRAINED public boolean bcBoolA; diff --git a/odk/examples/java/Spreadsheet/EuroAdaption.java b/odk/examples/java/Spreadsheet/EuroAdaption.java index 498f18800dd3..870c20978245 100644 --- a/odk/examples/java/Spreadsheet/EuroAdaption.java +++ b/odk/examples/java/Spreadsheet/EuroAdaption.java @@ -213,7 +213,7 @@ public class EuroAdaption { // set the new numberformat to the cellrange DM->EUR xCellProp.setPropertyValue( "NumberFormat", - new Integer( iNewNumberFormat ) ); + Integer.valueOf( iNewNumberFormat ) ); // interate over all cells from the cellrange with an // content and use the DM/EUR factor @@ -297,7 +297,7 @@ public class EuroAdaption { XPropertySet xCellProp = UnoRuntime.queryInterface( XPropertySet.class, xCellRange ); xCellProp.setPropertyValue( "NumberFormat", - new Integer(iNumberFormatKey) ); + Integer.valueOf(iNumberFormatKey) ); } } catch( Exception e) { diff --git a/odk/examples/java/Spreadsheet/SCalc.java b/odk/examples/java/Spreadsheet/SCalc.java index a303fafabc65..0a8b705c7b17 100644 --- a/odk/examples/java/Spreadsheet/SCalc.java +++ b/odk/examples/java/Spreadsheet/SCalc.java @@ -139,15 +139,15 @@ public class SCalc { XPropertySet oCPS1 = UnoRuntime.queryInterface( XPropertySet.class, oInt1 ); oCPS1.setPropertyValue("IsCellBackgroundTransparent", Boolean.FALSE); - oCPS1.setPropertyValue("CellBackColor",new Integer(6710932)); - oCPS1.setPropertyValue("CharColor",new Integer(16777215)); + oCPS1.setPropertyValue("CellBackColor",Integer.valueOf(6710932)); + oCPS1.setPropertyValue("CharColor",Integer.valueOf(16777215)); XInterface oInt2 = (XInterface) oDocMSF.createInstance( "com.sun.star.style.CellStyle"); oStyleFamilyNameContainer.insertByName("My Style2", oInt2); XPropertySet oCPS2 = UnoRuntime.queryInterface( XPropertySet.class, oInt2 ); oCPS2.setPropertyValue("IsCellBackgroundTransparent", Boolean.FALSE); - oCPS2.setPropertyValue("CellBackColor",new Integer(13421823)); + oCPS2.setPropertyValue("CellBackColor",Integer.valueOf(13421823)); } catch (Exception e) { e.printStackTrace(System.err); } diff --git a/odk/examples/java/Storage/Test01.java b/odk/examples/java/Storage/Test01.java index 7ff1f4f498bc..b2e94b36ac44 100644 --- a/odk/examples/java/Storage/Test01.java +++ b/odk/examples/java/Storage/Test01.java @@ -95,7 +95,7 @@ public class Test01 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -119,7 +119,7 @@ public class Test01 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READWRITE ); + pArgs[1] = Integer.valueOf( ElementModes.READWRITE ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/odk/examples/java/Storage/Test02.java b/odk/examples/java/Storage/Test02.java index 10fda47a713a..5750f253939c 100644 --- a/odk/examples/java/Storage/Test02.java +++ b/odk/examples/java/Storage/Test02.java @@ -50,7 +50,7 @@ public class Test02 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/odk/examples/java/Storage/Test04.java b/odk/examples/java/Storage/Test04.java index 89417471afa8..79a55dcb25a4 100644 --- a/odk/examples/java/Storage/Test04.java +++ b/odk/examples/java/Storage/Test04.java @@ -115,7 +115,7 @@ public class Test04 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -176,7 +176,7 @@ public class Test04 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READWRITE ); + pArgs[1] = Integer.valueOf( ElementModes.READWRITE ); Object oResStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResStorage = UnoRuntime.queryInterface( XStorage.class, oResStorage ); if ( xResStorage == null ) diff --git a/odk/examples/java/Storage/Test05.java b/odk/examples/java/Storage/Test05.java index 99a7716994a1..b0c84ae11b9f 100644 --- a/odk/examples/java/Storage/Test05.java +++ b/odk/examples/java/Storage/Test05.java @@ -51,7 +51,7 @@ public class Test05 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -214,7 +214,7 @@ public class Test05 implements StorageTest { // now check all the written and copied information - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/odk/examples/java/Storage/Test07.java b/odk/examples/java/Storage/Test07.java index ba92f649aafd..7ae850fab32c 100644 --- a/odk/examples/java/Storage/Test07.java +++ b/odk/examples/java/Storage/Test07.java @@ -73,7 +73,7 @@ public class Test07 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -97,7 +97,7 @@ public class Test07 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READWRITE ); + pArgs[1] = Integer.valueOf( ElementModes.READWRITE ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/odk/examples/java/Storage/Test08.java b/odk/examples/java/Storage/Test08.java index 6e5aec84b3e0..adc911ccb95f 100644 --- a/odk/examples/java/Storage/Test08.java +++ b/odk/examples/java/Storage/Test08.java @@ -128,7 +128,7 @@ public class Test08 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -152,7 +152,7 @@ public class Test08 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/odk/examples/java/Storage/Test09.java b/odk/examples/java/Storage/Test09.java index 4e7f5f2ba66c..171ce6f25627 100644 --- a/odk/examples/java/Storage/Test09.java +++ b/odk/examples/java/Storage/Test09.java @@ -70,7 +70,7 @@ public class Test09 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -104,7 +104,7 @@ public class Test09 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/odk/examples/java/Text/GraphicsInserter.java b/odk/examples/java/Text/GraphicsInserter.java index 0bcdcfa12443..82a263866e57 100644 --- a/odk/examples/java/Text/GraphicsInserter.java +++ b/odk/examples/java/Text/GraphicsInserter.java @@ -150,17 +150,17 @@ public class GraphicsInserter { // Setting the horizontal position xPropSet.setPropertyValue( "HoriOrientPosition", - new Integer( 5500 ) ); + Integer.valueOf( 5500 ) ); // Setting the vertical position xPropSet.setPropertyValue( "VertOrientPosition", - new Integer( 4200 ) ); + Integer.valueOf( 4200 ) ); // Setting the width - xPropSet.setPropertyValue( "Width", new Integer( 4400 ) ); + xPropSet.setPropertyValue( "Width", Integer.valueOf( 4400 ) ); // Setting the height - xPropSet.setPropertyValue( "Height", new Integer( 4000 ) ); + xPropSet.setPropertyValue( "Height", Integer.valueOf( 4000 ) ); } catch ( Exception exception ) { System.out.println( "Couldn't set property 'GraphicURL'" ); exception.printStackTrace( printwriterLog ); diff --git a/odk/examples/java/Text/HardFormatting.java b/odk/examples/java/Text/HardFormatting.java index 5f69d84acac4..6ed8296fa500 100644 --- a/odk/examples/java/Text/HardFormatting.java +++ b/odk/examples/java/Text/HardFormatting.java @@ -119,7 +119,7 @@ public class HardFormatting { com.sun.star.beans.XPropertySet.class, xWordCursor); xPropertySet.setPropertyValue("CharWeight", new Float(com.sun.star.awt.FontWeight.BOLD)); - xPropertySet.setPropertyValue("CharColor", new Integer( 255 ) ); + xPropertySet.setPropertyValue("CharColor", Integer.valueOf( 255 ) ); System.out.println( "Parastyle : " diff --git a/odk/examples/java/Text/SWriter.java b/odk/examples/java/Text/SWriter.java index 393edc1c01d5..4e65ae288fa8 100644 --- a/odk/examples/java/Text/SWriter.java +++ b/odk/examples/java/Text/SWriter.java @@ -156,9 +156,9 @@ public class SWriter { // Change the BackColor try { xTTPS.setPropertyValue("BackTransparent", Boolean.FALSE); - xTTPS.setPropertyValue("BackColor",new Integer(13421823)); + xTTPS.setPropertyValue("BackColor",Integer.valueOf(13421823)); xTTRowPS.setPropertyValue("BackTransparent", Boolean.FALSE); - xTTRowPS.setPropertyValue("BackColor",new Integer(6710932)); + xTTRowPS.setPropertyValue("BackColor",Integer.valueOf(6710932)); } catch (Exception e) { System.err.println("Couldn't change the color " + e); @@ -205,7 +205,7 @@ public class SWriter { // Change the CharColor and add a Shadow try { - xTCPS.setPropertyValue("CharColor",new Integer(255)); + xTCPS.setPropertyValue("CharColor",Integer.valueOf(255)); xTCPS.setPropertyValue("CharShadowed", Boolean.TRUE); } catch (Exception e) { System.err.println("Couldn't change the color " + e); @@ -315,7 +315,7 @@ public class SWriter { // Change the CharColor and add a Shadow try { - xTCPS.setPropertyValue("CharColor",new Integer(65536)); + xTCPS.setPropertyValue("CharColor",Integer.valueOf(65536)); xTCPS.setPropertyValue("CharShadowed", Boolean.FALSE); } catch (Exception e) { System.err.println("Couldn't change the color " + e); @@ -374,7 +374,7 @@ public class SWriter { com.sun.star.beans.XPropertySet xTPS = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xTC); try { - xTPS.setPropertyValue("CharColor",new Integer(16777215)); + xTPS.setPropertyValue("CharColor",Integer.valueOf(16777215)); } catch (Exception e) { System.err.println(" Exception " + e); e.printStackTrace(System.err); diff --git a/odk/examples/java/Text/StyleCreation.java b/odk/examples/java/Text/StyleCreation.java index 04207407c41d..2861131aed0e 100644 --- a/odk/examples/java/Text/StyleCreation.java +++ b/odk/examples/java/Text/StyleCreation.java @@ -102,10 +102,10 @@ public class StyleCreation { xPropertySet.setPropertyValue("CharAutoKerning", Boolean.TRUE ); System.out.println( "set the paragraph attribute 'AutoKerning'" ); xPropertySet.setPropertyValue("ParaAdjust", - new Integer( com.sun.star.style.ParagraphAdjust.CENTER_value ) ); + Integer.valueOf( com.sun.star.style.ParagraphAdjust.CENTER_value ) ); System.out.println( "set the paragraph adjust to LEFT" ); - xPropertySet.setPropertyValue("ParaFirstLineIndent", new Integer( 0 ) ); + xPropertySet.setPropertyValue("ParaFirstLineIndent", Integer.valueOf( 0 ) ); System.out.println( "set the first line indent to 0 cm" ); xPropertySet.setPropertyValue("BreakType", diff --git a/odk/examples/java/Text/TextReplace.java b/odk/examples/java/Text/TextReplace.java index 4566130870b2..0e87656ebd0e 100644 --- a/odk/examples/java/Text/TextReplace.java +++ b/odk/examples/java/Text/TextReplace.java @@ -113,10 +113,10 @@ public class TextReplace { com.sun.star.beans.XPropertySet xCPS = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xTextCursor); // Set the word blue - xCPS.setPropertyValue( "CharColor", new Integer( 255 ) ); + xCPS.setPropertyValue( "CharColor", Integer.valueOf( 255 ) ); // Go to last character xTextCursor.gotoEnd(false); - xCPS.setPropertyValue( "CharColor", new Integer( 0 ) ); + xCPS.setPropertyValue( "CharColor", Integer.valueOf( 0 ) ); xText.insertString( xTextCursor, "in the alley. Like lightening he darted off to the left and disappeared between the two warehouses almost falling over the trash can lying in the ", false ); @@ -124,10 +124,10 @@ public class TextReplace { xCPS = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xTextCursor); // Set the word blue - xCPS.setPropertyValue( "CharColor", new Integer( 255 ) ); + xCPS.setPropertyValue( "CharColor", Integer.valueOf( 255 ) ); // Go to last character xTextCursor.gotoEnd(false); - xCPS.setPropertyValue( "CharColor", new Integer( 0 ) ); + xCPS.setPropertyValue( "CharColor", Integer.valueOf( 0 ) ); xText.insertString( xTextCursor, "of the sidewalk.", false ); diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java index e40dfc8873f4..de80b92b213d 100644 --- a/odk/examples/java/ToDo/ToDo.java +++ b/odk/examples/java/ToDo/ToDo.java @@ -270,7 +270,7 @@ public class ToDo { // Changing the background color of the cell to white xpropertyset.setPropertyValue( "CellBackColor", - new Integer( 16777215 ) ); + Integer.valueOf( 16777215 ) ); // Getting the cell of the bug id XCell xcell = xcellrange.getCellByPosition( @@ -503,7 +503,7 @@ public class ToDo { // Changing the background color of the cell // to red xpropertyset.setPropertyValue( - "CellBackColor", new Integer( 16711680 ) ); + "CellBackColor", Integer.valueOf( 16711680 ) ); } else { // Querying for the interface XColumnRowRange // on the XCellRange @@ -720,7 +720,7 @@ public class ToDo { // Getting the Easter sunday Double dEasterSunday = ( Double ) xfunctionaccess.callFunction( - "EASTERSUNDAY", new Object[] { new Integer(intYear) }); + "EASTERSUNDAY", new Object[] { Integer.valueOf(intYear) }); int intEasterSunday = (int)Math.round( dEasterSunday.doubleValue()); @@ -729,9 +729,9 @@ public class ToDo { vectorHolidays.add( xfunctionaccess.callFunction( "DATE", new Object[] { - new Integer( intYear ), - new Integer( 1 ), - new Integer( 1 ) } )); + Integer.valueOf( intYear ), + Integer.valueOf( 1 ), + Integer.valueOf( 1 ) } )); // Good Friday vectorHolidays.add( @@ -745,9 +745,9 @@ public class ToDo { vectorHolidays.add( xfunctionaccess.callFunction( "DATE", new Object[] { - new Integer( intYear ), - new Integer( 5 ), - new Integer( 1 ) } )); + Integer.valueOf( intYear ), + Integer.valueOf( 5 ), + Integer.valueOf( 1 ) } )); // Ascension Day vectorHolidays.add(new Double(intEasterSunday + 39 )); @@ -759,25 +759,25 @@ public class ToDo { vectorHolidays.add( xfunctionaccess.callFunction( "DATE", new Object[] { - new Integer( intYear ), - new Integer( 10 ), - new Integer( 3 ) } )); + Integer.valueOf( intYear ), + Integer.valueOf( 10 ), + Integer.valueOf( 3 ) } )); // Christmas Day First vectorHolidays.add( xfunctionaccess.callFunction( "DATE", new Object[] { - new Integer( intYear ), - new Integer( 12 ), - new Integer( 25 ) } )); + Integer.valueOf( intYear ), + Integer.valueOf( 12 ), + Integer.valueOf( 25 ) } )); // Christmas Day Second vectorHolidays.add( xfunctionaccess.callFunction( "DATE", new Object[] { - new Integer( intYear ), - new Integer( 12 ), - new Integer( 26 ) } )); + Integer.valueOf( intYear ), + Integer.valueOf( 12 ), + Integer.valueOf( 26 ) } )); } } catch( Exception exception ) { @@ -805,14 +805,14 @@ public class ToDo { Double dDate = ( Double ) xfunctionaccess.callFunction( "DATE", new Object[] { - new Integer( gregCalStartDate.get( Calendar.YEAR ) ), - new Integer( gregCalStartDate.get( Calendar.MONTH ) + 1 ), - new Integer( gregCalStartDate.get( Calendar.DATE ) ) + Integer.valueOf( gregCalStartDate.get( Calendar.YEAR ) ), + Integer.valueOf( gregCalStartDate.get( Calendar.MONTH ) + 1 ), + Integer.valueOf( gregCalStartDate.get( Calendar.DATE ) ) } ); Double dWorkday = ( Double ) xfunctionaccess.callFunction( "com.sun.star.sheet.addin.Analysis.getWorkday", - new Object[] { dDate, new Integer( intDays ), objectHolidays } ); + new Object[] { dDate, Integer.valueOf( intDays ), objectHolidays } ); Double dYear = ( Double ) xfunctionaccess.callFunction( "YEAR", new Object[] { dWorkday } ); @@ -854,7 +854,7 @@ public class ToDo { while ( dHolidayStart != 0 ) { if ( dHolidayEnd == 0 ) { vectorHolidays.add( - new Integer( (int) Math.round( + Integer.valueOf( (int) Math.round( dHolidayStart ) ) ); } else { diff --git a/package/qa/ofopxmlstorages/TestHelper.java b/package/qa/ofopxmlstorages/TestHelper.java index 16ded7037459..b7f7a44d9846 100644 --- a/package/qa/ofopxmlstorages/TestHelper.java +++ b/package/qa/ofopxmlstorages/TestHelper.java @@ -923,7 +923,7 @@ public class TestHelper { Object pArgs[] = new Object[3]; pArgs[0] = (Object) aURL; - pArgs[1] = new Integer( nMode ); + pArgs[1] = Integer.valueOf( nMode ); pArgs[2] = (Object) aAddArgs; Object oTempStorage = xFactory.createInstanceWithArguments( pArgs ); @@ -957,7 +957,7 @@ public class TestHelper { Object pArgs[] = new Object[3]; pArgs[0] = (Object) xStream; - pArgs[1] = new Integer( nMode ); + pArgs[1] = Integer.valueOf( nMode ); pArgs[2] = (Object) aAddArgs; Object oTempStorage = xFactory.createInstanceWithArguments( pArgs ); @@ -990,7 +990,7 @@ public class TestHelper { Object pArgs[] = new Object[3]; pArgs[0] = (Object) xInStream; - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); pArgs[2] = (Object) aAddArgs; Object oTempStorage = xFactory.createInstanceWithArguments( pArgs ); diff --git a/package/qa/storages/RegressionTest_114358.java b/package/qa/storages/RegressionTest_114358.java index 6ac2b7685b46..f76216cf22d2 100644 --- a/package/qa/storages/RegressionTest_114358.java +++ b/package/qa/storages/RegressionTest_114358.java @@ -58,7 +58,7 @@ public class RegressionTest_114358 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); @@ -163,7 +163,7 @@ public class RegressionTest_114358 implements StorageTest { // create a new readonly storage based on the stream and check the contents - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); if ( xTempStorage == null ) diff --git a/package/qa/storages/RegressionTest_125919.java b/package/qa/storages/RegressionTest_125919.java index f0a7a78854e5..3ad8b0e6ce40 100644 --- a/package/qa/storages/RegressionTest_125919.java +++ b/package/qa/storages/RegressionTest_125919.java @@ -63,9 +63,9 @@ public class RegressionTest_125919 implements StorageTest { for ( int nInitInd = 0; nInitInd < 36000; nInitInd++ ) { - pBytes36[nInitInd] = ( new Integer( nInitInd >> ( ( nInitInd % 2 ) * 8 ) ) ).byteValue(); + pBytes36[nInitInd] = ( Integer.valueOf( nInitInd >> ( ( nInitInd % 2 ) * 8 ) ) ).byteValue(); if ( nInitInd < 18000 ) - pBytes18[nInitInd] = ( new Integer( 256 - pBytes36[nInitInd] ) ).byteValue(); + pBytes18[nInitInd] = ( Integer.valueOf( 256 - pBytes36[nInitInd] ) ).byteValue(); } System.out.println( "This test can take up to some hours. The file size currently is about 50000." ); @@ -83,7 +83,7 @@ public class RegressionTest_125919 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xBorderedStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/RegressionTest_i26398.java b/package/qa/storages/RegressionTest_i26398.java index fd1c85a9b78c..ec14400c8fc9 100644 --- a/package/qa/storages/RegressionTest_i26398.java +++ b/package/qa/storages/RegressionTest_i26398.java @@ -58,7 +58,7 @@ public class RegressionTest_i26398 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/RegressionTest_i27773.java b/package/qa/storages/RegressionTest_i27773.java index 7f0855f5f86e..ac592d965766 100644 --- a/package/qa/storages/RegressionTest_i27773.java +++ b/package/qa/storages/RegressionTest_i27773.java @@ -83,7 +83,7 @@ public class RegressionTest_i27773 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); @@ -202,7 +202,7 @@ public class RegressionTest_i27773 implements StorageTest { // reopen the storage in readonly mode an check contents - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/RegressionTest_i29169.java b/package/qa/storages/RegressionTest_i29169.java index 3a2f50601953..12286e7589cd 100644 --- a/package/qa/storages/RegressionTest_i29169.java +++ b/package/qa/storages/RegressionTest_i29169.java @@ -58,7 +58,7 @@ public class RegressionTest_i29169 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); @@ -326,7 +326,7 @@ public class RegressionTest_i29169 implements StorageTest { // create a new readonly storage based on the stream and check the contents - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); if ( xTempStorage == null ) diff --git a/package/qa/storages/RegressionTest_i29321.java b/package/qa/storages/RegressionTest_i29321.java index 6c30280d0c60..8fe980ba9dce 100644 --- a/package/qa/storages/RegressionTest_i29321.java +++ b/package/qa/storages/RegressionTest_i29321.java @@ -58,7 +58,7 @@ public class RegressionTest_i29321 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/RegressionTest_i30400.java b/package/qa/storages/RegressionTest_i30400.java index 244e3be86c4c..39866503b615 100644 --- a/package/qa/storages/RegressionTest_i30400.java +++ b/package/qa/storages/RegressionTest_i30400.java @@ -63,7 +63,7 @@ public class RegressionTest_i30400 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); byte pBytes1[] = { 1, 1, 1, 1, 1 }; String pPass1 = "1, 2, 3, 4, 5"; @@ -181,7 +181,7 @@ public class RegressionTest_i30400 implements StorageTest { // reopen the target storage readonly, and check the copying with renaming - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); if ( xTempStorage == null ) @@ -244,7 +244,7 @@ public class RegressionTest_i30400 implements StorageTest { Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream2; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); byte pBytes1[] = { 1, 1, 1, 1, 1 }; String pPass1 = "1, 2, 3, 4, 5"; @@ -338,7 +338,7 @@ public class RegressionTest_i30400 implements StorageTest { // reopen the target storage readonly, and check the contents - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); oTempStorage2 = m_xStorageFactory.createInstanceWithArguments( pArgs ); xTempStorage2 = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage2 ); if ( xTempStorage2 == null ) diff --git a/package/qa/storages/RegressionTest_i30677.java b/package/qa/storages/RegressionTest_i30677.java index a80bff2530f1..faee91afe559 100644 --- a/package/qa/storages/RegressionTest_i30677.java +++ b/package/qa/storages/RegressionTest_i30677.java @@ -58,7 +58,7 @@ public class RegressionTest_i30677 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); @@ -223,7 +223,7 @@ public class RegressionTest_i30677 implements StorageTest { // reopen the storages and check the contents - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); if ( xTempStorage == null ) diff --git a/package/qa/storages/RegressionTest_i35095.java b/package/qa/storages/RegressionTest_i35095.java index 6c57f7e49686..0c979466c33e 100644 --- a/package/qa/storages/RegressionTest_i35095.java +++ b/package/qa/storages/RegressionTest_i35095.java @@ -58,7 +58,7 @@ public class RegressionTest_i35095 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/RegressionTest_i46848.java b/package/qa/storages/RegressionTest_i46848.java index 82981cc26063..9252766abcc2 100644 --- a/package/qa/storages/RegressionTest_i46848.java +++ b/package/qa/storages/RegressionTest_i46848.java @@ -58,7 +58,7 @@ public class RegressionTest_i46848 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); @@ -164,7 +164,7 @@ public class RegressionTest_i46848 implements StorageTest { // create a new readonly storage based on the stream and check the contents - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); if ( xTempStorage == null ) diff --git a/package/qa/storages/RegressionTest_i49755.java b/package/qa/storages/RegressionTest_i49755.java index e0e0d38be95c..d2b32b8b931e 100644 --- a/package/qa/storages/RegressionTest_i49755.java +++ b/package/qa/storages/RegressionTest_i49755.java @@ -58,7 +58,7 @@ public class RegressionTest_i49755 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/RegressionTest_i55821.java b/package/qa/storages/RegressionTest_i55821.java index b663cf09fc27..b4be15db48bd 100644 --- a/package/qa/storages/RegressionTest_i55821.java +++ b/package/qa/storages/RegressionTest_i55821.java @@ -62,7 +62,7 @@ public class RegressionTest_i55821 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); @@ -98,7 +98,7 @@ public class RegressionTest_i55821 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/RegressionTest_i59886.java b/package/qa/storages/RegressionTest_i59886.java index 475b6a4a2983..90bf87a7e34e 100644 --- a/package/qa/storages/RegressionTest_i59886.java +++ b/package/qa/storages/RegressionTest_i59886.java @@ -58,7 +58,7 @@ public class RegressionTest_i59886 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/RegressionTest_i61909.java b/package/qa/storages/RegressionTest_i61909.java index 8021e22e70dd..a73d8677f2b9 100644 --- a/package/qa/storages/RegressionTest_i61909.java +++ b/package/qa/storages/RegressionTest_i61909.java @@ -67,7 +67,7 @@ public class RegressionTest_i61909 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/RegressionTest_i84234.java b/package/qa/storages/RegressionTest_i84234.java index d48fac52d282..7bd8073c64f9 100644 --- a/package/qa/storages/RegressionTest_i84234.java +++ b/package/qa/storages/RegressionTest_i84234.java @@ -58,7 +58,7 @@ public class RegressionTest_i84234 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/Test01.java b/package/qa/storages/Test01.java index 37012a1b7e8c..a5d76bcca015 100644 --- a/package/qa/storages/Test01.java +++ b/package/qa/storages/Test01.java @@ -117,7 +117,7 @@ public class Test01 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -141,7 +141,7 @@ public class Test01 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/Test02.java b/package/qa/storages/Test02.java index b976e90b52d2..2e3e712549ee 100644 --- a/package/qa/storages/Test02.java +++ b/package/qa/storages/Test02.java @@ -58,7 +58,7 @@ public class Test02 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/Test04.java b/package/qa/storages/Test04.java index f66964df3d81..c4169d6709fc 100644 --- a/package/qa/storages/Test04.java +++ b/package/qa/storages/Test04.java @@ -139,7 +139,7 @@ public class Test04 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -209,7 +209,7 @@ public class Test04 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oResStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResStorage ); if ( xResStorage == null ) diff --git a/package/qa/storages/Test05.java b/package/qa/storages/Test05.java index 64e8a72c4ff6..9138b4f86bf1 100644 --- a/package/qa/storages/Test05.java +++ b/package/qa/storages/Test05.java @@ -60,7 +60,7 @@ public class Test05 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -249,7 +249,7 @@ public class Test05 implements StorageTest { // now check all the written and copied information - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/Test07.java b/package/qa/storages/Test07.java index 8ce7be62721f..db0cca5b0371 100644 --- a/package/qa/storages/Test07.java +++ b/package/qa/storages/Test07.java @@ -95,7 +95,7 @@ public class Test07 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -119,7 +119,7 @@ public class Test07 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/Test08.java b/package/qa/storages/Test08.java index 404efc104b1b..9113ee385491 100644 --- a/package/qa/storages/Test08.java +++ b/package/qa/storages/Test08.java @@ -148,7 +148,7 @@ public class Test08 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -172,7 +172,7 @@ public class Test08 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/Test09.java b/package/qa/storages/Test09.java index f9299ad2e24f..3790ecd8b9e6 100644 --- a/package/qa/storages/Test09.java +++ b/package/qa/storages/Test09.java @@ -85,7 +85,7 @@ public class Test09 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -126,7 +126,7 @@ public class Test09 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/Test12.java b/package/qa/storages/Test12.java index 20801741ff3d..13850daf47cf 100644 --- a/package/qa/storages/Test12.java +++ b/package/qa/storages/Test12.java @@ -58,7 +58,7 @@ public class Test12 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/Test13.java b/package/qa/storages/Test13.java index 5b6b4d432ab8..649f9d88b4d7 100644 --- a/package/qa/storages/Test13.java +++ b/package/qa/storages/Test13.java @@ -76,7 +76,7 @@ public class Test13 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -195,7 +195,7 @@ public class Test13 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/Test14.java b/package/qa/storages/Test14.java index 103a739e594c..04d4a87874af 100644 --- a/package/qa/storages/Test14.java +++ b/package/qa/storages/Test14.java @@ -73,7 +73,7 @@ public class Test14 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -170,7 +170,7 @@ public class Test14 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/Test15.java b/package/qa/storages/Test15.java index 335bfa9c89d1..3afe8dfc04bf 100644 --- a/package/qa/storages/Test15.java +++ b/package/qa/storages/Test15.java @@ -74,7 +74,7 @@ public class Test15 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -229,7 +229,7 @@ public class Test15 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.READ ); + pArgs[1] = Integer.valueOf( ElementModes.READ ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/Test16.java b/package/qa/storages/Test16.java index ac5f32a78cc2..36e945e74d12 100644 --- a/package/qa/storages/Test16.java +++ b/package/qa/storages/Test16.java @@ -105,7 +105,7 @@ public class Test16 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -129,7 +129,7 @@ public class Test16 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/Test17.java b/package/qa/storages/Test17.java index 5133638e1572..b81fc240a7e6 100644 --- a/package/qa/storages/Test17.java +++ b/package/qa/storages/Test17.java @@ -58,7 +58,7 @@ public class Test17 implements StorageTest { // create storage based on the temporary stream Object pArgs[] = new Object[2]; pArgs[0] = (Object) xTempFileStream; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oTempStorage ); diff --git a/package/qa/storages/Test18.java b/package/qa/storages/Test18.java index 9b55a66ecf0d..3e0f246d1d3a 100644 --- a/package/qa/storages/Test18.java +++ b/package/qa/storages/Test18.java @@ -112,7 +112,7 @@ public class Test18 implements StorageTest { // create temporary storage based on a previously created temporary file Object pArgs[] = new Object[2]; pArgs[0] = (Object) sTempFileURL; - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oTempFileStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xTempFileStorage = (XStorage)UnoRuntime.queryInterface( XStorage.class, oTempFileStorage ); @@ -136,7 +136,7 @@ public class Test18 implements StorageTest { // the temporary file must not be locked any more after storage disposing - pArgs[1] = new Integer( ElementModes.WRITE ); + pArgs[1] = Integer.valueOf( ElementModes.WRITE ); Object oResultStorage = m_xStorageFactory.createInstanceWithArguments( pArgs ); XStorage xResultStorage = (XStorage) UnoRuntime.queryInterface( XStorage.class, oResultStorage ); if ( xResultStorage == null ) diff --git a/package/qa/storages/TestHelper.java b/package/qa/storages/TestHelper.java index 2f430dd81b1f..3630e707c6a4 100644 --- a/package/qa/storages/TestHelper.java +++ b/package/qa/storages/TestHelper.java @@ -1485,7 +1485,7 @@ public class TestHelper { if ( nRead1 != nRead2 ) { - Error( "The encrypted stream '" + sStreamName + "' raw representations have different size! nRead1 - nRead2 = " + ( new Integer( nRead1 - nRead2 ) ).toString() ); + Error( "The encrypted stream '" + sStreamName + "' raw representations have different size! nRead1 - nRead2 = " + ( Integer.valueOf( nRead1 - nRead2 ) ).toString() ); return false; } 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) { diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java index 28e79cbb4089..2717dfb4666d 100644 --- a/ridljar/com/sun/star/uno/UnoRuntime.java +++ b/ridljar/com/sun/star/uno/UnoRuntime.java @@ -312,7 +312,7 @@ public class UnoRuntime { return new Short((short) 0); case TypeClass.LONG_value: case TypeClass.UNSIGNED_LONG_value: - return new Integer(0); + return Integer.valueOf(0); case TypeClass.HYPER_value: case TypeClass.UNSIGNED_HYPER_value: return new Long(0L); diff --git a/ridljar/test/com/sun/star/uno/Any_Test.java b/ridljar/test/com/sun/star/uno/Any_Test.java index 28684d630bfb..9ecde9e5388e 100644 --- a/ridljar/test/com/sun/star/uno/Any_Test.java +++ b/ridljar/test/com/sun/star/uno/Any_Test.java @@ -35,7 +35,7 @@ public final class Any_Test { @Test public void testComplete() { assertSame(Any.VOID, Any.complete(Any.VOID)); assertEquals( - new Any(Type.LONG, new Integer(10)), Any.complete(new Integer(10))); + new Any(Type.LONG, Integer.valueOf(10)), Any.complete(Integer.valueOf(10))); assertEquals( new Any(new Type(XInterface.class), null), Any.complete(null)); XInterface x = new XInterface() {}; diff --git a/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java b/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java index 5992eda802b2..e92422ffa1e4 100644 --- a/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java +++ b/ridljar/test/com/sun/star/uno/UnoRuntime_Test.java @@ -57,11 +57,11 @@ public final class UnoRuntime_Test { @Test public void test_areSame() { assertTrue( UnoRuntime.areSame( - new Any(Type.UNSIGNED_LONG, new Integer(3)), - new Any(Type.UNSIGNED_LONG, new Integer(3)))); + new Any(Type.UNSIGNED_LONG, Integer.valueOf(3)), + new Any(Type.UNSIGNED_LONG, Integer.valueOf(3)))); assertFalse( UnoRuntime.areSame( - new Any(Type.UNSIGNED_LONG, new Integer(3)), new Integer(3))); + new Any(Type.UNSIGNED_LONG, Integer.valueOf(3)), Integer.valueOf(3))); assertFalse(UnoRuntime.areSame(new int[] { 1 }, new int[] { 1, 2 })); assertTrue( UnoRuntime.areSame( @@ -74,7 +74,7 @@ public final class UnoRuntime_Test { new Optional<Integer>()), new Any( new Type("com.sun.star.beans.Optional<unsigned long>"), - new Optional<Integer>(false, new Integer(0))))); + new Optional<Integer>(false, Integer.valueOf(0))))); assertFalse(UnoRuntime.areSame(new Test1(), new Test2())); Test2 test2 = new Test2(); assertTrue( @@ -86,7 +86,7 @@ public final class UnoRuntime_Test { @SuppressWarnings("rawtypes") @Test public void test_completeValue() { assertEquals( - new Integer(0), UnoRuntime.completeValue(Type.UNSIGNED_LONG, null)); + Integer.valueOf(0), UnoRuntime.completeValue(Type.UNSIGNED_LONG, null)); Object v = UnoRuntime.completeValue( new Type("[][]unsigned long"), null); assertTrue(v instanceof int[][]); diff --git a/sc/qa/complex/dataPilot/CheckDataPilot.java b/sc/qa/complex/dataPilot/CheckDataPilot.java index efa3aee6b6f3..ee4980fece72 100644 --- a/sc/qa/complex/dataPilot/CheckDataPilot.java +++ b/sc/qa/complex/dataPilot/CheckDataPilot.java @@ -249,7 +249,7 @@ public class CheckDataPilot { int y = sCellAdress.Row + 3; // cell of the data pilot output oCheckCell = oSheet.getCellByPosition(x, y); - aChangeValue = new Integer(27); + aChangeValue = Integer.valueOf(27); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { e.printStackTrace(); throw new StatusException( "Couldn't get cells for changing.", e); @@ -335,7 +335,7 @@ public class CheckDataPilot { param.put("CELLFORCHANGE", oChangeCell); param.put("CELLFORCHECK", oCheckCell); param.put("CHANGEVALUE", aChangeValue); - param.put("FIELDSAMOUNT", new Integer(5)); + param.put("FIELDSAMOUNT", Integer.valueOf(5)); } diff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.java index 0a1e15d5968d..d1f96aae8650 100644 --- a/sc/qa/complex/sc/CalcRTL.java +++ b/sc/qa/complex/sc/CalcRTL.java @@ -132,10 +132,10 @@ public class CalcRTL /* extends ComplexTestCase */ } assertTrue("Problems when setting property 'HoriOrientPosition'", - changeProperty(set, "HoriOrientPosition", new Integer(1000))); + changeProperty(set, "HoriOrientPosition", Integer.valueOf(1000))); assertTrue("Problems when setting property 'VertOrientPosition'", - changeProperty(set, "VertOrientPosition", new Integer(1000))); + changeProperty(set, "VertOrientPosition", Integer.valueOf(1000))); assertTrue("Couldn't close document", closeSpreadsheetDocument()); } @@ -188,7 +188,7 @@ public class CalcRTL /* extends ComplexTestCase */ reValue[0] = toString(getRealValue(set.getPropertyValue("Anchor"))); reValue[1] = toString(set.getPropertyValue("HoriOrientPosition")); reValue[2] = toString(set.getPropertyValue("VertOrientPosition")); - reValue[3] = toString(new Integer(oShape.getPosition().X)); + reValue[3] = toString(Integer.valueOf(oShape.getPosition().X)); } catch (com.sun.star.beans.UnknownPropertyException e) { } catch (com.sun.star.lang.WrappedTargetException e) { } diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java index 11f5249acba8..8da530161ae7 100644 --- a/scripting/examples/java/Highlight/HighlightText.java +++ b/scripting/examples/java/Highlight/HighlightText.java @@ -152,7 +152,7 @@ public class HighlightText implements com.sun.star.awt.XActionListener { // Sets the replaced text property color value to RGB parameter PropertyValue cv = new PropertyValue("CharColor", -1, - new Integer(red), + Integer.valueOf(red), com.sun.star.beans.PropertyState.DIRECT_VALUE); // Apply the properties diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java index 57e72843203c..5c1523ec5301 100644 --- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java +++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java @@ -237,10 +237,10 @@ XInitialization { "com.sun.star.awt.UnoControlDialogModel", _xComponentContext ); XPropertySet xPSetDialog = UnoRuntime.queryInterface( XPropertySet.class, dialogModel ); - xPSetDialog.setPropertyValue( "PositionX", new Integer( dialogX) ); - xPSetDialog.setPropertyValue( "PositionY", new Integer( dialogY)); - xPSetDialog.setPropertyValue( "Width", new Integer( dialogW+cbIncrW )); - xPSetDialog.setPropertyValue( "Height", new Integer( dialogH+cbIncrH )); + xPSetDialog.setPropertyValue( "PositionX", Integer.valueOf( dialogX) ); + xPSetDialog.setPropertyValue( "PositionY", Integer.valueOf( dialogY)); + xPSetDialog.setPropertyValue( "Width", Integer.valueOf( dialogW+cbIncrW )); + xPSetDialog.setPropertyValue( "Height", Integer.valueOf( dialogH+cbIncrH )); xPSetDialog.setPropertyValue( "Title", _title ); // get the service manager from the dialog model @@ -254,10 +254,10 @@ XInitialization { XPropertySet.class, runButtonModel ); LogUtils.DEBUG("run: x="+(((dialogW+cbIncrW)/2)-runButtonW -1) ); LogUtils.DEBUG("run: y="+(dialogH+cbIncrH-runButtonH-1)); - xPSetButton.setPropertyValue( "PositionX", new Integer( (((dialogW+cbIncrW)/2)-runButtonW -1) )); - xPSetButton.setPropertyValue( "PositionY", new Integer( dialogH+cbIncrH-runButtonH-1)); - xPSetButton.setPropertyValue( "Width", new Integer( runButtonW )); - xPSetButton.setPropertyValue( "Height", new Integer( runButtonH )); + xPSetButton.setPropertyValue( "PositionX", Integer.valueOf( (((dialogW+cbIncrW)/2)-runButtonW -1) )); + xPSetButton.setPropertyValue( "PositionY", Integer.valueOf( dialogH+cbIncrH-runButtonH-1)); + xPSetButton.setPropertyValue( "Width", Integer.valueOf( runButtonW )); + xPSetButton.setPropertyValue( "Height", Integer.valueOf( runButtonH )); xPSetButton.setPropertyValue( "Name", _runButtonName ); xPSetButton.setPropertyValue( "TabIndex", new Short( (short)1 ) ); xPSetButton.setPropertyValue( "Label", _runMacro ); @@ -269,10 +269,10 @@ XInitialization { XPropertySet.class, doNotRunButtonModel ); LogUtils.DEBUG("dontrun: x="+(((dialogW+cbIncrW)/2)-1) ); LogUtils.DEBUG("dontrun: y="+(dialogH+cbIncrH-doNotRunButtonH-1 )); - xPSetButton.setPropertyValue( "PositionX", new Integer( (((dialogW+cbIncrW)/2) + 1) )); - xPSetButton.setPropertyValue( "PositionY", new Integer( (dialogH+cbIncrH-doNotRunButtonH-1 ) )); - xPSetButton.setPropertyValue( "Width", new Integer( doNotRunButtonW )); - xPSetButton.setPropertyValue( "Height", new Integer( doNotRunButtonH )); + xPSetButton.setPropertyValue( "PositionX", Integer.valueOf( (((dialogW+cbIncrW)/2) + 1) )); + xPSetButton.setPropertyValue( "PositionY", Integer.valueOf( (dialogH+cbIncrH-doNotRunButtonH-1 ) )); + xPSetButton.setPropertyValue( "Width", Integer.valueOf( doNotRunButtonW )); + xPSetButton.setPropertyValue( "Height", Integer.valueOf( doNotRunButtonH )); xPSetButton.setPropertyValue( "Name", _doNotRunButtonName ); xPSetButton.setPropertyValue( "TabIndex", new Short( (short)0 ) ); xPSetButton.setPropertyValue( "Label", _doNotRunMacro ); @@ -291,10 +291,10 @@ XInitialization { "com.sun.star.awt.UnoControlFixedTextModel" ); XPropertySet xPSetLabel = UnoRuntime.queryInterface( XPropertySet.class, label2Model ); - xPSetLabel.setPropertyValue( "PositionX", new Integer( label2X )); - xPSetLabel.setPropertyValue( "PositionY", new Integer( label2Y )); - xPSetLabel.setPropertyValue( "Width", new Integer( label2W )); - xPSetLabel.setPropertyValue( "Height", new Integer( label2H )); + xPSetLabel.setPropertyValue( "PositionX", Integer.valueOf( label2X )); + xPSetLabel.setPropertyValue( "PositionY", Integer.valueOf( label2Y )); + xPSetLabel.setPropertyValue( "Width", Integer.valueOf( label2W )); + xPSetLabel.setPropertyValue( "Height", Integer.valueOf( label2H )); xPSetLabel.setPropertyValue( "Name", _label2Name ); xPSetLabel.setPropertyValue( "TabIndex", new Short( (short)1 ) ); xPSetLabel.setPropertyValue( "Label", _label2String ); @@ -304,10 +304,10 @@ XInitialization { "com.sun.star.awt.UnoControlFixedTextModel" ); XPropertySet xPSetLabel3 = UnoRuntime.queryInterface( XPropertySet.class, label3Model ); - xPSetLabel3.setPropertyValue( "PositionX", new Integer( label3X )); - xPSetLabel3.setPropertyValue( "PositionY", new Integer( label3Y )); - xPSetLabel3.setPropertyValue( "Width", new Integer( label3W )); - xPSetLabel3.setPropertyValue( "Height", new Integer( label3H )); + xPSetLabel3.setPropertyValue( "PositionX", Integer.valueOf( label3X )); + xPSetLabel3.setPropertyValue( "PositionY", Integer.valueOf( label3Y )); + xPSetLabel3.setPropertyValue( "Width", Integer.valueOf( label3W )); + xPSetLabel3.setPropertyValue( "Height", Integer.valueOf( label3H )); xPSetLabel3.setPropertyValue( "Name", _label3Name ); xPSetLabel3.setPropertyValue( "TabIndex", new Short( (short)1 ) ); xPSetLabel3.setPropertyValue( "Label", _label3String ); @@ -317,10 +317,10 @@ XInitialization { "com.sun.star.awt.UnoControlFixedTextModel" ); XPropertySet xPSetLabel4 = UnoRuntime.queryInterface( XPropertySet.class, label4Model ); - xPSetLabel4.setPropertyValue( "PositionX", new Integer( label4X )); - xPSetLabel4.setPropertyValue( "PositionY", new Integer( label4Y )); - xPSetLabel4.setPropertyValue( "Width", new Integer( label4W )); - xPSetLabel4.setPropertyValue( "Height", new Integer( label4H )); + xPSetLabel4.setPropertyValue( "PositionX", Integer.valueOf( label4X )); + xPSetLabel4.setPropertyValue( "PositionY", Integer.valueOf( label4Y )); + xPSetLabel4.setPropertyValue( "Width", Integer.valueOf( label4W )); + xPSetLabel4.setPropertyValue( "Height", Integer.valueOf( label4H )); xPSetLabel4.setPropertyValue( "Name", _label4Name ); xPSetLabel4.setPropertyValue( "TabIndex", new Short( (short)1 ) ); xPSetLabel4.setPropertyValue( "Label", _label4String ); @@ -330,10 +330,10 @@ XInitialization { "com.sun.star.awt.UnoControlCheckBoxModel" ); XPropertySet xPSetCheckBox = UnoRuntime.queryInterface( XPropertySet.class, checkBoxModel ); - xPSetCheckBox.setPropertyValue( "PositionX", new Integer( checkBoxX )); - xPSetCheckBox.setPropertyValue( "PositionY", new Integer( checkBoxY )); - xPSetCheckBox.setPropertyValue( "Width", new Integer( checkBoxW )); - xPSetCheckBox.setPropertyValue( "Height", new Integer( checkBoxH )); + xPSetCheckBox.setPropertyValue( "PositionX", Integer.valueOf( checkBoxX )); + xPSetCheckBox.setPropertyValue( "PositionY", Integer.valueOf( checkBoxY )); + xPSetCheckBox.setPropertyValue( "Width", Integer.valueOf( checkBoxW )); + xPSetCheckBox.setPropertyValue( "Height", Integer.valueOf( checkBoxH )); xPSetCheckBox.setPropertyValue( "State", new Short((short)0) ); xPSetCheckBox.setPropertyValue( "Name", _checkBoxName ); xPSetCheckBox.setPropertyValue( "TabIndex", new Short( (short)1 ) ); @@ -352,10 +352,10 @@ XInitialization { "com.sun.star.awt.UnoControlFixedTextModel" ); XPropertySet xPSetLabel5 = UnoRuntime.queryInterface( XPropertySet.class, label5Model ); - xPSetLabel5.setPropertyValue( "PositionX", new Integer( label5X )); - xPSetLabel5.setPropertyValue( "PositionY", new Integer( label5Y )); - xPSetLabel5.setPropertyValue( "Width", new Integer( label5W )); - xPSetLabel5.setPropertyValue( "Height", new Integer( label5H )); + xPSetLabel5.setPropertyValue( "PositionX", Integer.valueOf( label5X )); + xPSetLabel5.setPropertyValue( "PositionY", Integer.valueOf( label5Y )); + xPSetLabel5.setPropertyValue( "Width", Integer.valueOf( label5W )); + xPSetLabel5.setPropertyValue( "Height", Integer.valueOf( label5H )); xPSetLabel5.setPropertyValue( "Name", _label5Name ); xPSetLabel5.setPropertyValue( "TabIndex", new Short( (short)1 ) ); xPSetLabel5.setPropertyValue( "Label", checkBoxPath2 ); @@ -369,10 +369,10 @@ XInitialization { "com.sun.star.awt.UnoControlFixedTextModel" ); XPropertySet xPSetLabel = UnoRuntime.queryInterface( XPropertySet.class, labelModel ); - xPSetLabel.setPropertyValue( "PositionX", new Integer( label1X )); - xPSetLabel.setPropertyValue( "PositionY", new Integer( label1Y )); - xPSetLabel.setPropertyValue( "Width", new Integer( label1W )); - xPSetLabel.setPropertyValue( "Height", new Integer( label1H )); + xPSetLabel.setPropertyValue( "PositionX", Integer.valueOf( label1X )); + xPSetLabel.setPropertyValue( "PositionY", Integer.valueOf( label1Y )); + xPSetLabel.setPropertyValue( "Width", Integer.valueOf( label1W )); + xPSetLabel.setPropertyValue( "Height", Integer.valueOf( label1H )); xPSetLabel.setPropertyValue( "Name", _label1Name ); xPSetLabel.setPropertyValue( "TabIndex", new Short( (short)1 ) ); xPSetLabel.setPropertyValue( "Label", _label1String ); diff --git a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java index 6e46e193f8cf..78c97cf5b07a 100644 --- a/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java +++ b/scripting/java/com/sun/star/script/framework/browse/DialogFactory.java @@ -131,10 +131,10 @@ public class DialogFactory { XPropertySet props = UnoRuntime.queryInterface(XPropertySet.class, o); - props.setPropertyValue("PositionX", new Integer(x)); - props.setPropertyValue("PositionY", new Integer(y)); - props.setPropertyValue("Height", new Integer(height)); - props.setPropertyValue("Width", new Integer(width)); + props.setPropertyValue("PositionX", Integer.valueOf(x)); + props.setPropertyValue("PositionY", Integer.valueOf(y)); + props.setPropertyValue("Height", Integer.valueOf(height)); + props.setPropertyValue("Width", Integer.valueOf(width)); } private XDialog createInputDialog(String title, String prompt) diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java index 0fe4b8b1518b..137d1a21ca6f 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathDescriptor.java @@ -76,7 +76,7 @@ public class InstallationPathDescriptor extends WizardDescriptor { protected void updateState() { super.updateState(); putProperty("WizardPanel_contentData", iterator.getSteps()); // NOI18N - putProperty("WizardPanel_contentSelectedIndex", new Integer(iterator.getIndex())); // NOI18N + putProperty("WizardPanel_contentSelectedIndex", Integer.valueOf(iterator.getIndex())); // NOI18N } } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathIterator.java index 4aee8814a065..918bcbdf0b49 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathIterator.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/InstallationPathIterator.java @@ -87,7 +87,7 @@ public class InstallationPathIterator implements WizardDescriptor.Iterator { public String name() { return NbBundle.getMessage(InstallationPathIterator.class, "TITLE_x_of_y", - new Integer(index + 1), new Integer(getPanels().length)); + Integer.valueOf(index + 1), Integer.valueOf(getPanels().length)); } public boolean hasNext() { diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java index bf22ecfc35d2..8a326201301b 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/JavaScriptIterator.java @@ -161,7 +161,7 @@ public class JavaScriptIterator implements TemplateWizard.Iterator { if (c instanceof JComponent) { // assume Swing components JComponent jc = (JComponent)c; // Step #. - jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i)); // NOI18N + jc.putClientProperty("WizardPanel_contentSelectedIndex", Integer.valueOf(i)); // NOI18N // Step name (actually the whole list for reference). jc.putClientProperty("WizardPanel_contentData", steps); // NOI18N } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java index a48ff2d1592f..510a9adb638c 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/ParcelContentsIterator.java @@ -163,7 +163,7 @@ public class ParcelContentsIterator implements TemplateWizard.Iterator { if (c instanceof JComponent) { // assume Swing components JComponent jc = (JComponent)c; // Step #. - jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i)); // NOI18N + jc.putClientProperty("WizardPanel_contentSelectedIndex", Integer.valueOf(i)); // NOI18N // Step name (actually the whole list for reference). jc.putClientProperty("WizardPanel_contentData", steps); // NOI18N } diff --git a/scripting/workben/ifc/scripting/_XScriptInvocation.java b/scripting/workben/ifc/scripting/_XScriptInvocation.java index ba96ccc55f78..e7c4e28acf46 100644 --- a/scripting/workben/ifc/scripting/_XScriptInvocation.java +++ b/scripting/workben/ifc/scripting/_XScriptInvocation.java @@ -90,7 +90,7 @@ public class _XScriptInvocation extends MultiMethodTest { ctx = loadDocument(context); HashMap<String,Object> map = new HashMap<String,Object>(); - map.put("SCRIPTING_DOC_STORAGE_ID", new Integer(storageId)); + map.put("SCRIPTING_DOC_STORAGE_ID", Integer.valueOf(storageId)); map.put("SCRIPTING_DOC_URI", "hahaha"); if (ctx != null) map.put("SCRIPTING_DOC_REF", ctx); diff --git a/scripting/workben/ifc/scripting/_XScriptNameResolver.java b/scripting/workben/ifc/scripting/_XScriptNameResolver.java index f62c0baf24d8..77385d28a3be 100644 --- a/scripting/workben/ifc/scripting/_XScriptNameResolver.java +++ b/scripting/workben/ifc/scripting/_XScriptNameResolver.java @@ -82,7 +82,7 @@ public class _XScriptNameResolver extends MultiMethodTest { log.println(description + ": " + logicalname); HashMap<String,Object> map = new HashMap<String,Object>(); - map.put("SCRIPTING_DOC_STORAGE_ID", new Integer(storageId)); + map.put("SCRIPTING_DOC_STORAGE_ID", Integer.valueOf(storageId)); map.put("SCRIPTING_DOC_URI", util.utils.getFullTestURL(location)); Parameters params = new Parameters(map); diff --git a/scripting/workben/ifc/scripting/_XScriptSecurity.java b/scripting/workben/ifc/scripting/_XScriptSecurity.java index 4f6abe8edbf8..7791aa92a13e 100644 --- a/scripting/workben/ifc/scripting/_XScriptSecurity.java +++ b/scripting/workben/ifc/scripting/_XScriptSecurity.java @@ -278,7 +278,7 @@ public class _XScriptSecurity extends MultiMethodTest { xNameReplace.replaceByName( "SecureURL", aSecureURLs ); log.println("setting OfficeBasic"); - xNameReplace.replaceByName( "OfficeBasic", new Integer(officeBasic) ); + xNameReplace.replaceByName( "OfficeBasic", Integer.valueOf(officeBasic) ); Boolean bConfirm = null; if( ( confirm != null ) && ( confirm.equals("true") ) ) diff --git a/scripting/workben/mod/_scripting/ScriptInfo.java b/scripting/workben/mod/_scripting/ScriptInfo.java index c1fd57520c3f..8001ca99d5c7 100644 --- a/scripting/workben/mod/_scripting/ScriptInfo.java +++ b/scripting/workben/mod/_scripting/ScriptInfo.java @@ -77,7 +77,7 @@ public class ScriptInfo extends TestCase { access = UnoRuntime.queryInterface( XSimpleFileAccess.class, xInterface ); Object storageObj = xMSF.createInstanceWithArguments( "drafts.com.sun.star.script.framework.storage.ScriptStorage", - new Object[]{ access, new Integer(99), docPath } ); + new Object[]{ access, Integer.valueOf(99), docPath } ); XScriptInfoAccess infoAccess = UnoRuntime.queryInterface(XScriptInfoAccess.class, storageObj); XScriptInfo[] infos = infoAccess.getImplementations("script://MemoryUtils.MemUsage?location=document"); oObj = infos[0]; diff --git a/scripting/workben/mod/_scripting/ScriptStorage.java b/scripting/workben/mod/_scripting/ScriptStorage.java index 1d55c18060af..dc8749bf103f 100644 --- a/scripting/workben/mod/_scripting/ScriptStorage.java +++ b/scripting/workben/mod/_scripting/ScriptStorage.java @@ -74,7 +74,7 @@ public class ScriptStorage extends TestCase { access = UnoRuntime.queryInterface( XSimpleFileAccess.class, xInterface ); oObj = ( XInterface )xMSF.createInstanceWithArguments( "drafts.com.sun.star.script.framework.storage.ScriptStorage", - new Object[]{ access, new Integer(99), docPath } ); + new Object[]{ access, Integer.valueOf(99), docPath } ); } catch (com.sun.star.uno.Exception e) { throw new StatusException("Can't create object environment", e) ; diff --git a/sfx2/qa/complex/sfx2/DocumentProperties.java b/sfx2/qa/complex/sfx2/DocumentProperties.java index 653c54092a25..ded17fb662b1 100644 --- a/sfx2/qa/complex/sfx2/DocumentProperties.java +++ b/sfx2/qa/complex/sfx2/DocumentProperties.java @@ -206,9 +206,9 @@ public class DocumentProperties NamedValue[] ds = xDP.getDocumentStatistics(); assertTrue("DocumentStatistics:WordCount", containsNV(ds, - new NamedValue("WordCount", new Integer(23)))); + new NamedValue("WordCount", Integer.valueOf(23)))); assertTrue("DocumentStatistics:PageCount", containsNV(ds, - new NamedValue("PageCount", new Integer(1)))); + new NamedValue("PageCount", Integer.valueOf(1)))); XPropertyContainer udpc = xDP.getUserDefinedProperties(); XPropertySet udps = UnoRuntime.queryInterface( XPropertySet.class, udpc ); @@ -302,17 +302,17 @@ public class DocumentProperties assertTrue("setKeywords", fromArray(kws).containsAll(fromArray(kws2))); NamedValue[] ds2 = new NamedValue[] { - new NamedValue("SyllableCount", new Integer(9)), - new NamedValue("FrameCount", new Integer(2)), - new NamedValue("SentenceCount", new Integer(7)) }; + new NamedValue("SyllableCount", Integer.valueOf(9)), + new NamedValue("FrameCount", Integer.valueOf(2)), + new NamedValue("SentenceCount", Integer.valueOf(7)) }; xDP.setDocumentStatistics(ds2); ds = xDP.getDocumentStatistics(); assertTrue("setDocumentStatistics:SyllableCount", containsNV(ds, - new NamedValue("SyllableCount", new Integer(9)))); + new NamedValue("SyllableCount", Integer.valueOf(9)))); assertTrue("setDocumentStatistics:FrameCount", containsNV(ds, - new NamedValue("FrameCount", new Integer(2)))); + new NamedValue("FrameCount", Integer.valueOf(2)))); assertTrue("setDocumentStatistics:SentenceCount", containsNV(ds, - new NamedValue("SentenceCount", new Integer(7)))); + new NamedValue("SentenceCount", Integer.valueOf(7)))); System.out.println("...done"); diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java index 9470e962a38c..699a682b5eed 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java @@ -177,10 +177,10 @@ public class WikiDialog implements XDialogEventHandler, XTopWindowListener if ( xThrobberProps != null ) { xThrobberProps.setPropertyValue( "Name", "WikiThrobber" ); - xThrobberProps.setPropertyValue( "PositionX", new Integer( X ) ); - xThrobberProps.setPropertyValue( "PositionY", new Integer( Y ) ); - xThrobberProps.setPropertyValue( "Height", new Integer( Width ) ); - xThrobberProps.setPropertyValue( "Width", new Integer( Height ) ); + xThrobberProps.setPropertyValue( "PositionX", Integer.valueOf( X ) ); + xThrobberProps.setPropertyValue( "PositionY", Integer.valueOf( Y ) ); + xThrobberProps.setPropertyValue( "Height", Integer.valueOf( Width ) ); + xThrobberProps.setPropertyValue( "Width", Integer.valueOf( Height ) ); XNameContainer xDialogContainer = UnoRuntime.queryInterface( XNameContainer.class, xDialogModel ); xDialogContainer.insertByName( "WikiThrobber", xThrobberModel ); diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java index ba50d56c1de9..ea7f572cc4aa 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponent.java +++ b/testtools/com/sun/star/comp/bridge/TestComponent.java @@ -1168,8 +1168,8 @@ public class TestComponent { new Byte(Byte.MIN_VALUE), new Short(Short.MIN_VALUE), new Any(Type.UNSIGNED_SHORT, new Short((short) -1)), - new Integer(Integer.MIN_VALUE), - new Any(Type.UNSIGNED_LONG, new Integer(-1)), + Integer.valueOf(Integer.MIN_VALUE), + new Any(Type.UNSIGNED_LONG, Integer.valueOf(-1)), new Long(Long.MIN_VALUE), new Any(Type.UNSIGNED_HYPER, new Long(-1L)), new Float(0.123f), @@ -1225,7 +1225,7 @@ public class TestComponent { new TestPolyStruct(Boolean.TRUE), new TestPolyStruct(new Byte(Byte.MIN_VALUE)), new TestPolyStruct(new Short(Short.MIN_VALUE)), - new TestPolyStruct(new Integer(Integer.MIN_VALUE)), + new TestPolyStruct(Integer.valueOf(Integer.MIN_VALUE)), new TestPolyStruct(new Long(Long.MIN_VALUE)), new TestPolyStruct(new Character('X')), new TestPolyStruct("test"), @@ -1261,7 +1261,7 @@ public class TestComponent { new TestPolyStruct(new TestPolyStruct2[] {new TestPolyStruct2( new TestPolyStruct(new Character('X')), new Any[] {new Any(Type.BOOLEAN, Boolean.TRUE)})}), new TestPolyStruct(new int[][] { new int[] {Integer.MIN_VALUE} }), - new TestPolyStruct[]{ new TestPolyStruct(new Integer(Integer.MIN_VALUE))}, + new TestPolyStruct[]{ new TestPolyStruct(Integer.valueOf(Integer.MIN_VALUE))}, new TestPolyStruct[]{new TestPolyStruct(new TestPolyStruct2( new Character('X'), new Any(Type.BOOLEAN, Boolean.TRUE)))}, new TestPolyStruct[]{new TestPolyStruct(new TestPolyStruct2( diff --git a/testtools/source/servicetests/TestService.java b/testtools/source/servicetests/TestService.java index 8d3c4c5203a5..a825f0df1cd9 100644 --- a/testtools/source/servicetests/TestService.java +++ b/testtools/source/servicetests/TestService.java @@ -87,7 +87,7 @@ public final class TestService implements XServiceInfo, XSingleComponentFactory } public void setProp6(int value) { - prop6 = new Integer(value); + prop6 = Integer.valueOf(value); } public int getProp7() @@ -96,7 +96,7 @@ public final class TestService implements XServiceInfo, XSingleComponentFactory } public void setProp7(int value) { - prop7 = new Integer(value); + prop7 = Integer.valueOf(value); } public int getProp8Long() { @@ -117,8 +117,8 @@ public final class TestService implements XServiceInfo, XSingleComponentFactory } private int prop1 = 1; - private Integer prop6 = new Integer(6); - private Integer prop7 = new Integer(7); + private Integer prop6 = Integer.valueOf(6); + private Integer prop7 = Integer.valueOf(7); private int prop8 = 8; } diff --git a/toolkit/test/accessibility/AccessibleTextHandler.java b/toolkit/test/accessibility/AccessibleTextHandler.java index a02bc0b34c15..6d3d69892d2a 100644 --- a/toolkit/test/accessibility/AccessibleTextHandler.java +++ b/toolkit/test/accessibility/AccessibleTextHandler.java @@ -788,19 +788,19 @@ class TextAttributeDialog extends TextActionDialog PropertyValue[] aSequence = new PropertyValue[6]; aSequence[0] = new PropertyValue(); aSequence[0].Name = "CharWeight"; - aSequence[0].Value = new Integer( aBold.isSelected() ? 150 : 100 ); + aSequence[0].Value = Integer.valueOf( aBold.isSelected() ? 150 : 100 ); aSequence[1] = new PropertyValue(); aSequence[1].Name = "CharUnderline"; - aSequence[1].Value = new Integer( aUnderline.isSelected() ? 1 : 0 ); + aSequence[1].Value = Integer.valueOf( aUnderline.isSelected() ? 1 : 0 ); aSequence[2] = new PropertyValue(); aSequence[2].Name = "CharBackColor"; - aSequence[2].Value = new Integer( aBackground.getRGB() ); + aSequence[2].Value = Integer.valueOf( aBackground.getRGB() ); aSequence[3] = new PropertyValue(); aSequence[3].Name = "CharColor"; - aSequence[3].Value = new Integer( aForeground.getRGB() ); + aSequence[3].Value = Integer.valueOf( aForeground.getRGB() ); aSequence[4] = new PropertyValue(); aSequence[4].Name = "CharPosture"; - aSequence[4].Value = new Integer( aItalics.isSelected() ? 1 : 0 ); + aSequence[4].Value = Integer.valueOf( aItalics.isSelected() ? 1 : 0 ); aSequence[5] = new PropertyValue(); aSequence[5].Name = "CharBackTransparent"; aSequence[5].Value = Boolean.FALSE; diff --git a/toolkit/test/accessibility/tools/NameProvider.java b/toolkit/test/accessibility/tools/NameProvider.java index 09ae5ea3e420..d4055c7f4511 100644 --- a/toolkit/test/accessibility/tools/NameProvider.java +++ b/toolkit/test/accessibility/tools/NameProvider.java @@ -40,7 +40,7 @@ public class NameProvider */ public static String getStateName (int nStateId) { - return maStateMap.get (new Integer(nStateId)); + return maStateMap.get (Integer.valueOf(nStateId)); } @@ -55,7 +55,7 @@ public class NameProvider */ public static String getEventName (int nEventId) { - return maEventMap.get (new Integer(nEventId)); + return maEventMap.get (Integer.valueOf(nEventId)); } @@ -70,7 +70,7 @@ public class NameProvider */ public static String getRoleName (int nRole) { - return maRoleMap.get (new Integer(nRole)); + return maRoleMap.get (Integer.valueOf(nRole)); } @@ -85,7 +85,7 @@ public class NameProvider */ public static String getRelationName (int nRelation) { - return maRelationMap.get (new Integer(nRelation)); + return maRelationMap.get (Integer.valueOf(nRelation)); } @@ -95,181 +95,181 @@ public class NameProvider private static HashMap<Integer, String> maRelationMap = new HashMap<Integer, String>(); static { - maStateMap.put (new Integer (AccessibleStateType.INVALID), "INVALID"); - maStateMap.put (new Integer (AccessibleStateType.ACTIVE), "ACTIVE"); - maStateMap.put (new Integer (AccessibleStateType.ARMED), "ARMED"); - maStateMap.put (new Integer (AccessibleStateType.BUSY), "BUSY"); - maStateMap.put (new Integer (AccessibleStateType.CHECKED), "CHECKED"); - maStateMap.put (new Integer (AccessibleStateType.DEFUNC), "DEFUNC"); - maStateMap.put (new Integer (AccessibleStateType.EDITABLE), "EDITABLE"); - maStateMap.put (new Integer (AccessibleStateType.ENABLED), "ENABLED"); - maStateMap.put (new Integer (AccessibleStateType.EXPANDABLE), "EXPANDABLE"); - maStateMap.put (new Integer (AccessibleStateType.EXPANDED), "EXPANDED"); - maStateMap.put (new Integer (AccessibleStateType.FOCUSABLE), "FOCUSABLE"); - maStateMap.put (new Integer (AccessibleStateType.FOCUSED), "FOCUSED"); - maStateMap.put (new Integer (AccessibleStateType.HORIZONTAL), "HORIZONTAL"); - maStateMap.put (new Integer (AccessibleStateType.ICONIFIED), "ICONIFIED"); - maStateMap.put (new Integer (AccessibleStateType.MODAL), "MODAL"); - maStateMap.put (new Integer (AccessibleStateType.MULTI_LINE), "MULTI_LINE"); - maStateMap.put (new Integer (AccessibleStateType.MULTI_SELECTABLE), "MULTI_SELECTABLE"); - maStateMap.put (new Integer (AccessibleStateType.OPAQUE), "OPAQUE"); - maStateMap.put (new Integer (AccessibleStateType.PRESSED), "PRESSED"); - maStateMap.put (new Integer (AccessibleStateType.RESIZABLE), "RESIZABLE"); - maStateMap.put (new Integer (AccessibleStateType.SELECTABLE), "SELECTABLE"); - maStateMap.put (new Integer (AccessibleStateType.SELECTED), "SELECTED"); - maStateMap.put (new Integer (AccessibleStateType.SENSITIVE), "SENSITIVE"); - maStateMap.put (new Integer (AccessibleStateType.SHOWING), "SHOWING"); - maStateMap.put (new Integer (AccessibleStateType.SINGLE_LINE), "SINGLE_LINE"); - maStateMap.put (new Integer (AccessibleStateType.STALE), "STALE"); - maStateMap.put (new Integer (AccessibleStateType.TRANSIENT), "TRANSIENT"); - maStateMap.put (new Integer (AccessibleStateType.VERTICAL), "VERTICAL"); - maStateMap.put (new Integer (AccessibleStateType.VISIBLE), "VISIBLE"); - maStateMap.put (new Integer (AccessibleStateType.MANAGES_DESCENDANTS), + maStateMap.put (Integer.valueOf(AccessibleStateType.INVALID), "INVALID"); + maStateMap.put (Integer.valueOf(AccessibleStateType.ACTIVE), "ACTIVE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.ARMED), "ARMED"); + maStateMap.put (Integer.valueOf(AccessibleStateType.BUSY), "BUSY"); + maStateMap.put (Integer.valueOf(AccessibleStateType.CHECKED), "CHECKED"); + maStateMap.put (Integer.valueOf(AccessibleStateType.DEFUNC), "DEFUNC"); + maStateMap.put (Integer.valueOf(AccessibleStateType.EDITABLE), "EDITABLE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.ENABLED), "ENABLED"); + maStateMap.put (Integer.valueOf(AccessibleStateType.EXPANDABLE), "EXPANDABLE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.EXPANDED), "EXPANDED"); + maStateMap.put (Integer.valueOf(AccessibleStateType.FOCUSABLE), "FOCUSABLE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.FOCUSED), "FOCUSED"); + maStateMap.put (Integer.valueOf(AccessibleStateType.HORIZONTAL), "HORIZONTAL"); + maStateMap.put (Integer.valueOf(AccessibleStateType.ICONIFIED), "ICONIFIED"); + maStateMap.put (Integer.valueOf(AccessibleStateType.MODAL), "MODAL"); + maStateMap.put (Integer.valueOf(AccessibleStateType.MULTI_LINE), "MULTI_LINE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.MULTI_SELECTABLE), "MULTI_SELECTABLE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.OPAQUE), "OPAQUE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.PRESSED), "PRESSED"); + maStateMap.put (Integer.valueOf(AccessibleStateType.RESIZABLE), "RESIZABLE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.SELECTABLE), "SELECTABLE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.SELECTED), "SELECTED"); + maStateMap.put (Integer.valueOf(AccessibleStateType.SENSITIVE), "SENSITIVE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.SHOWING), "SHOWING"); + maStateMap.put (Integer.valueOf(AccessibleStateType.SINGLE_LINE), "SINGLE_LINE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.STALE), "STALE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.TRANSIENT), "TRANSIENT"); + maStateMap.put (Integer.valueOf(AccessibleStateType.VERTICAL), "VERTICAL"); + maStateMap.put (Integer.valueOf(AccessibleStateType.VISIBLE), "VISIBLE"); + maStateMap.put (Integer.valueOf(AccessibleStateType.MANAGES_DESCENDANTS), "MANAGES_DESCENDANTS"); - maEventMap.put (new Integer (0), + maEventMap.put (Integer.valueOf(0), "[UNKNOWN]"); - maEventMap.put (new Integer (AccessibleEventId.NAME_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.NAME_CHANGED), "NAME_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.DESCRIPTION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.DESCRIPTION_CHANGED), "DESCRIPTION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.ACTION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.ACTION_CHANGED), "ACTION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.STATE_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.STATE_CHANGED), "STATE_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.ACTIVE_DESCENDANT_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.ACTIVE_DESCENDANT_CHANGED), "ACTIVE_DESCENDANT_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.BOUNDRECT_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.BOUNDRECT_CHANGED), "BOUNDRECT_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.CHILD), + maEventMap.put (Integer.valueOf(AccessibleEventId.CHILD), "CHILD"); - maEventMap.put (new Integer (AccessibleEventId.INVALIDATE_ALL_CHILDREN), + maEventMap.put (Integer.valueOf(AccessibleEventId.INVALIDATE_ALL_CHILDREN), "INVALIDATE_ALL_CHILDREN"); - maEventMap.put (new Integer (AccessibleEventId.SELECTION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.SELECTION_CHANGED), "SELECTION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.VISIBLE_DATA_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.VISIBLE_DATA_CHANGED), "VISIBLE_DATA_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.VALUE_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.VALUE_CHANGED), "VALUE_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.CONTENT_FLOWS_FROM_RELATION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.CONTENT_FLOWS_FROM_RELATION_CHANGED), "CONTENT_FLOWS_FROM_RELATION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.CONTENT_FLOWS_TO_RELATION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.CONTENT_FLOWS_TO_RELATION_CHANGED), "CONTENT_FLOWS_TO_RELATION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.CONTROLLED_BY_RELATION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.CONTROLLED_BY_RELATION_CHANGED), "CONTROLLED_BY_RELATION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.CONTROLLER_FOR_RELATION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.CONTROLLER_FOR_RELATION_CHANGED), "CONTROLLER_FOR_RELATION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.LABEL_FOR_RELATION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.LABEL_FOR_RELATION_CHANGED), "LABEL_FOR_RELATION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.LABELED_BY_RELATION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.LABELED_BY_RELATION_CHANGED), "LABELED_BY_RELATION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.MEMBER_OF_RELATION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.MEMBER_OF_RELATION_CHANGED), "MEMBER_OF_RELATION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.SUB_WINDOW_OF_RELATION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.SUB_WINDOW_OF_RELATION_CHANGED), "SUB_WINDOW_OF_RELATION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.CARET_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.CARET_CHANGED), "CARET_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TEXT_SELECTION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TEXT_SELECTION_CHANGED), "TEXT_SELECTION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TEXT_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TEXT_CHANGED), "TEXT_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TEXT_ATTRIBUTE_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TEXT_ATTRIBUTE_CHANGED), "TEXT_ATTRIBUTE_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.HYPERTEXT_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.HYPERTEXT_CHANGED), "HYPERTEXT_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TABLE_CAPTION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TABLE_CAPTION_CHANGED), "TABLE_CAPTION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TABLE_COLUMN_DESCRIPTION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TABLE_COLUMN_DESCRIPTION_CHANGED), "TABLE_COLUMN_DESCRIPTION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TABLE_COLUMN_HEADER_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TABLE_COLUMN_HEADER_CHANGED), "TABLE_COLUMN_HEADER_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TABLE_MODEL_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TABLE_MODEL_CHANGED), "TABLE_MODEL_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TABLE_ROW_DESCRIPTION_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TABLE_ROW_DESCRIPTION_CHANGED), "TABLE_ROW_DESCRIPTION_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TABLE_ROW_HEADER_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TABLE_ROW_HEADER_CHANGED), "TABLE_ROW_HEADER_CHANGED"); - maEventMap.put (new Integer (AccessibleEventId.TABLE_SUMMARY_CHANGED), + maEventMap.put (Integer.valueOf(AccessibleEventId.TABLE_SUMMARY_CHANGED), "TABLE_SUMMARY_CHANGED"); - maRoleMap.put (new Integer(AccessibleRole.UNKNOWN), "UNKNOWN"); - maRoleMap.put (new Integer (AccessibleRole.UNKNOWN), "UNKNOWN"); - maRoleMap.put (new Integer (AccessibleRole.ALERT), "ALERT"); - maRoleMap.put (new Integer (AccessibleRole.COLUMN_HEADER), "COLUMN_HEADER"); - maRoleMap.put (new Integer (AccessibleRole.CANVAS), "CANVAS"); - maRoleMap.put (new Integer (AccessibleRole.CHECK_BOX), "CHECK_BOX"); - maRoleMap.put (new Integer (AccessibleRole.CHECK_MENU_ITEM), "CHECK_MENU_ITEM"); - maRoleMap.put (new Integer (AccessibleRole.COLOR_CHOOSER), "COLOR_CHOOSER"); - maRoleMap.put (new Integer (AccessibleRole.COMBO_BOX), "COMBO_BOX"); - maRoleMap.put (new Integer (AccessibleRole.DESKTOP_ICON), "DESKTOP_ICON"); - maRoleMap.put (new Integer (AccessibleRole.DESKTOP_PANE), "DESKTOP_PANE"); - maRoleMap.put (new Integer (AccessibleRole.DIRECTORY_PANE), "DIRECTORY_PANE"); - maRoleMap.put (new Integer (AccessibleRole.DIALOG), "DIALOG"); - maRoleMap.put (new Integer (AccessibleRole.DOCUMENT), "DOCUMENT"); - maRoleMap.put (new Integer (AccessibleRole.EMBEDDED_OBJECT), "EMBEDDED_OBJECT"); - maRoleMap.put (new Integer (AccessibleRole.END_NOTE), "END_NOTE"); - maRoleMap.put (new Integer (AccessibleRole.FILE_CHOOSER), "FILE_CHOOSER"); - maRoleMap.put (new Integer (AccessibleRole.FILLER), "FILLER"); - maRoleMap.put (new Integer (AccessibleRole.FONT_CHOOSER), "FONT_CHOOSER"); - maRoleMap.put (new Integer (AccessibleRole.FOOTER), "FOOTER"); - maRoleMap.put (new Integer (AccessibleRole.FOOTNOTE), "FOOTNOTE"); - maRoleMap.put (new Integer (AccessibleRole.FRAME), "FRAME"); - maRoleMap.put (new Integer (AccessibleRole.GLASS_PANE), "GLASS_PANE"); - maRoleMap.put (new Integer (AccessibleRole.GRAPHIC), "GRAPHIC"); - maRoleMap.put (new Integer (AccessibleRole.GROUP_BOX), "GROUP_BOX"); - maRoleMap.put (new Integer (AccessibleRole.HEADER), "HEADER"); - maRoleMap.put (new Integer (AccessibleRole.HEADING), "HEADING"); - maRoleMap.put (new Integer (AccessibleRole.HYPER_LINK), "HYPER_LINK"); - maRoleMap.put (new Integer (AccessibleRole.ICON), "ICON"); - maRoleMap.put (new Integer (AccessibleRole.INTERNAL_FRAME), "INTERNAL_FRAME"); - maRoleMap.put (new Integer (AccessibleRole.LABEL), "LABEL"); - maRoleMap.put (new Integer (AccessibleRole.LAYERED_PANE), "LAYERED_PANE"); - maRoleMap.put (new Integer (AccessibleRole.LIST), "LIST"); - maRoleMap.put (new Integer (AccessibleRole.LIST_ITEM), "LIST_ITEM"); - maRoleMap.put (new Integer (AccessibleRole.MENU), "MENU"); - maRoleMap.put (new Integer (AccessibleRole.MENU_BAR), "MENU_BAR"); - maRoleMap.put (new Integer (AccessibleRole.MENU_ITEM), "MENU_ITEM"); - maRoleMap.put (new Integer (AccessibleRole.OPTION_PANE), "OPTION_PANE"); - maRoleMap.put (new Integer (AccessibleRole.PAGE_TAB), "PAGE_TAB"); - maRoleMap.put (new Integer (AccessibleRole.PAGE_TAB_LIST), "PAGE_TAB_LIST"); - maRoleMap.put (new Integer (AccessibleRole.PANEL), "PANEL"); - maRoleMap.put (new Integer (AccessibleRole.PARAGRAPH), "PARAGRAPH"); - maRoleMap.put (new Integer (AccessibleRole.PASSWORD_TEXT), "PASSWORD_TEXT"); - maRoleMap.put (new Integer (AccessibleRole.POPUP_MENU), "POPUP_MENU"); - maRoleMap.put (new Integer (AccessibleRole.PUSH_BUTTON), "PUSH_BUTTON"); - maRoleMap.put (new Integer (AccessibleRole.PROGRESS_BAR), "PROGRESS_BAR"); - maRoleMap.put (new Integer (AccessibleRole.RADIO_BUTTON), "RADIO_BUTTON"); - maRoleMap.put (new Integer (AccessibleRole.RADIO_MENU_ITEM), "RADIO_MENU_ITEM"); - maRoleMap.put (new Integer (AccessibleRole.ROW_HEADER), "ROW_HEADER"); - maRoleMap.put (new Integer (AccessibleRole.ROOT_PANE), "ROOT_PANE"); - maRoleMap.put (new Integer (AccessibleRole.SCROLL_BAR), "SCROLL_BAR"); - maRoleMap.put (new Integer (AccessibleRole.SCROLL_PANE), "SCROLL_PANE"); - maRoleMap.put (new Integer (AccessibleRole.SHAPE), "SHAPE"); - maRoleMap.put (new Integer (AccessibleRole.SEPARATOR), "SEPARATOR"); - maRoleMap.put (new Integer (AccessibleRole.SLIDER), "SLIDER"); - maRoleMap.put (new Integer (AccessibleRole.SPIN_BOX), "SPIN_BOX"); - maRoleMap.put (new Integer (AccessibleRole.SPLIT_PANE), "SPLIT_PANE"); - maRoleMap.put (new Integer (AccessibleRole.STATUS_BAR), "STATUS_BAR"); - maRoleMap.put (new Integer (AccessibleRole.TABLE), "TABLE"); - maRoleMap.put (new Integer (AccessibleRole.TABLE_CELL), "TABLE_CELL"); - maRoleMap.put (new Integer (AccessibleRole.TEXT), "TEXT"); - maRoleMap.put (new Integer (AccessibleRole.TEXT_FRAME), "TEXT_FRAME"); - maRoleMap.put (new Integer (AccessibleRole.TOGGLE_BUTTON), "TOGGLE_BUTTON"); - maRoleMap.put (new Integer (AccessibleRole.TOOL_BAR), "TOOL_BAR"); - maRoleMap.put (new Integer (AccessibleRole.TOOL_TIP), "TOOL_TIP"); - maRoleMap.put (new Integer (AccessibleRole.TREE), "TREE"); - maRoleMap.put (new Integer (AccessibleRole.VIEW_PORT), "VIEW_PORT"); - maRoleMap.put (new Integer (AccessibleRole.WINDOW), "WINDOW"); + maRoleMap.put (Integer.valueOf(AccessibleRole.UNKNOWN), "UNKNOWN"); + maRoleMap.put (Integer.valueOf(AccessibleRole.UNKNOWN), "UNKNOWN"); + maRoleMap.put (Integer.valueOf(AccessibleRole.ALERT), "ALERT"); + maRoleMap.put (Integer.valueOf(AccessibleRole.COLUMN_HEADER), "COLUMN_HEADER"); + maRoleMap.put (Integer.valueOf(AccessibleRole.CANVAS), "CANVAS"); + maRoleMap.put (Integer.valueOf(AccessibleRole.CHECK_BOX), "CHECK_BOX"); + maRoleMap.put (Integer.valueOf(AccessibleRole.CHECK_MENU_ITEM), "CHECK_MENU_ITEM"); + maRoleMap.put (Integer.valueOf(AccessibleRole.COLOR_CHOOSER), "COLOR_CHOOSER"); + maRoleMap.put (Integer.valueOf(AccessibleRole.COMBO_BOX), "COMBO_BOX"); + maRoleMap.put (Integer.valueOf(AccessibleRole.DESKTOP_ICON), "DESKTOP_ICON"); + maRoleMap.put (Integer.valueOf(AccessibleRole.DESKTOP_PANE), "DESKTOP_PANE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.DIRECTORY_PANE), "DIRECTORY_PANE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.DIALOG), "DIALOG"); + maRoleMap.put (Integer.valueOf(AccessibleRole.DOCUMENT), "DOCUMENT"); + maRoleMap.put (Integer.valueOf(AccessibleRole.EMBEDDED_OBJECT), "EMBEDDED_OBJECT"); + maRoleMap.put (Integer.valueOf(AccessibleRole.END_NOTE), "END_NOTE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.FILE_CHOOSER), "FILE_CHOOSER"); + maRoleMap.put (Integer.valueOf(AccessibleRole.FILLER), "FILLER"); + maRoleMap.put (Integer.valueOf(AccessibleRole.FONT_CHOOSER), "FONT_CHOOSER"); + maRoleMap.put (Integer.valueOf(AccessibleRole.FOOTER), "FOOTER"); + maRoleMap.put (Integer.valueOf(AccessibleRole.FOOTNOTE), "FOOTNOTE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.FRAME), "FRAME"); + maRoleMap.put (Integer.valueOf(AccessibleRole.GLASS_PANE), "GLASS_PANE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.GRAPHIC), "GRAPHIC"); + maRoleMap.put (Integer.valueOf(AccessibleRole.GROUP_BOX), "GROUP_BOX"); + maRoleMap.put (Integer.valueOf(AccessibleRole.HEADER), "HEADER"); + maRoleMap.put (Integer.valueOf(AccessibleRole.HEADING), "HEADING"); + maRoleMap.put (Integer.valueOf(AccessibleRole.HYPER_LINK), "HYPER_LINK"); + maRoleMap.put (Integer.valueOf(AccessibleRole.ICON), "ICON"); + maRoleMap.put (Integer.valueOf(AccessibleRole.INTERNAL_FRAME), "INTERNAL_FRAME"); + maRoleMap.put (Integer.valueOf(AccessibleRole.LABEL), "LABEL"); + maRoleMap.put (Integer.valueOf(AccessibleRole.LAYERED_PANE), "LAYERED_PANE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.LIST), "LIST"); + maRoleMap.put (Integer.valueOf(AccessibleRole.LIST_ITEM), "LIST_ITEM"); + maRoleMap.put (Integer.valueOf(AccessibleRole.MENU), "MENU"); + maRoleMap.put (Integer.valueOf(AccessibleRole.MENU_BAR), "MENU_BAR"); + maRoleMap.put (Integer.valueOf(AccessibleRole.MENU_ITEM), "MENU_ITEM"); + maRoleMap.put (Integer.valueOf(AccessibleRole.OPTION_PANE), "OPTION_PANE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.PAGE_TAB), "PAGE_TAB"); + maRoleMap.put (Integer.valueOf(AccessibleRole.PAGE_TAB_LIST), "PAGE_TAB_LIST"); + maRoleMap.put (Integer.valueOf(AccessibleRole.PANEL), "PANEL"); + maRoleMap.put (Integer.valueOf(AccessibleRole.PARAGRAPH), "PARAGRAPH"); + maRoleMap.put (Integer.valueOf(AccessibleRole.PASSWORD_TEXT), "PASSWORD_TEXT"); + maRoleMap.put (Integer.valueOf(AccessibleRole.POPUP_MENU), "POPUP_MENU"); + maRoleMap.put (Integer.valueOf(AccessibleRole.PUSH_BUTTON), "PUSH_BUTTON"); + maRoleMap.put (Integer.valueOf(AccessibleRole.PROGRESS_BAR), "PROGRESS_BAR"); + maRoleMap.put (Integer.valueOf(AccessibleRole.RADIO_BUTTON), "RADIO_BUTTON"); + maRoleMap.put (Integer.valueOf(AccessibleRole.RADIO_MENU_ITEM), "RADIO_MENU_ITEM"); + maRoleMap.put (Integer.valueOf(AccessibleRole.ROW_HEADER), "ROW_HEADER"); + maRoleMap.put (Integer.valueOf(AccessibleRole.ROOT_PANE), "ROOT_PANE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.SCROLL_BAR), "SCROLL_BAR"); + maRoleMap.put (Integer.valueOf(AccessibleRole.SCROLL_PANE), "SCROLL_PANE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.SHAPE), "SHAPE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.SEPARATOR), "SEPARATOR"); + maRoleMap.put (Integer.valueOf(AccessibleRole.SLIDER), "SLIDER"); + maRoleMap.put (Integer.valueOf(AccessibleRole.SPIN_BOX), "SPIN_BOX"); + maRoleMap.put (Integer.valueOf(AccessibleRole.SPLIT_PANE), "SPLIT_PANE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.STATUS_BAR), "STATUS_BAR"); + maRoleMap.put (Integer.valueOf(AccessibleRole.TABLE), "TABLE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.TABLE_CELL), "TABLE_CELL"); + maRoleMap.put (Integer.valueOf(AccessibleRole.TEXT), "TEXT"); + maRoleMap.put (Integer.valueOf(AccessibleRole.TEXT_FRAME), "TEXT_FRAME"); + maRoleMap.put (Integer.valueOf(AccessibleRole.TOGGLE_BUTTON), "TOGGLE_BUTTON"); + maRoleMap.put (Integer.valueOf(AccessibleRole.TOOL_BAR), "TOOL_BAR"); + maRoleMap.put (Integer.valueOf(AccessibleRole.TOOL_TIP), "TOOL_TIP"); + maRoleMap.put (Integer.valueOf(AccessibleRole.TREE), "TREE"); + maRoleMap.put (Integer.valueOf(AccessibleRole.VIEW_PORT), "VIEW_PORT"); + maRoleMap.put (Integer.valueOf(AccessibleRole.WINDOW), "WINDOW"); - maRelationMap.put (new Integer (AccessibleRelationType.INVALID), "INVALID"); - maRelationMap.put (new Integer (AccessibleRelationType.CONTENT_FLOWS_FROM), "CONTENT_FLOWS_FROM"); - maRelationMap.put (new Integer (AccessibleRelationType.CONTENT_FLOWS_TO), "CONTENT_FLOWS_TO"); - maRelationMap.put (new Integer (AccessibleRelationType.CONTROLLED_BY), "CONTROLLED_BY"); - maRelationMap.put (new Integer (AccessibleRelationType.CONTROLLER_FOR), "CONTROLLER_FOR"); - maRelationMap.put (new Integer (AccessibleRelationType.LABEL_FOR), "LABEL_FOR"); - maRelationMap.put (new Integer (AccessibleRelationType.LABELED_BY), "LABELED_BY"); - maRelationMap.put (new Integer (AccessibleRelationType.MEMBER_OF), "MEMBER_OF"); - maRelationMap.put (new Integer (AccessibleRelationType.SUB_WINDOW_OF), "SUB_WINDOW_OF"); + maRelationMap.put (Integer.valueOf(AccessibleRelationType.INVALID), "INVALID"); + maRelationMap.put (Integer.valueOf(AccessibleRelationType.CONTENT_FLOWS_FROM), "CONTENT_FLOWS_FROM"); + maRelationMap.put (Integer.valueOf(AccessibleRelationType.CONTENT_FLOWS_TO), "CONTENT_FLOWS_TO"); + maRelationMap.put (Integer.valueOf(AccessibleRelationType.CONTROLLED_BY), "CONTROLLED_BY"); + maRelationMap.put (Integer.valueOf(AccessibleRelationType.CONTROLLER_FOR), "CONTROLLER_FOR"); + maRelationMap.put (Integer.valueOf(AccessibleRelationType.LABEL_FOR), "LABEL_FOR"); + maRelationMap.put (Integer.valueOf(AccessibleRelationType.LABELED_BY), "LABELED_BY"); + maRelationMap.put (Integer.valueOf(AccessibleRelationType.MEMBER_OF), "MEMBER_OF"); + maRelationMap.put (Integer.valueOf(AccessibleRelationType.SUB_WINDOW_OF), "SUB_WINDOW_OF"); } } diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java index be511c95444c..660b4c4bfefc 100644 --- a/ucb/qa/complex/ucb/UCB.java +++ b/ucb/qa/complex/ucb/UCB.java @@ -85,7 +85,7 @@ public class UCB { } else if (type.equals(Integer.class)) { - return new Integer(xrow.getInt(1)); + return Integer.valueOf(xrow.getInt(1)); } else if (type.equals(Short.class)) { diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java index ac996ae350d6..0c6ed329b58f 100644 --- a/unotest/source/java/org/openoffice/test/OfficeConnection.java +++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java @@ -229,7 +229,7 @@ public final class OfficeConnection { if (old) { t1.interrupt(); // reset old status } - return done ? new Integer(n) : null; + return done ? Integer.valueOf(n) : null; } private static final class Forward extends Thread { diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java index 9483825ea546..3b119c4a5b20 100644 --- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java +++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java @@ -455,7 +455,7 @@ public class CheckMemoryUsage /* extends ComplexTestCase */ aToken.nextToken(); String mem = aToken.nextToken(); mem = mem.substring(0, mem.indexOf('K')); - Integer memory = new Integer(mem); + Integer memory = Integer.valueOf(mem); return memory.intValue(); } diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.java b/wizards/com/sun/star/wizards/common/ConfigGroup.java index e69cb18a63b7..0ff5086ab7df 100644 --- a/wizards/com/sun/star/wizards/common/ConfigGroup.java +++ b/wizards/com/sun/star/wizards/common/ConfigGroup.java @@ -78,7 +78,7 @@ public class ConfigGroup implements ConfigNode } if (field.getType().equals(Integer.TYPE)) { - return new Integer(field.getInt(this)); + return Integer.valueOf(field.getInt(this)); } if (field.getType().equals(Short.TYPE)) { diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java index d2f39c22cd95..2a2d8c0c81b4 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.java +++ b/wizards/com/sun/star/wizards/common/Configuration.java @@ -108,7 +108,7 @@ public abstract class Configuration public static void set(int value, String name, Object parent) throws Exception { - set(new Integer(value), name, parent); + set(Integer.valueOf(value), name, parent); } diff --git a/wizards/com/sun/star/wizards/common/NumberFormatter.java b/wizards/com/sun/star/wizards/common/NumberFormatter.java index d3dd3b5df1d3..83a51bc6d9db 100644 --- a/wizards/com/sun/star/wizards/common/NumberFormatter.java +++ b/wizards/com/sun/star/wizards/common/NumberFormatter.java @@ -183,11 +183,11 @@ public class NumberFormatter } if (xPSet.getPropertySetInfo().hasPropertyByName("NumberFormat")) { - xPSet.setPropertyValue("NumberFormat", new Integer(NewFormatKey)); + xPSet.setPropertyValue("NumberFormat", Integer.valueOf(NewFormatKey)); } else if (xPSet.getPropertySetInfo().hasPropertyByName("FormatKey")) { - xPSet.setPropertyValue("FormatKey", new Integer(NewFormatKey)); + xPSet.setPropertyValue("FormatKey", Integer.valueOf(NewFormatKey)); } else { diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index bf02290d9ae6..2b998ded224c 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -97,7 +97,7 @@ public class NumericalHelper case STRING_TYPE: try { - Integer i = new Integer((String) aTypeObject.aValue); + Integer i = Integer.valueOf((String) aTypeObject.aValue); retValue = i.intValue(); } catch (java.lang.NumberFormatException e) @@ -257,7 +257,7 @@ public class NumericalHelper break; case TypeClass.LONG_value: aTypeObject.iType = INT_TYPE; - aTypeObject.aValue = new Integer(AnyConverter.toInt(aValue)); + aTypeObject.aValue = Integer.valueOf(AnyConverter.toInt(aValue)); break; case TypeClass.HYPER_value: aTypeObject.iType = LONG_TYPE; diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java index 1b4fecc09f14..70fa6b8576a0 100644 --- a/wizards/com/sun/star/wizards/common/UCB.java +++ b/wizards/com/sun/star/wizards/common/UCB.java @@ -219,7 +219,7 @@ public class UCB } else if (type.equals(Integer.class)) { - return new Integer(xrow.getInt(1)); + return Integer.valueOf(xrow.getInt(1)); } else if (type.equals(Short.class)) { diff --git a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java index ef0b0ec2e4c5..2d81090b2855 100644 --- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java +++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java @@ -96,7 +96,7 @@ public class ColumnPropertySet } if (_bsetDefaultProperties) { - assignPropertyValue("IsNullable", new Integer(oTypeInspector.isNullable(xPropertySet))); + assignPropertyValue("IsNullable", Integer.valueOf(oTypeInspector.isNullable(xPropertySet))); } } catch (Exception e) @@ -135,7 +135,7 @@ public class ColumnPropertySet sTypeName = _sTypeName; } nType = oTypeInspector.getDataType(sTypeName); - assignPropertyValue("Type", new Integer(nType)); + assignPropertyValue("Type", Integer.valueOf(nType)); assignPropertyValue("TypeName", sTypeName); } @@ -146,7 +146,7 @@ public class ColumnPropertySet if (_spropname.equals("Type")) { nType = ((Integer) _oValue).intValue(); - xPropertySet.setPropertyValue("Type", new Integer(nType)); + xPropertySet.setPropertyValue("Type", Integer.valueOf(nType)); } else if (_spropname.equals(PropertyNames.PROPERTY_NAME)) { @@ -160,13 +160,13 @@ public class ColumnPropertySet { int nScale = ((Integer) _oValue).intValue(); nScale = oTypeInspector.getScale(xPropertySet); - xPropertySet.setPropertyValue("Scale", new Integer(nScale)); + xPropertySet.setPropertyValue("Scale", Integer.valueOf(nScale)); } else if (_spropname.equals("IsNullable")) { int nNullability = ((Integer) _oValue).intValue(); nNullability = oTypeInspector.getNullability(xPropertySet, nNullability); - xPropertySet.setPropertyValue("IsNullable", new Integer(nNullability)); + xPropertySet.setPropertyValue("IsNullable", Integer.valueOf(nNullability)); } else if (_spropname.equals("TypeName")) { diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index 1eba9a59bad7..39b115206dac 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -209,7 +209,7 @@ public class RecordParser extends QueryMetaData Helper.setUnoPropertyValue(xRowSet, "DataSourceName", DataSourceName); Helper.setUnoPropertyValue(xRowSet, PropertyNames.ACTIVE_CONNECTION, DBConnection); Helper.setUnoPropertyValue(xRowSet, PropertyNames.COMMAND, Command); - Helper.setUnoPropertyValue(xRowSet, PropertyNames.COMMAND_TYPE, new Integer(_nCommandType)); // CommandType + Helper.setUnoPropertyValue(xRowSet, PropertyNames.COMMAND_TYPE, Integer.valueOf(_nCommandType)); // CommandType xExecute.executeWithCompletion(xInteraction); com.sun.star.sdb.XResultSetAccess xResultAccess = UnoRuntime.queryInterface(com.sun.star.sdb.XResultSetAccess.class, xRowSet); ResultSet = xResultAccess.createResultSet(); diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index 90b06df8e70c..08f7351aa82f 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -146,7 +146,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen xKeyDrop = UnoRuntime.queryInterface(XDrop.class, xIndexAccessKeys); xKeyAppend = UnoRuntime.queryInterface(XAppend.class, xKeyFac); xKey = xKeyFac.createDataDescriptor(); - xKey.setPropertyValue("Type", new Integer(KeyType.PRIMARY)); + xKey.setPropertyValue("Type", Integer.valueOf(KeyType.PRIMARY)); xKeyColumnSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, xKey); XDataDescriptorFactory xKeyColFac = UnoRuntime.queryInterface(XDataDescriptorFactory.class, xKeyColumnSupplier.getColumns()); xKeyColAppend = UnoRuntime.queryInterface(XAppend.class, xKeyColFac); @@ -165,7 +165,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen { xColPropertySet = addPrimaryKeyColumn(_fieldnames[i]); } - xColPropertySet.setPropertyValue("IsNullable", new Integer(com.sun.star.sdbc.ColumnValue.NO_NULLS)); + xColPropertySet.setPropertyValue("IsNullable", Integer.valueOf(com.sun.star.sdbc.ColumnValue.NO_NULLS)); if (_bAutoincrementation) { int nDataType = oTypeInspector.getAutoIncrementIndex(xColPropertySet); @@ -173,7 +173,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen { if (xColPropertySet.getPropertySetInfo().hasPropertyByName("IsAutoIncrement")) { - xColPropertySet.setPropertyValue("Type", new Integer(nDataType)); + xColPropertySet.setPropertyValue("Type", Integer.valueOf(nDataType)); xColPropertySet.setPropertyValue("IsAutoIncrement", Boolean.valueOf(_bAutoincrementation)); } } @@ -654,7 +654,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen xColPropertySet.setPropertyValue(PropertyNames.PROPERTY_NAME, IDFieldName); int nDataType = oTypeInspector.convertDataType(com.sun.star.sdbc.DataType.INTEGER); - xColPropertySet.setPropertyValue("Type", new Integer(nDataType)); + xColPropertySet.setPropertyValue("Type", Integer.valueOf(nDataType)); xColPropertySet.setPropertyValue("TypeName", oTypeInspector.getDefaultTypeName(nDataType, null)); ColumnDescriptor oColumnDescriptor = new ColumnDescriptor(xColPropertySet, IDFieldName); this.columncontainer.add(0, oColumnDescriptor); diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java index 8811d0c98c3b..b93c09737fb3 100644 --- a/wizards/com/sun/star/wizards/db/TypeInspector.java +++ b/wizards/com/sun/star/wizards/db/TypeInspector.java @@ -76,13 +76,13 @@ public class TypeInspector while (xResultSet.next()) { aTypeNameVector.add(xRow.getString(1)); - aTypeVector.add(new Integer(xRow.getShort(2))); - aPrecisionVector.add(new Integer(xRow.getInt(3))); - aNullableVector.add(new Integer(xRow.getShort(7))); - aSearchableVector.add(new Integer(xRow.getShort(9))); + aTypeVector.add(Integer.valueOf(xRow.getShort(2))); + aPrecisionVector.add(Integer.valueOf(xRow.getInt(3))); + aNullableVector.add(Integer.valueOf(xRow.getShort(7))); + aSearchableVector.add(Integer.valueOf(xRow.getShort(9))); aAutoIncrementVector.add(Boolean.valueOf(xRow.getBoolean(12))); - aMinScaleVector.add(new Integer(xRow.getShort(14))); - aMaxScaleVector.add(new Integer(xRow.getShort(15))); + aMinScaleVector.add(Integer.valueOf(xRow.getShort(14))); + aMaxScaleVector.add(Integer.valueOf(xRow.getShort(15))); } sDataTypeNames = new String[aTypeNameVector.size()]; diff --git a/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java index 4663a1d268c1..1a40e46b3116 100644 --- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java +++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.java @@ -42,7 +42,7 @@ public class DataEntrySetter { this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (FormWizard.SODATA_PAGE * 100); - Integer IDataStep = new Integer(FormWizard.SODATA_PAGE); + Integer IDataStep = Integer.valueOf(FormWizard.SODATA_PAGE); String sNewDataOnly = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 44); String sDisplayAllData = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 46); String sNoModification = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 47); // AllowUpdates diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index 53456ff8615c..84d5032fe894 100644 --- a/wizards/com/sun/star/wizards/form/FieldLinker.java +++ b/wizards/com/sun/star/wizards/form/FieldLinker.java @@ -80,7 +80,7 @@ public class FieldLinker extends DBLimitedFieldSelection }, new Object[] { - Boolean.valueOf(bDoEnable), 8, sSlaveListHeader[i], 97, new Integer(iCurPosY), IStep, new Short(curtabindex++), 97 + Boolean.valueOf(bDoEnable), 8, sSlaveListHeader[i], 97, Integer.valueOf(iCurPosY), IStep, new Short(curtabindex++), 97 }); lstSlaveFields[i] = CurUnoDialog.insertListBox("lstSlaveFieldLink" + (i + 1), SOLINKLST[i], null, new ItemListenerImpl(), new String[] @@ -104,7 +104,7 @@ public class FieldLinker extends DBLimitedFieldSelection sSlaveHidString, Short.valueOf(UnoDialog.getListBoxLineCount()), 97, - new Integer(iCurPosY + 10), + Integer.valueOf(iCurPosY + 10), IStep, new Short(curtabindex++), 97 @@ -117,7 +117,7 @@ public class FieldLinker extends DBLimitedFieldSelection }, new Object[] { - Boolean.valueOf(bDoEnable), 8, sMasterListHeader[i], 206, new Integer(iCurPosY), IStep, new Short(curtabindex++), 97 + Boolean.valueOf(bDoEnable), 8, sMasterListHeader[i], 206, Integer.valueOf(iCurPosY), IStep, new Short(curtabindex++), 97 }); lstMasterFields[i] = CurUnoDialog.insertListBox("lstMasterFieldLink" + Integer.toString(i + 1), SOLINKLST[i], null, new ItemListenerImpl(), @@ -142,7 +142,7 @@ public class FieldLinker extends DBLimitedFieldSelection sMasterHidString, Short.valueOf(UnoDialog.getListBoxLineCount()), 206, - new Integer(iCurPosY + 10), + Integer.valueOf(iCurPosY + 10), IStep, new Short(curtabindex++), 97 diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index a871b1c4bb45..377180c6812c 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -56,7 +56,7 @@ public class FormConfiguration { this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (FormWizard.SOSUBFORM_PAGE * 100); - Integer ISubFormStep = new Integer(FormWizard.SOSUBFORM_PAGE); + Integer ISubFormStep = Integer.valueOf(FormWizard.SOSUBFORM_PAGE); String sOnExistingRelation = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 5); String sOnManualRelation = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 7); String sSelectManually = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 4); diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java b/wizards/com/sun/star/wizards/form/FormDocument.java index 62ef353c8001..d8828dc23078 100644 --- a/wizards/com/sun/star/wizards/form/FormDocument.java +++ b/wizards/com/sun/star/wizards/form/FormDocument.java @@ -121,10 +121,10 @@ public class FormDocument extends TextDocument { nMargin = 1000; } - xPropPageStyle.setPropertyValue("RightMargin", new Integer(nMargin)); - xPropPageStyle.setPropertyValue("LeftMargin", new Integer(nMargin)); - xPropPageStyle.setPropertyValue("TopMargin", new Integer(nMargin)); - xPropPageStyle.setPropertyValue("BottomMargin", new Integer(nMargin)); + xPropPageStyle.setPropertyValue("RightMargin", Integer.valueOf(nMargin)); + xPropPageStyle.setPropertyValue("LeftMargin", Integer.valueOf(nMargin)); + xPropPageStyle.setPropertyValue("TopMargin", Integer.valueOf(nMargin)); + xPropPageStyle.setPropertyValue("BottomMargin", Integer.valueOf(nMargin)); aMainFormPoint = new Point(nMargin, nMargin); nFormWidth = (int) (0.8 * nPageWidth) - 2 * nMargin; nFormHeight = (int) (0.65 * nPageHeight) - 2 * nMargin; @@ -482,7 +482,7 @@ public class FormDocument extends TextDocument { xPropertySet.setPropertyValue("DataSourceName", getDataSourceName()); xPropertySet.setPropertyValue(PropertyNames.COMMAND, _oDBMetaData.getCommandName()); - xPropertySet.setPropertyValue(PropertyNames.COMMAND_TYPE, new Integer(_oDBMetaData.getCommandType())); + xPropertySet.setPropertyValue(PropertyNames.COMMAND_TYPE, Integer.valueOf(_oDBMetaData.getCommandType())); for (int i = 0; i < _aPropertySetList.length; i++) { xPropertySet.setPropertyValue(_aPropertySetList[i].Name, _aPropertySetList[i].Value); diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index 293b6c8c8965..16e47ee6f284 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -236,7 +236,7 @@ public class FormWizard extends DatabaseObjectWizard }, new Object[] { - 28, sShowBinaryFields, Boolean.TRUE, 95, 154, new Integer(SOMAIN_PAGE), 210 + 28, sShowBinaryFields, Boolean.TRUE, 95, 154, Integer.valueOf(SOMAIN_PAGE), 210 }); curFormConfiguration = new FormConfiguration(this); @@ -254,7 +254,7 @@ public class FormWizard extends DatabaseObjectWizard }, new Object[] { - 28, sShowBinaryFields, Boolean.TRUE, 95, 154, new Integer(SOSUBFORMFIELDS_PAGE), 210 + 28, sShowBinaryFields, Boolean.TRUE, 95, 154, Integer.valueOf(SOSUBFORMFIELDS_PAGE), 210 }); curFormDocument.xProgressBar.setValue(40); diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index ce905730331b..27f898639df5 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -71,7 +71,7 @@ public class StyleApplier xPageStylePropertySet = oTextStyleHandler.getStyleByName("PageStyles", "Standard"); this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (FormWizard.SOSTYLE_PAGE * 100); - Integer IStyleStep = new Integer(FormWizard.SOSTYLE_PAGE); + Integer IStyleStep = Integer.valueOf(FormWizard.SOSTYLE_PAGE); String sPageStyles = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 86); String sNoBorder = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 29); String s3DLook = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 30); @@ -292,7 +292,7 @@ public class StyleApplier { if (_iStyleColors[SOLABELTEXTCOLOR] > -1) { - curControlForm.oGridControl.xPropertySet.setPropertyValue("TextColor", new Integer(_iStyleColors[SODBTEXTCOLOR])); + curControlForm.oGridControl.xPropertySet.setPropertyValue("TextColor", Integer.valueOf(_iStyleColors[SODBTEXTCOLOR])); } curControlForm.oGridControl.xPropertySet.setPropertyValue("BackgroundColor", Integer.decode("#DDDDDD")); } @@ -327,12 +327,12 @@ public class StyleApplier { if (_iStyleColors[SOLABELTEXTCOLOR] > -1) { - LabelControls[n].xPropertySet.setPropertyValue("TextColor", new Integer(_iStyleColors[SOLABELTEXTCOLOR])); + LabelControls[n].xPropertySet.setPropertyValue("TextColor", Integer.valueOf(_iStyleColors[SOLABELTEXTCOLOR])); } } } } - xPageStylePropertySet.setPropertyValue("BackColor", new Integer(_iStyleColors[SOBACKGROUNDCOLOR])); + xPageStylePropertySet.setPropertyValue("BackColor", Integer.valueOf(_iStyleColors[SOBACKGROUNDCOLOR])); } catch (Exception e) { diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index ba9b18cee5ee..2c1e839e9cb2 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -54,7 +54,7 @@ public class UIControlArranger this.CurUnoDialog = _CurUnoDialog; this.curFormDocument = _curFormDocument; curtabindex = (short) (FormWizard.SOCONTROL_PAGE * 100); - IControlStep = new Integer(FormWizard.SOCONTROL_PAGE); + IControlStep = Integer.valueOf(FormWizard.SOCONTROL_PAGE); String sLabelPlacment = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 32); String sAlignLeft = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 33); String sAlignRight = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 34); @@ -99,7 +99,7 @@ public class UIControlArranger DefaultListModel imageModel = new DefaultListModel(); for (int i = 0; i < HelpTexts.length; i++) { - imageModel.addElement(new Integer(i)); + imageModel.addElement(Integer.valueOf(i)); } String sMainArrangementHeader = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 41); // "Arrangement of the main form" m_aArrangeList[0] = new ArrangeButtonList(0, imageModel, sMainArrangementHeader); @@ -122,7 +122,7 @@ public class UIControlArranger int ResId = UIConsts.RID_IMG_FORM + (2 * ((Integer) listitem).intValue()); return new Integer[] { - new Integer(ResId), new Integer(ResId + 1) + Integer.valueOf(ResId), Integer.valueOf(ResId + 1) }; } @@ -166,7 +166,7 @@ public class UIControlArranger public ArrangeButtonList(int _formindex, ListModel model, String _sArrangementHeader) { formindex = _formindex; - Integer YPos = new Integer(SOBASEIMAGEYPOSITION + _formindex * SOIMAGELISTHEIGHT); + Integer YPos = Integer.valueOf(SOBASEIMAGEYPOSITION + _formindex * SOIMAGELISTHEIGHT); // Label ArrangementHeader ---------------------- CurUnoDialog.insertFixedLine("lnLabelPlacment_" + (_formindex + 1), new String[] diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java index 9d6673e6b416..2523a7bc6503 100644 --- a/wizards/com/sun/star/wizards/query/Finalizer.java +++ b/wizards/com/sun/star/wizards/query/Finalizer.java @@ -63,7 +63,7 @@ public class Finalizer }, new Object[] { - 8, reslblQueryTitle, 95, 27, new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 52 + 8, reslblQueryTitle, 95, 27, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 52 }); m_aTxtTitle = m_queryWizard.insertTextField("txtQueryTitle", "changeTitle", this, new String[] { @@ -71,7 +71,7 @@ public class Finalizer }, new Object[] { - 12, HelpIds.getHelpIdString(curHelpIndex++), 95, 37, new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 90 + 12, HelpIds.getHelpIdString(curHelpIndex++), 95, 37, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 90 }); m_queryWizard.insertLabel("lblHowGoOn", new String[] { @@ -79,7 +79,7 @@ public class Finalizer }, new Object[] { - 16, reslblHowGoOn, Boolean.TRUE, 192, 27, new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 112 + 16, reslblHowGoOn, Boolean.TRUE, 192, 27, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 112 }); this.xRadioDisplayQuery = m_queryWizard.insertRadioButton("optDisplayQuery", new String[] @@ -88,7 +88,7 @@ public class Finalizer }, new Object[] { - 9, HelpIds.getHelpIdString(curHelpIndex++), resoptDisplayQuery, 192, 46, new Short((short) 1), new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 118 + 9, HelpIds.getHelpIdString(curHelpIndex++), resoptDisplayQuery, 192, 46, new Short((short) 1), Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 118 }); m_queryWizard.insertRadioButton("optModifyQuery", @@ -98,7 +98,7 @@ public class Finalizer }, new Object[] { - 10, HelpIds.getHelpIdString(curHelpIndex++), resoptModifyQuery, 192, 56, new Integer(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 118 + 10, HelpIds.getHelpIdString(curHelpIndex++), resoptModifyQuery, 192, 56, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 118 }); m_queryWizard.insertFixedLine("flnSummary", new String[] { diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 7394ee9a151d..677fb6e250ac 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -276,7 +276,7 @@ public class DBColumn if (bAlignLeft) { xValCellCursor = TextDocument.createTextCursor(xValCell); - Helper.setUnoPropertyValue(xValCellCursor, "ParaAdjust", new Integer(com.sun.star.style.ParagraphAdjust.LEFT_value)); + Helper.setUnoPropertyValue(xValCellCursor, "ParaAdjust", Integer.valueOf(com.sun.star.style.ParagraphAdjust.LEFT_value)); } } catch (Exception exception) @@ -353,7 +353,7 @@ public class DBColumn modifyCellContent(CurGroupValue); if (bAlignLeft) { - Helper.setUnoPropertyValue(xValCellCursor, "ParaAdjust", new Integer(ParagraphAdjust.LEFT_value)); + Helper.setUnoPropertyValue(xValCellCursor, "ParaAdjust", Integer.valueOf(ParagraphAdjust.LEFT_value)); } int nFieldType = CurDBField.getFieldType(); @@ -364,7 +364,7 @@ public class DBColumn Helper.setUnoPropertyValue(xValCellCursor, "CharFontName", CharFontName); if (!bIsGroupColumn) { - Helper.setUnoPropertyValue(xValCellCursor, "ParaAdjust", new Integer(ParagraphAdjust.CENTER_value)); + Helper.setUnoPropertyValue(xValCellCursor, "ParaAdjust", Integer.valueOf(ParagraphAdjust.CENTER_value)); } } else diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index e992e99150a0..7933f99ad12b 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -56,7 +56,7 @@ public class GroupFieldHandler extends FieldSelection }, new Object[] { - Boolean.FALSE, 18, sNote, Boolean.TRUE, 95, 158, new Integer(ReportWizard.SOGROUPPAGE), 209 + Boolean.FALSE, 18, sNote, Boolean.TRUE, 95, 158, Integer.valueOf(ReportWizard.SOGROUPPAGE), 209 }); } catch (Exception exception) diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 63c15a434280..6186744b5da2 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -69,7 +69,7 @@ public class ReportFinalizer }, new Object[] { - 8, sReportTitle, 95, 27, new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 68 + 8, sReportTitle, 95, 27, Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 68 }); xTitleTextBox = CurUnoDialog.insertTextField("txtTitle", CHANGEREPORTTITLE_FUNCNAME, this, @@ -79,7 +79,7 @@ public class ReportFinalizer }, new Object[] { - 12, "HID:WIZARDS_HID_DLGREPORT_4_TITLE", 95, 37, new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 + 12, "HID:WIZARDS_HID_DLGREPORT_4_TITLE", 95, 37, Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblChooseReportKind", @@ -89,7 +89,7 @@ public class ReportFinalizer }, new Object[] { - 8, slblChooseReportKind, 95, 57, new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 + 8, slblChooseReportKind, 95, 57, Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 }); CurUnoDialog.insertRadioButton("optCreateDocument", TOGGLESUBTEMPLATECONTROLS_FUNCNAME, this, @@ -99,7 +99,7 @@ public class ReportFinalizer }, new Object[] { - 10, "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", sSaveAsDocument, 95, 69, new Short((short) 0), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 138 + 10, "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", sSaveAsDocument, 95, 69, new Short((short) 0), Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 138 }); CurUnoDialog.insertRadioButton("optCreateReportTemplate", TOGGLESUBTEMPLATECONTROLS_FUNCNAME, this, @@ -109,7 +109,7 @@ public class ReportFinalizer }, new Object[] { - 8, "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", sSaveAsTemplate, 95, 81, new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 + 8, "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", sSaveAsTemplate, 95, 81, new Short((short) 1), Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 }); @@ -120,7 +120,7 @@ public class ReportFinalizer }, new Object[] { - 8, slblHowProceed, 105, 93, new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 + 8, slblHowProceed, 105, 93, Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 }); @@ -141,7 +141,7 @@ public class ReportFinalizer }, new Object[] { - 10, "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", sUseTemplate, 111, 115, new Short((short) 1), new Integer(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 138 + 10, "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", sUseTemplate, 111, 115, new Short((short) 1), Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 138 }); } diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 84328628d24c..bb34b5bd1c91 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -80,7 +80,7 @@ public class ReportLayouter }, new Object[] { - 8, slblDataStructure, 95, 27, new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 99 + 8, slblDataStructure, 95, 27, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 99 }); short iSelPos = 0; @@ -101,7 +101,7 @@ public class ReportLayouter 108, "HID:WIZARDS_HID_DLGREPORT_4_DATALAYOUT", 95, 37, new short[] { iSelPos - }, new Integer(ReportWizard.SOTEMPLATEPAGE), ContentFiles[0], new Short(curtabindex++), 99 + }, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), ContentFiles[0], new Short(curtabindex++), 99 }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblLayout", @@ -111,7 +111,7 @@ public class ReportLayouter }, new Object[] { - 8, slblPageLayout, 205, 27, new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 99 + 8, slblPageLayout, 205, 27, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 99 }); short iSelLayoutPos = 0; @@ -135,7 +135,7 @@ public class ReportLayouter 108, "HID:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT", 205, 37, new short[] { iSelLayoutPos - }, new Integer(ReportWizard.SOTEMPLATEPAGE), LayoutFiles[0], new Short(curtabindex++), 99 + }, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), LayoutFiles[0], new Short(curtabindex++), 99 }); iOldLayoutPos = iSelPos; CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblOrientation", @@ -145,7 +145,7 @@ public class ReportLayouter }, new Object[] { - 8, sOrientationHeader, 95, 148, new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 74 + 8, sOrientationHeader, 95, 148, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 74 }); short m_nLandscapeState = CurReportDocument.getDefaultPageOrientation() == SOOPTLANDSCAPE ? (short) 1 : 0; @@ -156,7 +156,7 @@ public class ReportLayouter }, new Object[] { - 10, "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", sOrientHorizontal, 101, 158, new Short(m_nLandscapeState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 60 + 10, "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", sOrientHorizontal, 101, 158, new Short(m_nLandscapeState), Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 60 }); short m_nPortraitState = CurReportDocument.getDefaultPageOrientation() == SOOPTPORTRAIT ? (short) 1 : (short) 0; @@ -167,7 +167,7 @@ public class ReportLayouter }, new Object[] { - 10, "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", sOrientVertical, 101, 171, new Short(m_nPortraitState), new Integer(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 60 + 10, "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", sOrientVertical, 101, 171, new Short(m_nPortraitState), Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 60 }); aOrientationImage = CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlImageControlModel", "imgOrientation", @@ -177,7 +177,7 @@ public class ReportLayouter }, new Object[] { - new Short("0"), 23, 164, 158, Boolean.FALSE, new Integer(ReportWizard.SOTEMPLATEPAGE), 30 + new Short("0"), 23, 164, 158, Boolean.FALSE, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), 30 }); String sNote = ReportWizard.getBlindTextNote(CurReportDocument, CurUnoDialog.m_oResource); @@ -188,7 +188,7 @@ public class ReportLayouter }, new Object[] { - 34, sNote, Boolean.TRUE, 205, 148, new Integer(ReportWizard.SOTEMPLATEPAGE), 99 + 34, sNote, Boolean.TRUE, 205, 148, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), 99 }); if (m_nLandscapeState == 1) { diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index bfdf6e523b0e..93947e2b6bf4 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -1025,8 +1025,8 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter setToPageStyles("IsLandscape", Boolean.TRUE); if (nWidth < nHeight) { - setToPageStyles(PropertyNames.PROPERTY_WIDTH, new Integer(nHeight)); - setToPageStyles(PropertyNames.PROPERTY_HEIGHT, new Integer(nWidth)); + setToPageStyles(PropertyNames.PROPERTY_WIDTH, Integer.valueOf(nHeight)); + setToPageStyles(PropertyNames.PROPERTY_HEIGHT, Integer.valueOf(nWidth)); } } else @@ -1034,8 +1034,8 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter setToPageStyles("IsLandscape", Boolean.FALSE); if (nHeight < nWidth) { - setToPageStyles(PropertyNames.PROPERTY_WIDTH, new Integer(nHeight)); - setToPageStyles(PropertyNames.PROPERTY_HEIGHT, new Integer(nWidth)); + setToPageStyles(PropertyNames.PROPERTY_WIDTH, Integer.valueOf(nHeight)); + setToPageStyles(PropertyNames.PROPERTY_HEIGHT, Integer.valueOf(nWidth)); } } // dirty the PageWidth @@ -1517,7 +1517,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter final Size aSize = getPreferredSize(_sLabel, xFont); nWidth = aSize.Width; // cache the found width - m_aLabelWidthMap.put(sKey, new Integer(nWidth)); + m_aLabelWidthMap.put(sKey, Integer.valueOf(nWidth)); } catch (com.sun.star.uno.Exception e) { diff --git a/wizards/com/sun/star/wizards/table/FieldDescription.java b/wizards/com/sun/star/wizards/table/FieldDescription.java index b122b40ecb5c..826989c611df 100644 --- a/wizards/com/sun/star/wizards/table/FieldDescription.java +++ b/wizards/com/sun/star/wizards/table/FieldDescription.java @@ -66,7 +66,7 @@ public class FieldDescription { Name = _fieldname; aPropertyValues = new ArrayList<PropertyValue>(); - Type = new Integer(com.sun.star.sdbc.DataType.VARCHAR); + Type = Integer.valueOf(com.sun.star.sdbc.DataType.VARCHAR); aPropertyValues.add(Properties.createProperty(PropertyNames.PROPERTY_NAME, _fieldname)); aPropertyValues.add(Properties.createProperty("Type", Type)); } diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index a60a75c6e94e..1a802d797687 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -58,7 +58,7 @@ public class FieldFormatter implements XItemListener { this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (TableWizard.SOFIELDSFORMATPAGE * 100); - IFieldFormatStep = new Integer(TableWizard.SOFIELDSFORMATPAGE); + IFieldFormatStep = Integer.valueOf(TableWizard.SOFIELDSFORMATPAGE); String sFieldName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 23); String sFieldNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 25); String sfieldinfo = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 20); diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index 694418233e9e..de504133e1e7 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -51,7 +51,7 @@ public class Finalizer this.CurUnoDialog = _CurUnoDialog; this.curtabledescriptor = _curtabledescriptor; curtabindex = (short) (TableWizard.SOFINALPAGE * 100); - Integer IFINALSTEP = new Integer(TableWizard.SOFINALPAGE); + Integer IFINALSTEP = Integer.valueOf(TableWizard.SOFINALPAGE); String slblTableName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 34); String slblProceed = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 36); String sWorkWithTable = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 38); @@ -110,7 +110,7 @@ public class Finalizer }, new Object[] { - 8, slblCatalog, new Integer(nListBoxPosX), 52, IFINALSTEP, new Short(curtabindex++), 120 + 8, slblCatalog, Integer.valueOf(nListBoxPosX), 52, IFINALSTEP, new Short(curtabindex++), 120 }); try @@ -122,7 +122,7 @@ public class Finalizer }, new Object[] { - Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), 62, IFINALSTEP, sCatalogNames, new Short(curtabindex++), 80 + Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", new Short(UnoDialog.getListBoxLineCount()), Integer.valueOf(nListBoxPosX), 62, IFINALSTEP, sCatalogNames, new Short(curtabindex++), 80 }); int isel = JavaTools.FieldInList(sCatalogNames, sCatalog); if (isel < 0) @@ -165,7 +165,7 @@ public class Finalizer }, new Object[] { - 8, slblSchema, new Integer(nListBoxPosX), 52, IFINALSTEP, new Short(curtabindex++), 80 + 8, slblSchema, Integer.valueOf(nListBoxPosX), 52, IFINALSTEP, new Short(curtabindex++), 80 }); try @@ -177,7 +177,7 @@ public class Finalizer }, new Object[] { - Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA", new Short(UnoDialog.getListBoxLineCount()), new Integer(nListBoxPosX), 62, IFINALSTEP, sSchemaNames, new Short(curtabindex++), 80 + Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA", new Short(UnoDialog.getListBoxLineCount()), Integer.valueOf(nListBoxPosX), 62, IFINALSTEP, sSchemaNames, new Short(curtabindex++), 80 }); int isel = JavaTools.FieldInList(sSchemaNames, sSchema); if (isel < 0) @@ -219,7 +219,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], slblProceed, 97, new Integer(82 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 227 + UIConsts.INTEGERS[8], slblProceed, 97, Integer.valueOf(82 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 227 }); optWorkWithTable = CurUnoDialog.insertRadioButton("optWorkWithTable", null, new String[] @@ -228,7 +228,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", sWorkWithTable, 101, new Integer(97 + ndiffPosY), new Short((short) 1), IFINALSTEP, new Short(curtabindex++), 177 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE", sWorkWithTable, 101, Integer.valueOf(97 + ndiffPosY), new Short((short) 1), IFINALSTEP, new Short(curtabindex++), 177 }); optModifyTable = CurUnoDialog.insertRadioButton("optModifyTable", null, new String[] @@ -237,7 +237,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, 101, new Integer(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 177 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, 101, Integer.valueOf(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 177 }); CurUnoDialog.insertRadioButton("optStartFormWizard", null, new String[] @@ -246,7 +246,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", sStartFormWizard, 101, new Integer(121 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 177 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", sStartFormWizard, 101, Integer.valueOf(121 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 177 }); } catch (SQLException e) diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index be154da43d26..784a6ab98b1e 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -60,7 +60,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener curTableDescriptor = _curTableDescriptor; bAutoPrimaryKeysupportsAutoIncrmentation = isAutoPrimeKeyAutoIncrementationsupported(); curtabindex = (short) ((TableWizard.SOPRIMARYKEYPAGE * 100) - 20); - Integer IPRIMEKEYSTEP = new Integer(TableWizard.SOPRIMARYKEYPAGE); + Integer IPRIMEKEYSTEP = Integer.valueOf(TableWizard.SOPRIMARYKEYPAGE); final String sExplanations = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 26); final String screatePrimaryKey = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 27); final String slblPrimeFieldName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 31); diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 6b60f063929f..f82f166aa53f 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -80,7 +80,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X String sPrivate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 17); String sTableNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 18); smytable = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 44); - Integer IMAINSTEP = new Integer(TableWizard.SOMAINPAGE); + Integer IMAINSTEP = Integer.valueOf(TableWizard.SOMAINPAGE); oCGCategory = new CGCategory(CurUnoDialog.xMSF); oCGTable = new CGTable(CurUnoDialog.xMSF); lblExplanation = CurUnoDialog.insertLabel("lblScenarioExplanation", diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index ad0fe2bcba96..c3cca66e640e 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -84,7 +84,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - 8, HelpIds.getHelpIdString(curHelpID), soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(iCompWidth) + 8, HelpIds.getHelpIdString(curHelpID), soptDetailQuery, Integer.valueOf(_iPosX), Integer.valueOf(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), Integer.valueOf(iCompWidth) }); CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(), @@ -94,7 +94,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - 16, HelpIds.getHelpIdString(curHelpID + 1), soptSummaryQuery, Boolean.TRUE, new Integer(_iPosX), new Integer(iCompPosY - 32), IStep, new Short(curtabindex++), new Integer(iCompWidth) + 16, HelpIds.getHelpIdString(curHelpID + 1), soptSummaryQuery, Boolean.TRUE, Integer.valueOf(_iPosX), Integer.valueOf(iCompPosY - 32), IStep, new Short(curtabindex++), Integer.valueOf(iCompWidth) }); CurUnoDialog.insertLabel("lblAggregate", new String[] @@ -103,7 +103,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - 8, slblAggregate, new Integer(iCompPosX + 5), new Integer(iCompPosY - 10), IStep, new Short(curtabindex++), 90 + 8, slblAggregate, Integer.valueOf(iCompPosX + 5), Integer.valueOf(iCompPosY - 10), IStep, new Short(curtabindex++), 90 }); CurUnoDialog.insertLabel("lblFieldnames", new String[] @@ -112,7 +112,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - 8, slblFieldNames, new Integer(iCompPosX + 101), new Integer(iCompPosY - 10), IStep, new Short(curtabindex++), 90 + 8, slblFieldNames, Integer.valueOf(iCompPosX + 101), Integer.valueOf(iCompPosY - 10), IStep, new Short(curtabindex++), 90 }); this.setTotalFieldCount(1); FontDescriptor oFontDescriptor = new FontDescriptor(); @@ -127,7 +127,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - oFontDescriptor, 14, HelpIds.getHelpIdString(lastHelpIndex + 1), "+", new Integer(_iPosX + iCompWidth - 36), new Integer(iButtonPosY), IStep, new Short((curtabindex++)), 16 + oFontDescriptor, 14, HelpIds.getHelpIdString(lastHelpIndex + 1), "+", Integer.valueOf(_iPosX + iCompWidth - 36), Integer.valueOf(iButtonPosY), IStep, new Short((curtabindex++)), 16 }); CurUnoDialog.insertButton("btnminus", SOREMOVEROW, new ActionListenerImpl(), new String[] @@ -136,7 +136,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - oFontDescriptor, 14, HelpIds.getHelpIdString(lastHelpIndex + 2), "-", new Integer(_iPosX + iCompWidth - 16), new Integer(iButtonPosY), IStep, new Short(curtabindex++), 16 + oFontDescriptor, 14, HelpIds.getHelpIdString(lastHelpIndex + 2), "-", Integer.valueOf(_iPosX + iCompWidth - 16), Integer.valueOf(iButtonPosY), IStep, new Short(curtabindex++), 16 }); CurDBMetaData.Type = getQueryType(); } @@ -525,7 +525,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - Boolean.TRUE, 12, HelpIds.getHelpIdString(_curHelpID++), new Integer(iCompPosX + 4), new Integer(ypos), UIConsts.INVISIBLESTEP, sFunctions, new Short(curtabindex++), 88 + Boolean.TRUE, 12, HelpIds.getHelpIdString(_curHelpID++), Integer.valueOf(iCompPosX + 4), Integer.valueOf(ypos), UIConsts.INVISIBLESTEP, sFunctions, new Short(curtabindex++), 88 }); xFieldListBox = CurUnoDialog.insertListBox(getFieldsControlName(index), 1, null, new ItemListenerImpl(), @@ -535,7 +535,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - Boolean.TRUE, 12, HelpIds.getHelpIdString(_curHelpID++), new Integer(iCompPosX + 98), new Integer(ypos), UIConsts.INVISIBLESTEP, new Short(curtabindex++), 86 + Boolean.TRUE, 12, HelpIds.getHelpIdString(_curHelpID++), Integer.valueOf(iCompPosX + 98), Integer.valueOf(ypos), UIConsts.INVISIBLESTEP, new Short(curtabindex++), 86 }); lastHelpIndex = _curHelpID - 1; } diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index e6c084a6c7cd..b209d2f7e5e9 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -102,7 +102,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< sTableListBoxName = "lstTables_" + super.sIncSuffix; sTablePrefix = getTablePrefix(); sQueryPrefix = getQueryPrefix(); - Integer LabelWidth = new Integer(getListboxWidth().intValue() + 6); + Integer LabelWidth = Integer.valueOf(getListboxWidth().intValue() + 6); // Label 'Tables or Queries' xlblTable = CurUnoDialog.insertLabel(sTableLabelName, new String[] diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 9fe81b84c2ce..6e055a0f901f 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -88,7 +88,7 @@ public abstract class ControlScroller this.curHelpIndex = _firsthelpindex; curtabindex = UnoDialog.setInitialTabindex(iStep); this.linedistance = _nlinedistance; - IStep = new Integer(iStep); + IStep = Integer.valueOf(iStep); this.iCompPosX = _iCompPosX; this.iCompPosY = _iCompPosY; this.iCompWidth = _iCompWidth; @@ -105,7 +105,7 @@ public abstract class ControlScroller }, new Object[] { - new Short((short) 0), Boolean.TRUE, new Integer(ScrollHeight), HelpIds.getHelpIdString(curHelpIndex), new Integer(ScrollBarOrientation.VERTICAL), new Integer(iCompPosX + iCompWidth - iScrollBarWidth - 1), new Integer(iCompPosY + 1), IStep, new Integer(iScrollBarWidth) + new Short((short) 0), Boolean.TRUE, Integer.valueOf(ScrollHeight), HelpIds.getHelpIdString(curHelpIndex), Integer.valueOf(ScrollBarOrientation.VERTICAL), Integer.valueOf(iCompPosX + iCompWidth - iScrollBarWidth - 1), Integer.valueOf(iCompPosY + 1), IStep, Integer.valueOf(iScrollBarWidth) }); scrollfields = new ArrayList<PropertyValue[]>(); int ypos = iStartPosY + SORELFIRSTPOSY; @@ -128,7 +128,7 @@ public abstract class ControlScroller ntotfieldcount = _ntotfieldcount; setCurFieldCount(); nscrollvalue = 0; - Helper.setUnoPropertyValue(UnoDialog.getModel(xScrollBar), "ScrollValue", new Integer(nscrollvalue)); + Helper.setUnoPropertyValue(UnoDialog.getModel(xScrollBar), "ScrollValue", Integer.valueOf(nscrollvalue)); if (ntotfieldcount > nblockincrement) { Helper.setUnoPropertyValues(UnoDialog.getModel(xScrollBar), new String[] @@ -136,7 +136,7 @@ public abstract class ControlScroller PropertyNames.PROPERTY_ENABLED, "BlockIncrement", "LineIncrement", "ScrollValue", "ScrollValueMax" }, new Object[] { - Boolean.TRUE, new Integer(nblockincrement), new Integer(nlineincrement), new Integer(nscrollvalue), new Integer(ntotfieldcount - nblockincrement) + Boolean.TRUE, Integer.valueOf(nblockincrement), Integer.valueOf(nlineincrement), Integer.valueOf(nscrollvalue), Integer.valueOf(ntotfieldcount - nblockincrement) }); } else @@ -146,7 +146,7 @@ public abstract class ControlScroller PropertyNames.PROPERTY_ENABLED, "ScrollValue" }, new Object[] { - Boolean.FALSE, new Integer(nscrollvalue) + Boolean.FALSE, Integer.valueOf(nscrollvalue) }); } fillupControls(true); @@ -197,7 +197,7 @@ public abstract class ControlScroller { if (_nscrollvalue >= 0) { - Helper.setUnoPropertyValue(UnoDialog.getModel(xScrollBar), "ScrollValue", new Integer(_nscrollvalue)); + Helper.setUnoPropertyValue(UnoDialog.getModel(xScrollBar), "ScrollValue", Integer.valueOf(_nscrollvalue)); scrollControls(); } } @@ -241,7 +241,7 @@ public abstract class ControlScroller PropertyNames.PROPERTY_ENABLED, "ScrollValueMax" }, new Object[] { - Boolean.TRUE, new Integer(ntotfieldcount - nblockincrement) + Boolean.TRUE, Integer.valueOf(ntotfieldcount - nblockincrement) }); } else diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java index 779eadaba4d5..b9946e21a003 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -49,7 +49,7 @@ public abstract class DBLimitedFieldSelection FirstHelpIndex = _FirstHelpIndex; curtabindex = (short) (iStep * 100); sNoField = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 8); - IStep = new Integer(iStep); + IStep = Integer.valueOf(iStep); iCompPosX = _iCompPosX; iCurPosY = iCompPosY; for (int i = 0; i < rowcount; i++) diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index ba3d83e261a2..4c6e23dec1d0 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -184,22 +184,22 @@ public class FieldSelection final int lblHeight = 8; final int lblVertiDist = 2; - ListBoxWidth = new Integer(((CompWidth - 3 * cmdButtonHoriDist - 2 * cmdButtonWidth) / 2)); - Integer cmdShiftButtonPosX = new Integer((CompPosX + ListBoxWidth.intValue() + cmdButtonHoriDist)); - Integer ListBoxPosY = new Integer(CompPosY + lblVertiDist + lblHeight); - Integer ListBoxHeight = new Integer(CompHeight - 8 - 2); - SelListBoxPosX = new Integer(cmdShiftButtonPosX.intValue() + cmdButtonWidth + cmdButtonHoriDist); + ListBoxWidth = Integer.valueOf(((CompWidth - 3 * cmdButtonHoriDist - 2 * cmdButtonWidth) / 2)); + Integer cmdShiftButtonPosX = Integer.valueOf((CompPosX + ListBoxWidth.intValue() + cmdButtonHoriDist)); + Integer ListBoxPosY = Integer.valueOf(CompPosY + lblVertiDist + lblHeight); + Integer ListBoxHeight = Integer.valueOf(CompHeight - 8 - 2); + SelListBoxPosX = Integer.valueOf(cmdShiftButtonPosX.intValue() + cmdButtonWidth + cmdButtonHoriDist); - IStep = new Integer(_iStep); + IStep = Integer.valueOf(_iStep); if (bshowFourButtons) { ShiftButtonCount = 4; } Integer[] ShiftButtonPosY = getYButtonPositions(ShiftButtonCount); Integer[] MoveButtonPosY = getYButtonPositions(2); - Integer cmdMoveButtonPosX = new Integer(SelListBoxPosX.intValue() + ListBoxWidth.intValue() + cmdButtonHoriDist); + Integer cmdMoveButtonPosX = Integer.valueOf(SelListBoxPosX.intValue() + ListBoxWidth.intValue() + cmdButtonHoriDist); - Integer CmdButtonWidth = new Integer(cmdButtonWidth); + Integer CmdButtonWidth = Integer.valueOf(cmdButtonWidth); sIncSuffix = "_" + com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "lblFields_"); @@ -211,7 +211,7 @@ public class FieldSelection }, new Object[] { - 8, slblFields, new Integer(CompPosX), new Integer(CompPosY), IStep, new Short(curtabindex), 109 + 8, slblFields, Integer.valueOf(CompPosX), Integer.valueOf(CompPosY), IStep, new Short(curtabindex), 109 }); // Listbox 'Available fields' @@ -222,7 +222,7 @@ public class FieldSelection }, new Object[] { - ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex), Boolean.TRUE, new Integer(CompPosX), ListBoxPosY, IStep, new Short((curtabindex++)), ListBoxWidth + ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex), Boolean.TRUE, Integer.valueOf(CompPosX), ListBoxPosY, IStep, new Short((curtabindex++)), ListBoxWidth }); Object btnmoveselected = CurUnoDialog.insertButton("cmdMoveSelected" + sIncSuffix, SOCMDMOVESEL, new ActionListenerImpl(), @@ -281,7 +281,7 @@ public class FieldSelection }, new Object[] { - 8, slblSelFields, SelListBoxPosX, new Integer(CompPosY), IStep, new Short(curtabindex++), ListBoxWidth + 8, slblSelFields, SelListBoxPosX, Integer.valueOf(CompPosY), IStep, new Short(curtabindex++), ListBoxWidth }); // ListBox 'Fields in the form' @@ -353,12 +353,12 @@ public class FieldSelection final int cmdButtonHeight = 14; final int cmdButtonVertiDist = 2; - YPosArray[0] = new Integer( (CompPosY + 10 + (((CompHeight - 10) - (ButtonCount * cmdButtonHeight) - ((ButtonCount - 1) * cmdButtonVertiDist)) / 2))); + YPosArray[0] = Integer.valueOf( (CompPosY + 10 + (((CompHeight - 10) - (ButtonCount * cmdButtonHeight) - ((ButtonCount - 1) * cmdButtonVertiDist)) / 2))); if (ButtonCount > 1) { for (int i = 1; i < ButtonCount; i++) { - YPosArray[i] = new Integer(YPosArray[i - 1].intValue() + cmdButtonHeight + cmdButtonVertiDist); + YPosArray[i] = Integer.valueOf(YPosArray[i - 1].intValue() + cmdButtonHeight + cmdButtonVertiDist); } } return YPosArray; diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 0b45dc4cc626..61975f4bad20 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -77,7 +77,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener private ImageKeyListener imageKeyListener; private static final Integer BACKGROUND_COLOR = 16777216; private final static Short HIDE_PAGE = new Short((short) 99); - private final static Integer TRANSPARENT = new Integer(-1); + private final static Integer TRANSPARENT = Integer.valueOf(-1); private final static int LINE_HEIGHT = 8; private MethodInvocation METHOD_MOUSE_PRESSED; @@ -151,11 +151,11 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener { BACKGROUND_COLOR, new Short((short) 1), - new Integer((imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), - new Integer(pos.Width), - new Integer(pos.Height), + Integer.valueOf((imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), + Integer.valueOf(pos.Width), + Integer.valueOf(pos.Height), step, - new Integer((imageSize.Width + gap.Width) * cols + gap.Width) + Integer.valueOf((imageSize.Width + gap.Width) * cols + gap.Width) }); opeerConfig.setPeerProperties(imgContainer, new String[] @@ -184,13 +184,13 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener { TRANSPARENT, new Short((short) 1), - new Integer(imageSize.Height + (selectionGap.Height * 2)), + Integer.valueOf(imageSize.Height + (selectionGap.Height * 2)), //height 0, //posx 0, //posy step, Boolean.TRUE, - new Integer(selectionWidth) + Integer.valueOf(selectionWidth) }); XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, grbxSelectedImage); @@ -210,14 +210,14 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener lblImageText = dialog.insertLabel(name + "_imageText", pNames1, new Object[] { - new Integer(imageTextHeight), + Integer.valueOf(imageTextHeight), PropertyNames.EMPTY_STRING, - new Integer(pos.Width + 1), - new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height), + Integer.valueOf(pos.Width + 1), + Integer.valueOf(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height), step, new Short((short) 0), Boolean.FALSE, - new Integer(cols * (imageSize.Width + gap.Width) + gap.Width - 2) + Integer.valueOf(cols * (imageSize.Width + gap.Width) + gap.Width - 2) }); @@ -229,8 +229,8 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener { btnSize, HelpIds.getHelpIdString(helpURL++), - new Integer(pos.Width), - new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), + Integer.valueOf(pos.Width), + Integer.valueOf(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, new Short((short) (tabIndex + 1)), Boolean.TRUE, @@ -241,8 +241,8 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener { btnSize, HelpIds.getHelpIdString(helpURL++), - new Integer(pos.Width + (imageSize.Width + gap.Width) * cols + gap.Width - btnSize.intValue() + 1), - new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), + Integer.valueOf(pos.Width + (imageSize.Width + gap.Width) * cols + gap.Width - btnSize.intValue() + 1), + Integer.valueOf(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, new Short((short) (tabIndex + 2)), Boolean.TRUE, @@ -251,14 +251,14 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener lblCounter = dialog.insertLabel(name + "_lblCounter", pNames1, new Object[] { - new Integer(LINE_HEIGHT), + Integer.valueOf(LINE_HEIGHT), PropertyNames.EMPTY_STRING, - new Integer(pos.Width + btnSize.intValue() + 1), - new Integer(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + ((btnSize.intValue() - LINE_HEIGHT) / 2)), + Integer.valueOf(pos.Width + btnSize.intValue() + 1), + Integer.valueOf(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + ((btnSize.intValue() - LINE_HEIGHT) / 2)), step, new Short((short) 0), Boolean.FALSE, - new Integer(cols * (imageSize.Width + gap.Width) + gap.Width - 2 * btnSize.intValue() - 1) + Integer.valueOf(cols * (imageSize.Width + gap.Width) + gap.Width - 2 * btnSize.intValue() - 1) }); Helper.setUnoPropertyValue(getModel(lblCounter), PropertyNames.PROPERTY_ALIGN, new Short((short) 1)); @@ -282,8 +282,8 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener e.printStackTrace(); } - m_imageHeight = new Integer(imageSize.Height); - m_imageWidth = new Integer(imageSize.Width); + m_imageHeight = Integer.valueOf(imageSize.Height); + m_imageWidth = Integer.valueOf(imageSize.Width); for (int r = 0; r < rows; r++) { @@ -326,8 +326,8 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener BACKGROUND_COLOR, m_imageHeight, HelpIds.getHelpIdString(helpURL++), - new Integer(getImagePosX(_col)), - new Integer(getImagePosY(_row)), + Integer.valueOf(getImagePosX(_col)), + Integer.valueOf(getImagePosY(_row)), scaleImages, step, m_tabIndex, @@ -442,8 +442,8 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener int row = image / cols; int col = rowSelect ? 0 : image - (row * cols); - MOVE_SELECTION_VALS[0] = new Integer(getImagePosX(col) - selectionGap.Width); - MOVE_SELECTION_VALS[1] = new Integer(getImagePosY(row) - selectionGap.Height); + MOVE_SELECTION_VALS[0] = Integer.valueOf(getImagePosX(col) - selectionGap.Width); + MOVE_SELECTION_VALS[1] = Integer.valueOf(getImagePosY(row) - selectionGap.Height); Helper.setUnoPropertyValues(getModel(grbxSelectedImage), MOVE_SELECTION, MOVE_SELECTION_VALS); diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java b/wizards/com/sun/star/wizards/ui/PathSelection.java index 2c108687bd0c..9b1123ce8440 100644 --- a/wizards/com/sun/star/wizards/ui/PathSelection.java +++ b/wizards/com/sun/star/wizards/ui/PathSelection.java @@ -69,7 +69,7 @@ public class PathSelection PropertyNames.PROPERTY_ENABLED, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH }, new Object[] { - Boolean.valueOf(Enabled), 8, LabelText, new Integer(XPos), new Integer(YPos), new Integer(DialogStep), new Short(CurTabIndex), new Integer(Width) + Boolean.valueOf(Enabled), 8, LabelText, Integer.valueOf(XPos), Integer.valueOf(YPos), Integer.valueOf(DialogStep), new Short(CurTabIndex), Integer.valueOf(Width) }); xSaveTextBox = CurUnoDialog.insertTextField("txtSavePath", "callXPathSelectionListener", this, new String[] @@ -77,7 +77,7 @@ public class PathSelection PropertyNames.PROPERTY_ENABLED, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH }, new Object[] { - Boolean.valueOf(Enabled), 12, TxtHelpURL, new Integer(XPos), new Integer(YPos + 10), new Integer(DialogStep), new Short((short) (CurTabIndex + 1)), new Integer(Width - 26) + Boolean.valueOf(Enabled), 12, TxtHelpURL, Integer.valueOf(XPos), Integer.valueOf(YPos + 10), Integer.valueOf(DialogStep), new Short((short) (CurTabIndex + 1)), Integer.valueOf(Width - 26) }); CurUnoDialog.setControlProperty("txtSavePath", PropertyNames.PROPERTY_ENABLED, Boolean.FALSE); CurUnoDialog.insertButton("cmdSelectPath", "triggerPathPicker", this, new String[] @@ -85,7 +85,7 @@ public class PathSelection PropertyNames.PROPERTY_ENABLED, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH }, new Object[] { - Boolean.valueOf(Enabled), 14, BtnHelpURL, "...", new Integer(XPos + Width - 16), new Integer(YPos + 9), new Integer(DialogStep), new Short((short) (CurTabIndex + 2)), 16 + Boolean.valueOf(Enabled), 14, BtnHelpURL, "...", Integer.valueOf(XPos + Width - 16), Integer.valueOf(YPos + 9), Integer.valueOf(DialogStep), new Short((short) (CurTabIndex + 2)), 16 }); } diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index 36bc2f4a5af4..53f2ba76c1e0 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -182,7 +182,7 @@ public class PeerConfig implements XWindowListener */ public void setImageUrl(Object _ocontrolmodel, int _nResId, int _nhcResId) { - ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, new Integer(_nResId), new Integer(_nhcResId)); + ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, Integer.valueOf(_nResId), Integer.valueOf(_nhcResId)); this.aImageUrlTasks.add(oImageUrlTask); } diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index 93687627c64c..b7fe1e23352e 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -69,15 +69,15 @@ public class SortingComponent { this.CurUnoDialog = CurUnoDialog; short curtabindex = UnoDialog.setInitialTabindex(iStep); - Integer IStep = new Integer(iStep); - Integer ICompPosX = new Integer(iCompPosX); - Integer ICompWidth = new Integer(iCompWidth); + Integer IStep = Integer.valueOf(iStep); + Integer ICompPosX = Integer.valueOf(iCompPosX); + Integer ICompWidth = Integer.valueOf(iCompWidth); - Integer IListBoxPosX = new Integer(iCompPosX + 6); + Integer IListBoxPosX = Integer.valueOf(iCompPosX + 6); int iOptButtonWidth = 65; - Integer IOptButtonWidth = new Integer(iOptButtonWidth); - Integer IListBoxWidth = new Integer(iCompWidth - iOptButtonWidth - 12); - Integer IOptButtonPosX = new Integer(IListBoxPosX.intValue() + IListBoxWidth.intValue() + 6); + Integer IOptButtonWidth = Integer.valueOf(iOptButtonWidth); + Integer IListBoxWidth = Integer.valueOf(iCompWidth - iOptButtonWidth - 12); + Integer IOptButtonPosX = Integer.valueOf(IListBoxPosX.intValue() + IListBoxWidth.intValue() + 6); getResources(); boolean bDoEnable; String HIDString; @@ -90,7 +90,7 @@ public class SortingComponent PropertyNames.PROPERTY_ENABLED, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.ORIENTATION, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH }, new Object[] { - Boolean.valueOf(bDoEnable), 8, sSortHeader[i], 0, ICompPosX, new Integer(iCurPosY), IStep, new Short(curtabindex++), ICompWidth + Boolean.valueOf(bDoEnable), 8, sSortHeader[i], 0, ICompPosX, Integer.valueOf(iCurPosY), IStep, new Short(curtabindex++), ICompWidth }); HIDString = HelpIds.getHelpIdString(FirstHelpIndex); @@ -99,7 +99,7 @@ public class SortingComponent "Dropdown", PropertyNames.PROPERTY_ENABLED, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, "LineCount", PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH }, new Object[] { - true, bDoEnable, 12, HIDString, new Short(UnoDialog.getListBoxLineCount()), "lstSort" + new Integer(i + 1), IListBoxPosX, new Integer(iCurPosY + 14), IStep, new Short(curtabindex++), IListBoxWidth + true, bDoEnable, 12, HIDString, new Short(UnoDialog.getListBoxLineCount()), "lstSort" + Integer.valueOf(i + 1), IListBoxPosX, Integer.valueOf(iCurPosY + 14), IStep, new Short(curtabindex++), IListBoxWidth }); //new Short((short) (17+i*4)) HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 1); @@ -108,7 +108,7 @@ public class SortingComponent PropertyNames.PROPERTY_ENABLED, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Tag", PropertyNames.PROPERTY_WIDTH }, new Object[] { - bDoEnable, 10, HIDString, sSortAscend[i], IOptButtonPosX, new Integer(iCurPosY + 10), new Short((short) 1), IStep, new Short(curtabindex++), PropertyNames.ASC, IOptButtonWidth + bDoEnable, 10, HIDString, sSortAscend[i], IOptButtonPosX, Integer.valueOf(iCurPosY + 10), new Short((short) 1), IStep, new Short(curtabindex++), PropertyNames.ASC, IOptButtonWidth }); //, new Short((short) (18+i*4)) HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 2); @@ -117,7 +117,7 @@ public class SortingComponent PropertyNames.PROPERTY_ENABLED, PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, "Tag", PropertyNames.PROPERTY_WIDTH }, new Object[] { - bDoEnable, 10, HIDString, sSortDescend[i], IOptButtonPosX, new Integer(iCurPosY + 24), new Short((short) 0), IStep, new Short(curtabindex++), "DESC", IOptButtonWidth + bDoEnable, 10, HIDString, sSortDescend[i], IOptButtonPosX, Integer.valueOf(iCurPosY + 24), new Short((short) 0), IStep, new Short(curtabindex++), "DESC", IOptButtonWidth }); //, new Short((short) (19+i*4)) iCurPosY = iCurPosY + 36; FirstHelpIndex += 3; diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index 4558077dfba7..85d8cab05ca1 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -46,14 +46,14 @@ public class TitlesComponent extends ControlScroller PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_WIDTH }, new Object[] { - 8, _slblColumnNames, new Integer(iLabelPosX), new Integer(iCompPosY - 10), IStep, 60 + 8, _slblColumnNames, Integer.valueOf(iLabelPosX), Integer.valueOf(iCompPosY - 10), IStep, 60 }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblColumnTitles", new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_WIDTH }, new Object[] { - 8, _slblColumnTitles, 90, new Integer(iCompPosY - 10), IStep, 152 + 8, _slblColumnTitles, 90, Integer.valueOf(iCompPosY - 10), IStep, 152 }); } @@ -104,7 +104,7 @@ public class TitlesComponent extends ControlScroller }, new Object[] { - 16, Boolean.TRUE, new Integer(iLabelPosX), new Integer(_iCompPosY + 1), UIConsts.INVISIBLESTEP, new Short(curtabindex++), 30 + 16, Boolean.TRUE, Integer.valueOf(iLabelPosX), Integer.valueOf(_iCompPosY + 1), UIConsts.INVISIBLESTEP, new Short(curtabindex++), 30 }); xTextComponent = CurUnoDialog.insertTextField(stextfieldname, 0, null, @@ -114,7 +114,7 @@ public class TitlesComponent extends ControlScroller }, new Object[] { - 12, HelpIds.getHelpIdString(curHelpIndex++), new Integer(iLabelPosX + 30), new Integer(_iCompPosY), UIConsts.INVISIBLESTEP, new Short(curtabindex++), new Integer(iCompWidth - 90 - 20) + 12, HelpIds.getHelpIdString(curHelpIndex++), Integer.valueOf(iLabelPosX + 30), Integer.valueOf(_iCompPosY), UIConsts.INVISIBLESTEP, new Short(curtabindex++), Integer.valueOf(iCompWidth - 90 - 20) }); } } @@ -147,9 +147,9 @@ public class TitlesComponent extends ControlScroller Size aSize = CurUnoDialog.getpreferredLabelSize(getColumnName(0), sLongestFieldName); double dblMAPConversion = CurUnoDialog.getMAPConversionFactor(getColumnName(0)); int iFieldNameWidth = getFieldNameWidth(aSize.Width, dblMAPConversion) + 10; - Integer FieldNameWidth = new Integer(iFieldNameWidth); - Integer TitlePosX = new Integer(iLabelPosX + iFieldNameWidth + 2); - Integer TitleWidth = new Integer(iCompPosX + iCompWidth - TitlePosX.intValue() - iScrollBarWidth - 6); + Integer FieldNameWidth = Integer.valueOf(iFieldNameWidth); + Integer TitlePosX = Integer.valueOf(iLabelPosX + iFieldNameWidth + 2); + Integer TitleWidth = Integer.valueOf(iCompPosX + iCompWidth - TitlePosX.intValue() - iScrollBarWidth - 6); for (short i = 0; i <= ncurfieldcount; i++) { CurUnoDialog.setControlProperty(getColumnName(i), PropertyNames.PROPERTY_WIDTH, FieldNameWidth); diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 9bc3bce63101..a6c40caf965c 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -281,7 +281,7 @@ public class UnoDialog implements EventNames { xButton.addActionListener(xActionListener); } - Integer ControlKey = new Integer(iControlKey); + Integer ControlKey = Integer.valueOf(iControlKey); if (ControlList != null) { ControlList.put(sName, ControlKey); @@ -306,7 +306,7 @@ public class UnoDialog implements EventNames { xScrollBar.addAdjustmentListener(xAdjustmentListener); } - Integer ControlKey = new Integer(iControlKey); + Integer ControlKey = Integer.valueOf(iControlKey); if (ControlList != null) { ControlList.put(sName, ControlKey); @@ -343,7 +343,7 @@ public class UnoDialog implements EventNames { xTextBox.addTextListener(xTextListener); } - Integer ControlKey = new Integer(iControlKey); + Integer ControlKey = Integer.valueOf(iControlKey); ControlList.put(sName, ControlKey); return xTextBox; } @@ -369,7 +369,7 @@ public class UnoDialog implements EventNames { xListBox.addActionListener(xActionListener); } - Integer ControlKey = new Integer(iControlKey); + Integer ControlKey = Integer.valueOf(iControlKey); ControlList.put(sName, ControlKey); return xListBox; } @@ -400,7 +400,7 @@ public class UnoDialog implements EventNames public XRadioButton insertRadioButton(String sName, int iControlKey, String[] sProperties, Object[] sValues) { XRadioButton xRadioButton = insertRadioButton(sName, sProperties, sValues); - Integer ControlKey = new Integer(iControlKey); + Integer ControlKey = Integer.valueOf(iControlKey); ControlList.put(sName, ControlKey); return xRadioButton; } @@ -439,7 +439,7 @@ public class UnoDialog implements EventNames int iCurDialogStep = AnyConverter.toInt(Helper.getUnoPropertyValue(this.xDialogModel, PropertyNames.PROPERTY_STEP)); if (bIsVisible) { - setControlProperty(controlname, PropertyNames.PROPERTY_STEP, new Integer(iCurDialogStep)); + setControlProperty(controlname, PropertyNames.PROPERTY_STEP, Integer.valueOf(iCurDialogStep)); } else { @@ -461,7 +461,7 @@ public class UnoDialog implements EventNames { int ncurstep = AnyConverter.toInt(Helper.getUnoPropertyValue(this.xDialogModel, PropertyNames.PROPERTY_STEP)); Helper.setUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_STEP, 99); - Helper.setUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_STEP, new Integer(ncurstep)); + Helper.setUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_STEP, Integer.valueOf(ncurstep)); } catch (com.sun.star.lang.IllegalArgumentException exception) { diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index 701d435ded3c..75eee42370eb 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -165,7 +165,7 @@ public class UnoDialog2 extends UnoDialog }, new Object[] { - new Short((short) 0), 10, UIConsts.INFOIMAGEURL, new Integer(_posx), new Integer(_posy), Boolean.FALSE, new Integer(_iStep), 10 + new Short((short) 0), 10, UIConsts.INFOIMAGEURL, Integer.valueOf(_posx), Integer.valueOf(_posy), Boolean.FALSE, Integer.valueOf(_iStep), 10 }); super.getPeerConfiguration().setImageUrl(getModel(xImgControl), UIConsts.INFOIMAGEURL, UIConsts.INFOIMAGEURL_HC); return xImgControl; diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 115e94fc1e9c..bdda2b7304cf 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -214,7 +214,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, new Object[] { - new Integer(iDialogHeight - 26), + Integer.valueOf(iDialogHeight - 26), 0, 0, 0, @@ -268,7 +268,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL Object oRoadmapItem = xSSFRoadmap.createInstance(); Helper.setUnoPropertyValue(oRoadmapItem, PropertyNames.PROPERTY_LABEL, _sLabel); Helper.setUnoPropertyValue(oRoadmapItem, PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(_bEnabled)); - Helper.setUnoPropertyValue(oRoadmapItem, "ID", new Integer(_CurItemID)); + Helper.setUnoPropertyValue(oRoadmapItem, "ID", Integer.valueOf(_CurItemID)); xIndexContRoadmap.insertByIndex(Index, oRoadmapItem); return Index + 1; } @@ -343,7 +343,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private void changeToStep(int nNewStep) { - Helper.setUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_STEP, new Integer(nNewStep)); + Helper.setUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_STEP, Integer.valueOf(nNewStep)); setCurrentRoadmapItemID((short) (nNewStep)); enableNextButton(getNextAvailableStep() > 0); enableBackButton(nNewStep != 1); @@ -383,9 +383,9 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL try { short curtabindex = UIConsts.SOFIRSTWIZARDNAVITABINDEX; - Integer IButtonWidth = new Integer(iButtonWidth); + Integer IButtonWidth = Integer.valueOf(iButtonWidth); int iButtonHeight = 14; - Integer IButtonHeight = new Integer(iButtonHeight); + Integer IButtonHeight = Integer.valueOf(iButtonHeight); Integer ICurStep = 0; int iDialogHeight = ((Integer) Helper.getUnoPropertyValue(this.xDialogModel, PropertyNames.PROPERTY_HEIGHT)).intValue(); int iDialogWidth = ((Integer) Helper.getUnoPropertyValue(this.xDialogModel, PropertyNames.PROPERTY_WIDTH)).intValue(); @@ -403,7 +403,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, new Object[] { - 1, 0, 0, new Integer(iDialogHeight - 26), ICurStep, new Integer(iDialogWidth) + 1, 0, 0, Integer.valueOf(iDialogHeight - 26), ICurStep, Integer.valueOf(iDialogWidth) }); insertControlModel("com.sun.star.awt.UnoControlFixedLineModel", "lnRoadSep", @@ -413,7 +413,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, new Object[] { - new Integer(iBtnPosY - 6), 1, 85, 0, ICurStep, 1 + Integer.valueOf(iBtnPosY - 6), 1, 85, 0, ICurStep, 1 }); String[] propNames = new String[] @@ -428,30 +428,30 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, new Object[] { - true, IButtonHeight, oWizardResource.getResText(UIConsts.RID_COMMON + 15), new Integer(iHelpPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.HELP_value), ICurStep, new Short(curtabindex++), IButtonWidth + true, IButtonHeight, oWizardResource.getResText(UIConsts.RID_COMMON + 15), Integer.valueOf(iHelpPosX), Integer.valueOf(iBtnPosY), new Short((short) PushButtonType.HELP_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardBack", BACK_ACTION_PERFORMED, propNames, new Object[] { - false, IButtonHeight, HelpIds.getHelpIdString(hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), new Integer(iBackPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + false, IButtonHeight, HelpIds.getHelpIdString(hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), Integer.valueOf(iBackPosX), Integer.valueOf(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardNext", NEXT_ACTION_PERFORMED, propNames, new Object[] { - true, IButtonHeight, HelpIds.getHelpIdString(hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), new Integer(iNextPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + true, IButtonHeight, HelpIds.getHelpIdString(hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), Integer.valueOf(iNextPosX), Integer.valueOf(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardFinish", FINISH_ACTION_PERFORMED, propNames, new Object[] { - true, IButtonHeight, HelpIds.getHelpIdString(hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), new Integer(iFinishPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + true, IButtonHeight, HelpIds.getHelpIdString(hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), Integer.valueOf(iFinishPosX), Integer.valueOf(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); insertButton("btnWizardCancel", CANCEL_ACTION_PERFORMED, propNames, new Object[] { - true, IButtonHeight, HelpIds.getHelpIdString(hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), new Integer(iCancelPosX), new Integer(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth + true, IButtonHeight, HelpIds.getHelpIdString(hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), Integer.valueOf(iCancelPosX), Integer.valueOf(iBtnPosY), new Short((short) PushButtonType.STANDARD_value), ICurStep, new Short(curtabindex++), IButtonWidth }); setControlProperty("btnWizardNext", "DefaultButton", Boolean.TRUE); @@ -616,7 +616,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, new Object[] { - oFontDesc, 16, sRightPaneHeaders[i], Boolean.TRUE, 91, 8, new Integer(i + 1), new Short((short) 12), 212 + oFontDesc, 16, sRightPaneHeaders[i], Boolean.TRUE, 91, 8, Integer.valueOf(i + 1), new Short((short) 12), 212 }); } } diff --git a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java index 45c4a5b089e6..3920029e8d74 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java @@ -306,7 +306,7 @@ public class DataAwareFields } else { - return new Integer(s); + return Integer.valueOf(s); } } else if (convertTo.equals(Double.class)) @@ -473,7 +473,7 @@ public class DataAwareFields { if (c.equals(Integer.class)) { - return new Integer((int) i); + return Integer.valueOf((int) i); } else if (c.equals(Short.class)) { diff --git a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java index 583ff5b8c8d5..d0c50f67583d 100644 --- a/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/RadioDataAware.java @@ -66,10 +66,10 @@ public class RadioDataAware extends DataAware { if (radioButtons[i].getState()) { - return new Integer(i); + return Integer.valueOf(i); } } - return new Integer(-1); + return Integer.valueOf(-1); } public static DataAware attachRadioButtons(Object data, String dataProp, Object[] buttons, final Listener listener, boolean field) diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index 4ed8f865c9bf..0234a1b4a6ea 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java @@ -542,7 +542,7 @@ public class ParaStyle extends Style implements Cloneable { if (isSet[LINE_HEIGHT]) { String stringVal; if ((value[LINE_HEIGHT] & LH_PCT) != 0) - stringVal = (new Integer(value[LINE_HEIGHT] & LH_VALUEMASK)).toString() + "%"; + stringVal = (Integer.valueOf(value[LINE_HEIGHT] & LH_VALUEMASK)).toString() + "%"; else { double temp = (value[LINE_HEIGHT] & LH_VALUEMASK) / 100.0; stringVal = (new Double(temp)).toString() + "mm"; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java index c3b4857e7f5c..9c79c9898c9f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java @@ -559,7 +559,7 @@ public class TextStyle extends Style implements Cloneable { node.setAttribute("style:text-position", "sub 58%"); if (sizeInPoints != 0) { - Integer fs = new Integer(sizeInPoints); + Integer fs = Integer.valueOf(sizeInPoints); node.setAttribute("fo:font-size", fs.toString() + "pt"); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java index e907dd481822..1bde03f48da2 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java @@ -412,7 +412,7 @@ public class CellStyle extends Style implements Cloneable { node.setAttribute("style:text-position", "sub 58%"); if (fmt.getFontSize() != 0) { - Integer fs = new Integer(fmt.getFontSize()); + Integer fs = Integer.valueOf(fmt.getFontSize()); node.setAttribute("fo:font-size", fs.toString() + "pt"); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java index c9bee878fd23..c79abc3a1406 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java @@ -400,7 +400,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, // Get the number of times the row is repeated String rowsRepeatedString = rowsRepeatedNode.getNodeValue(); - Integer rowsRepeatedInt = new Integer(rowsRepeatedString); + Integer rowsRepeatedInt = Integer.valueOf(rowsRepeatedString); rowsRepeated = rowsRepeatedInt.intValue(); @@ -594,7 +594,7 @@ public abstract class SxcDocumentSerializer implements OfficeConstants, // Get the number of times the cell is repeated String colsRepeatedString = colsRepeatedNode.getNodeValue(); - Integer colsRepeatedInt = new Integer(colsRepeatedString); + Integer colsRepeatedInt = Integer.valueOf(colsRepeatedString); colsRepeated = colsRepeatedInt.intValue(); } else { diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java index f66c71abed06..ba76967ea63f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/IntArrayList.java @@ -81,7 +81,7 @@ public class IntArrayList { int needToAdd = minCapacity - list.size(); if (needToAdd > 0) { for (int i = 0; i < needToAdd; i++) { - list.add(new Integer(fillValue)); + list.add(Integer.valueOf(fillValue)); } } } @@ -97,7 +97,7 @@ public class IntArrayList { * selected element of the list. */ public void set(int index, int value) { - list.set(index, new Integer(value)); + list.set(index, Integer.valueOf(value)); } @@ -108,7 +108,7 @@ public class IntArrayList { * element that we are appending to the list. */ public void add(int value) { - list.add(new Integer(value)); + list.add(Integer.valueOf(value)); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java index 35cf0eb9bbad..eef2ded2e76f 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java @@ -101,7 +101,7 @@ public class OfficeUtil implements OfficeConstants { Element spaceNode = parentDoc.createElement(TAG_SPACE); spaceNode.setAttribute(ATTRIBUTE_SPACE_COUNT, - new Integer(nrSpaces).toString()); + Integer.valueOf(nrSpaces).toString()); nodeVec.add(spaceNode); text = text.substring(nrSpaces); } |