diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-12 15:12:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-08-19 14:57:18 +0200 |
| commit | 0764292c5dcb7daa62e9adeb1ac9af1dbe14066f (patch) | |
| tree | 17a4e9f2393d23aaba1e68bbc944aa8e18b9e2f6 | |
| parent | 8a2c6c29af41cd7a62f37861fb0d4e81a857bb45 (diff) | |
java: use 'Short.valueOf' instead of 'new Short'
Change-Id: Icef19ef61ee0af2dd3bda527263934006271f219
132 files changed, 445 insertions, 445 deletions
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/com/sun/star/comp/beans/OOoBean.java index 1f3612ffa166..9bbf6ad07e6e 100644 --- a/bean/com/sun/star/comp/beans/OOoBean.java +++ b/bean/com/sun/star/comp/beans/OOoBean.java @@ -595,7 +595,7 @@ public class OOoBean com.sun.star.beans.PropertyValue aArgs[] = addArgument( aArguments, new com.sun.star.beans.PropertyValue( "MacroExecutionMode", -1, - new Short( com.sun.star.document.MacroExecMode.USE_CONFIG ), + Short.valueOf( com.sun.star.document.MacroExecMode.USE_CONFIG ), com.sun.star.beans.PropertyState.DIRECT_VALUE ) ); com.sun.star.lang.XComponent xComponent = xLoader.loadComponentFromURL( diff --git a/bridges/test/java_remote/PolyStructTest.java b/bridges/test/java_remote/PolyStructTest.java index affb828a80cf..bfa0aa7fe6fc 100644 --- a/bridges/test/java_remote/PolyStructTest.java +++ b/bridges/test/java_remote/PolyStructTest.java @@ -70,16 +70,16 @@ public final class PolyStructTest extends ComplexTestCase { new TestPolyStruct(new Byte(Byte.MAX_VALUE))).member); assertEquals( - new Short((short) 0), + Short.valueOf((short) 0), t.transportShort(new TestPolyStruct()).member); assertEquals( - new Short(Short.MIN_VALUE), + Short.valueOf(Short.MIN_VALUE), t.transportShort( - new TestPolyStruct(new Short(Short.MIN_VALUE))).member); + new TestPolyStruct(Short.valueOf(Short.MIN_VALUE))).member); assertEquals( - new Short(Short.MAX_VALUE), + Short.valueOf(Short.MAX_VALUE), t.transportShort( - new TestPolyStruct(new Short(Short.MAX_VALUE))).member); + new TestPolyStruct(Short.valueOf(Short.MAX_VALUE))).member); assertEquals( Integer.valueOf(0), t.transportLong(new TestPolyStruct()).member); diff --git a/bridges/test/java_uno/any/TestAny.java b/bridges/test/java_uno/any/TestAny.java index 7e1d0dc7ef50..861fc17623c5 100644 --- a/bridges/test/java_uno/any/TestAny.java +++ b/bridges/test/java_uno/any/TestAny.java @@ -140,31 +140,31 @@ final class TestAny { new CompareUnboxed()); // SHORT: - success &= testMapAny(transport, new Short((short) -32768), + success &= testMapAny(transport, Short.valueOf((short) -32768), new CompareBoxed()); - success &= testMapAny(transport, new Short((short) 0), + success &= testMapAny(transport, Short.valueOf((short) 0), new CompareBoxed()); - success &= testMapAny(transport, new Short((short) 32767), + success &= testMapAny(transport, Short.valueOf((short) 32767), new CompareBoxed()); success &= testMapAny(transport, new Any(Type.SHORT, - new Short((short) -32768)), + Short.valueOf((short) -32768)), new CompareUnboxed()); success &= testMapAny(transport, - new Any(Type.SHORT, new Short((short) 0)), + new Any(Type.SHORT, Short.valueOf((short) 0)), new CompareUnboxed()); success &= testMapAny(transport, - new Any(Type.SHORT, new Short((short) 32767)), + new Any(Type.SHORT, Short.valueOf((short) 32767)), new CompareUnboxed()); // UNSIGNED SHORT: success &= testMapAny(transport, new Any(Type.UNSIGNED_SHORT, - new Short((short) 0)), + Short.valueOf((short) 0)), new CompareBoxed()); success &= testMapAny(transport, new Any(Type.UNSIGNED_SHORT, - new Short((short) -32768)), + Short.valueOf((short) -32768)), new CompareBoxed()); // LONG: diff --git a/comphelper/qa/complex/comphelper/Map.java b/comphelper/qa/complex/comphelper/Map.java index 9ff558a44b2c..a08c2c8855eb 100644 --- a/comphelper/qa/complex/comphelper/Map.java +++ b/comphelper/qa/complex/comphelper/Map.java @@ -235,7 +235,7 @@ public class Map /* extends complexlib.ComplexTestCase */ switch ( _pos ) { case 0: someValue = Boolean.FALSE; break; - case 1: someValue = new Short( (short)0 ); break; + case 1: someValue = Short.valueOf( (short)0 ); break; case 2: someValue = Integer.valueOf( 0 ); break; case 3: someValue = Long.valueOf( 0 ); break; case 4: someValue = UnoRuntime.queryInterface( XInterface.class, new DummyInterface() ); break; diff --git a/forms/qa/integration/forms/CellBinding.java b/forms/qa/integration/forms/CellBinding.java index 170feb9d1c0a..d039aee762a2 100644 --- a/forms/qa/integration/forms/CellBinding.java +++ b/forms/qa/integration/forms/CellBinding.java @@ -222,7 +222,7 @@ public class CellBinding extends complexlib.ComplexTestCase bindToCell( checkBox, col, row ); // initialize with "not checked" - checkBox.setPropertyValue( "State", new Short( (short)0 ) ); + checkBox.setPropertyValue( "State", Short.valueOf( (short)0 ) ); verifyNumericCellContent( col, row, 0, "programmatically unchecking the check box is not propagated to the cell." ); // first click: "not checked" -> "checked" @@ -253,7 +253,7 @@ public class CellBinding extends complexlib.ComplexTestCase bindToCell( checkBox, col, row ); // initialize with "not checked" - checkBox.setPropertyValue( "State", new Short( (short)0 ) ); + checkBox.setPropertyValue( "State", Short.valueOf( (short)0 ) ); verifyNumericCellContent( col, row, 0, "programmatically unchecking the check box is not propagated to the cell." ); // first click: "not checked" -> "checked" @@ -524,7 +524,7 @@ public class CellBinding extends complexlib.ComplexTestCase XAccessibleValue xValue = UnoRuntime.queryInterface( XAccessibleValue.class, accessible.getAccessibleContext() ); - xValue.setCurrentValue( new Short( state ) ); + xValue.setCurrentValue( Short.valueOf( state ) ); } /* ------------------------------------------------------------------ */ diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index 323b15f74715..d78fd581d133 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -223,7 +223,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE } XPropertySet checkModel = getControlModel( "f_tinyint" ); - checkModel.setPropertyValue( "State", new Short( (short)0 ) ); + checkModel.setPropertyValue( "State", Short.valueOf( (short)0 ) ); // setting the state of the check box needs to be reflected in the formatted field immediately if ( !checkDoubleValue( 0, "f_tinyint_format", "EffectiveValue" ) ) @@ -233,7 +233,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE } // same for the "indetermined" state of the check box - checkModel.setPropertyValue( "State", new Short( (short)2 ) ); + checkModel.setPropertyValue( "State", Short.valueOf( (short)2 ) ); if ( !checkNullValue( "f_tinyint_format", "EffectiveValue" ) ) { failed( "cross-update failed: updating the check box should result in updating the same-bound formatted field (2)!" ); @@ -294,7 +294,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE } XPropertySet radioModel = getRadioModel( "radio_group", "normal" ); - radioModel.setPropertyValue( "State", new Short( (short)1 ) ); + radioModel.setPropertyValue( "State", Short.valueOf( (short)1 ) ); // setting the state of the radio button needs to be reflected in the formatted field immediately if ( !checkStringValue( "normal", "f_text_enum_text", "Text" ) ) @@ -304,7 +304,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE } // same for the "indetermined" state of the check box - getRadioModel( "radio_group", "important" ).setPropertyValue( "State", new Short( (short)1 ) ); + getRadioModel( "radio_group", "important" ).setPropertyValue( "State", Short.valueOf( (short)1 ) ); if ( !checkStringValue( "important", "f_text_enum_text", "Text" ) ) { failed( "cross-update failed: updating the radio button should result in updating the same-bound text field (2)!" ); @@ -526,12 +526,12 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE m_formLayer.insertControlLine( "DatabaseFormattedField","f_tinyint", "_format",80, 41, 6 ); m_formLayer.insertControlLine( "DatabaseTextField", "dummy", "", 150 ); - xIDField.setPropertyValue( "DecimalAccuracy", new Short( (short)0 ) ); + xIDField.setPropertyValue( "DecimalAccuracy", Short.valueOf( (short)0 ) ); xImageField.setPropertyValue( "ScaleImage", Boolean.TRUE ); xImageField.setPropertyValue( "Tabstop", Boolean.TRUE ); xCheckBox.setPropertyValue( "TriState", Boolean.TRUE ); - xCheckBox.setPropertyValue( "DefaultState", new Short( (short)2 ) ); - xTimeField.setPropertyValue( "TimeFormat", new Short( (short)1 ) ); + xCheckBox.setPropertyValue( "DefaultState", Short.valueOf( (short)2 ) ); + xTimeField.setPropertyValue( "TimeFormat", Short.valueOf( (short)1 ) ); xTimeField.setPropertyValue( "TimeMax", Integer.valueOf( 23595999 ) ); xReqField.setPropertyValue( "ConvertEmptyToNull", Boolean.FALSE ); diff --git a/forms/qa/integration/forms/FormLayer.java b/forms/qa/integration/forms/FormLayer.java index ed684be68bae..a86f6f1aeb6b 100644 --- a/forms/qa/integration/forms/FormLayer.java +++ b/forms/qa/integration/forms/FormLayer.java @@ -217,7 +217,7 @@ public class FormLayer xFieldModel.setPropertyValue( "DataField", sFieldName ); if ( xFieldModel.getPropertySetInfo().hasPropertyByName( "Border" ) ) { - xFieldModel.setPropertyValue( "Border", new Short( VisualEffect.FLAT ) ); + xFieldModel.setPropertyValue( "Border", Short.valueOf( VisualEffect.FLAT ) ); if ( xFieldModel.getPropertySetInfo().hasPropertyByName( "BorderColor" ) ) xFieldModel.setPropertyValue( "BorderColor", Integer.valueOf( 0x00C0C0C0 ) ); } diff --git a/forms/qa/integration/forms/ListBox.java b/forms/qa/integration/forms/ListBox.java index 60f115df6221..1d1275127e82 100644 --- a/forms/qa/integration/forms/ListBox.java +++ b/forms/qa/integration/forms/ListBox.java @@ -277,7 +277,7 @@ public class ListBox extends TestCase listBoxModel.setPropertyValue( "ListSourceType", ListSourceType.SQL ); listBoxModel.setPropertyValue( "ListSource", new String[] { "SELECT \"content\", \"" + columnPKName + "\" FROM \"" + tableName + "\"" } ); - listBoxModel.setPropertyValue( "BoundColumn", new Short( (short)1 ) ); + listBoxModel.setPropertyValue( "BoundColumn", Short.valueOf( (short)1 ) ); } m_document.getCurrentView().toggleFormDesignMode(); diff --git a/forms/qa/integration/forms/MasterDetailForms.java b/forms/qa/integration/forms/MasterDetailForms.java index 3117c3661f98..7619539ed562 100644 --- a/forms/qa/integration/forms/MasterDetailForms.java +++ b/forms/qa/integration/forms/MasterDetailForms.java @@ -227,7 +227,7 @@ public class MasterDetailForms extends complexlib.ComplexTestCase implements com formFactory.createInstanceWithArguments( "com.sun.star.sdb.DocumentDefinition", loadArgs ) ); Command command = new Command(); command.Name = "openDesign"; - command.Argument = new Short( OpenMode.DOCUMENT ); + command.Argument = Short.valueOf( OpenMode.DOCUMENT ); DocumentHelper subDocument = new DocumentHelper( m_orb, UnoRuntime.queryInterface( XComponent.class, diff --git a/forms/qa/integration/forms/SingleControlValidation.java b/forms/qa/integration/forms/SingleControlValidation.java index 044af2f22afe..239789decabe 100644 --- a/forms/qa/integration/forms/SingleControlValidation.java +++ b/forms/qa/integration/forms/SingleControlValidation.java @@ -96,7 +96,7 @@ public class SingleControlValidation implements XFormComponentValidityListener controls[ i ].setPropertyValue( "Tag", String.valueOf( i ) ); if ( controls[ i ].getPropertySetInfo().hasPropertyByName( "Border" ) ) - controls[ i ].setPropertyValue( "Border", new Short( (short)2 ) ); + controls[ i ].setPropertyValue( "Border", Short.valueOf( (short)2 ) ); XValidatableFormComponent xComp = UnoRuntime.queryInterface( XValidatableFormComponent.class, controls[ i ] ); diff --git a/framework/qa/complex/accelerators/KeyMapping.java b/framework/qa/complex/accelerators/KeyMapping.java index 8573051dd51a..0eb23b08b452 100644 --- a/framework/qa/complex/accelerators/KeyMapping.java +++ b/framework/qa/complex/accelerators/KeyMapping.java @@ -48,78 +48,78 @@ public class KeyMapping public KeyMapping() { KeyIdentifierInfo[] aInfoMap = { - new KeyIdentifierInfo("0", new Short(com.sun.star.awt.Key.NUM0)), - new KeyIdentifierInfo("1", new Short(com.sun.star.awt.Key.NUM1)), - new KeyIdentifierInfo("2", new Short(com.sun.star.awt.Key.NUM2)), - new KeyIdentifierInfo("3", new Short(com.sun.star.awt.Key.NUM3)), - new KeyIdentifierInfo("4", new Short(com.sun.star.awt.Key.NUM4)), - new KeyIdentifierInfo("5", new Short(com.sun.star.awt.Key.NUM5)), - new KeyIdentifierInfo("6", new Short(com.sun.star.awt.Key.NUM6)), - new KeyIdentifierInfo("7", new Short(com.sun.star.awt.Key.NUM7)), - new KeyIdentifierInfo("8", new Short(com.sun.star.awt.Key.NUM8)), - new KeyIdentifierInfo("9", new Short(com.sun.star.awt.Key.NUM9)), - new KeyIdentifierInfo("A", new Short(com.sun.star.awt.Key.A)), - new KeyIdentifierInfo("B", new Short(com.sun.star.awt.Key.B)), - new KeyIdentifierInfo("C", new Short(com.sun.star.awt.Key.C)), - new KeyIdentifierInfo("D", new Short(com.sun.star.awt.Key.D)), - new KeyIdentifierInfo("E", new Short(com.sun.star.awt.Key.E)), - new KeyIdentifierInfo("F", new Short(com.sun.star.awt.Key.F)), - new KeyIdentifierInfo("G", new Short(com.sun.star.awt.Key.G)), - new KeyIdentifierInfo("H", new Short(com.sun.star.awt.Key.H)), - new KeyIdentifierInfo("I", new Short(com.sun.star.awt.Key.I)), - new KeyIdentifierInfo("J", new Short(com.sun.star.awt.Key.J)), - new KeyIdentifierInfo("K", new Short(com.sun.star.awt.Key.K)), - new KeyIdentifierInfo("L", new Short(com.sun.star.awt.Key.L)), - new KeyIdentifierInfo("M", new Short(com.sun.star.awt.Key.M)), - new KeyIdentifierInfo("N", new Short(com.sun.star.awt.Key.N)), - new KeyIdentifierInfo("O", new Short(com.sun.star.awt.Key.O)), - new KeyIdentifierInfo("P", new Short(com.sun.star.awt.Key.P)), - new KeyIdentifierInfo("Q", new Short(com.sun.star.awt.Key.Q)), - new KeyIdentifierInfo("R", new Short(com.sun.star.awt.Key.R)), - new KeyIdentifierInfo("S", new Short(com.sun.star.awt.Key.S)), - new KeyIdentifierInfo("T", new Short(com.sun.star.awt.Key.T)), - new KeyIdentifierInfo("U", new Short(com.sun.star.awt.Key.U)), - new KeyIdentifierInfo("V", new Short(com.sun.star.awt.Key.V)), - new KeyIdentifierInfo("W", new Short(com.sun.star.awt.Key.W)), - new KeyIdentifierInfo("X", new Short(com.sun.star.awt.Key.X)), - new KeyIdentifierInfo("Y", new Short(com.sun.star.awt.Key.Y)), - new KeyIdentifierInfo("Z", new Short(com.sun.star.awt.Key.Z)), - new KeyIdentifierInfo("F1", new Short(com.sun.star.awt.Key.F1)), - new KeyIdentifierInfo("F2", new Short(com.sun.star.awt.Key.F2)), - new KeyIdentifierInfo("F3", new Short(com.sun.star.awt.Key.F3)), - new KeyIdentifierInfo("F4", new Short(com.sun.star.awt.Key.F4)), - new KeyIdentifierInfo("F5", new Short(com.sun.star.awt.Key.F5)), - new KeyIdentifierInfo("F6", new Short(com.sun.star.awt.Key.F6)), - new KeyIdentifierInfo("F7", new Short(com.sun.star.awt.Key.F7)), - new KeyIdentifierInfo("F8", new Short(com.sun.star.awt.Key.F8)), - new KeyIdentifierInfo("F9", new Short(com.sun.star.awt.Key.F9)), - new KeyIdentifierInfo("F10", new Short(com.sun.star.awt.Key.F10)), - new KeyIdentifierInfo("F11", new Short(com.sun.star.awt.Key.F11)), - new KeyIdentifierInfo("F12", new Short(com.sun.star.awt.Key.F12)), - new KeyIdentifierInfo("DOWN", new Short(com.sun.star.awt.Key.DOWN)), - new KeyIdentifierInfo("UP", new Short(com.sun.star.awt.Key.UP)), - new KeyIdentifierInfo("LEFT", new Short(com.sun.star.awt.Key.LEFT)), - new KeyIdentifierInfo("RIGHT", new Short(com.sun.star.awt.Key.RIGHT)), - new KeyIdentifierInfo("HOME", new Short(com.sun.star.awt.Key.HOME)), - new KeyIdentifierInfo("END", new Short(com.sun.star.awt.Key.END)), - new KeyIdentifierInfo("PAGEUP", new Short(com.sun.star.awt.Key.PAGEUP)), - new KeyIdentifierInfo("PAGEDOWN", new Short(com.sun.star.awt.Key.PAGEDOWN)), - new KeyIdentifierInfo("RETURN", new Short(com.sun.star.awt.Key.RETURN)), - new KeyIdentifierInfo("ESCAPE", new Short(com.sun.star.awt.Key.ESCAPE)), - new KeyIdentifierInfo("TAB", new Short(com.sun.star.awt.Key.TAB)), - new KeyIdentifierInfo("BACKSPACE", new Short(com.sun.star.awt.Key.BACKSPACE)), - new KeyIdentifierInfo("SPACE", new Short(com.sun.star.awt.Key.SPACE)), - new KeyIdentifierInfo("INSERT", new Short(com.sun.star.awt.Key.INSERT)), - new KeyIdentifierInfo("DELETE", new Short(com.sun.star.awt.Key.DELETE)), - new KeyIdentifierInfo("ADD", new Short(com.sun.star.awt.Key.ADD)), - new KeyIdentifierInfo("SUBTRACT", new Short(com.sun.star.awt.Key.SUBTRACT)), - new KeyIdentifierInfo("MULTIPLY", new Short(com.sun.star.awt.Key.MULTIPLY)), - new KeyIdentifierInfo("DIVIDE", new Short(com.sun.star.awt.Key.DIVIDE)), - new KeyIdentifierInfo("CUT", new Short(com.sun.star.awt.Key.CUT)), - new KeyIdentifierInfo("COPY", new Short(com.sun.star.awt.Key.COPY)), - new KeyIdentifierInfo("PASTE", new Short(com.sun.star.awt.Key.PASTE)), - new KeyIdentifierInfo("UNDO", new Short(com.sun.star.awt.Key.UNDO)), - new KeyIdentifierInfo("REPEAT", new Short(com.sun.star.awt.Key.REPEAT)) + new KeyIdentifierInfo("0", Short.valueOf(com.sun.star.awt.Key.NUM0)), + new KeyIdentifierInfo("1", Short.valueOf(com.sun.star.awt.Key.NUM1)), + new KeyIdentifierInfo("2", Short.valueOf(com.sun.star.awt.Key.NUM2)), + new KeyIdentifierInfo("3", Short.valueOf(com.sun.star.awt.Key.NUM3)), + new KeyIdentifierInfo("4", Short.valueOf(com.sun.star.awt.Key.NUM4)), + new KeyIdentifierInfo("5", Short.valueOf(com.sun.star.awt.Key.NUM5)), + new KeyIdentifierInfo("6", Short.valueOf(com.sun.star.awt.Key.NUM6)), + new KeyIdentifierInfo("7", Short.valueOf(com.sun.star.awt.Key.NUM7)), + new KeyIdentifierInfo("8", Short.valueOf(com.sun.star.awt.Key.NUM8)), + new KeyIdentifierInfo("9", Short.valueOf(com.sun.star.awt.Key.NUM9)), + new KeyIdentifierInfo("A", Short.valueOf(com.sun.star.awt.Key.A)), + new KeyIdentifierInfo("B", Short.valueOf(com.sun.star.awt.Key.B)), + new KeyIdentifierInfo("C", Short.valueOf(com.sun.star.awt.Key.C)), + new KeyIdentifierInfo("D", Short.valueOf(com.sun.star.awt.Key.D)), + new KeyIdentifierInfo("E", Short.valueOf(com.sun.star.awt.Key.E)), + new KeyIdentifierInfo("F", Short.valueOf(com.sun.star.awt.Key.F)), + new KeyIdentifierInfo("G", Short.valueOf(com.sun.star.awt.Key.G)), + new KeyIdentifierInfo("H", Short.valueOf(com.sun.star.awt.Key.H)), + new KeyIdentifierInfo("I", Short.valueOf(com.sun.star.awt.Key.I)), + new KeyIdentifierInfo("J", Short.valueOf(com.sun.star.awt.Key.J)), + new KeyIdentifierInfo("K", Short.valueOf(com.sun.star.awt.Key.K)), + new KeyIdentifierInfo("L", Short.valueOf(com.sun.star.awt.Key.L)), + new KeyIdentifierInfo("M", Short.valueOf(com.sun.star.awt.Key.M)), + new KeyIdentifierInfo("N", Short.valueOf(com.sun.star.awt.Key.N)), + new KeyIdentifierInfo("O", Short.valueOf(com.sun.star.awt.Key.O)), + new KeyIdentifierInfo("P", Short.valueOf(com.sun.star.awt.Key.P)), + new KeyIdentifierInfo("Q", Short.valueOf(com.sun.star.awt.Key.Q)), + new KeyIdentifierInfo("R", Short.valueOf(com.sun.star.awt.Key.R)), + new KeyIdentifierInfo("S", Short.valueOf(com.sun.star.awt.Key.S)), + new KeyIdentifierInfo("T", Short.valueOf(com.sun.star.awt.Key.T)), + new KeyIdentifierInfo("U", Short.valueOf(com.sun.star.awt.Key.U)), + new KeyIdentifierInfo("V", Short.valueOf(com.sun.star.awt.Key.V)), + new KeyIdentifierInfo("W", Short.valueOf(com.sun.star.awt.Key.W)), + new KeyIdentifierInfo("X", Short.valueOf(com.sun.star.awt.Key.X)), + new KeyIdentifierInfo("Y", Short.valueOf(com.sun.star.awt.Key.Y)), + new KeyIdentifierInfo("Z", Short.valueOf(com.sun.star.awt.Key.Z)), + new KeyIdentifierInfo("F1", Short.valueOf(com.sun.star.awt.Key.F1)), + new KeyIdentifierInfo("F2", Short.valueOf(com.sun.star.awt.Key.F2)), + new KeyIdentifierInfo("F3", Short.valueOf(com.sun.star.awt.Key.F3)), + new KeyIdentifierInfo("F4", Short.valueOf(com.sun.star.awt.Key.F4)), + new KeyIdentifierInfo("F5", Short.valueOf(com.sun.star.awt.Key.F5)), + new KeyIdentifierInfo("F6", Short.valueOf(com.sun.star.awt.Key.F6)), + new KeyIdentifierInfo("F7", Short.valueOf(com.sun.star.awt.Key.F7)), + new KeyIdentifierInfo("F8", Short.valueOf(com.sun.star.awt.Key.F8)), + new KeyIdentifierInfo("F9", Short.valueOf(com.sun.star.awt.Key.F9)), + new KeyIdentifierInfo("F10", Short.valueOf(com.sun.star.awt.Key.F10)), + new KeyIdentifierInfo("F11", Short.valueOf(com.sun.star.awt.Key.F11)), + new KeyIdentifierInfo("F12", Short.valueOf(com.sun.star.awt.Key.F12)), + new KeyIdentifierInfo("DOWN", Short.valueOf(com.sun.star.awt.Key.DOWN)), + new KeyIdentifierInfo("UP", Short.valueOf(com.sun.star.awt.Key.UP)), + new KeyIdentifierInfo("LEFT", Short.valueOf(com.sun.star.awt.Key.LEFT)), + new KeyIdentifierInfo("RIGHT", Short.valueOf(com.sun.star.awt.Key.RIGHT)), + new KeyIdentifierInfo("HOME", Short.valueOf(com.sun.star.awt.Key.HOME)), + new KeyIdentifierInfo("END", Short.valueOf(com.sun.star.awt.Key.END)), + new KeyIdentifierInfo("PAGEUP", Short.valueOf(com.sun.star.awt.Key.PAGEUP)), + new KeyIdentifierInfo("PAGEDOWN", Short.valueOf(com.sun.star.awt.Key.PAGEDOWN)), + new KeyIdentifierInfo("RETURN", Short.valueOf(com.sun.star.awt.Key.RETURN)), + new KeyIdentifierInfo("ESCAPE", Short.valueOf(com.sun.star.awt.Key.ESCAPE)), + new KeyIdentifierInfo("TAB", Short.valueOf(com.sun.star.awt.Key.TAB)), + new KeyIdentifierInfo("BACKSPACE", Short.valueOf(com.sun.star.awt.Key.BACKSPACE)), + new KeyIdentifierInfo("SPACE", Short.valueOf(com.sun.star.awt.Key.SPACE)), + new KeyIdentifierInfo("INSERT", Short.valueOf(com.sun.star.awt.Key.INSERT)), + new KeyIdentifierInfo("DELETE", Short.valueOf(com.sun.star.awt.Key.DELETE)), + new KeyIdentifierInfo("ADD", Short.valueOf(com.sun.star.awt.Key.ADD)), + new KeyIdentifierInfo("SUBTRACT", Short.valueOf(com.sun.star.awt.Key.SUBTRACT)), + new KeyIdentifierInfo("MULTIPLY", Short.valueOf(com.sun.star.awt.Key.MULTIPLY)), + new KeyIdentifierInfo("DIVIDE", Short.valueOf(com.sun.star.awt.Key.DIVIDE)), + new KeyIdentifierInfo("CUT", Short.valueOf(com.sun.star.awt.Key.CUT)), + new KeyIdentifierInfo("COPY", Short.valueOf(com.sun.star.awt.Key.COPY)), + new KeyIdentifierInfo("PASTE", Short.valueOf(com.sun.star.awt.Key.PASTE)), + new KeyIdentifierInfo("UNDO", Short.valueOf(com.sun.star.awt.Key.UNDO)), + new KeyIdentifierInfo("REPEAT", Short.valueOf(com.sun.star.awt.Key.REPEAT)) }; aIdentifierHashMap = new IdentifierHashMap(); @@ -138,6 +138,6 @@ public class KeyMapping public String mapCode2Identifier(short nCode) { - return aCodeHashMap.get(new Short(nCode)); + return aCodeHashMap.get(Short.valueOf(nCode)); } } diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java index 306ba6d3bb78..d3430486560c 100644 --- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java @@ -53,7 +53,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor // create a line separator for our new help sub menu com.sun.star.beans.XPropertySet xSeparator = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator")); - Short aSeparatorType = new Short(ActionTriggerSeparatorType.LINE); + Short aSeparatorType = Short.valueOf(ActionTriggerSeparatorType.LINE); xSeparator.setPropertyValue("SeparatorType", aSeparatorType); // query sub menu for index container to get access diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index bf7a69f45758..118738c7c1d7 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -737,7 +737,7 @@ XMultiPropertySet else if (cl.equals(byte.class)) retVal= new Byte(AnyConverter.toByte(obj)); else if (cl.equals(short.class)) - retVal= new Short(AnyConverter.toShort(obj)); + retVal= Short.valueOf(AnyConverter.toShort(obj)); else if (cl.equals(int.class)) retVal= Integer.valueOf(AnyConverter.toInt(obj)); else if (cl.equals(long.class)) @@ -759,7 +759,7 @@ XMultiPropertySet else if (cl.equals(Byte.class)) retVal= new Byte(AnyConverter.toByte(obj)); else if (cl.equals(Short.class)) - retVal= new Short(AnyConverter.toShort(obj)); + retVal= Short.valueOf(AnyConverter.toShort(obj)); else if (cl.equals(Integer.class)) retVal= Integer.valueOf(AnyConverter.toInt(obj)); else if (cl.equals(Long.class)) 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 fb173ba58cd1..fbe595fe7cc8 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 @@ -109,7 +109,7 @@ public class PropertySet_Test cl.setPropertyValue("PropByteA",value); ret= cl.getPropertyValue("PropByteA"); r[i++]= ((Byte) ret).equals(value); - value= new Short((short)112); + value= Short.valueOf((short)112); cl.setPropertyValue("PropShortA", value); ret= cl.getPropertyValue("PropShortA"); r[i++]= ((Short) ret).equals(value); @@ -184,7 +184,7 @@ public class PropertySet_Test cl.setPropertyValue("PropObjectA",value); ret= cl.getPropertyValue("PropObjectA"); r[i++]= ((Byte) ret).equals(value); - value= new Short((short)112); + value= Short.valueOf((short)112); cl.setPropertyValue("PropObjectA", value); ret= cl.getPropertyValue("PropObjectA"); r[i++]= ((Short) ret).equals(value); @@ -241,7 +241,7 @@ public class PropertySet_Test cl.setPropertyValue("PropAnyA",value); ret= cl.getPropertyValue("PropAnyA"); r[i++]= ret instanceof Any && util.anyEquals(value, ret); - value= new Short((short)112); + value= Short.valueOf((short)112); cl.setPropertyValue("PropAnyA", value); ret= cl.getPropertyValue("PropAnyA"); r[i++]= ret instanceof Any && util.anyEquals(value, ret); @@ -295,7 +295,7 @@ public class PropertySet_Test cl.setPropertyValue("PropByteA",value); ret= cl.getPropertyValue("PropByteA"); r[i++]= ret instanceof Byte && util.anyEquals(value, ret); - value= new Any(new Type(short.class), new Short((short)112)); + value= new Any(new Type(short.class), Short.valueOf((short)112)); cl.setPropertyValue("PropShortA", value); ret= cl.getPropertyValue("PropShortA"); r[i++]= ret instanceof Short && util.anyEquals(value, ret); @@ -350,7 +350,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(short.class), new Short((short)112)); + value= new Any(new Type(short.class), Short.valueOf((short)112)); cl.setPropertyValue("PropAnyA", value); ret= cl.getPropertyValue("PropAnyA"); r[i++]= ret instanceof Any && util.anyEquals(value, ret); @@ -406,7 +406,7 @@ public class PropertySet_Test cl.setPropertyValue("PropByteClass",value); ret= cl.getPropertyValue("PropByteClass"); r[i++]= ((Byte) ret).equals(value); - value= new Short((short)112); + value= Short.valueOf((short)112); cl.setPropertyValue("PropShortClass", value); ret= cl.getPropertyValue("PropShortClass"); r[i++]= ((Short) ret).equals(value); @@ -442,7 +442,7 @@ public class PropertySet_Test cl.setPropertyValue("PropByteClass",value); ret= cl.getPropertyValue("PropByteClass"); r[i++]= ret instanceof Byte && util.anyEquals(value, ret); - value= new Any(new Type(short.class), new Short((short)112)); + value= new Any(new Type(short.class), Short.valueOf((short)112)); cl.setPropertyValue("PropShortClass", value); ret= cl.getPropertyValue("PropShortClass"); r[i++]= ret instanceof Short && util.anyEquals(value, ret); @@ -1213,7 +1213,7 @@ class TestClass extends PropertySet value= new Byte((byte) 111); r[i++]= convertPropertyValue(propByteA, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Byte && outNewVal[0].equals(value); - value= new Short((short) 112); + value= Short.valueOf((short) 112); r[i++]= convertPropertyValue(propShortA, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Short && outNewVal[0].equals(value); value= Integer.valueOf( 113); @@ -1324,7 +1324,7 @@ class TestClass extends PropertySet value= new Byte((byte) 111); r[i++]= convertPropertyValue(propByteClass, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Byte && outNewVal[0].equals(value); - value= new Short((short) 112); + value= Short.valueOf((short) 112); r[i++]= convertPropertyValue(propShortClass, outNewVal, outOldVal, value); r[i++]= outNewVal[0] instanceof Short && outNewVal[0].equals(value); value= Integer.valueOf( 113); @@ -1365,7 +1365,7 @@ class TestClass extends PropertySet value= new Byte((byte) 111); setPropertyValueNoBroadcast(propByteA, value); r[i++]= bytePropA == ((Byte)value).byteValue(); - value= new Short((short) 112); + value= Short.valueOf((short) 112); setPropertyValueNoBroadcast(propShortA, value); r[i++]= shortPropA == ((Short) value).shortValue(); value= Integer.valueOf( 113); 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 865bb0733bb7..9f1eb841839d 100644 --- a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java +++ b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java @@ -218,7 +218,7 @@ final class Unmarshal { private Short readShortValue() { try { - return new Short(input.readShort()); + return Short.valueOf(input.readShort()); } catch (IOException e) { throw new RuntimeException(e.toString()); } diff --git a/jurt/com/sun/star/uno/AnyConverter.java b/jurt/com/sun/star/uno/AnyConverter.java index 83819d51a89f..efe46250198c 100644 --- a/jurt/com/sun/star/uno/AnyConverter.java +++ b/jurt/com/sun/star/uno/AnyConverter.java @@ -541,7 +541,7 @@ public class AnyConverter case TypeClass.SHORT_value: switch (tc) { case TypeClass.BYTE_value: - return new Short( ((Byte)object).byteValue() ); + return Short.valueOf( ((Byte)object).byteValue() ); case TypeClass.SHORT_value: return object; } 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 c5498dea1ae8..ef4a4da49a65 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 @@ -59,7 +59,7 @@ public final class Marshaling_Test { Integer.valueOf(0xff0000), Integer.valueOf(0xff000000), Long.valueOf(666L), - new Short((short)444), + Short.valueOf((short)444), new String("blabla"), Integer.valueOf(10), // Any as object Integer.valueOf(10), // Any as object diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java b/jurt/test/com/sun/star/uno/AnyConverter_Test.java index 3a0c77723a4d..b8be66d71760 100644 --- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java +++ b/jurt/test/com/sun/star/uno/AnyConverter_Test.java @@ -40,7 +40,7 @@ public final class AnyConverter_Test { Boolean aBool= Boolean.TRUE; Character aChar= new Character('A'); Byte aByte= new Byte((byte) 111); - Short aShort= new Short((short) 11111); + Short aShort= Short.valueOf((short) 11111); Integer aInt= Integer.valueOf( 1111111); Long aLong= Long.valueOf( 0xffffffff); Float aFloat= new Float( 3.14); @@ -242,7 +242,7 @@ public final class AnyConverter_Test { assertEquals(sh, ((Byte)anyByte.getObject()).byteValue()); sh= AnyConverter.toShort(anyShort); assertEquals(sh, ((Short) anyShort.getObject()).shortValue()); - Any a = new Any( Type.UNSIGNED_SHORT, new Short((short)5) ); + Any a = new Any( Type.UNSIGNED_SHORT, Short.valueOf((short)5) ); assertEquals(5, AnyConverter.toUnsignedShort( a )); // must fail @@ -312,7 +312,7 @@ public final class AnyConverter_Test { assertEquals(val, ((Short) anyShort.getObject()).shortValue()); val= AnyConverter.toInt(anyInt); assertEquals(val, ((Integer) anyInt.getObject()).intValue()); - Any a = new Any( Type.UNSIGNED_SHORT, new Short((short)5) ); + Any a = new Any( Type.UNSIGNED_SHORT, Short.valueOf((short)5) ); assertEquals(5, AnyConverter.toInt(a)); assertEquals(5, AnyConverter.toUnsignedInt(a)); a = new Any( Type.UNSIGNED_LONG, Integer.valueOf(5) ); @@ -383,7 +383,7 @@ public final class AnyConverter_Test { assertEquals(val, ((Integer) anyInt.getObject()).intValue()); val= AnyConverter.toLong(anyLong); assertEquals(val, ((Long) anyLong.getObject()).longValue()); - Any a = new Any( Type.UNSIGNED_SHORT, new Short((short)5) ); + Any a = new Any( Type.UNSIGNED_SHORT, Short.valueOf((short)5) ); assertEquals(5, AnyConverter.toLong(a)); assertEquals(5, AnyConverter.toUnsignedLong(a)); a = new Any( Type.UNSIGNED_LONG, Integer.valueOf(5) ); @@ -797,7 +797,7 @@ public final class AnyConverter_Test { assertTrue(AnyConverter.isShort(aShort)); assertTrue(AnyConverter.isShort(anyShort)); assertEquals(Type.SHORT, AnyConverter.getType(anyShort)); - Any a = new Any( Type.UNSIGNED_SHORT, new Short((short)5) ); + Any a = new Any( Type.UNSIGNED_SHORT, Short.valueOf((short)5) ); assertEquals(Type.UNSIGNED_SHORT, AnyConverter.getType(a)); assertFalse(AnyConverter.isShort(a)); assertFalse(Type.SHORT.equals(AnyConverter.getType(a))); diff --git a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java index f7479b26a8ca..c455e5ff9f2d 100644 --- a/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java +++ b/odk/examples/DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java @@ -167,7 +167,7 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor 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( "TabIndex", Short.valueOf( (short)0 ) ); xPSetButton.setPropertyValue( "Label", new String( "Click Me" ) ); // create the label model and set the properties @@ -180,7 +180,7 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor 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( "TabIndex", Short.valueOf( (short)1 ) ); xPSetLabel.setPropertyValue( "Label", _labelPrefix ); // create a Cancel button model and set the properties @@ -193,8 +193,8 @@ public class SampleDialog extends WeakBase implements XServiceInfo, XJobExecutor 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 ) ); + xPSetCancelButton.setPropertyValue( "TabIndex", Short.valueOf( (short)2 ) ); + xPSetCancelButton.setPropertyValue( "PushButtonType", Short.valueOf( (short)2 ) ); xPSetCancelButton.setPropertyValue( "Label", new String( "Cancel" ) ); // insert the control models into the dialog model diff --git a/odk/examples/DevelopersGuide/Charts/ChartHelper.java b/odk/examples/DevelopersGuide/Charts/ChartHelper.java index 90dccd153800..19d1ede85c45 100644 --- a/odk/examples/DevelopersGuide/Charts/ChartHelper.java +++ b/odk/examples/DevelopersGuide/Charts/ChartHelper.java @@ -108,10 +108,10 @@ public class ChartHelper xShape.setSize( aExtent ); aAny = new Any(new Type(Short.class), - new Short(com.sun.star.text.VertOrientation.NONE)); + Short.valueOf(com.sun.star.text.VertOrientation.NONE)); xPropSet.setPropertyValue("VertOrient", aAny ); aAny = new Any(new Type(Short.class), - new Short(com.sun.star.text.HoriOrientation.NONE)); + Short.valueOf(com.sun.star.text.HoriOrientation.NONE)); xPropSet.setPropertyValue("HoriOrient", aAny ); aAny = new Any(new Type(Integer.class), Integer.valueOf(aUpperLeft.Y)); xPropSet.setPropertyValue("VertOrientPosition", aAny ); diff --git a/odk/examples/DevelopersGuide/Forms/DataAwareness.java b/odk/examples/DevelopersGuide/Forms/DataAwareness.java index e7401c13bb34..1386aa316385 100644 --- a/odk/examples/DevelopersGuide/Forms/DataAwareness.java +++ b/odk/examples/DevelopersGuide/Forms/DataAwareness.java @@ -704,8 +704,8 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan m_formLayer.insertControlLine( "FormattedField", "BIRTHDATE", "", 51 ); // for the salesman number / zip code, we don't want to have decimal places: - xSNRField.setPropertyValue( "DecimalAccuracy", new Short( (short)0 ) ); - xZipField.setPropertyValue( "DecimalAccuracy", new Short( (short)0 ) ); + xSNRField.setPropertyValue( "DecimalAccuracy", Short.valueOf( (short)0 ) ); + xZipField.setPropertyValue( "DecimalAccuracy", Short.valueOf( (short)0 ) ); /** need the form the control models belong to @@ -771,10 +771,10 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan m_aSalesNameValidator = new GridFieldValidator( m_xCtx, xSalesNameColumn ); m_aSalesNameValidator.enableColumnWatch( m_bAllowEmptySales ); - xKeyColumn.setPropertyValue( "DecimalAccuracy", new Short( (short)0 ) ); + xKeyColumn.setPropertyValue( "DecimalAccuracy", Short.valueOf( (short)0 ) ); // init the list box which is for choosing the customer a sale belongs to - xCustomerColumn.setPropertyValue( "BoundColumn", new Short( (short)1 ) ); + xCustomerColumn.setPropertyValue( "BoundColumn", Short.valueOf( (short)1 ) ); xCustomerColumn.setPropertyValue( "Label", "Customer" ); xCustomerColumn.setPropertyValue( "ListSourceType", ListSourceType.SQL ); @@ -859,7 +859,7 @@ public class DataAwareness extends DocumentBasedExample implements XPropertyChan m_aSalesLocker.enableLock( m_bProtectKeyFields ); // initially, we want to generate keys when moving to a new record - xKeyGen.setPropertyValue( "DefaultState", new Short( (short)1 ) ); + xKeyGen.setPropertyValue( "DefaultState", Short.valueOf( (short)1 ) ); // second options block diff --git a/odk/examples/DevelopersGuide/Forms/FormLayer.java b/odk/examples/DevelopersGuide/Forms/FormLayer.java index 0e8ebb88eb44..6b049a2e5324 100644 --- a/odk/examples/DevelopersGuide/Forms/FormLayer.java +++ b/odk/examples/DevelopersGuide/Forms/FormLayer.java @@ -117,10 +117,10 @@ public class FormLayer if ( xPSI.hasPropertyByName( "Border" ) ) { if ( ((Short)xModelProps.getPropertyValue( "Border" )).shortValue() == com.sun.star.awt.VisualEffect.LOOK3D ) - xModelProps.setPropertyValue( "Border", new Short( com.sun.star.awt.VisualEffect.FLAT ) ); + xModelProps.setPropertyValue( "Border", Short.valueOf( com.sun.star.awt.VisualEffect.FLAT ) ); } if ( xPSI.hasPropertyByName( "VisualEffect" ) ) - xModelProps.setPropertyValue( "VisualEffect", new Short( com.sun.star.awt.VisualEffect.FLAT ) ); + xModelProps.setPropertyValue( "VisualEffect", Short.valueOf( com.sun.star.awt.VisualEffect.FLAT ) ); if ( m_document.classify() != DocumentType.CALC ) if ( xPSI.hasPropertyByName( "BorderColor" ) ) xModelProps.setPropertyValue( "BorderColor", Integer.valueOf( 0x00C0C0C0 ) ); diff --git a/odk/examples/DevelopersGuide/Forms/SalesFilter.java b/odk/examples/DevelopersGuide/Forms/SalesFilter.java index 2a6ed6a66c35..ee2aedf1c99d 100644 --- a/odk/examples/DevelopersGuide/Forms/SalesFilter.java +++ b/odk/examples/DevelopersGuide/Forms/SalesFilter.java @@ -84,9 +84,9 @@ class SalesFilter implements XActionListener, XPropertyChangeListener, XResetLis // init control models m_xFilterList.setPropertyValue( "Dropdown", Boolean.TRUE ); - m_xFilterList.setPropertyValue( "LineCount", new Short( (short)11 ) ); + m_xFilterList.setPropertyValue( "LineCount", Short.valueOf( (short)11 ) ); m_xFilterList.setPropertyValue( "StringItemList", new String[] { "ever (means no filter)", "this morning", "1 week ago", "1 month ago", "1 year ago", "<other>" } ); - m_xFilterList.setPropertyValue( "DefaultSelection", new Short[] { new Short( (short)0 ) } ); + m_xFilterList.setPropertyValue( "DefaultSelection", new Short[] { Short.valueOf( (short)0 ) } ); m_xApplyFilter.setPropertyValue( "Label", "Apply Filter" ); diff --git a/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java b/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java index f4c2e0fba29f..115d4c381bff 100644 --- a/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java +++ b/odk/examples/DevelopersGuide/Forms/SingleControlValidation.java @@ -92,7 +92,7 @@ public class SingleControlValidation implements XFormComponentValidityListener controls[ i ].setPropertyValue( "Tag", String.valueOf( i ) ); if ( controls[ i ].getPropertySetInfo().hasPropertyByName( "Border" ) ) - controls[ i ].setPropertyValue( "Border", new Short( (short)2 ) ); + controls[ i ].setPropertyValue( "Border", Short.valueOf( (short)2 ) ); XValidatableFormComponent xComp = UnoRuntime.queryInterface( XValidatableFormComponent.class, controls[ i ] ); diff --git a/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java b/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java index d599eeef54ae..d860c2c6c840 100644 --- a/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java +++ b/odk/examples/DevelopersGuide/Forms/SpreadsheetValueBinding.java @@ -51,10 +51,10 @@ public class SpreadsheetValueBinding extends DocumentBasedExample // a numeric control XPropertySet numericControl = m_formLayer.insertControlLine( "NumericField", "enter a value", "", 30 ); - numericControl.setPropertyValue( "ValueMin", new Short( (short)1 ) ); - numericControl.setPropertyValue( "ValueMax", new Short( (short)5 ) ); - numericControl.setPropertyValue( "Value", new Short( (short)1 ) ); - numericControl.setPropertyValue( "DecimalAccuracy", new Short( (short)0 ) ); + numericControl.setPropertyValue( "ValueMin", Short.valueOf( (short)1 ) ); + numericControl.setPropertyValue( "ValueMax", Short.valueOf( (short)5 ) ); + numericControl.setPropertyValue( "Value", Short.valueOf( (short)1 ) ); + numericControl.setPropertyValue( "DecimalAccuracy", Short.valueOf( (short)0 ) ); numericControl.setPropertyValue( "Spin", Boolean.TRUE ); // bind the control model to cell B2 diff --git a/odk/examples/DevelopersGuide/GUI/DialogDocument.java b/odk/examples/DevelopersGuide/GUI/DialogDocument.java index 8ec7681cab38..570f5b2a78f5 100644 --- a/odk/examples/DevelopersGuide/GUI/DialogDocument.java +++ b/odk/examples/DevelopersGuide/GUI/DialogDocument.java @@ -65,7 +65,7 @@ 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[] { Integer.valueOf(400), Boolean.TRUE, "Dialog1", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(1), new Short((short) 0), "Document-Dialog", Integer.valueOf(300)}); + new Object[] { Integer.valueOf(400), Boolean.TRUE, "Dialog1", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(1), Short.valueOf((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); diff --git a/odk/examples/DevelopersGuide/GUI/ImageControlSample.java b/odk/examples/DevelopersGuide/GUI/ImageControlSample.java index ac2bf2791930..7415b055bb92 100644 --- a/odk/examples/DevelopersGuide/GUI/ImageControlSample.java +++ b/odk/examples/DevelopersGuide/GUI/ImageControlSample.java @@ -69,7 +69,7 @@ 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[] { Integer.valueOf(100), Boolean.TRUE, "MyTestDialog", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(0), new Short((short) 0), "OpenOffice", Integer.valueOf(230)}); + new Object[] { Integer.valueOf(100), Boolean.TRUE, "MyTestDialog", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(0), Short.valueOf((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( @@ -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), Integer.valueOf(_nHeight), sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Boolean.FALSE, Integer.valueOf(_nWidth)}); + new Object[] { Short.valueOf((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/SystemDialog.java b/odk/examples/DevelopersGuide/GUI/SystemDialog.java index 1fb63c61890d..3631678d3f20 100644 --- a/odk/examples/DevelopersGuide/GUI/SystemDialog.java +++ b/odk/examples/DevelopersGuide/GUI/SystemDialog.java @@ -99,7 +99,7 @@ public class SystemDialog { // choose the template that defines the capabilities of the filepicker dialog XInitialization xInitialize = UnoRuntime.queryInterface(XInitialization.class, xFilePicker); - Short[] listAny = new Short[] { new Short(com.sun.star.ui.dialogs.TemplateDescription.FILESAVE_AUTOEXTENSION)}; + Short[] listAny = new Short[] { Short.valueOf(com.sun.star.ui.dialogs.TemplateDescription.FILESAVE_AUTOEXTENSION)}; xInitialize.initialize(listAny); // add a control to the dialog to add the extension automatically to the filename... diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java index 6a0f6fab85dd..6fa8055d3a11 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java +++ b/odk/examples/DevelopersGuide/GUI/UnoDialogSample.java @@ -134,7 +134,7 @@ 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[] { Integer.valueOf(380), Boolean.TRUE, "MyTestDialog", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(0), new Short((short) 0), "OpenOffice", Integer.valueOf(380)}); + new Object[] { Integer.valueOf(380), Boolean.TRUE, "MyTestDialog", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(0), Short.valueOf((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( @@ -508,7 +508,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 - xTFModelPSet.setPropertyValue("EchoChar", new Short((short) '*')); + xTFModelPSet.setPropertyValue("EchoChar", Short.valueOf((short) '*')); XControl xTFControl = m_xDlgContainer.getControl(sName); // add a textlistener that is notified on each change of the controlvalue... @@ -553,7 +553,7 @@ 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 - xTFModelPSet.setPropertyValue("TimeFormat", new Short((short) 5)); + xTFModelPSet.setPropertyValue("TimeFormat", Short.valueOf((short) 5)); xTFModelPSet.setPropertyValue("TimeMin", _aTimeMin); xTFModelPSet.setPropertyValue("TimeMax", _aTimeMax); xTFModelPSet.setPropertyValue("Time", _aTime); @@ -595,7 +595,7 @@ 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 - xDFModelPSet.setPropertyValue("DateFormat", new Short((short) 7)); + xDFModelPSet.setPropertyValue("DateFormat", Short.valueOf((short) 7)); xDFModelPSet.setPropertyValue("DateMin", new Date((short)1, (short)4, (short)2007)); xDFModelPSet.setPropertyValue("DateMax", new Date((short)1, (short)5, (short)2007)); xDFModelPSet.setPropertyValue("Date", new Date((short)15, (short)4, (short)2000)); @@ -688,7 +688,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis xNFModelPSet.setPropertyValue("Value", new Double(_fValue)); xNFModelPSet.setPropertyValue("ValueStep", new Double(_fValueStep)); xNFModelPSet.setPropertyValue("ShowThousandsSeparator", Boolean.TRUE); - xNFModelPSet.setPropertyValue("DecimalAccuracy", new Short(_nDecimalAccuracy)); + xNFModelPSet.setPropertyValue("DecimalAccuracy", Short.valueOf(_nDecimalAccuracy)); } catch (com.sun.star.uno.Exception ex) { /* perform individual exception handling here. * Possible exception types are: @@ -793,7 +793,7 @@ public class UnoDialogSample implements XTextListener, XSpinListener, XActionLis // use the XPropertySet interface merely for reasons of demonstration XPropertySet xCBModelPSet = UnoRuntime.queryInterface(XPropertySet.class, xCBMPSet); xCBModelPSet.setPropertyValue("TriState", Boolean.TRUE); - xCBModelPSet.setPropertyValue("State", new Short((short) 1)); + xCBModelPSet.setPropertyValue("State", Short.valueOf((short) 1)); // add the model to the NameContainer of the dialog model m_xDlgModelNameContainer.insertByName(sName, oCBModel); @@ -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[] {Integer.valueOf(8), "~First Option", sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), new Short((short) 1), new Short(_nTabIndex++),Integer.valueOf(_nWidth)}); + new Object[] {Integer.valueOf(8), "~First Option", sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Short.valueOf((short) 1), Short.valueOf(_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[] {Integer.valueOf(8), "~Second Option", sName, Integer.valueOf(130), Integer.valueOf(214), new Short(_nTabIndex), Integer.valueOf(150)}); + new Object[] {Integer.valueOf(8), "~Second Option", sName, Integer.valueOf(130), Integer.valueOf(214), Short.valueOf(_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) { @@ -919,7 +919,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 XPropertySet xCbBModelPSet = UnoRuntime.queryInterface(XPropertySet.class, xCbBModelMPSet); - xCbBModelPSet.setPropertyValue("MaxTextLen", new Short((short) 10)); + xCbBModelPSet.setPropertyValue("MaxTextLen", Short.valueOf((short) 10)); xCbBModelPSet.setPropertyValue("ReadOnly", Boolean.FALSE); // add the model to the NameContainer of the dialog model @@ -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[] {Integer.valueOf(14), _sLabel, sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), new Short(_nPushButtonType), Integer.valueOf(_nWidth)}); + new Object[] {Integer.valueOf(14), _sLabel, sName, Integer.valueOf(_nPosX), Integer.valueOf(_nPosY), Short.valueOf(_nPushButtonType), Integer.valueOf(_nWidth)}); // add the model to the NameContainer of the dialog model m_xDlgModelNameContainer.insertByName(sName, oButtonModel); diff --git a/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java b/odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java index a73362a53a87..1e1ba1bbc659 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[] { 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)}); + new Object[] { Integer.valueOf(nDialogHeight), Boolean.TRUE, "Dialog1", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(1), Short.valueOf((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... @@ -127,7 +127,7 @@ public class UnoDialogSample2 extends UnoDialogSample { oUnoDialogSample2.insertRoadmapItem(2, true, "Interfaces", 3); oUnoDialogSample2.insertRoadmapItem(3, true, "Methods", 4); oUnoDialogSample2.insertRoadmapItem(4, true, "Properties", 5); - oUnoDialogSample2.m_xRMPSet.setPropertyValue("CurrentItemID", new Short((short) 1)); + oUnoDialogSample2.m_xRMPSet.setPropertyValue("CurrentItemID", Short.valueOf((short) 1)); oUnoDialogSample2.m_xRMPSet.setPropertyValue("Complete", Boolean.TRUE); oUnoDialogSample2.xDialog = UnoRuntime.queryInterface(XDialog.class, oUnoDialogSample2.m_xDialogControl); oUnoDialogSample2.xDialog.execute(); diff --git a/odk/examples/DevelopersGuide/GUI/UnoMenu2.java b/odk/examples/DevelopersGuide/GUI/UnoMenu2.java index 8869cf4394e3..9e7ed3d0fed1 100644 --- a/odk/examples/DevelopersGuide/GUI/UnoMenu2.java +++ b/odk/examples/DevelopersGuide/GUI/UnoMenu2.java @@ -42,7 +42,7 @@ 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[] { Integer.valueOf(140), Boolean.TRUE, "Dialog1", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(1), new Short((short) 0), "Menu-Dialog", Integer.valueOf(200)}); + new Object[] { Integer.valueOf(140), Boolean.TRUE, "Dialog1", Integer.valueOf(102),Integer.valueOf(41), Integer.valueOf(1), Short.valueOf((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); diff --git a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java index 41af02a39613..2f542f739668 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java +++ b/odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java @@ -83,7 +83,7 @@ public class Clipboard com.sun.star.view.XViewSettingsSupplier.class, xModel.getCurrentController()); xViewSettings.getViewSettings().setPropertyValue( - "ZoomType", new Short((short)0)); + "ZoomType", Short.valueOf((short)0)); } // test document will be closed later diff --git a/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java b/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java index 3f0297dcc0ac..eaecc4c5e44e 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java +++ b/odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java @@ -83,7 +83,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { UnoRuntime.queryInterface( com.sun.star.view.XViewSettingsSupplier.class, xModel.getCurrentController()); xViewSettings.getViewSettings().setPropertyValue( - "ZoomType", new Short((short)0)); + "ZoomType", Short.valueOf((short)0)); } // test document will be closed later @@ -165,7 +165,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance( "com.sun.star.ui.ActionTriggerSeparator" )); - Short aSeparatorType = new Short( ActionTriggerSeparatorType.LINE ); + Short aSeparatorType = Short.valueOf( ActionTriggerSeparatorType.LINE ); xSeparator.setPropertyValue( "SeparatorType", aSeparatorType ); // query sub menu for index container to get access diff --git a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java index 2f161b42708e..37fbc0988c3c 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java @@ -116,7 +116,7 @@ public class DisableCommandsTest extends java.lang.Object { com.sun.star.view.XViewSettingsSupplier.class, xModel.getCurrentController()); xViewSettings.getViewSettings().setPropertyValue( - "ZoomType", new Short((short)0)); + "ZoomType", Short.valueOf((short)0)); } // test document will be closed later diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java b/odk/examples/DevelopersGuide/Text/TextDocuments.java index dc767f3d7494..ba78fc7e0255 100644 --- a/odk/examples/DevelopersGuide/Text/TextDocuments.java +++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java @@ -1053,7 +1053,7 @@ public class TextDocuments { "AlternativeText", "Big dogs! Falling on my head!"); // The Level property _must_ be set - xEntry.setPropertyValue ( "Level", new Short ( (short) 1 ) ); + xEntry.setPropertyValue ( "Level", Short.valueOf( (short) 1 ) ); // Create a ContentIndex and access its XPropertySet interface XPropertySet xIndex = UnoRuntime.queryInterface( @@ -1061,7 +1061,7 @@ public class TextDocuments { mxDocFactory.createInstance ( "com.sun.star.text.ContentIndex" ) ); // Again, the Level property _must_ be set - xIndex.setPropertyValue ( "Level", new Short ( (short) 10 ) ); + xIndex.setPropertyValue ( "Level", Short.valueOf( (short) 10 ) ); // Access the XTextContent interfaces of both the Index and the // IndexMark @@ -1172,11 +1172,11 @@ public class TextDocuments { // specify that the source is a reference mark (could also be a // footnote, bookmark or sequence field ) xFieldProps.setPropertyValue ( "ReferenceFieldSource", - new Short(ReferenceFieldSource.REFERENCE_MARK)); + Short.valueOf(ReferenceFieldSource.REFERENCE_MARK)); // We want the reference displayed as 'above' or 'below' xFieldProps.setPropertyValue ( "ReferenceFieldPart", - new Short(ReferenceFieldPart.UP_DOWN)); + Short.valueOf(ReferenceFieldPart.UP_DOWN)); // Get the XTextContent interface of the GetReference text field @@ -1489,13 +1489,13 @@ public class TextDocuments { switch ( i ) { case 0 : aProps[j].Value = - new Short(NumberingType.ROMAN_UPPER); + Short.valueOf(NumberingType.ROMAN_UPPER); break; case 1 : aProps[j].Value = - new Short(NumberingType.CHARS_UPPER_LETTER); + Short.valueOf(NumberingType.CHARS_UPPER_LETTER); break; case 2 : aProps[j].Value = - new Short(NumberingType.ARABIC); + Short.valueOf(NumberingType.ARABIC); break; } // Put the updated PropertyValue sequence back into the @@ -1523,15 +1523,15 @@ public class TextDocuments { // Set the first paragraph that was inserted to a numbering level of // 2 (thus it will have Arabic style numbering) - xParas[0].setPropertyValue ( "NumberingLevel", new Short((short) 2)); + xParas[0].setPropertyValue ( "NumberingLevel", Short.valueOf((short) 2)); // Set the second paragraph that was inserted to a numbering level of // 1 (thus it will have 'Chars Upper Letter' style numbering) - xParas[1].setPropertyValue ( "NumberingLevel", new Short((short) 1)); + xParas[1].setPropertyValue ( "NumberingLevel", Short.valueOf((short) 1)); // Set the third paragraph that was inserted to a numbering level of // 0 (thus it will have 'Chars Upper Letter' style numbering) - xParas[2].setPropertyValue ( "NumberingLevel", new Short((short) 0)); + xParas[2].setPropertyValue ( "NumberingLevel", Short.valueOf((short) 0)); } catch (Exception e) { diff --git a/odk/examples/java/Text/WriterSelector.java b/odk/examples/java/Text/WriterSelector.java index 1343293a968a..338db681ae87 100644 --- a/odk/examples/java/Text/WriterSelector.java +++ b/odk/examples/java/Text/WriterSelector.java @@ -82,7 +82,7 @@ public class WriterSelector { UnoRuntime.queryInterface( com.sun.star.view.XViewSettingsSupplier.class, xModel.getCurrentController()); xViewSettings.getViewSettings().setPropertyValue( - "ZoomType", new Short((short)0)); + "ZoomType", Short.valueOf((short)0)); } // test document will be closed later diff --git a/qadevOOo/runner/helper/ContextMenuInterceptor.java b/qadevOOo/runner/helper/ContextMenuInterceptor.java index 87844522865d..e87c296aae6d 100644 --- a/qadevOOo/runner/helper/ContextMenuInterceptor.java +++ b/qadevOOo/runner/helper/ContextMenuInterceptor.java @@ -53,7 +53,7 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor { UnoRuntime.queryInterface( XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerSeparator" ) ); - Short aSeparatorType = new Short( ActionTriggerSeparatorType.LINE ); + Short aSeparatorType = Short.valueOf( ActionTriggerSeparatorType.LINE ); xSeparator.setPropertyValue( "SeparatorType", aSeparatorType ); // query sub menu for index container to get access diff --git a/qadevOOo/runner/util/DesktopTools.java b/qadevOOo/runner/util/DesktopTools.java index 075980db9b03..d44182cdb2ac 100644 --- a/qadevOOo/runner/util/DesktopTools.java +++ b/qadevOOo/runner/util/DesktopTools.java @@ -400,7 +400,7 @@ public class DesktopTools XInterface oViewSettings = oVSSupp.getViewSettings(); XPropertySet oViewProp = UnoRuntime.queryInterface(XPropertySet.class, oViewSettings); oViewProp.setPropertyValue("ZoomType", - new Short(com.sun.star.view.DocumentZoomType.ENTIRE_PAGE)); + Short.valueOf(com.sun.star.view.DocumentZoomType.ENTIRE_PAGE)); utils.shortWait(5000); } diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java index a197c1b65d69..f4b57aa771a1 100644 --- a/qadevOOo/runner/util/ValueChanger.java +++ b/qadevOOo/runner/util/ValueChanger.java @@ -65,7 +65,7 @@ public class ValueChanger { if (oldValue instanceof Short) { short oldshort = ((Short) oldValue).shortValue(); - newValue = new Short((short) (oldshort + 1)); + newValue = Short.valueOf((short) (oldshort + 1)); } else if (oldValue instanceof Byte) { 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 6af61067447d..fe43065d8955 100644 --- a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java +++ b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java @@ -216,7 +216,7 @@ public class MyPersistObject implements XPersistObject, XTypeProvider, if ( property.equals(props[4].Name)) return new Float(f); if ( property.equals(props[5].Name)) - return new Short(s); + return Short.valueOf(s); if ( property.equals(props[6].Name)) return st; return new Object(); diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java index c1b700e29bc3..e4362339f976 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleValue.java @@ -320,7 +320,7 @@ public class _XAccessibleValue extends MultiMethodTest { return Integer.valueOf((int)val); } else if (clazz.equals(Short.class)) { - return new Short((short)val); + return Short.valueOf((short)val); } else if (clazz.equals(Float.class)) { return new Float((float)val); diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java index d49fdb62cca1..93d2063d5ea6 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlButtonModel.java @@ -107,7 +107,7 @@ public class _UnoControlButtonModel extends MultiPropertyTest { public void _PushButtonType() { log.println("Testing with custom Property tester") ; testProperty("PushButtonType", - new Short((short)0), new Short((short)1)); + Short.valueOf((short)0), Short.valueOf((short)1)); } diff --git a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java index 1d1bf7880bd0..7e3202eba111 100644 --- a/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java +++ b/qadevOOo/tests/java/ifc/awt/_UnoControlComboBoxModel.java @@ -99,7 +99,7 @@ public class _UnoControlComboBoxModel extends MultiPropertyTest { public void _Text() { try { - oObj.setPropertyValue("MaxTextLen",new Short((short)0)); + oObj.setPropertyValue("MaxTextLen",Short.valueOf((short)0)); } catch (com.sun.star.beans.UnknownPropertyException ue) { } catch (com.sun.star.beans.PropertyVetoException pe) { } catch (com.sun.star.lang.IllegalArgumentException ie) { diff --git a/qadevOOo/tests/java/ifc/document/_Settings.java b/qadevOOo/tests/java/ifc/document/_Settings.java index c1f5e3ec0cd0..01e7be08f35e 100644 --- a/qadevOOo/tests/java/ifc/document/_Settings.java +++ b/qadevOOo/tests/java/ifc/document/_Settings.java @@ -40,7 +40,7 @@ public class _Settings extends MultiPropertyTest { public void _PrinterIndependentLayout() { try{ Short oldVal = (Short) oObj.getPropertyValue("PrinterIndependentLayout"); - Short newVal = oldVal.intValue() == 1 ? new Short("3") : new Short("1"); + Short newVal = oldVal.intValue() == 1 ? Short.valueOf("3") : Short.valueOf("1"); testProperty("PrinterIndependentLayout", oldVal, newVal); diff --git a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java index 760446d2e022..85db87e12c88 100644 --- a/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java +++ b/qadevOOo/tests/java/ifc/drawing/_RotationDescriptor.java @@ -74,7 +74,7 @@ public class _RotationDescriptor extends MultiPropertyTest { } try { - oObj.setPropertyValue("RotateAngle",new Short((short) 0)); + oObj.setPropertyValue("RotateAngle",Short.valueOf((short) 0)); } catch (Exception e) { } log.println("Testing with custom Property tester") ; diff --git a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java index eb12935a20c6..b5efcabbe44c 100644 --- a/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java +++ b/qadevOOo/tests/java/ifc/frame/_XComponentLoader.java @@ -58,7 +58,7 @@ public class _XComponentLoader extends MultiMethodTest { PropertyValue [] szArgs = new PropertyValue [1]; PropertyValue Arg = new PropertyValue(); Arg.Name = "UpdateDocMode"; - Arg.Value = new Short(com.sun.star.document.UpdateDocMode.NO_UPDATE); + Arg.Value = Short.valueOf(com.sun.star.document.UpdateDocMode.NO_UPDATE); szArgs[0]=Arg; String url = util.utils.getFullTestURL("Writer_link.sxw"); log.println("try to load '" + url + "'"); diff --git a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java index 81777db051d5..cd8ef6b894d6 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java +++ b/qadevOOo/tests/java/ifc/i18n/_XBreakIterator.java @@ -576,7 +576,7 @@ public class _XBreakIterator extends MultiMethodTest { vCharBlockBounds.add(new Boundary(startPos, endPos)); log.println("" + vCharBlockBounds.size() + "). Bounds: [" + startPos + "," + endPos + "]; Type = " + charType); - vCharBlockTypes.add(new Short(charType)); + vCharBlockTypes.add(Short.valueOf(charType)); } for(int i = 0; i < vCharBlockBounds.size() - 1; i++) { diff --git a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java index 5aa4994daf98..2e90a1f666c2 100644 --- a/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java +++ b/qadevOOo/tests/java/ifc/sheet/_SpreadsheetViewSettings.java @@ -52,8 +52,8 @@ import lib.MultiPropertyTest; */ public class _SpreadsheetViewSettings extends MultiPropertyTest { public void _ZoomType() { - testProperty("ZoomType", new Short(DocumentZoomType.PAGE_WIDTH), - new Short(DocumentZoomType.BY_VALUE)); + testProperty("ZoomType", Short.valueOf(DocumentZoomType.PAGE_WIDTH), + Short.valueOf(DocumentZoomType.BY_VALUE)); } /** diff --git a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java index da30b2cbed20..7a53627de3e4 100644 --- a/qadevOOo/tests/java/ifc/style/_CharacterProperties.java +++ b/qadevOOo/tests/java/ifc/style/_CharacterProperties.java @@ -250,13 +250,13 @@ public class _CharacterProperties extends MultiPropertyTest { Object oPara = tEnv.getObjRelation("PARA"); Object oPort = tEnv.getObjRelation("PORTION"); if (oPara == null) { - testProperty("RubyAdjust",new Short((short)0),new Short((short)1)); + testProperty("RubyAdjust",Short.valueOf((short)0),Short.valueOf((short)1)); } else { - Short aShort = new Short((short) 1); + Short aShort = Short.valueOf((short) 1); changeProp((XPropertySet) oPara, (XPropertySet) oPort,"RubyAdjust", aShort); } - new Short((short) 1); + Short.valueOf((short) 1); } /** @@ -324,7 +324,7 @@ public class _CharacterProperties extends MultiPropertyTest { * new value must be specified. */ public void _CharRotation() { - Short aShort = new Short((short) 10); + Short aShort = Short.valueOf((short) 10); changeProp(oObj,oObj, "CharRotation", aShort); } @@ -360,8 +360,8 @@ public class _CharacterProperties extends MultiPropertyTest { } if (name.equals("CharRotation")) { - Short s1 = new Short((short) 0); - Short s2 = new Short((short) 900); + Short s1 = Short.valueOf((short) 0); + Short s2 = Short.valueOf((short) 900); if (gValue.equals(s1)) { ValueToSet = s2; } else { diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java index 33caa19966f3..27f5788caf51 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java @@ -171,10 +171,10 @@ public class _ParagraphProperties extends MultiPropertyTest { @Override protected Object getNewValue(String propName, Object oldValue) { if ((oldValue != null) && - (oldValue.equals(new Short((short) 0)))) { - return new Short((short) 2); + (oldValue.equals(Short.valueOf((short) 0)))) { + return Short.valueOf((short) 2); } else { - return new Short((short) 0); + return Short.valueOf((short) 0); } } }; diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java index a05b4d2946cb..09c00af10e26 100644 --- a/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java +++ b/qadevOOo/tests/java/ifc/style/_ParagraphPropertiesComplex.java @@ -32,9 +32,9 @@ public class _ParagraphPropertiesComplex extends MultiPropertyTest { protected PropertyTester WritingModeTester = new PropertyTester() { @Override protected Object getNewValue(String propName, Object oldValue) { - if ((oldValue != null) && (oldValue.equals(new Short(com.sun.star.text.WritingMode2.LR_TB)))) - return new Short(com.sun.star.text.WritingMode2.PAGE); else - return new Short(com.sun.star.text.WritingMode2.LR_TB); + if ((oldValue != null) && (oldValue.equals(Short.valueOf(com.sun.star.text.WritingMode2.LR_TB)))) + return Short.valueOf(com.sun.star.text.WritingMode2.PAGE); else + return Short.valueOf(com.sun.star.text.WritingMode2.LR_TB); } } ; diff --git a/qadevOOo/tests/java/ifc/text/_CellProperties.java b/qadevOOo/tests/java/ifc/text/_CellProperties.java index 6cefdad8ac12..25b739cc71e7 100644 --- a/qadevOOo/tests/java/ifc/text/_CellProperties.java +++ b/qadevOOo/tests/java/ifc/text/_CellProperties.java @@ -84,8 +84,8 @@ public class _CellProperties extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ public void _BackColor() { - final Short val1 = new Short( (short) 4 ); - final Short val2 = new Short( (short) 6 ); + final Short val1 = Short.valueOf( (short) 4 ); + final Short val2 = Short.valueOf( (short) 6 ); log.println("Testing with custom Property tester") ; testProperty("BackColor", new PropertyTester() { @Override diff --git a/qadevOOo/tests/java/ifc/text/_CellRange.java b/qadevOOo/tests/java/ifc/text/_CellRange.java index e98b2f791b72..c2942a1c5766 100644 --- a/qadevOOo/tests/java/ifc/text/_CellRange.java +++ b/qadevOOo/tests/java/ifc/text/_CellRange.java @@ -51,8 +51,8 @@ public class _CellRange extends MultiPropertyTest { * Redefined method returns value, that differs from property value. */ public void _BackColor() { - final Short val1 = new Short( (short) 4 ); - final Short val2 = new Short( (short) 6 ); + final Short val1 = Short.valueOf( (short) 4 ); + final Short val2 = Short.valueOf( (short) 6 ); log.println("Testing with custom Property tester") ; testProperty("BackColor", new PropertyTester() { @Override diff --git a/qadevOOo/tests/java/ifc/text/_Footnote.java b/qadevOOo/tests/java/ifc/text/_Footnote.java index 6f9793ab79b3..4af1725644be 100644 --- a/qadevOOo/tests/java/ifc/text/_Footnote.java +++ b/qadevOOo/tests/java/ifc/text/_Footnote.java @@ -36,8 +36,8 @@ public class _Footnote extends MultiPropertyTest { * value must be defined. */ public void _ReferenceId() { - final Short val1 = new Short( (short) 1); - final Short val2 = new Short( (short) 2); + final Short val1 = Short.valueOf( (short) 1); + final Short val2 = Short.valueOf( (short) 2); log.println("Testing with custom Property tester"); testProperty("ReferenceId", val1, val2); diff --git a/qadevOOo/tests/java/ifc/text/_FootnoteSettings.java b/qadevOOo/tests/java/ifc/text/_FootnoteSettings.java index 8e6db87a3f31..77cc50d87274 100644 --- a/qadevOOo/tests/java/ifc/text/_FootnoteSettings.java +++ b/qadevOOo/tests/java/ifc/text/_FootnoteSettings.java @@ -73,8 +73,8 @@ public class _FootnoteSettings extends MultiPropertyTest { * value must be defined. */ public void _NumberingType() { - Short val1 = new Short(com.sun.star.text.FootnoteNumbering.PER_DOCUMENT); - Short val2 = new Short(com.sun.star.text.FootnoteNumbering.PER_PAGE); + Short val1 = Short.valueOf(com.sun.star.text.FootnoteNumbering.PER_DOCUMENT); + Short val2 = Short.valueOf(com.sun.star.text.FootnoteNumbering.PER_PAGE); log.println("Testing with custom Property tester") ; testProperty("NumberingType", val1, val2) ; } @@ -84,8 +84,8 @@ public class _FootnoteSettings extends MultiPropertyTest { * value must be defined. */ public void _FootnoteCounting() { - Short val1 = new Short( (short) 1 ); - Short val2 = new Short( (short) 2 ); + Short val1 = Short.valueOf( (short) 1 ); + Short val2 = Short.valueOf( (short) 2 ); log.println("Testing with custom Property tester") ; testProperty("FootnoteCounting", val1, val2) ; } diff --git a/qadevOOo/tests/java/ifc/text/_TextFrame.java b/qadevOOo/tests/java/ifc/text/_TextFrame.java index c501654f4a40..a23d22862a37 100644 --- a/qadevOOo/tests/java/ifc/text/_TextFrame.java +++ b/qadevOOo/tests/java/ifc/text/_TextFrame.java @@ -43,9 +43,9 @@ public class _TextFrame extends MultiPropertyTest { @Override protected Object getNewValue(String propName, Object oldValue) throws java.lang.IllegalArgumentException { - if (oldValue.equals(new Short(com.sun.star.text.WritingMode2.LR_TB))) - return new Short(com.sun.star.text.WritingMode2.TB_LR); else - return new Short(com.sun.star.text.WritingMode2.LR_TB); + if (oldValue.equals(Short.valueOf(com.sun.star.text.WritingMode2.LR_TB))) + return Short.valueOf(com.sun.star.text.WritingMode2.TB_LR); else + return Short.valueOf(com.sun.star.text.WritingMode2.LR_TB); } } ; diff --git a/qadevOOo/tests/java/ifc/text/_TextPortion.java b/qadevOOo/tests/java/ifc/text/_TextPortion.java index 7a1c8569dbff..24096fe6daa5 100644 --- a/qadevOOo/tests/java/ifc/text/_TextPortion.java +++ b/qadevOOo/tests/java/ifc/text/_TextPortion.java @@ -40,8 +40,8 @@ public class _TextPortion extends MultiPropertyTest { */ public void _ControlCharacter() { testProperty("ControlCharacter", - new Short(ControlCharacter.LINE_BREAK), - new Short(ControlCharacter.PARAGRAPH_BREAK)) ; + Short.valueOf(ControlCharacter.LINE_BREAK), + Short.valueOf(ControlCharacter.PARAGRAPH_BREAK)) ; } } //finish class _TextPortion diff --git a/qadevOOo/tests/java/ifc/text/_TextSection.java b/qadevOOo/tests/java/ifc/text/_TextSection.java index b3e3a34eb265..3c756a60f7f0 100644 --- a/qadevOOo/tests/java/ifc/text/_TextSection.java +++ b/qadevOOo/tests/java/ifc/text/_TextSection.java @@ -82,8 +82,8 @@ public class _TextSection extends MultiPropertyTest { public void _FootnoteNumberingType() { log.println("Testing with custom Property tester") ; testProperty("FootnoteNumberingType", - new Short(com.sun.star.text.FootnoteNumbering.PER_DOCUMENT), - new Short(com.sun.star.text.FootnoteNumbering.PER_PAGE)) ; + Short.valueOf(com.sun.star.text.FootnoteNumbering.PER_DOCUMENT), + Short.valueOf(com.sun.star.text.FootnoteNumbering.PER_PAGE)) ; } diff --git a/qadevOOo/tests/java/ifc/text/_TextTable.java b/qadevOOo/tests/java/ifc/text/_TextTable.java index fac44cdb96fc..ad3645d220a3 100644 --- a/qadevOOo/tests/java/ifc/text/_TextTable.java +++ b/qadevOOo/tests/java/ifc/text/_TextTable.java @@ -69,7 +69,7 @@ public class _TextTable extends MultiPropertyTest { * set to non-automatic. */ public void _Width() { - Short align = new Short(com.sun.star.text.HoriOrientation.CENTER); + Short align = Short.valueOf(com.sun.star.text.HoriOrientation.CENTER); try { oObj.setPropertyValue("HoriOrient",align); } @@ -86,7 +86,7 @@ public class _TextTable extends MultiPropertyTest { * set to non-automatic. */ public void _RelativeWidth() { - Short align = new Short(com.sun.star.text.HoriOrientation.CENTER); + Short align = Short.valueOf(com.sun.star.text.HoriOrientation.CENTER); try { oObj.setPropertyValue("HoriOrient",align); } diff --git a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java index f57ccc97374e..b67ed2d5a324 100644 --- a/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java +++ b/qadevOOo/tests/java/ifc/ui/_XUIConfigurationManager.java @@ -300,7 +300,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { prop[1].Value = sLabelName; prop[2] = new PropertyValue(); prop[2].Name = "Type"; - prop[2].Value = new Short((short)0); + prop[2].Value = Short.valueOf((short)0); prop[3] = new PropertyValue(); prop[3].Name = "ItemDescriptorContainer"; @@ -337,7 +337,7 @@ public class _XUIConfigurationManager extends MultiMethodTest { aMenuItem[1].Value = sLabelName; aMenuItem[2] = new PropertyValue(); aMenuItem[2].Name = "Type"; - aMenuItem[2].Value = new Short((short)0); + aMenuItem[2].Value = Short.valueOf((short)0); try { xDescriptionContainer.insertByIndex(0, aMenuItem); diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 58cd7a252c94..4bdc611e2aa9 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -622,7 +622,7 @@ public class ODatabaseForm extends TestCase { params.add("SAU99") ; params.add(Boolean.FALSE) ; params.add(new Byte((byte) 123)) ; - params.add(new Short((short) 234)) ; + params.add(Short.valueOf((short) 234)) ; params.add(Integer.valueOf(12345)) ; params.add(Long.valueOf(23456)) ; params.add(new Float(1.234)) ; diff --git a/qadevOOo/tests/java/mod/_fps/FilePicker.java b/qadevOOo/tests/java/mod/_fps/FilePicker.java index 82c34e67c44c..6ce1107eda1d 100644 --- a/qadevOOo/tests/java/mod/_fps/FilePicker.java +++ b/qadevOOo/tests/java/mod/_fps/FilePicker.java @@ -93,7 +93,7 @@ public class FilePicker extends TestCase { Object oInterface = null; XMultiServiceFactory xMSF = Param.getMSF(); - Object[] iniArgs = new Object[] { new Short + Object[] iniArgs = new Object[] { Short.valueOf (com.sun.star.ui.dialogs.TemplateDescription.FILEOPEN_READONLY_VERSION)}; short ctrlId = com.sun.star.ui.dialogs.ExtendedFilePickerElementIds.CHECKBOX_READONLY; @@ -114,7 +114,7 @@ public class FilePicker extends TestCase { // adding relation for XFilePickerControlAccess tEnv.addObjRelation("XFilePickerControlAccess.ControlID", - new Short(ctrlId)) ; + Short.valueOf(ctrlId)) ; tEnv.addObjRelation("XFilePickerControlAccess.ControlValue", Boolean.FALSE) ; diff --git a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java index e8c198ebf1a2..501e2b82d873 100644 --- a/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sm/XMLSettingsExporter.java @@ -132,7 +132,7 @@ public class XMLSettingsExporter extends TestCase { XPropertySet xPS = UnoRuntime.queryInterface (XPropertySet.class, xMathDoc) ; - xPS.setPropertyValue("TopMargin", new Short(expMargin)) ; + xPS.setPropertyValue("TopMargin", Short.valueOf(expMargin)) ; } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; throw new StatusException("Can't create component.", e) ; diff --git a/qadevOOo/tests/java/mod/_stm/DataInputStream.java b/qadevOOo/tests/java/mod/_stm/DataInputStream.java index 7a3a5a31864e..fae8af2c044b 100644 --- a/qadevOOo/tests/java/mod/_stm/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataInputStream.java @@ -131,7 +131,7 @@ public class DataInputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java index 73500ddc95ba..3ffd18444cc9 100644 --- a/qadevOOo/tests/java/mod/_stm/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/DataOutputStream.java @@ -108,7 +108,7 @@ public class DataOutputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java index 289de5cc02ca..6ec2d548c115 100644 --- a/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/MarkableOutputStream.java @@ -131,7 +131,7 @@ public class MarkableOutputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java index 350ca4d19d63..3664491099e0 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectInputStream.java @@ -245,7 +245,7 @@ public class ObjectInputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java index 7308371932c6..f8b84c1f90f0 100644 --- a/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_stm/ObjectOutputStream.java @@ -234,7 +234,7 @@ public class ObjectOutputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java index 6e7f81bfcc14..b24f50d7fbdc 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataInputStream.java @@ -128,7 +128,7 @@ public class DataInputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java index f91e967eed39..8144e67b1536 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/DataOutputStream.java @@ -105,7 +105,7 @@ public class DataOutputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java index 94065169be7a..a90b0aef9a75 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/MarkableOutputStream.java @@ -128,7 +128,7 @@ public class MarkableOutputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java index a2acc83c62f8..6c851658ea61 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectInputStream.java @@ -242,7 +242,7 @@ public class ObjectInputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java index 0a26e9fb1f63..fbe7a0d00872 100644 --- a/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java +++ b/qadevOOo/tests/java/mod/_streams/uno/ObjectOutputStream.java @@ -231,7 +231,7 @@ public class ObjectOutputStream extends TestCase { data.add(Boolean.TRUE) ; data.add(new Byte((byte)123)) ; data.add(new Character((char)1234)) ; - data.add(new Short((short)1234)) ; + data.add(Short.valueOf((short)1234)) ; data.add(Integer.valueOf(123456)) ; data.add(new Float(1.234)) ; data.add(new Double(1.23456)) ; diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java index c6823a6c742e..651975828ea3 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java @@ -97,7 +97,7 @@ public class SwAccessibleEndnoteView extends TestCase { try { //change zoom value to 10% //footer should be in the vissible area of the document - xPropSet.setPropertyValue("ZoomValue", new Short("10")); + xPropSet.setPropertyValue("ZoomValue", Short.valueOf("10")); } catch ( com.sun.star.lang.WrappedTargetException e ) { e.printStackTrace(log); throw new StatusException("Couldn't set propertyValue...", e); @@ -133,9 +133,9 @@ public class SwAccessibleEndnoteView extends TestCase { public void fireEvent() { try { //change zoom value to 130% - PropSet.setPropertyValue("ZoomValue", new Short("15")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("15")); //and back to 10% - PropSet.setPropertyValue("ZoomValue", new Short("10")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("10")); } catch ( com.sun.star.lang.WrappedTargetException e ) { } catch ( com.sun.star.lang.IllegalArgumentException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index 76e0f7846b1d..4d70c06cc72a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -110,7 +110,7 @@ public class SwAccessibleFooterView extends TestCase { XViewSettingsSupplier xViewSetSup = UnoRuntime.queryInterface(XViewSettingsSupplier.class, xController); XPropertySet xPropSet = xViewSetSup.getViewSettings(); - xPropSet.setPropertyValue("ZoomValue", new Short("20")); + xPropSet.setPropertyValue("ZoomValue", Short.valueOf("20")); } catch ( com.sun.star.lang.WrappedTargetException e ) { e.printStackTrace(log); throw new StatusException("Couldn't set propertyValue...", e); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java index efdd158eb842..92621b0ae27e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java @@ -98,7 +98,7 @@ public class SwAccessibleFootnoteView extends TestCase { try { //change zoom value to 10% //footer should be in the vissible area of the document - xPropSet.setPropertyValue("ZoomValue", new Short("10")); + xPropSet.setPropertyValue("ZoomValue", Short.valueOf("10")); } catch ( com.sun.star.lang.WrappedTargetException e ) { e.printStackTrace(log); throw new StatusException("Couldn't set propertyValue...", e); @@ -134,9 +134,9 @@ public class SwAccessibleFootnoteView extends TestCase { public void fireEvent() { try { //change zoom value to 130% - PropSet.setPropertyValue("ZoomValue", new Short("15")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("15")); //and back to 10% - PropSet.setPropertyValue("ZoomValue", new Short("10")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("10")); } catch ( com.sun.star.lang.WrappedTargetException e ) { } catch ( com.sun.star.lang.IllegalArgumentException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java index cb8bfea423db..3696797dd8ff 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java @@ -107,9 +107,9 @@ public class SwAccessibleTableView extends TestCase { public void fireEvent() { try { //change zoom value to 15% - PropSet.setPropertyValue("ZoomValue", new Short("15")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("15")); //and back to 100% - PropSet.setPropertyValue("ZoomValue", new Short("100")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("100")); } catch ( com.sun.star.lang.WrappedTargetException e ) { } catch ( com.sun.star.lang.IllegalArgumentException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java index ab9a9764b359..da7b10d138f4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java @@ -91,9 +91,9 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { public void fireEvent() { try { //change zoom value to 15% - PropSet.setPropertyValue("ZoomValue", new Short("15")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("15")); //and back to 100% - PropSet.setPropertyValue("ZoomValue", new Short("100")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("100")); } catch ( com.sun.star.lang.WrappedTargetException e ) { } catch ( com.sun.star.lang.IllegalArgumentException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java index db0679727650..04aef60e68e4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java @@ -124,9 +124,9 @@ public class SwAccessibleTextFrameView extends TestCase { public void fireEvent() { try { //change zoom value to 15% - PropSet.setPropertyValue("ZoomValue", new Short("15")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("15")); //and back to 100% - PropSet.setPropertyValue("ZoomValue", new Short("100")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("100")); } catch ( com.sun.star.lang.WrappedTargetException e ) { } catch ( com.sun.star.lang.IllegalArgumentException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java index c7c682eed8e4..66a14e7cc89f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java @@ -113,9 +113,9 @@ public class SwAccessibleTextGraphicObject extends TestCase { public void fireEvent() { try { //change zoom value to 15% - PropSet.setPropertyValue("ZoomValue", new Short("15")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("15")); //and back to 100% - PropSet.setPropertyValue("ZoomValue", new Short("100")); + PropSet.setPropertyValue("ZoomValue", Short.valueOf("100")); } catch ( com.sun.star.lang.WrappedTargetException e ) { } catch ( com.sun.star.lang.IllegalArgumentException e ) { diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java index 92623758637f..4bbd95dcf74a 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java +++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java @@ -156,7 +156,7 @@ public class SwXMailMerge extends TestCase { oObjProps.setPropertyValue("DataSourceName", cDataSourceName); oObjProps.setPropertyValue("Command", cDataCommand); oObjProps.setPropertyValue("CommandType", Integer.valueOf(CommandType.TABLE)); - oObjProps.setPropertyValue("OutputType", new Short(MailMergeType.FILE)); + oObjProps.setPropertyValue("OutputType", Short.valueOf(MailMergeType.FILE)); oObjProps.setPropertyValue("DocumentURL", cTestDoc); oObjProps.setPropertyValue("OutputURL", cOutputURL); oObjProps.setPropertyValue("FileNamePrefix", "Author"); @@ -186,7 +186,7 @@ public class SwXMailMerge extends TestCase { vXJobArg0[0] = new NamedValue("DataSourceName", cDataSourceName); vXJobArg0[1] = new NamedValue("Command", cDataCommand); vXJobArg0[2] = new NamedValue("CommandType",Integer.valueOf(CommandType.TABLE)); - vXJobArg0[3] = new NamedValue("OutputType",new Short(MailMergeType.FILE)); + vXJobArg0[3] = new NamedValue("OutputType",Short.valueOf(MailMergeType.FILE)); vXJobArg0[4] = new NamedValue("DocumentURL", cTestDoc); vXJobArg0[5] = new NamedValue("OutputURL", cOutputURL); vXJobArg0[6] = new NamedValue("FileNamePrefix", "Identifier"); @@ -197,7 +197,7 @@ public class SwXMailMerge extends TestCase { vXJobArg1[1] = new NamedValue("Command", cDataCommand); vXJobArg1[2] = new NamedValue("CommandType",Integer.valueOf(CommandType.TABLE)); vXJobArg1[3] = new NamedValue("OutputType", - new Short(MailMergeType.PRINTER)); + Short.valueOf(MailMergeType.PRINTER)); vXJobArg1[4] = new NamedValue("DocumentURL", cTestDoc); vXJobArg1[5] = new NamedValue("FileNamePrefix", "Author"); vXJobArg1[6] = new NamedValue("FileNameFromColumn", Boolean.TRUE); @@ -208,7 +208,7 @@ public class SwXMailMerge extends TestCase { vXJobArg2[2] = new NamedValue("Command", cDataCommand); vXJobArg2[3] = new NamedValue("CommandType",Integer.valueOf(CommandType.TABLE)); vXJobArg2[4] = new NamedValue("OutputType", - new Short(MailMergeType.FILE)); + Short.valueOf(MailMergeType.FILE)); vXJobArg2[5] = new NamedValue("ResultSet", oResultSet); vXJobArg2[6] = new NamedValue("OutputURL", cOutputURL); vXJobArg2[7] = new NamedValue("FileNamePrefix", "Identifier"); diff --git a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java index 819d27ce87ed..d0943ae08160 100644 --- a/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java +++ b/qadevOOo/tests/java/mod/_sw/XMLSettingsExporter.java @@ -139,7 +139,7 @@ public class XMLSettingsExporter extends TestCase { XViewSettingsSupplier xViewSetSup = UnoRuntime.queryInterface(XViewSettingsSupplier.class, xController); XPropertySet xPropSet = xViewSetSup.getViewSettings(); - xPropSet.setPropertyValue("ZoomValue", new Short(ZOOM)); + xPropSet.setPropertyValue("ZoomValue", Short.valueOf(ZOOM)); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log) ; diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java index 347562e094dd..7b34cde66845 100644 --- a/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java +++ b/qadevOOo/tests/java/mod/_toolkit/UnoControlDialogModel.java @@ -108,7 +108,7 @@ public class UnoControlDialogModel extends TestCase { 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("TabIndex", Short.valueOf((short) 0)); xPSetButton.setPropertyValue("Label", "Click Me"); // create the label model and set the properties @@ -121,7 +121,7 @@ public class UnoControlDialogModel extends TestCase { 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("TabIndex", Short.valueOf((short) 1)); xPSetLabel.setPropertyValue("Label", _labelPrefix); // insert the control models into the dialog model diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java index 6ea263c5f0fc..98d6959b8efe 100644 --- a/ridljar/com/sun/star/uno/UnoRuntime.java +++ b/ridljar/com/sun/star/uno/UnoRuntime.java @@ -309,7 +309,7 @@ public class UnoRuntime { return new Byte((byte) 0); case TypeClass.SHORT_value: case TypeClass.UNSIGNED_SHORT_value: - return new Short((short) 0); + return Short.valueOf((short) 0); case TypeClass.LONG_value: case TypeClass.UNSIGNED_LONG_value: return Integer.valueOf(0); diff --git a/sc/qa/complex/sc/CalcRTL.java b/sc/qa/complex/sc/CalcRTL.java index d1f96aae8650..5921372e8050 100644 --- a/sc/qa/complex/sc/CalcRTL.java +++ b/sc/qa/complex/sc/CalcRTL.java @@ -98,10 +98,10 @@ public class CalcRTL /* extends ComplexTestCase */ changeProperty(set, "PageStyle", "Default")); assertTrue("Problems when setting property 'TableLayout'", changeProperty(set, "TableLayout", - new Short(com.sun.star.text.WritingMode2.RL_TB))); + Short.valueOf(com.sun.star.text.WritingMode2.RL_TB))); assertTrue("Problems when setting property 'TableLayout'", changeProperty(set, "TableLayout", - new Short(com.sun.star.text.WritingMode2.LR_TB))); + Short.valueOf(com.sun.star.text.WritingMode2.LR_TB))); assertTrue("Couldn't close document", closeSpreadsheetDocument()); } @@ -152,12 +152,12 @@ public class CalcRTL /* extends ComplexTestCase */ String[] previous = getShapeProps(shapeProps, oShape); assertTrue("Problems when setting property 'TableLayout'", changeProperty(sheetProps, "TableLayout", - new Short(com.sun.star.text.WritingMode2.RL_TB))); + Short.valueOf(com.sun.star.text.WritingMode2.RL_TB))); String[] RL_TB = getShapeProps(shapeProps, oShape); assertTrue("Problems when setting property 'TableLayout'", changeProperty(sheetProps, "TableLayout", - new Short(com.sun.star.text.WritingMode2.LR_TB))); + Short.valueOf(com.sun.star.text.WritingMode2.LR_TB))); String[] LR_TB = getShapeProps(shapeProps, oShape); assertTrue("Anchor has changed", 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 5c1523ec5301..dfba37555c99 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 @@ -259,7 +259,7 @@ XInitialization { 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( "TabIndex", Short.valueOf( (short)1 ) ); xPSetButton.setPropertyValue( "Label", _runMacro ); // create the Dont Run Macro button model and set the properties @@ -274,7 +274,7 @@ XInitialization { 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( "TabIndex", Short.valueOf( (short)0 ) ); xPSetButton.setPropertyValue( "Label", _doNotRunMacro ); // insert the control models into the dialog model @@ -296,7 +296,7 @@ XInitialization { 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( "TabIndex", Short.valueOf( (short)1 ) ); xPSetLabel.setPropertyValue( "Label", _label2String ); // create the label model and set the properties @@ -309,7 +309,7 @@ XInitialization { 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( "TabIndex", Short.valueOf( (short)1 ) ); xPSetLabel3.setPropertyValue( "Label", _label3String ); // create the label model and set the properties @@ -322,7 +322,7 @@ XInitialization { 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( "TabIndex", Short.valueOf( (short)1 ) ); xPSetLabel4.setPropertyValue( "Label", _label4String ); // create the checkbox model and set the properties @@ -334,9 +334,9 @@ XInitialization { 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( "State", Short.valueOf((short)0) ); xPSetCheckBox.setPropertyValue( "Name", _checkBoxName ); - xPSetCheckBox.setPropertyValue( "TabIndex", new Short( (short)1 ) ); + xPSetCheckBox.setPropertyValue( "TabIndex", Short.valueOf( (short)1 ) ); xPSetCheckBox.setPropertyValue( "Label", new String(_checkBoxString +checkBoxPath) ); // insert the control models into the dialog model @@ -357,7 +357,7 @@ XInitialization { 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( "TabIndex", Short.valueOf( (short)1 ) ); xPSetLabel5.setPropertyValue( "Label", checkBoxPath2 ); xNameCont.insertByName( _label5Name, label5Model ); } @@ -374,7 +374,7 @@ XInitialization { 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( "TabIndex", Short.valueOf( (short)1 ) ); xPSetLabel.setPropertyValue( "Label", _label1String ); // insert the control models into the dialog model diff --git a/sw/qa/complex/writer/CheckCrossReferences.java b/sw/qa/complex/writer/CheckCrossReferences.java index 8e842d52f660..508ca6cf6a04 100644 --- a/sw/qa/complex/writer/CheckCrossReferences.java +++ b/sw/qa/complex/writer/CheckCrossReferences.java @@ -90,7 +90,7 @@ public class CheckCrossReferences { throws com.sun.star.uno.Exception { // set requested format - xProps.setPropertyValue("ReferenceFieldPart", new Short(nFormat)); + xProps.setPropertyValue("ReferenceFieldPart", Short.valueOf(nFormat)); // refresh fields in order to get new format applied xFldsRefresh.refresh(); @@ -260,8 +260,8 @@ public class CheckCrossReferences { com.sun.star.beans.XPropertySet xFieldProps = UnoRuntime.queryInterface( com.sun.star.beans.XPropertySet.class, xNewField ); - xFieldProps.setPropertyValue( "ReferenceFieldPart", new Short(com.sun.star.text.ReferenceFieldPart.TEXT) ); - xFieldProps.setPropertyValue( "ReferenceFieldSource", new Short(com.sun.star.text.ReferenceFieldSource.BOOKMARK) ); + xFieldProps.setPropertyValue( "ReferenceFieldPart", Short.valueOf(com.sun.star.text.ReferenceFieldPart.TEXT) ); + xFieldProps.setPropertyValue( "ReferenceFieldSource", Short.valueOf(com.sun.star.text.ReferenceFieldSource.BOOKMARK) ); xFieldProps.setPropertyValue( "SourceName", cBookmarkName ); com.sun.star.text.XTextRange xFieldTextRange = UnoRuntime.queryInterface( diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java index fd3093df40a3..1c9db304f358 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java @@ -180,7 +180,7 @@ public class WikiEditSettingDialog extends WikiDialog XPropertySet xSaveCheck = GetPropSet( "SaveBox" ); try { - xSaveCheck.setPropertyValue( "State", new Short( bInitSaveCheckBox ? (short)1 : (short)0 ) ); + xSaveCheck.setPropertyValue( "State", Short.valueOf( bInitSaveCheckBox ? (short)1 : (short)0 ) ); xSaveCheck.setPropertyValue( "Enabled", Boolean.valueOf( Helper.PasswordStoringIsAllowed( xContext ) ) ); } catch( Exception e ) diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java index 1d6abff6948f..48e55f3cd187 100644 --- a/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java +++ b/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java @@ -94,7 +94,7 @@ public class WikiPropDialog extends WikiDialog{ { try { - GetPropSet( "BrowserCheck" ).setPropertyValue( "State", new Short( Helper.GetShowInBrowserByDefault( m_xContext ) ? (short)1 : (short)0 ) ); + GetPropSet( "BrowserCheck" ).setPropertyValue( "State", Short.valueOf( Helper.GetShowInBrowserByDefault( m_xContext ) ? (short)1 : (short)0 ) ); } catch( Exception e ) { diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java index beba7850dae4..220dfc497459 100644 --- a/testtools/com/sun/star/comp/bridge/TestComponent.java +++ b/testtools/com/sun/star/comp/bridge/TestComponent.java @@ -1166,8 +1166,8 @@ public class TestComponent { Constructors.create2(context, new Object[] { Boolean.TRUE, new Byte(Byte.MIN_VALUE), - new Short(Short.MIN_VALUE), - new Any(Type.UNSIGNED_SHORT, new Short((short) -1)), + Short.valueOf(Short.MIN_VALUE), + new Any(Type.UNSIGNED_SHORT, Short.valueOf((short) -1)), Integer.valueOf(Integer.MIN_VALUE), new Any(Type.UNSIGNED_LONG, Integer.valueOf(-1)), Long.valueOf(Long.MIN_VALUE), @@ -1224,7 +1224,7 @@ public class TestComponent { new TestPolyStruct(new Any(Type.BOOLEAN, Boolean.TRUE)), new TestPolyStruct(Boolean.TRUE), new TestPolyStruct(new Byte(Byte.MIN_VALUE)), - new TestPolyStruct(new Short(Short.MIN_VALUE)), + new TestPolyStruct(Short.valueOf(Short.MIN_VALUE)), new TestPolyStruct(Integer.valueOf(Integer.MIN_VALUE)), new TestPolyStruct(Long.valueOf(Long.MIN_VALUE)), new TestPolyStruct(new Character('X')), diff --git a/ucb/qa/complex/ucb/UCB.java b/ucb/qa/complex/ucb/UCB.java index 660b4c4bfefc..ddaac8790297 100644 --- a/ucb/qa/complex/ucb/UCB.java +++ b/ucb/qa/complex/ucb/UCB.java @@ -89,7 +89,7 @@ public class UCB { } else if (type.equals(Short.class)) { - return new Short(xrow.getShort(1)); + return Short.valueOf(xrow.getShort(1)); } else { diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.java b/wizards/com/sun/star/wizards/common/ConfigGroup.java index 0ff5086ab7df..238e3fb99921 100644 --- a/wizards/com/sun/star/wizards/common/ConfigGroup.java +++ b/wizards/com/sun/star/wizards/common/ConfigGroup.java @@ -82,7 +82,7 @@ public class ConfigGroup implements ConfigNode } if (field.getType().equals(Short.TYPE)) { - return new Short(field.getShort(this)); + return Short.valueOf(field.getShort(this)); } if (field.getType().equals(Float.TYPE)) { diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java index 0472aea2cca4..ba555ff64430 100644 --- a/wizards/com/sun/star/wizards/common/NumericalHelper.java +++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java @@ -253,7 +253,7 @@ public class NumericalHelper break; case TypeClass.SHORT_value: aTypeObject.iType = SHORT_TYPE; - aTypeObject.aValue = new Short(AnyConverter.toShort(aValue)); + aTypeObject.aValue = Short.valueOf(AnyConverter.toShort(aValue)); break; case TypeClass.LONG_value: aTypeObject.iType = INT_TYPE; diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java index 623b4838e4fb..fd2f5721e26e 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -82,7 +82,7 @@ public class PlaceholderTextElement extends TextElement } Helper.setUnoPropertyValue(placeHolder, "PlaceHolder", ph); Helper.setUnoPropertyValue(placeHolder, "Hint", hint); - Helper.setUnoPropertyValue(placeHolder, "PlaceHolderType", new Short(PlaceholderType.TEXT)); + Helper.setUnoPropertyValue(placeHolder, "PlaceHolderType", Short.valueOf(PlaceholderType.TEXT)); return UnoRuntime.queryInterface(XTextContent.class, placeHolder); } diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java index 8ed3804f6069..58c85af8ab1f 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.java +++ b/wizards/com/sun/star/wizards/common/SystemDialog.java @@ -66,7 +66,7 @@ public class SystemDialog xStringSubstitution = createStringSubstitution(xMSF); Short[] listAny = new Short[] { - new Short(type) + Short.valueOf(type) }; if (xInitialize != null) { diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java index 70fa6b8576a0..6f6cf053a8d0 100644 --- a/wizards/com/sun/star/wizards/common/UCB.java +++ b/wizards/com/sun/star/wizards/common/UCB.java @@ -223,7 +223,7 @@ public class UCB } else if (type.equals(Short.class)) { - return new Short(xrow.getShort(1)); + return Short.valueOf(xrow.getShort(1)); } else { diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index 432971a3f44c..216e5c755c16 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -94,7 +94,7 @@ public class Control extends Shape XPropertySetInfo xPSI = xPropertySet.getPropertySetInfo(); if ( xPSI.hasPropertyByName( "MouseWheelBehavior" ) ) - xPropertySet.setPropertyValue( "MouseWheelBehavior", new Short( com.sun.star.awt.MouseWheelBehavior.SCROLL_DISABLED ) ); + xPropertySet.setPropertyValue( "MouseWheelBehavior", Short.valueOf( com.sun.star.awt.MouseWheelBehavior.SCROLL_DISABLED ) ); insertControlInContainer(_FieldName); xControlShape.setControl(xControlModel); diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java index 07513eb3d38e..7e98a872cd9d 100644 --- a/wizards/com/sun/star/wizards/document/DatabaseControl.java +++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java @@ -81,7 +81,7 @@ public class DatabaseControl extends Control XPropertySetInfo xPSI = xPropColumn.getPropertySetInfo(); if ( xPSI.hasPropertyByName( "MouseWheelBehavior" ) ) - xPropColumn.setPropertyValue( "MouseWheelBehavior", new Short( com.sun.star.awt.MouseWheelBehavior.SCROLL_DISABLED ) ); + xPropColumn.setPropertyValue( "MouseWheelBehavior", Short.valueOf( com.sun.star.awt.MouseWheelBehavior.SCROLL_DISABLED ) ); setNumericLimits(); _oGridControl.xNameContainer.insertByName(sFieldName, xPropColumn); diff --git a/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java index 1a40e46b3116..c087df2d24f6 100644 --- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java +++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.java @@ -57,7 +57,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTNEWDATAONLY", sNewDataOnly, 98, 25, IDataStep, new Short(curtabindex++), 195 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTNEWDATAONLY", sNewDataOnly, 98, 25, IDataStep, Short.valueOf(curtabindex++), 195 }); optDisplayAllData = CurUnoDialog.insertRadioButton("optDisplayAllData", "toggleCheckBoxes", this, @@ -67,7 +67,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA", sDisplayAllData, 98, 50, new Short((short) 1), IDataStep, new Short(curtabindex++), 197 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTDISPLAYALLDATA", sDisplayAllData, 98, 50, Short.valueOf((short) 1), IDataStep, Short.valueOf(curtabindex++), 197 }); chknomodification = CurUnoDialog.insertCheckBox("chknomodification", null, new String[] @@ -76,7 +76,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOMODIFICATION", sNoModification, 108, 62, new Short((short) 0), IDataStep, new Short(curtabindex++), 189 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOMODIFICATION", sNoModification, 108, 62, Short.valueOf((short) 0), IDataStep, Short.valueOf(curtabindex++), 189 }); chknodeletion = CurUnoDialog.insertCheckBox("chknodeletion", null, new String[] @@ -85,7 +85,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNODELETION", sNoDeletion, 108, 74, new Short((short) 0), IDataStep, new Short(curtabindex++), 189 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNODELETION", sNoDeletion, 108, 74, Short.valueOf((short) 0), IDataStep, Short.valueOf(curtabindex++), 189 }); chknoaddition = CurUnoDialog.insertCheckBox("chknoaddition", null, new String[] @@ -94,7 +94,7 @@ public class DataEntrySetter }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOADDITION", sNoAddition, 108, 86, new Short((short) 0), IDataStep, new Short(curtabindex++), 191 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKNOADDITION", sNoAddition, 108, 86, Short.valueOf((short) 0), IDataStep, Short.valueOf(curtabindex++), 191 }); CurUnoDialog.insertLabel("lbldontdisplayExistingData", new String[] @@ -103,7 +103,7 @@ public class DataEntrySetter }, new Object[] { - 8, sdontdisplayExistingData, 108, 33, IDataStep, new Short(curtabindex++), 134 + 8, sdontdisplayExistingData, 108, 33, IDataStep, Short.valueOf(curtabindex++), 134 }); } diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index 84d5032fe894..3aea942e7de3 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, Integer.valueOf(iCurPosY), IStep, new Short(curtabindex++), 97 + Boolean.valueOf(bDoEnable), 8, sSlaveListHeader[i], 97, Integer.valueOf(iCurPosY), IStep, Short.valueOf(curtabindex++), 97 }); lstSlaveFields[i] = CurUnoDialog.insertListBox("lstSlaveFieldLink" + (i + 1), SOLINKLST[i], null, new ItemListenerImpl(), new String[] @@ -106,7 +106,7 @@ public class FieldLinker extends DBLimitedFieldSelection 97, Integer.valueOf(iCurPosY + 10), IStep, - new Short(curtabindex++), + Short.valueOf(curtabindex++), 97 }); @@ -117,7 +117,7 @@ public class FieldLinker extends DBLimitedFieldSelection }, new Object[] { - Boolean.valueOf(bDoEnable), 8, sMasterListHeader[i], 206, Integer.valueOf(iCurPosY), IStep, new Short(curtabindex++), 97 + Boolean.valueOf(bDoEnable), 8, sMasterListHeader[i], 206, Integer.valueOf(iCurPosY), IStep, Short.valueOf(curtabindex++), 97 }); lstMasterFields[i] = CurUnoDialog.insertListBox("lstMasterFieldLink" + Integer.toString(i + 1), SOLINKLST[i], null, new ItemListenerImpl(), @@ -144,7 +144,7 @@ public class FieldLinker extends DBLimitedFieldSelection 206, Integer.valueOf(iCurPosY + 10), IStep, - new Short(curtabindex++), + Short.valueOf(curtabindex++), 97 }); iCurPosY = iCurPosY + 38; diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index e49bbe14efc7..9f9e8cd8c7d6 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -54,7 +54,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], slblFormName, 97, 25, UIConsts.INTEGERS[8], new Short(curtabindex++), 111 + UIConsts.INTEGERS[8], slblFormName, 97, 25, UIConsts.INTEGERS[8], Short.valueOf(curtabindex++), 111 }); txtFormName = CurUnoDialog.insertTextField("txtFormName", "toggleFinishButton", this, new String[] @@ -63,7 +63,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGFORM_TXTPATH", 97, 35, UIConsts.INTEGERS[8], new Short((short) 82), PropertyNames.EMPTY_STRING, 185 + UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGFORM_TXTPATH", 97, 35, UIConsts.INTEGERS[8], Short.valueOf((short) 82), PropertyNames.EMPTY_STRING, 185 }); CurUnoDialog.insertLabel("lblProceed", new String[] @@ -72,7 +72,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], slblProceed, 97, 62, UIConsts.INTEGERS[8], new Short(curtabindex++), 185 + UIConsts.INTEGERS[8], slblProceed, 97, 62, UIConsts.INTEGERS[8], Short.valueOf(curtabindex++), 185 }); CurUnoDialog.insertRadioButton("optWorkWithForm", null, new String[] @@ -81,7 +81,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTWORKWITHFORM", sWorkWithForm, 101, 77, new Short((short) 1), UIConsts.INTEGERS[8], new Short(curtabindex++), 107 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTWORKWITHFORM", sWorkWithForm, 101, 77, Short.valueOf((short) 1), UIConsts.INTEGERS[8], Short.valueOf(curtabindex++), 107 }); optModifyForm = CurUnoDialog.insertRadioButton("optModifyForm", null, new String[] @@ -90,7 +90,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTMODIFYFORM", sModifyForm, 101, 89, UIConsts.INTEGERS[8], new Short(curtabindex++), 107 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTMODIFYFORM", sModifyForm, 101, 89, UIConsts.INTEGERS[8], Short.valueOf(curtabindex++), 107 }); } diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index 377180c6812c..e6073651bfe2 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -71,7 +71,7 @@ public class FormConfiguration }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM", sSelectManually, 97, 26, ISubFormStep, new Short(curtabindex++), 160 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_CHKCREATESUBFORM", sSelectManually, 97, 26, ISubFormStep, Short.valueOf(curtabindex++), 160 }); optOnExistingRelation = CurUnoDialog.insertRadioButton("optOnExistingRelation", STOGGLESTEPS, this, new String[] @@ -80,7 +80,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION", sOnExistingRelation, 107, 43, ISubFormStep, new Short(curtabindex++), 160 + Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTONEXISTINGRELATION", sOnExistingRelation, 107, 43, ISubFormStep, Short.valueOf(curtabindex++), 160 }); optSelectManually = CurUnoDialog.insertRadioButton("optSelectManually", STOGGLESTEPS, this, new String[] @@ -89,7 +89,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY", sOnManualRelation, 107, 99, new Short((short) 1), ISubFormStep, new Short(curtabindex++), 160 + Boolean.FALSE, UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGFORM_OPTSELECTMANUALLY", sOnManualRelation, 107, 99, Short.valueOf((short) 1), ISubFormStep, Short.valueOf(curtabindex++), 160 }); lblRelations = CurUnoDialog.insertLabel("lblSelectRelation", new String[] @@ -98,7 +98,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, 19, sSelectRelation, Boolean.TRUE, 119, 56, ISubFormStep, new Short(curtabindex++), 80 + Boolean.FALSE, 19, sSelectRelation, Boolean.TRUE, 119, 56, ISubFormStep, Short.valueOf(curtabindex++), 80 }); lstRelations = CurUnoDialog.insertListBox("lstrelations", SONEXISTINGRELATIONSELECTION, SONEXISTINGRELATIONSELECTION, this, new String[] @@ -107,7 +107,7 @@ public class FormConfiguration }, new Object[] { - Boolean.FALSE, 37, "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", 201, 55, ISubFormStep, new Short(curtabindex++), 103 + Boolean.FALSE, 37, "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", 201, 55, ISubFormStep, Short.valueOf(curtabindex++), 103 }); CurUnoDialog.insertLabel("lblSubFormDescription", new String[] @@ -116,7 +116,7 @@ public class FormConfiguration }, new Object[] { - 59, sSubFormDescription, Boolean.TRUE, 110, 120, ISubFormStep, new Short(curtabindex++), 190 + 59, sSubFormDescription, Boolean.TRUE, 110, 120, ISubFormStep, Short.valueOf(curtabindex++), 190 }); CurUnoDialog.insertInfoImage(97, 120, ISubFormStep.intValue()); } diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java index 2257bd7bd79d..07006beb9a29 100644 --- a/wizards/com/sun/star/wizards/form/FormControlArranger.java +++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java @@ -75,7 +75,7 @@ public class FormControlArranger private int a; private int StartA; private int m_controlMaxPosY = 0; //the maximum YPosition of a DBControl in the form - private Short NBorderType = new Short((short) 1); //3-D Border + private Short NBorderType = Short.valueOf((short) 1); //3-D Border public FormControlArranger(FormHandler _oFormHandler, XNameContainer _xFormName, CommandMetaData oDBMetaData, XStatusIndicator _xProgressBar, Point _StartPoint, Size _FormSize) { @@ -105,7 +105,7 @@ public class FormControlArranger public void setBorderType(short _nBorderType) { - NBorderType = new Short(_nBorderType); + NBorderType = Short.valueOf(_nBorderType); } public Control[] getLabelControlList() @@ -564,11 +564,11 @@ public class FormControlArranger { m_currentControlPosX = m_currentLabelPosX; m_currentControlPosY = m_currentLabelPosY + m_LabelHeight; - curLabelControl.xPropertySet.setPropertyValue(PropertyNames.PROPERTY_ALIGN, new Short((short) com.sun.star.awt.TextAlign.LEFT)); + curLabelControl.xPropertySet.setPropertyValue(PropertyNames.PROPERTY_ALIGN, Short.valueOf((short) com.sun.star.awt.TextAlign.LEFT)); } else { - curLabelControl.xPropertySet.setPropertyValue(PropertyNames.PROPERTY_ALIGN, new Short((short) _iAlign)); + curLabelControl.xPropertySet.setPropertyValue(PropertyNames.PROPERTY_ALIGN, Short.valueOf((short) _iAlign)); } if (!bControlsareCreated) { diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index 16e47ee6f284..7bdd12aa237b 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -75,7 +75,7 @@ public class FormWizard extends DatabaseObjectWizard }, new Object[] { - 210, Boolean.TRUE, "DialogForm", 102, 41, 1, new Short((short) 0), m_oResource.getResText(UIConsts.RID_FORM), 310 + 210, Boolean.TRUE, "DialogForm", 102, 41, 1, Short.valueOf((short) 0), m_oResource.getResText(UIConsts.RID_FORM), 310 }); drawNaviBar(); if (getFormResources()) diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index 27f898639df5..82367827854d 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -60,7 +60,7 @@ public class StyleApplier private final static int SODBTEXTCOLOR = 1; private final static int SOLABELTEXTCOLOR = 2; private final static int SOBORDERCOLOR = 5; - private Short IBorderValue = new Short((short) 1); + private Short IBorderValue = Short.valueOf((short) 1); public StyleApplier(WizardDialog _CurUnoDialog, FormDocument _curFormDocument) { @@ -91,7 +91,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[8], sPageStyles, 92, 25, IStyleStep, new Short(curtabindex++), 90 + UIConsts.INTEGERS[8], sPageStyles, 92, 25, IStyleStep, Short.valueOf(curtabindex++), 90 }); lstStyles = CurUnoDialog.insertListBox("lstStyles", null, SCHANGELAYOUT, this, @@ -101,7 +101,7 @@ public class StyleApplier }, new Object[] { - 143, "HID:WIZARDS_HID_DLGFORM_LSTSTYLES", 92, 35, SelLayoutPos, IStyleStep, this.StyleNames, new Short(curtabindex++), 90 + 143, "HID:WIZARDS_HID_DLGFORM_LSTSTYLES", 92, 35, SelLayoutPos, IStyleStep, this.StyleNames, Short.valueOf(curtabindex++), 90 }); optNoBorder = CurUnoDialog.insertRadioButton("otpNoBorder", SCHANGEBORDERTYPE, this, @@ -111,7 +111,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDNOBORDER", sNoBorder, 196, 39, IStyleStep, new Short(curtabindex++), "0", 93 + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDNOBORDER", sNoBorder, 196, 39, IStyleStep, Short.valueOf(curtabindex++), "0", 93 }); opt3DLook = CurUnoDialog.insertRadioButton("otp3DLook", SCHANGEBORDERTYPE, this, @@ -121,7 +121,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", s3DLook, 196, 53, new Short((short) 1), IStyleStep, new Short(curtabindex++), "1", 93 + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMD3DBORDER", s3DLook, 196, 53, Short.valueOf((short) 1), IStyleStep, Short.valueOf(curtabindex++), "1", 93 }); optFlat = CurUnoDialog.insertRadioButton("otpFlat", SCHANGEBORDERTYPE, this, @@ -131,7 +131,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER", sFlat, 196, 67, IStyleStep, new Short(curtabindex++), "2", 93 + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER", sFlat, 196, 67, IStyleStep, Short.valueOf(curtabindex++), "2", 93 }); CurUnoDialog.insertFixedLine("lnFieldBorder", @@ -141,7 +141,7 @@ public class StyleApplier }, new Object[] { - UIConsts.INTEGERS[8], sFieldBorder, 192, 25, IStyleStep, new Short(curtabindex++), 98 + UIConsts.INTEGERS[8], sFieldBorder, 192, 25, IStyleStep, Short.valueOf(curtabindex++), 98 }); } diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index 2c1e839e9cb2..4f6970b6fb83 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -67,7 +67,7 @@ public class UIControlArranger }, new Object[] { - UIConsts.INTEGERS[8], sLabelPlacment, 97, 25, IControlStep, new Short(curtabindex++), 207 + UIConsts.INTEGERS[8], sLabelPlacment, 97, 25, IControlStep, Short.valueOf(curtabindex++), 207 }); // Radio Button "Align Left" optAlignLeft = CurUnoDialog.insertRadioButton("optAlignLeft", SOALIGNMETHOD, this, @@ -77,7 +77,7 @@ public class UIControlArranger }, new Object[] { - UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNLEFT", sAlignLeft, 107, 38, new Short((short) 1), IControlStep, new Short(curtabindex++), 171 + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNLEFT", sAlignLeft, 107, 38, Short.valueOf((short) 1), IControlStep, Short.valueOf(curtabindex++), 171 }); // Radio Button "Align Right" optAlignRight = CurUnoDialog.insertRadioButton("optAlignRight", SOALIGNMETHOD, this, @@ -87,7 +87,7 @@ public class UIControlArranger }, new Object[] { - UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", sAlignRight, Boolean.TRUE, 107, 50, IControlStep, new Short(curtabindex++), 171 + UIConsts.INTEGERS[10], "HID:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT", sAlignRight, Boolean.TRUE, 107, 50, IControlStep, Short.valueOf(curtabindex++), 171 }); @@ -186,7 +186,7 @@ public class UIControlArranger 97, YPos, IControlStep, - new Short(curtabindex++), + Short.valueOf(curtabindex++), 207 }); diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java index 2523a7bc6503..c6567f1d931c 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, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 52 + 8, reslblQueryTitle, 95, 27, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(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, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 90 + 12, HelpIds.getHelpIdString(curHelpIndex++), 95, 37, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(curtabindex++), 90 }); m_queryWizard.insertLabel("lblHowGoOn", new String[] { @@ -79,7 +79,7 @@ public class Finalizer }, new Object[] { - 16, reslblHowGoOn, Boolean.TRUE, 192, 27, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 112 + 16, reslblHowGoOn, Boolean.TRUE, 192, 27, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(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), Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 118 + 9, HelpIds.getHelpIdString(curHelpIndex++), resoptDisplayQuery, 192, 46, Short.valueOf((short) 1), Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(curtabindex++), 118 }); m_queryWizard.insertRadioButton("optModifyQuery", @@ -98,7 +98,7 @@ public class Finalizer }, new Object[] { - 10, HelpIds.getHelpIdString(curHelpIndex++), resoptModifyQuery, 192, 56, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), new Short(curtabindex++), 118 + 10, HelpIds.getHelpIdString(curHelpIndex++), resoptModifyQuery, 192, 56, Integer.valueOf(QueryWizard.SOSUMMARY_PAGE), Short.valueOf(curtabindex++), 118 }); m_queryWizard.insertFixedLine("flnSummary", new String[] { @@ -106,7 +106,7 @@ public class Finalizer }, new Object[] { - 10, resflnSummary, 95, 68, 8, new Short(curtabindex++), 209 + 10, resflnSummary, 95, 68, 8, Short.valueOf(curtabindex++), 209 }); m_queryWizard.insertTextField("txtSummary", 0, null, new String[] { diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index a931f0bbbb9c..41d937732d1c 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -107,7 +107,7 @@ public class QueryWizard extends DatabaseObjectWizard }, new Object[] { - 210, Boolean.TRUE, "DialogQuery", 102, 41, 1, new Short((short) 0), resQueryWizard, 310 + 210, Boolean.TRUE, "DialogQuery", 102, 41, 1, Short.valueOf((short) 0), resQueryWizard, 310 }); drawNaviBar(); setRightPaneHeaders(m_oResource, UIConsts.RID_QUERY + 70, 8); diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index fc6dd01e7023..d5cd0665b1b3 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -129,7 +129,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi }, new Object[] { - 14, HelpIds.getHelpIdString(34321), 74, 58, 0, new Short((short) 1), 40, sStop + 14, HelpIds.getHelpIdString(34321), 74, 58, 0, Short.valueOf((short) 1), 40, sStop }); createWindowPeer(CurReportDocument.getWizardParent()); calculateDialogPosition(CurReportDocument.getFrame().getComponentWindow().getPosSize()); diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 6186744b5da2..8ca9b9c4c055 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, Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 68 + 8, sReportTitle, 95, 27, Integer.valueOf(ReportWizard.SOSTOREPAGE), Short.valueOf(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, Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 + 12, "HID:WIZARDS_HID_DLGREPORT_4_TITLE", 95, 37, Integer.valueOf(ReportWizard.SOSTOREPAGE), Short.valueOf(curtabindex++), 209 }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblChooseReportKind", @@ -89,7 +89,7 @@ public class ReportFinalizer }, new Object[] { - 8, slblChooseReportKind, 95, 57, Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 + 8, slblChooseReportKind, 95, 57, Integer.valueOf(ReportWizard.SOSTOREPAGE), Short.valueOf(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), Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 138 + 10, "HID:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT", sSaveAsDocument, 95, 69, Short.valueOf((short) 0), Integer.valueOf(ReportWizard.SOSTOREPAGE), Short.valueOf(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), Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 + 8, "HID:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE", sSaveAsTemplate, 95, 81, Short.valueOf((short) 1), Integer.valueOf(ReportWizard.SOSTOREPAGE), Short.valueOf(curtabindex++), 209 }); @@ -120,7 +120,7 @@ public class ReportFinalizer }, new Object[] { - 8, slblHowProceed, 105, 93, Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 209 + 8, slblHowProceed, 105, 93, Integer.valueOf(ReportWizard.SOSTOREPAGE), Short.valueOf(curtabindex++), 209 }); @@ -131,7 +131,7 @@ public class ReportFinalizer }, new Object[] { - 10, "HID:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE", sEditTemplate, 111, 105, 6, new Short(curtabindex++), 138 + 10, "HID:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE", sEditTemplate, 111, 105, 6, Short.valueOf(curtabindex++), 138 }); CurUnoDialog.insertRadioButton("optUseTemplate", TOGGLESUBTEMPLATECONTROLS_FUNCNAME, this, @@ -141,7 +141,7 @@ public class ReportFinalizer }, new Object[] { - 10, "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", sUseTemplate, 111, 115, new Short((short) 1), Integer.valueOf(ReportWizard.SOSTOREPAGE), new Short(curtabindex++), 138 + 10, "HID:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE", sUseTemplate, 111, 115, Short.valueOf((short) 1), Integer.valueOf(ReportWizard.SOSTOREPAGE), Short.valueOf(curtabindex++), 138 }); } diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index bb34b5bd1c91..da8d9b5343be 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, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 99 + 8, slblDataStructure, 95, 27, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), Short.valueOf(curtabindex++), 99 }); short iSelPos = 0; @@ -101,7 +101,7 @@ public class ReportLayouter 108, "HID:WIZARDS_HID_DLGREPORT_4_DATALAYOUT", 95, 37, new short[] { iSelPos - }, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), ContentFiles[0], new Short(curtabindex++), 99 + }, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), ContentFiles[0], Short.valueOf(curtabindex++), 99 }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblLayout", @@ -111,7 +111,7 @@ public class ReportLayouter }, new Object[] { - 8, slblPageLayout, 205, 27, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 99 + 8, slblPageLayout, 205, 27, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), Short.valueOf(curtabindex++), 99 }); short iSelLayoutPos = 0; @@ -135,7 +135,7 @@ public class ReportLayouter 108, "HID:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT", 205, 37, new short[] { iSelLayoutPos - }, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), LayoutFiles[0], new Short(curtabindex++), 99 + }, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), LayoutFiles[0], Short.valueOf(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, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 74 + 8, sOrientationHeader, 95, 148, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), Short.valueOf(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), Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 60 + 10, "HID:WIZARDS_HID_DLGREPORT_4_LANDSCAPE", sOrientHorizontal, 101, 158, Short.valueOf(m_nLandscapeState), Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), Short.valueOf(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), Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), new Short(curtabindex++), 60 + 10, "HID:WIZARDS_HID_DLGREPORT_4_PORTRAIT", sOrientVertical, 101, 171, Short.valueOf(m_nPortraitState), Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), Short.valueOf(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, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), 30 + Short.valueOf("0"), 23, 164, 158, Boolean.FALSE, Integer.valueOf(ReportWizard.SOTEMPLATEPAGE), 30 }); String sNote = ReportWizard.getBlindTextNote(CurReportDocument, CurUnoDialog.m_oResource); diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java index 945fdeb14fa9..37d527749d9d 100644 --- a/wizards/com/sun/star/wizards/report/ReportWizard.java +++ b/wizards/com/sun/star/wizards/report/ReportWizard.java @@ -110,7 +110,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener 102, 41, 1, - new Short((short) 0), + Short.valueOf((short) 0), sMsgWizardName, 310 }); diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index 1a802d797687..ce6217eaf015 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -74,7 +74,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - UIConsts.INTEGERS[8], sFieldNames, 91, 27, IFieldFormatStep, new Short(curtabindex++), 90 + UIConsts.INTEGERS[8], sFieldNames, 91, 27, IFieldFormatStep, Short.valueOf(curtabindex++), 90 }); try @@ -86,7 +86,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - 133, "HID:WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES", 92, 37, IFieldFormatStep, new Short(curtabindex++), 62 + 133, "HID:WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES", 92, 37, IFieldFormatStep, Short.valueOf(curtabindex++), 62 }); } catch (Exception e) @@ -104,7 +104,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - Boolean.FALSE, oFontDesc, 14, "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP", String.valueOf((char) 8743), 158, 139, IFieldFormatStep, new Short(curtabindex++), 14 + Boolean.FALSE, oFontDesc, 14, "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP", String.valueOf((char) 8743), 158, 139, IFieldFormatStep, Short.valueOf(curtabindex++), 14 }); btnShiftDown = CurUnoDialog.insertButton("btnShiftDown", "shiftFieldNameDown", this, @@ -114,7 +114,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - Boolean.FALSE, oFontDesc, 14, "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN", String.valueOf((char) 8744), 158, 156, IFieldFormatStep, new Short(curtabindex++), 14 + Boolean.FALSE, oFontDesc, 14, "HID:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN", String.valueOf((char) 8744), 158, 156, IFieldFormatStep, Short.valueOf(curtabindex++), 14 }); oFontDesc = new FontDescriptor(); oFontDesc.Weight = com.sun.star.awt.FontWeight.BOLD; @@ -126,7 +126,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - oFontDesc, 14, "HID:WIZARDS_HID_DLGTABLE_CMDMINUS", "-", 118, 175, IFieldFormatStep, new Short(curtabindex++), 14 + oFontDesc, 14, "HID:WIZARDS_HID_DLGTABLE_CMDMINUS", "-", 118, 175, IFieldFormatStep, Short.valueOf(curtabindex++), 14 }); btnplus = CurUnoDialog.insertButton("btnplus", "addFieldName", this, @@ -136,7 +136,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - oFontDesc, 14, "HID:WIZARDS_HID_DLGTABLE_CMDPLUS", "+", 137, 175, IFieldFormatStep, new Short(curtabindex++), 14 + oFontDesc, 14, "HID:WIZARDS_HID_DLGTABLE_CMDPLUS", "+", 137, 175, IFieldFormatStep, Short.valueOf(curtabindex++), 14 }); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedLineModel", "ColDescriptorHeader", @@ -146,7 +146,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - 8, sfieldinfo, 0, 158, 27, IFieldFormatStep, new Short(curtabindex++), 165 + 8, sfieldinfo, 0, 158, 27, IFieldFormatStep, Short.valueOf(curtabindex++), 165 }); @@ -157,7 +157,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - UIConsts.INTEGERS[8], sFieldName, 158, 39, IFieldFormatStep, new Short(curtabindex++), 94 + UIConsts.INTEGERS[8], sFieldName, 158, 39, IFieldFormatStep, Short.valueOf(curtabindex++), 94 }); txtfieldname = CurUnoDialog.insertTextField("txtfieldname", MODIFYFIELDNAME, this, @@ -167,7 +167,7 @@ public class FieldFormatter implements XItemListener }, new Object[] { - UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_COLNAME", 274, 37, IFieldFormatStep, new Short(curtabindex++), PropertyNames.EMPTY_STRING, 50 + UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_COLNAME", 274, 37, IFieldFormatStep, Short.valueOf(curtabindex++), PropertyNames.EMPTY_STRING, 50 }); txtfieldname.addTextListener(CurUnoDialog); CurUnoDialog.getPeerConfiguration().setAccessibleName(btnplus, sbtnplushelptext); @@ -185,7 +185,7 @@ public class FieldFormatter implements XItemListener }, // PropertyNames.PROPERTY_HELPURL new Object[] { - 85, 158, 49, IFieldFormatStep, new Short(curtabindex++), 166, 50 + 85, 158, 49, IFieldFormatStep, Short.valueOf(curtabindex++), 166, 50 }); //, "HID:WIZARDS_HID_DLGTABLE_COLMODIFIER" curTableDescriptor = _curTableDescriptor; Helper.setUnoPropertyValue(oColumnDescriptorModel, PropertyNames.ACTIVE_CONNECTION, _curTableDescriptor.DBConnection); diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index de504133e1e7..b8a81912d674 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -83,7 +83,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_TXT_NAME", 97, 35, IFINALSTEP, new Short(curtabindex++), PropertyNames.EMPTY_STRING, 223 + UIConsts.INTEGER_12, "HID:WIZARDS_HID_DLGTABLE_TXT_NAME", 97, 35, IFINALSTEP, Short.valueOf(curtabindex++), PropertyNames.EMPTY_STRING, 223 }); txtTableName.addTextListener(CurUnoDialog); txtTableName.setMaxTextLen((short) this.curtabledescriptor.getMaxTableNameLength()); @@ -110,7 +110,7 @@ public class Finalizer }, new Object[] { - 8, slblCatalog, Integer.valueOf(nListBoxPosX), 52, IFINALSTEP, new Short(curtabindex++), 120 + 8, slblCatalog, Integer.valueOf(nListBoxPosX), 52, IFINALSTEP, Short.valueOf(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()), Integer.valueOf(nListBoxPosX), 62, IFINALSTEP, sCatalogNames, new Short(curtabindex++), 80 + Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_CATALOG", Short.valueOf(UnoDialog.getListBoxLineCount()), Integer.valueOf(nListBoxPosX), 62, IFINALSTEP, sCatalogNames, Short.valueOf(curtabindex++), 80 }); int isel = JavaTools.FieldInList(sCatalogNames, sCatalog); if (isel < 0) @@ -165,7 +165,7 @@ public class Finalizer }, new Object[] { - 8, slblSchema, Integer.valueOf(nListBoxPosX), 52, IFINALSTEP, new Short(curtabindex++), 80 + 8, slblSchema, Integer.valueOf(nListBoxPosX), 52, IFINALSTEP, Short.valueOf(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()), Integer.valueOf(nListBoxPosX), 62, IFINALSTEP, sSchemaNames, new Short(curtabindex++), 80 + Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LST_SCHEMA", Short.valueOf(UnoDialog.getListBoxLineCount()), Integer.valueOf(nListBoxPosX), 62, IFINALSTEP, sSchemaNames, Short.valueOf(curtabindex++), 80 }); int isel = JavaTools.FieldInList(sSchemaNames, sSchema); if (isel < 0) @@ -205,7 +205,7 @@ public class Finalizer }, new Object[] { - 16, sCongratulations, Boolean.TRUE, 97, 62, IFINALSTEP, new Short(curtabindex++), 226 + 16, sCongratulations, Boolean.TRUE, 97, 62, IFINALSTEP, Short.valueOf(curtabindex++), 226 }); } else @@ -219,7 +219,7 @@ public class Finalizer }, new Object[] { - UIConsts.INTEGERS[8], slblProceed, 97, Integer.valueOf(82 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 227 + UIConsts.INTEGERS[8], slblProceed, 97, Integer.valueOf(82 + ndiffPosY), IFINALSTEP, Short.valueOf(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, Integer.valueOf(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), Short.valueOf((short) 1), IFINALSTEP, Short.valueOf(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, Integer.valueOf(109 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 177 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, 101, Integer.valueOf(109 + ndiffPosY), IFINALSTEP, Short.valueOf(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, Integer.valueOf(121 + ndiffPosY), IFINALSTEP, new Short(curtabindex++), 177 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD", sStartFormWizard, 101, Integer.valueOf(121 + ndiffPosY), IFINALSTEP, Short.valueOf(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 784a6ab98b1e..953fcf4996df 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -77,7 +77,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - 40, sExplanations, Boolean.TRUE, 91, 27, IPRIMEKEYSTEP, new Short(curtabindex++), 233 + 40, sExplanations, Boolean.TRUE, 91, 27, IPRIMEKEYSTEP, Short.valueOf(curtabindex++), 233 }); chkcreatePrimaryKey = CurUnoDialog.insertCheckBox("chkcreatePrimaryKey", SPRIMEKEYMODE, this, @@ -87,7 +87,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY", screatePrimaryKey, 97, 70, new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), 160 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CHK_USEPRIMEKEY", screatePrimaryKey, 97, 70, Short.valueOf((short) 1), IPRIMEKEYSTEP, Short.valueOf(curtabindex++), 160 }); optAddAutomatically = CurUnoDialog.insertRadioButton("optAddAutomatically", SPRIMEKEYMODE, this, @@ -97,7 +97,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC", sAddAutomatically, 106, 82, new Short((short) 1), IPRIMEKEYSTEP, new Short(curtabindex++), 200 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_AUTOMATIC", sAddAutomatically, 106, 82, Short.valueOf((short) 1), IPRIMEKEYSTEP, Short.valueOf(curtabindex++), 200 }); optUseExisting = CurUnoDialog.insertRadioButton("optUseExisting", SPRIMEKEYMODE, this, @@ -107,7 +107,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, //94 new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE", sUseExisting, 106, 104, IPRIMEKEYSTEP, new Short(curtabindex++), 200 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SINGLE", sUseExisting, 106, 104, IPRIMEKEYSTEP, Short.valueOf(curtabindex++), 200 }); optUseSeveral = CurUnoDialog.insertRadioButton("optUseSeveral", SPRIMEKEYMODE, this, @@ -117,7 +117,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL", sUseSeveral, 106, 132, IPRIMEKEYSTEP, new Short(curtabindex++), 200 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_PK_SEVERAL", sUseSeveral, 106, 132, IPRIMEKEYSTEP, Short.valueOf(curtabindex++), 200 }); chkApplyAutoValueAutomatic = CurUnoDialog.insertCheckBox("chkApplyAutoValueAutomatic", SPRIMEKEYMODE, this, @@ -127,7 +127,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, //107 new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC", sApplyAutoValue, 116, 92, IPRIMEKEYSTEP, new Short(curtabindex++), 68 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC", sApplyAutoValue, 116, 92, IPRIMEKEYSTEP, Short.valueOf(curtabindex++), 68 }); lblPrimeFieldName = CurUnoDialog.insertLabel("lblPrimeFieldName", @@ -137,7 +137,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, new Object[] { - Boolean.FALSE, UIConsts.INTEGERS[8], slblPrimeFieldName, 116, 117, IPRIMEKEYSTEP, new Short(curtabindex++), 46 + Boolean.FALSE, UIConsts.INTEGERS[8], slblPrimeFieldName, 116, 117, IPRIMEKEYSTEP, Short.valueOf(curtabindex++), 46 }); lstSinglePrimeKey = CurUnoDialog.insertListBox("lstSinglePrimeKey", "onPrimeKeySelected", null, this, @@ -164,7 +164,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener 162, 115, IPRIMEKEYSTEP, - new Short(curtabindex++), + Short.valueOf(curtabindex++), 80 }); @@ -175,7 +175,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener }, //107 new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE", sApplyAutoValue, 248, 117, IPRIMEKEYSTEP, new Short(curtabindex++), 66 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE", sApplyAutoValue, 248, 117, IPRIMEKEYSTEP, Short.valueOf(curtabindex++), 66 }); curPrimaryKeySelection = new FieldSelection(CurUnoDialog, IPRIMEKEYSTEP.intValue(), 116, 142, 208, 47, slblAvailableFields, slblSelPrimaryFields, 41234, false); curPrimaryKeySelection.addFieldSelectionListener(this); diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index f82f166aa53f..4e916c996be7 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -90,7 +90,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - 32, sExplanation, Boolean.TRUE, 91, 27, IMAINSTEP, new Short(pretabindex++), 233 + 32, sExplanation, Boolean.TRUE, 91, 27, IMAINSTEP, Short.valueOf(pretabindex++), 233 }); lblCategories = CurUnoDialog.insertLabel("lblCategories", @@ -100,7 +100,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - 8, sCategories, 91, 60, IMAINSTEP, new Short(pretabindex++), 100 + 8, sCategories, 91, 60, IMAINSTEP, Short.valueOf(pretabindex++), 100 }); optBusiness = CurTableWizardUnoDialog.insertRadioButton("optBusiness", SELECTCATEGORY, this, @@ -110,7 +110,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTBUSINESS", sBusiness, 98, 70, new Short((short) 1), IMAINSTEP, new Short(pretabindex++), 78 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTBUSINESS", sBusiness, 98, 70, Short.valueOf((short) 1), IMAINSTEP, Short.valueOf(pretabindex++), 78 }); optPrivate = CurTableWizardUnoDialog.insertRadioButton("optPrivate", SELECTCATEGORY, this, @@ -120,7 +120,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTPRIVATE", sPrivate, 182, 70, IMAINSTEP, new Short(pretabindex++), 90 + UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPTPRIVATE", sPrivate, 182, 70, IMAINSTEP, Short.valueOf(pretabindex++), 90 }); CurUnoDialog.insertLabel("lblTableNames", @@ -130,7 +130,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - 8, sTableNames, 91, 82, IMAINSTEP, new Short(pretabindex++), 80 + 8, sTableNames, 91, 82, IMAINSTEP, Short.valueOf(pretabindex++), 80 }); try @@ -142,7 +142,7 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X }, new Object[] { - Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LBTABLES", new Short(UnoDialog.getListBoxLineCount()), 91, 92, IMAINSTEP, new Short(pretabindex++), getListboxWidth() + Boolean.TRUE, 12, "HID:WIZARDS_HID_DLGTABLE_LBTABLES", Short.valueOf(UnoDialog.getListBoxLineCount()), 91, 92, IMAINSTEP, Short.valueOf(pretabindex++), getListboxWidth() }); } catch (Exception e) diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index 7644935a8163..44b932bb4ed0 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -73,7 +73,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener }, new Object[] { - 218, Boolean.TRUE, "DialogTable", 102, 41, 1, new Short((short) 0), sTitle, 330 + 218, Boolean.TRUE, "DialogTable", 102, 41, 1, Short.valueOf((short) 0), sTitle, 330 }); drawNaviBar(); fielditems = new HashMap<String, FieldDescription>(); diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index b8cfe4075109..dcb845918676 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -246,7 +246,7 @@ public class TextDocument ViewHandler myViewHandler = new ViewHandler(xTextDocument); try { - myViewHandler.setViewSetting("ZoomType", new Short(com.sun.star.view.DocumentZoomType.ENTIRE_PAGE)); + myViewHandler.setViewSetting("ZoomType", Short.valueOf(com.sun.star.view.DocumentZoomType.ENTIRE_PAGE)); } catch (Exception e) { diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java index 799ad8076783..1020004ec853 100644 --- a/wizards/com/sun/star/wizards/text/TextTableHandler.java +++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java @@ -202,7 +202,7 @@ public class TextTableHandler xSelection.select(xLocCellRange); Desktop.dispatchURL(_xMSF, ".Uno:DistributeColumns", xFrame); Desktop.dispatchURL(_xMSF, ".Uno:SetOptimalColumnWidth", xFrame); - Helper.setUnoPropertyValue(xTextTable, "HoriOrient", new Short(iHoriOrient)); + Helper.setUnoPropertyValue(xTextTable, "HoriOrient", Short.valueOf(iHoriOrient)); } catch (Exception exception) { diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index c3cca66e640e..3fd52d29e210 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, Integer.valueOf(_iPosX), Integer.valueOf(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), Integer.valueOf(iCompWidth) + 8, HelpIds.getHelpIdString(curHelpID), soptDetailQuery, Integer.valueOf(_iPosX), Integer.valueOf(iCompPosY - 42), Short.valueOf((short) 1), IStep, Short.valueOf(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, Integer.valueOf(_iPosX), Integer.valueOf(iCompPosY - 32), IStep, new Short(curtabindex++), Integer.valueOf(iCompWidth) + 16, HelpIds.getHelpIdString(curHelpID + 1), soptSummaryQuery, Boolean.TRUE, Integer.valueOf(_iPosX), Integer.valueOf(iCompPosY - 32), IStep, Short.valueOf(curtabindex++), Integer.valueOf(iCompWidth) }); CurUnoDialog.insertLabel("lblAggregate", new String[] @@ -103,7 +103,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - 8, slblAggregate, Integer.valueOf(iCompPosX + 5), Integer.valueOf(iCompPosY - 10), IStep, new Short(curtabindex++), 90 + 8, slblAggregate, Integer.valueOf(iCompPosX + 5), Integer.valueOf(iCompPosY - 10), IStep, Short.valueOf(curtabindex++), 90 }); CurUnoDialog.insertLabel("lblFieldnames", new String[] @@ -112,7 +112,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - 8, slblFieldNames, Integer.valueOf(iCompPosX + 101), Integer.valueOf(iCompPosY - 10), IStep, new Short(curtabindex++), 90 + 8, slblFieldNames, Integer.valueOf(iCompPosX + 101), Integer.valueOf(iCompPosY - 10), IStep, Short.valueOf(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), "+", Integer.valueOf(_iPosX + iCompWidth - 36), Integer.valueOf(iButtonPosY), IStep, new Short((curtabindex++)), 16 + oFontDescriptor, 14, HelpIds.getHelpIdString(lastHelpIndex + 1), "+", Integer.valueOf(_iPosX + iCompWidth - 36), Integer.valueOf(iButtonPosY), IStep, Short.valueOf((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), "-", Integer.valueOf(_iPosX + iCompWidth - 16), Integer.valueOf(iButtonPosY), IStep, new Short(curtabindex++), 16 + oFontDescriptor, 14, HelpIds.getHelpIdString(lastHelpIndex + 2), "-", Integer.valueOf(_iPosX + iCompWidth - 16), Integer.valueOf(iButtonPosY), IStep, Short.valueOf(curtabindex++), 16 }); CurDBMetaData.Type = getQueryType(); } @@ -525,7 +525,7 @@ public class AggregateComponent extends ControlScroller }, new Object[] { - Boolean.TRUE, 12, HelpIds.getHelpIdString(_curHelpID++), Integer.valueOf(iCompPosX + 4), Integer.valueOf(ypos), UIConsts.INVISIBLESTEP, sFunctions, new Short(curtabindex++), 88 + Boolean.TRUE, 12, HelpIds.getHelpIdString(_curHelpID++), Integer.valueOf(iCompPosX + 4), Integer.valueOf(ypos), UIConsts.INVISIBLESTEP, sFunctions, Short.valueOf(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++), Integer.valueOf(iCompPosX + 98), Integer.valueOf(ypos), UIConsts.INVISIBLESTEP, new Short(curtabindex++), 86 + Boolean.TRUE, 12, HelpIds.getHelpIdString(_curHelpID++), Integer.valueOf(iCompPosX + 98), Integer.valueOf(ypos), UIConsts.INVISIBLESTEP, Short.valueOf(curtabindex++), 86 }); lastHelpIndex = _curHelpID - 1; } diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index 2e539a56548c..81d4766535dc 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -165,7 +165,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener Integer.valueOf(pos.Width + (m_aButtonSize.Width + gap.Width) * cols + gap.Width - btnSize.intValue() + 1), Integer.valueOf(pos.Height + (m_aButtonSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, - new Short((short) (tabIndex + 2)), + Short.valueOf((short) (tabIndex + 2)), Boolean.TRUE, btnSize }); @@ -182,14 +182,14 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener Integer.valueOf(cols * (m_aButtonSize.Width + gap.Width) + gap.Width - 2 * btnSize.intValue() - 1) }); - Helper.setUnoPropertyValue(getModel(lblCounter), PropertyNames.PROPERTY_ALIGN, new Short((short) 1)); + Helper.setUnoPropertyValue(getModel(lblCounter), PropertyNames.PROPERTY_ALIGN, Short.valueOf((short) 1)); Helper.setUnoPropertyValue(getModel(btnBack), PropertyNames.PROPERTY_LABEL, "<"); Helper.setUnoPropertyValue(getModel(btnNext), PropertyNames.PROPERTY_LABEL, ">"); } - m_tabIndex = new Short((short) tabIndex); + m_tabIndex = Short.valueOf((short) tabIndex); m_aButtons = new XControl[rows * cols]; diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index b209d2f7e5e9..3ffeb19bc4b7 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -111,7 +111,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< }, new Object[] { - Boolean.FALSE, 8, _reslblTables, 95, 27, IStep, new Short((short) 3), LabelWidth + Boolean.FALSE, 8, _reslblTables, 95, 27, IStep, Short.valueOf((short) 3), LabelWidth }); // DropDown Listbox TableNames xTableListBox = CurUnoDialog.insertListBox(sTableListBoxName, 0, null, new ItemListenerImpl(), @@ -121,7 +121,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< }, new Object[] { - Boolean.TRUE, Boolean.FALSE, 12, HelpIds.getHelpIdString(super.FirstHelpIndex - 1), new Short(UnoDialog.getListBoxLineCount()), 95, 37, IStep, new Short((short) 4), getListboxWidth() + Boolean.TRUE, Boolean.FALSE, 12, HelpIds.getHelpIdString(super.FirstHelpIndex - 1), Short.valueOf(UnoDialog.getListBoxLineCount()), 95, 37, IStep, Short.valueOf((short) 4), getListboxWidth() }); fillupCommandListBox(); } diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index 6e055a0f901f..fba70c444c78 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -105,7 +105,7 @@ public abstract class ControlScroller }, new Object[] { - 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) + Short.valueOf((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; diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index 4c6e23dec1d0..fec46db6ea71 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -211,7 +211,7 @@ public class FieldSelection }, new Object[] { - 8, slblFields, Integer.valueOf(CompPosX), Integer.valueOf(CompPosY), IStep, new Short(curtabindex), 109 + 8, slblFields, Integer.valueOf(CompPosX), Integer.valueOf(CompPosY), IStep, Short.valueOf(curtabindex), 109 }); // Listbox 'Available fields' @@ -222,7 +222,7 @@ public class FieldSelection }, new Object[] { - ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex), Boolean.TRUE, Integer.valueOf(CompPosX), ListBoxPosY, IStep, new Short((curtabindex++)), ListBoxWidth + ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex), Boolean.TRUE, Integer.valueOf(CompPosX), ListBoxPosY, IStep, Short.valueOf((curtabindex++)), ListBoxWidth }); Object btnmoveselected = CurUnoDialog.insertButton("cmdMoveSelected" + sIncSuffix, SOCMDMOVESEL, new ActionListenerImpl(), @@ -232,7 +232,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, 14, HelpIds.getHelpIdString(_FirstHelpIndex + 1), ">", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, 14, HelpIds.getHelpIdString(_FirstHelpIndex + 1), ">", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, Short.valueOf(curtabindex++), CmdButtonWidth }); if (bshowFourButtons) @@ -244,7 +244,7 @@ public class FieldSelection }, new Object[] { - 14, HelpIds.getHelpIdString(_FirstHelpIndex + 2), ">>", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + 14, HelpIds.getHelpIdString(_FirstHelpIndex + 2), ">>", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, Short.valueOf(curtabindex++), CmdButtonWidth }); } Object btnremoveselected = CurUnoDialog.insertButton("cmdRemoveSelected" + sIncSuffix, SOCMDREMOVESEL, new ActionListenerImpl(), @@ -254,7 +254,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, 14, HelpIds.getHelpIdString(_FirstHelpIndex + 3), "<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, 14, HelpIds.getHelpIdString(_FirstHelpIndex + 3), "<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, Short.valueOf(curtabindex++), CmdButtonWidth }); if (bshowFourButtons) @@ -266,7 +266,7 @@ public class FieldSelection }, new Object[] { - 14, HelpIds.getHelpIdString(_FirstHelpIndex + 4), "<<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, new Short(curtabindex++), CmdButtonWidth + 14, HelpIds.getHelpIdString(_FirstHelpIndex + 4), "<<", cmdShiftButtonPosX, ShiftButtonPosY[a++], IStep, Short.valueOf(curtabindex++), CmdButtonWidth }); } @@ -281,7 +281,7 @@ public class FieldSelection }, new Object[] { - 8, slblSelFields, SelListBoxPosX, Integer.valueOf(CompPosY), IStep, new Short(curtabindex++), ListBoxWidth + 8, slblSelFields, SelListBoxPosX, Integer.valueOf(CompPosY), IStep, Short.valueOf(curtabindex++), ListBoxWidth }); // ListBox 'Fields in the form' @@ -292,7 +292,7 @@ public class FieldSelection }, new Object[] { - ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex + 5), Boolean.TRUE, SelListBoxPosX, ListBoxPosY, IStep, new Short(curtabindex++), ListBoxWidth + ListBoxHeight, HelpIds.getHelpIdString(_FirstHelpIndex + 5), Boolean.TRUE, SelListBoxPosX, ListBoxPosY, IStep, Short.valueOf(curtabindex++), ListBoxWidth }); Object btnmoveup = CurUnoDialog.insertButton("cmdMoveUp" + sIncSuffix, SOCMDMOVEUP, new ActionListenerImpl(), @@ -302,7 +302,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, oFontDesc, 14, HelpIds.getHelpIdString(_FirstHelpIndex + 6), String.valueOf((char) 8743), cmdMoveButtonPosX, MoveButtonPosY[0], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, oFontDesc, 14, HelpIds.getHelpIdString(_FirstHelpIndex + 6), String.valueOf((char) 8743), cmdMoveButtonPosX, MoveButtonPosY[0], IStep, Short.valueOf(curtabindex++), CmdButtonWidth }); Object btnmovedown = CurUnoDialog.insertButton("cmdMoveDown" + sIncSuffix, SOCMDMOVEDOWN, new ActionListenerImpl(), @@ -312,7 +312,7 @@ public class FieldSelection }, new Object[] { - Boolean.FALSE, oFontDesc, 14, HelpIds.getHelpIdString(_FirstHelpIndex + 7), String.valueOf((char) 8744), cmdMoveButtonPosX, MoveButtonPosY[1], IStep, new Short(curtabindex++), CmdButtonWidth + Boolean.FALSE, oFontDesc, 14, HelpIds.getHelpIdString(_FirstHelpIndex + 7), String.valueOf((char) 8744), cmdMoveButtonPosX, MoveButtonPosY[1], IStep, Short.valueOf(curtabindex++), CmdButtonWidth }); CurUnoDialog.getPeerConfiguration().setAccessibleName(btnmoveselected, AccessTextMoveSelected); diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index 61975f4bad20..f8cb5021eea3 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.java +++ b/wizards/com/sun/star/wizards/ui/ImageList.java @@ -59,7 +59,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener private Size selectionGap = new Size(2, 2); private boolean showButtons = true; private Short step; - private final static Short NO_BORDER = new Short((short) 0); + private final static Short NO_BORDER = Short.valueOf((short) 0); private boolean refreshOverNull = true; private int imageTextLines = 1; private boolean rowSelect = false; @@ -76,7 +76,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener private Object dialogModel; private ImageKeyListener imageKeyListener; private static final Integer BACKGROUND_COLOR = 16777216; - private final static Short HIDE_PAGE = new Short((short) 99); + private final static Short HIDE_PAGE = Short.valueOf((short) 99); private final static Integer TRANSPARENT = Integer.valueOf(-1); private final static int LINE_HEIGHT = 8; private MethodInvocation METHOD_MOUSE_PRESSED; @@ -150,7 +150,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener new Object[] { BACKGROUND_COLOR, - new Short((short) 1), + Short.valueOf((short) 1), Integer.valueOf((imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), Integer.valueOf(pos.Width), Integer.valueOf(pos.Height), @@ -183,7 +183,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener }, new Object[] { TRANSPARENT, - new Short((short) 1), + Short.valueOf((short) 1), Integer.valueOf(imageSize.Height + (selectionGap.Height * 2)), //height 0, //posx @@ -215,7 +215,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener Integer.valueOf(pos.Width + 1), Integer.valueOf(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height), step, - new Short((short) 0), + Short.valueOf((short) 0), Boolean.FALSE, Integer.valueOf(cols * (imageSize.Width + gap.Width) + gap.Width - 2) }); @@ -232,7 +232,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener Integer.valueOf(pos.Width), Integer.valueOf(pos.Height + (imageSize.Height + gap.Height) * rows + gap.Height + imageTextHeight + 1), step, - new Short((short) (tabIndex + 1)), + Short.valueOf((short) (tabIndex + 1)), Boolean.TRUE, btnSize }); @@ -244,7 +244,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener 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)), + Short.valueOf((short) (tabIndex + 2)), Boolean.TRUE, btnSize }); @@ -256,12 +256,12 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener 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), + Short.valueOf((short) 0), Boolean.FALSE, Integer.valueOf(cols * (imageSize.Width + gap.Width) + gap.Width - 2 * btnSize.intValue() - 1) }); - Helper.setUnoPropertyValue(getModel(lblCounter), PropertyNames.PROPERTY_ALIGN, new Short((short) 1)); + Helper.setUnoPropertyValue(getModel(lblCounter), PropertyNames.PROPERTY_ALIGN, Short.valueOf((short) 1)); Helper.setUnoPropertyValue(getModel(btnBack), PropertyNames.PROPERTY_LABEL, "<"); Helper.setUnoPropertyValue(getModel(btnNext), PropertyNames.PROPERTY_LABEL, ">"); @@ -269,7 +269,7 @@ public class ImageList implements XItemEventBroadcaster, ListDataListener } imageKeyListener = new ImageKeyListener(); - m_tabIndex = new Short((short) tabIndex); + m_tabIndex = Short.valueOf((short) tabIndex); m_aImages = new XControl[rows * cols]; diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java b/wizards/com/sun/star/wizards/ui/PathSelection.java index 9b1123ce8440..8ad0963e7b1c 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, Integer.valueOf(XPos), Integer.valueOf(YPos), Integer.valueOf(DialogStep), new Short(CurTabIndex), Integer.valueOf(Width) + Boolean.valueOf(Enabled), 8, LabelText, Integer.valueOf(XPos), Integer.valueOf(YPos), Integer.valueOf(DialogStep), Short.valueOf(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, Integer.valueOf(XPos), Integer.valueOf(YPos + 10), Integer.valueOf(DialogStep), new Short((short) (CurTabIndex + 1)), Integer.valueOf(Width - 26) + Boolean.valueOf(Enabled), 12, TxtHelpURL, Integer.valueOf(XPos), Integer.valueOf(YPos + 10), Integer.valueOf(DialogStep), Short.valueOf((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, "...", Integer.valueOf(XPos + Width - 16), Integer.valueOf(YPos + 9), Integer.valueOf(DialogStep), new Short((short) (CurTabIndex + 2)), 16 + Boolean.valueOf(Enabled), 14, BtnHelpURL, "...", Integer.valueOf(XPos + Width - 16), Integer.valueOf(YPos + 9), Integer.valueOf(DialogStep), Short.valueOf((short) (CurTabIndex + 2)), 16 }); } diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index b7fe1e23352e..27323b7e089c 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -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, Integer.valueOf(iCurPosY), IStep, new Short(curtabindex++), ICompWidth + Boolean.valueOf(bDoEnable), 8, sSortHeader[i], 0, ICompPosX, Integer.valueOf(iCurPosY), IStep, Short.valueOf(curtabindex++), ICompWidth }); HIDString = HelpIds.getHelpIdString(FirstHelpIndex); @@ -99,8 +99,8 @@ 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" + Integer.valueOf(i + 1), IListBoxPosX, Integer.valueOf(iCurPosY + 14), IStep, new Short(curtabindex++), IListBoxWidth - }); //new Short((short) (17+i*4)) + true, bDoEnable, 12, HIDString, Short.valueOf(UnoDialog.getListBoxLineCount()), "lstSort" + Integer.valueOf(i + 1), IListBoxPosX, Integer.valueOf(iCurPosY + 14), IStep, Short.valueOf(curtabindex++), IListBoxWidth + }); //Short.valueOf((short) (17+i*4)) HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 1); XRadioButton xRadioButtonAsc = CurUnoDialog.insertRadioButton("optAscend" + Integer.toString(i + 1), 0, new String[] @@ -108,8 +108,8 @@ 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, Integer.valueOf(iCurPosY + 10), new Short((short) 1), IStep, new Short(curtabindex++), PropertyNames.ASC, IOptButtonWidth - }); //, new Short((short) (18+i*4)) + bDoEnable, 10, HIDString, sSortAscend[i], IOptButtonPosX, Integer.valueOf(iCurPosY + 10), Short.valueOf((short) 1), IStep, Short.valueOf(curtabindex++), PropertyNames.ASC, IOptButtonWidth + }); //, Short.valueOf((short) (18+i*4)) HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 2); XRadioButton xRadioButtonDesc = CurUnoDialog.insertRadioButton("optDescend" + Integer.toString(i + 1), 0, new String[] @@ -117,8 +117,8 @@ 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, Integer.valueOf(iCurPosY + 24), new Short((short) 0), IStep, new Short(curtabindex++), "DESC", IOptButtonWidth - }); //, new Short((short) (19+i*4)) + bDoEnable, 10, HIDString, sSortDescend[i], IOptButtonPosX, Integer.valueOf(iCurPosY + 24), Short.valueOf((short) 0), IStep, Short.valueOf(curtabindex++), "DESC", IOptButtonWidth + }); //, Short.valueOf((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 85d8cab05ca1..0571cc03080b 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -104,7 +104,7 @@ public class TitlesComponent extends ControlScroller }, new Object[] { - 16, Boolean.TRUE, Integer.valueOf(iLabelPosX), Integer.valueOf(_iCompPosY + 1), UIConsts.INVISIBLESTEP, new Short(curtabindex++), 30 + 16, Boolean.TRUE, Integer.valueOf(iLabelPosX), Integer.valueOf(_iCompPosY + 1), UIConsts.INVISIBLESTEP, Short.valueOf(curtabindex++), 30 }); xTextComponent = CurUnoDialog.insertTextField(stextfieldname, 0, null, @@ -114,7 +114,7 @@ public class TitlesComponent extends ControlScroller }, new Object[] { - 12, HelpIds.getHelpIdString(curHelpIndex++), Integer.valueOf(iLabelPosX + 30), Integer.valueOf(_iCompPosY), UIConsts.INVISIBLESTEP, new Short(curtabindex++), Integer.valueOf(iCompWidth - 90 - 20) + 12, HelpIds.getHelpIdString(curHelpIndex++), Integer.valueOf(iLabelPosX + 30), Integer.valueOf(_iCompPosY), UIConsts.INVISIBLESTEP, Short.valueOf(curtabindex++), Integer.valueOf(iCompWidth - 90 - 20) }); } } diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index 75eee42370eb..9259425e041f 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, Integer.valueOf(_posx), Integer.valueOf(_posy), Boolean.FALSE, Integer.valueOf(_iStep), 10 + Short.valueOf((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 bdda2b7304cf..6b4ce02c877e 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -174,7 +174,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL int nCurItemID = getCurrentRoadmapItemID(); if (nCurItemID != ID) { - Helper.setUnoPropertyValue(oRoadmap, "CurrentItemID", new Short(ID)); + Helper.setUnoPropertyValue(oRoadmap, "CurrentItemID", Short.valueOf(ID)); } } } @@ -218,7 +218,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL 0, 0, 0, - new Short((short)0), + Short.valueOf((short)0), Boolean.TRUE, 85 }); @@ -428,30 +428,30 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, new Object[] { - 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 + true, IButtonHeight, oWizardResource.getResText(UIConsts.RID_COMMON + 15), Integer.valueOf(iHelpPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.HELP_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth }); insertButton("btnWizardBack", BACK_ACTION_PERFORMED, propNames, new Object[] { - 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 + false, IButtonHeight, HelpIds.getHelpIdString(hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), Integer.valueOf(iBackPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth }); insertButton("btnWizardNext", NEXT_ACTION_PERFORMED, propNames, new Object[] { - 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 + true, IButtonHeight, HelpIds.getHelpIdString(hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), Integer.valueOf(iNextPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth }); insertButton("btnWizardFinish", FINISH_ACTION_PERFORMED, propNames, new Object[] { - 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 + true, IButtonHeight, HelpIds.getHelpIdString(hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), Integer.valueOf(iFinishPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth }); insertButton("btnWizardCancel", CANCEL_ACTION_PERFORMED, propNames, new Object[] { - 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 + true, IButtonHeight, HelpIds.getHelpIdString(hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), Integer.valueOf(iCancelPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(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, Integer.valueOf(i + 1), new Short((short) 12), 212 + oFontDesc, 16, sRightPaneHeaders[i], Boolean.TRUE, 91, 8, Integer.valueOf(i + 1), Short.valueOf((short) 12), 212 }); } } diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.java b/wizards/com/sun/star/wizards/ui/event/DataAware.java index 17485dc012fb..185cd3cb1a94 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.java @@ -243,7 +243,7 @@ public abstract class DataAware { if (getMethod.getReturnType().equals(String.class)) return PropertyNames.EMPTY_STRING; if (getMethod.getReturnType().equals(Short.class)) - return new Short((short) 0); + return Short.valueOf((short) 0); if (getMethod.getReturnType().equals(Integer.class)) return 0; if (getMethod.getReturnType().equals(short[].class)) diff --git a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java index 3920029e8d74..c36e8b78a2c7 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java @@ -368,7 +368,7 @@ public class DataAwareFields } if (field.getType().equals(Short.class)) { - return new Short((short) 0); + return Short.valueOf((short) 0); } if (field.getType().equals(Integer.class)) { @@ -477,7 +477,7 @@ public class DataAwareFields } else if (c.equals(Short.class)) { - return new Short((short) i); + return Short.valueOf((short) i); } else if (c.equals(Double.class)) { |