diff options
87 files changed, 159 insertions, 187 deletions
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index d58a30fe23f6..93ca72b7efec 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -704,7 +704,7 @@ public class LocalOfficeConnection if (unoPath == null) throw new java.io.IOException( "UNO_PATH environment variable is not set (required system path to the office program directory)" ); - cmdArray[0] = (new File(unoPath, OFFICE_APP_NAME)).getPath(); + cmdArray[0] = new File(unoPath, OFFICE_APP_NAME).getPath(); cmdArray[1] = "--nologo"; cmdArray[2] = "--nodefault"; if ( mConnType.equals( "pipe" ) ) diff --git a/connectivity/qa/complex/connectivity/DBaseDriverTest.java b/connectivity/qa/complex/connectivity/DBaseDriverTest.java index 7749fde8d97d..f1c89dc70188 100644 --- a/connectivity/qa/complex/connectivity/DBaseDriverTest.java +++ b/connectivity/qa/complex/connectivity/DBaseDriverTest.java @@ -55,16 +55,16 @@ public class DBaseDriverTest extends ComplexTestCase implements TestCase public void Functions() throws com.sun.star.uno.Exception, com.sun.star.beans.UnknownPropertyException { - DBaseStringFunctions aStringTest = new DBaseStringFunctions((param.getMSF()), this); + DBaseStringFunctions aStringTest = new DBaseStringFunctions(param.getMSF(), this); aStringTest.testFunctions(); - DBaseNumericFunctions aNumericTest = new DBaseNumericFunctions((param.getMSF()), this); + DBaseNumericFunctions aNumericTest = new DBaseNumericFunctions(param.getMSF(), this); aNumericTest.testFunctions(); - DBaseDateFunctions aDateTest = new DBaseDateFunctions((param.getMSF()), this); + DBaseDateFunctions aDateTest = new DBaseDateFunctions(param.getMSF(), this); aDateTest.testFunctions(); - DBaseSqlTests aSqlTest = new DBaseSqlTests((param.getMSF()), this); + DBaseSqlTests aSqlTest = new DBaseSqlTests(param.getMSF(), this); aSqlTest.testFunctions(); } } diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java index 7a3b09362af8..03db63289ef1 100644 --- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java @@ -573,7 +573,7 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. // obtain the DataSource associated with the document. Keeping this alive // ensures that the "impl data" of the document is kept alive, too, so when closing // and re-opening it, this "impl data" must be re-used. - XDocumentDataSource dataSource = UnoRuntime.queryInterface(XDocumentDataSource.class, (UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, databaseDoc)).getDataSource()); + XDocumentDataSource dataSource = UnoRuntime.queryInterface(XDocumentDataSource.class, UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, databaseDoc).getDataSource()); // close and reload the doc impl_closeDocument(databaseDoc); diff --git a/forms/qa/integration/forms/FormControlTest.java b/forms/qa/integration/forms/FormControlTest.java index eac48209ca60..773a0197afdc 100644 --- a/forms/qa/integration/forms/FormControlTest.java +++ b/forms/qa/integration/forms/FormControlTest.java @@ -669,7 +669,7 @@ public class FormControlTest extends complexlib.ComplexTestCase implements XSQLE { try { - if ( ( "f_time" ).equals(fieldName) ) + if ( "f_time".equals(fieldName) ) // http://bugs.mysql.com/bug.php?id=5681 return true; if (fieldName == null) { diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java index a5226e0e4199..d8d1c06779fc 100644 --- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java +++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java @@ -767,7 +767,7 @@ public class AcceleratorsConfigurationTest private XMultiServiceFactory getMSF() { - return(UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager())); + return UnoRuntime.queryInterface(XMultiServiceFactory.class, connection.getComponentContext().getServiceManager()); } // setup and close connections diff --git a/framework/qa/complex/accelerators/KeyMapping.java b/framework/qa/complex/accelerators/KeyMapping.java index 79e562a39a0b..fd3637ba2a13 100644 --- a/framework/qa/complex/accelerators/KeyMapping.java +++ b/framework/qa/complex/accelerators/KeyMapping.java @@ -133,7 +133,7 @@ public class KeyMapping public short mapIdentifier2Code(String sIdentifier) { - return (aIdentifierHashMap.get(sIdentifier)).shortValue(); + return aIdentifierHashMap.get(sIdentifier).shortValue(); } public String mapCode2Identifier(short nCode) diff --git a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java index fa3a999ad25c..2a37129d8280 100644 --- a/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java @@ -61,9 +61,9 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor UnoRuntime.queryInterface(com.sun.star.container.XIndexContainer.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTriggerContainer")); // intialize root menu entry "Help" - xRootMenuEntry.setPropertyValue("Text", ("Help")); - xRootMenuEntry.setPropertyValue("CommandURL", ("slot:5410")); - xRootMenuEntry.setPropertyValue("HelpURL", ("5410")); + xRootMenuEntry.setPropertyValue("Text", "Help"); + xRootMenuEntry.setPropertyValue("CommandURL", "slot:5410"); + xRootMenuEntry.setPropertyValue("HelpURL", "5410"); xRootMenuEntry.setPropertyValue("SubContainer", xSubMenuContainer); xRootMenuEntry.setPropertyValue("Image", myBitmap); @@ -71,9 +71,9 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor // intialize help/content menu entry // entry "Content" XPropertySet xMenuEntry = UnoRuntime.queryInterface(XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); - xMenuEntry.setPropertyValue("Text", ("Content")); - xMenuEntry.setPropertyValue("CommandURL", ("slot:5401")); - xMenuEntry.setPropertyValue("HelpURL", ("5401")); + xMenuEntry.setPropertyValue("Text", "Content"); + xMenuEntry.setPropertyValue("CommandURL", "slot:5401"); + xMenuEntry.setPropertyValue("HelpURL", "5401"); // insert menu entry to sub menu xSubMenuContainer.insertByIndex(0, xMenuEntry); @@ -81,18 +81,18 @@ public class ContextMenuInterceptor implements XContextMenuInterceptor // intialize help/help agent // entry "Help Agent" xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); - xMenuEntry.setPropertyValue("Text", ("Help Agent")); - xMenuEntry.setPropertyValue("CommandURL", ("slot:5962")); - xMenuEntry.setPropertyValue("HelpURL", ("5962")); + xMenuEntry.setPropertyValue("Text", "Help Agent"); + xMenuEntry.setPropertyValue("CommandURL", "slot:5962"); + xMenuEntry.setPropertyValue("HelpURL", "5962"); // insert menu entry to sub menu xSubMenuContainer.insertByIndex(1, xMenuEntry); // intialize help/tips // entry "Tips" xMenuEntry = UnoRuntime.queryInterface(com.sun.star.beans.XPropertySet.class, xMenuElementFactory.createInstance("com.sun.star.ui.ActionTrigger")); - xMenuEntry.setPropertyValue("Text", ("Tips")); - xMenuEntry.setPropertyValue("CommandURL", ("slot:5404")); - xMenuEntry.setPropertyValue("HelpURL", ("5404")); + xMenuEntry.setPropertyValue("Text", "Tips"); + xMenuEntry.setPropertyValue("CommandURL", "slot:5404"); + xMenuEntry.setPropertyValue("HelpURL", "5404"); // insert menu entry to sub menu xSubMenuContainer.insertByIndex(2, xMenuEntry); diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java index 44ba2a2a9da0..40e8f2411727 100644 --- a/framework/qa/complex/dispatches/Interceptor.java +++ b/framework/qa/complex/dispatches/Interceptor.java @@ -304,6 +304,6 @@ public class Interceptor implements XDispatch, private boolean impl_match(String sVal1, String sVal2) { // TODO implement wildcard match - return (sVal1.equals(sVal2)); + return sVal1.equals(sVal2); } } diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java index e3280c1bb91b..25f1798fbada 100644 --- a/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java +++ b/javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java @@ -118,7 +118,7 @@ public final class XInputStreamToInputStreamAdapter extends InputStream { throw newEx; } - return (bytesRead); + return bytesRead; } @Override diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java index 26d94649174a..ab2a38143423 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java @@ -126,14 +126,14 @@ public final class PropertySetMixin { idlClass = getReflection(type.getTypeName()); XTypeDescription ifc; try { - ifc = UnoRuntime.queryInterface( - XTypeDescription.class, - (UnoRuntime.queryInterface( + XHierarchicalNameAccess xhna = UnoRuntime.queryInterface( XHierarchicalNameAccess.class, context.getValueByName( "/singletons/com.sun.star.reflection." - + "theTypeDescriptionManager")). - getByHierarchicalName(type.getTypeName()))); + + "theTypeDescriptionManager")); + ifc = UnoRuntime.queryInterface( + XTypeDescription.class, + xhna.getByHierarchicalName(type.getTypeName())); } catch (NoSuchElementException e) { throw new RuntimeException(e); } @@ -636,9 +636,7 @@ public final class PropertySetMixin { break; } attrAttribs |= n; - t = (UnoRuntime.queryInterface( - XStructTypeDescription.class, t)). - getTypeArguments()[0]; + t = UnoRuntime.queryInterface(XStructTypeDescription.class, t).getTypeArguments()[0]; } String name = members[i].getMemberName(); boolean present = true; diff --git a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java index 24187ffb1290..ac175d3a6d5d 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java @@ -78,7 +78,7 @@ public class WeakBase implements XWeak, XTypeProvider for(int i = 0; i < interfaces.length; ++ i) { // Test if it is a UNO interface - if (com.sun.star.uno.XInterface.class.isAssignableFrom((interfaces[i]))) + if (com.sun.star.uno.XInterface.class.isAssignableFrom(interfaces[i])) vec.add(new Type(interfaces[i])); } // get the superclass the currentClass inherits from diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java index 43decf30f388..a28794434e9f 100644 --- a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java +++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java @@ -74,11 +74,11 @@ class Proxy implements IQueryInterface, XEventListener if (object instanceof IQueryInterface) { IQueryInterface iquery = (IQueryInterface) object; - return (iquery.getOid().equals(oid)); + return iquery.getOid().equals(oid); } String oidObj = UnoRuntime.generateOid(object); - return (oidObj.equals(oid)); + return oidObj.equals(oid); } public Object queryInterface(Type type) { diff --git a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java b/linguistic/qa/complex/linguistic/HangulHanjaConversion.java index b7e479d271b8..b407c464261b 100644 --- a/linguistic/qa/complex/linguistic/HangulHanjaConversion.java +++ b/linguistic/qa/complex/linguistic/HangulHanjaConversion.java @@ -119,7 +119,7 @@ XComponent xDoc = DesktopTools.loadDoc(xMSF, FileToLoad, while (!done) { String[] HangulHanja = getLeftAndRight(counter, xSheet); - done = (HangulHanja[0].equals("")); + done = HangulHanja[0].equals(""); counter++; if (!done) { diff --git a/qadevOOo/runner/complexlib/ComplexTestCase.java b/qadevOOo/runner/complexlib/ComplexTestCase.java index 56bc0b986198..4ece6ae2b610 100644 --- a/qadevOOo/runner/complexlib/ComplexTestCase.java +++ b/qadevOOo/runner/complexlib/ComplexTestCase.java @@ -119,7 +119,7 @@ public abstract class ComplexTestCase extends Assurance implements ComplexTest int posLeftParenthesis = entryName.indexOf('('); if (posLeftParenthesis != -1) { - String sParameter = (entryName.substring(posLeftParenthesis + 1, entryName.indexOf(')'))); + String sParameter = entryName.substring(posLeftParenthesis + 1, entryName.indexOf(')')); mTestMethodName = entryName; parameter = new String[] { sParameter }; entryName = entryName.substring(0, posLeftParenthesis); diff --git a/qadevOOo/runner/helper/BuildEnvTools.java b/qadevOOo/runner/helper/BuildEnvTools.java index 2c10aa70cad7..b967ee7f5872 100644 --- a/qadevOOo/runner/helper/BuildEnvTools.java +++ b/qadevOOo/runner/helper/BuildEnvTools.java @@ -83,7 +83,7 @@ public class BuildEnvTools { error = true; } - mCygwin = (param.getBool(PropertyName.CYGWIN)); + mCygwin = param.getBool(PropertyName.CYGWIN); if (error) { throw new ParameterNotFoundException(msg); diff --git a/qadevOOo/runner/util/InstCreator.java b/qadevOOo/runner/util/InstCreator.java index de40b07c03b1..d517f0cd1e8c 100644 --- a/qadevOOo/runner/util/InstCreator.java +++ b/qadevOOo/runner/util/InstCreator.java @@ -88,7 +88,7 @@ public class InstCreator implements XInstCreator { XFootnotesSupplier oTTS = UnoRuntime.queryInterface( XFootnotesSupplier.class, xParent ); - return( oTTS.getFootnotes() ); + return oTTS.getFootnotes(); } if ( iDsc instanceof TextSectionDsc ) { diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java index 008b98295f8d..ec796aec5757 100644 --- a/qadevOOo/runner/util/ValueChanger.java +++ b/qadevOOo/runner/util/ValueChanger.java @@ -153,7 +153,7 @@ public class ValueChanger { com.sun.star.style.TabAlign TA1 = com.sun.star.style.TabAlign.CENTER; com.sun.star.style.TabAlign TA2 = com.sun.star.style.TabAlign.RIGHT; - if ((TSold.Alignment).equals(TA1)) + if (TSold.Alignment.equals(TA1)) TS.Alignment = TA2; else TS.Alignment = TA1; diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java index dc019a4fcbfb..2ca7351db781 100644 --- a/qadevOOo/runner/util/utils.java +++ b/qadevOOo/runner/util/utils.java @@ -537,7 +537,7 @@ public class utils { public static boolean isVoid(Object aObject) { if (aObject instanceof com.sun.star.uno.Any) { com.sun.star.uno.Any oAny = (com.sun.star.uno.Any) aObject; - return (oAny.getType().getTypeName().equals("void")); + return oAny.getType().getTypeName().equals("void"); } else { return false; } diff --git a/qadevOOo/tests/java/ifc/awt/_XControl.java b/qadevOOo/tests/java/ifc/awt/_XControl.java index 1dd1da4361f2..0f3c06a25e71 100644 --- a/qadevOOo/tests/java/ifc/awt/_XControl.java +++ b/qadevOOo/tests/java/ifc/awt/_XControl.java @@ -158,7 +158,7 @@ public class _XControl extends MultiMethodTest { requiredMethod("setModel()"); XControlModel the_model = (XControlModel) tEnv.getObjRelation("MODEL"); XControlModel get = oObj.getModel(); - boolean res = (get.equals(the_model)); + boolean res = get.equals(the_model); if (!res) { log.println("getting: "+get.toString()); log.println("expected: "+the_model.toString()); diff --git a/qadevOOo/tests/java/ifc/beans/_XIntrospection.java b/qadevOOo/tests/java/ifc/beans/_XIntrospection.java index c8c96edbc8b6..79d7d1767dbd 100644 --- a/qadevOOo/tests/java/ifc/beans/_XIntrospection.java +++ b/qadevOOo/tests/java/ifc/beans/_XIntrospection.java @@ -44,7 +44,7 @@ public class _XIntrospection extends MultiMethodTest { public void _inspect() { boolean result = true; XIntrospectionAccess xIA = oObj.inspect(oObj); - result = (xIA.hasMethod("acquire",1)); + result = xIA.hasMethod("acquire",1); tRes.tested("inspect()",result); } diff --git a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java index 80b96398e0dc..c74f93d7fac8 100644 --- a/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java +++ b/qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java @@ -155,8 +155,7 @@ public class _XMultiPropertyStates extends MultiMethodTest { the_first[0] = propName; log.println("Setting " + propName + " to default"); oObj.setPropertiesToDefault(the_first); - result = (oObj.getPropertyStates(the_first)[0].equals - (PropertyState.DEFAULT_VALUE)); + result = oObj.getPropertyStates(the_first)[0].equals(PropertyState.DEFAULT_VALUE); } catch (com.sun.star.beans.UnknownPropertyException e) { log.println("some properties seem to be unknown: " + e.toString()); } diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java index b7df9cc7c23a..ca7337a7417a 100644 --- a/qadevOOo/tests/java/ifc/beans/_XPropertyState.java +++ b/qadevOOo/tests/java/ifc/beans/_XPropertyState.java @@ -119,7 +119,7 @@ public class _XPropertyState extends MultiMethodTest { boolean result = true ; String localName = pName; if (localName == null) { - localName = (propertySetInfo.getProperties()[0]).Name; + localName = propertySetInfo.getProperties()[0].Name; } try { propDef = oObj.getPropertyDefault(localName); @@ -147,7 +147,7 @@ public class _XPropertyState extends MultiMethodTest { String localName = pName; if (localName == null) { - localName = (propertySetInfo.getProperties()[0]).Name; + localName = propertySetInfo.getProperties()[0].Name; } try { @@ -175,7 +175,7 @@ public class _XPropertyState extends MultiMethodTest { String localName = pName; if (localName == null) { - localName = (propertySetInfo.getProperties()[0]).Name; + localName = propertySetInfo.getProperties()[0].Name; } try { diff --git a/qadevOOo/tests/java/ifc/chart/_XDiagram.java b/qadevOOo/tests/java/ifc/chart/_XDiagram.java index 3d02e7399924..de51ea2e1082 100644 --- a/qadevOOo/tests/java/ifc/chart/_XDiagram.java +++ b/qadevOOo/tests/java/ifc/chart/_XDiagram.java @@ -73,7 +73,7 @@ public class _XDiagram extends MultiMethodTest { String stype = oObj.getDiagramType(); log.println("Current Diagram Type is " + stype); - result = (stype.startsWith("com.sun.star.chart.")); + result = stype.startsWith("com.sun.star.chart."); tRes.tested("getDiagramType()", result); } diff --git a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java index d8f7610654da..686f09a9ead4 100644 --- a/qadevOOo/tests/java/ifc/connection/_XAcceptor.java +++ b/qadevOOo/tests/java/ifc/connection/_XAcceptor.java @@ -125,8 +125,7 @@ public class _XAcceptor extends MultiMethodTest { // creating services required try { - Object oConnector = (tParam.getMSF()). - createInstance("com.sun.star.connection.Connector") ; + Object oConnector = tParam.getMSF().createInstance("com.sun.star.connection.Connector") ; xConnector = UnoRuntime.queryInterface (XConnector.class, oConnector) ; diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java index 102bf7fc9b28..e04595adbb8c 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java +++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java @@ -324,7 +324,7 @@ public class _XCalendar extends MultiMethodTest { log.println("*** " + lang + " ... FAILED ***"); log.println(error); } - res &= (error.equals("")); + res &= error.equals(""); } tRes.tested("setValue()", res); diff --git a/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java b/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java index d94daef71f99..e7060dcb2aae 100644 --- a/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java +++ b/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java @@ -233,7 +233,7 @@ public class _XLocaleData extends MultiMethodTest { for (int i=0;i<7;i++) { Implementation[] impl = oObj.getCollatorImplementations(getLocale(i)); for (int j=0;j<impl.length;j++) { - if ((impl[j].unoID.equals(""))) { + if (impl[j].unoID.equals("")) { printit = true; } res &= (!impl[j].unoID.equals("")); @@ -258,7 +258,7 @@ public class _XLocaleData extends MultiMethodTest { for (int i=0;i<7;i++) { String[] str = oObj.getSearchOptions(getLocale(i)); for (int j=0;j<str.length;j++) { - if ((str[j].equals(""))) { + if (str[j].equals("")) { printit = true; } res &= (!str[j].equals("")); @@ -283,7 +283,7 @@ public class _XLocaleData extends MultiMethodTest { for (int i=0;i<7;i++) { String[] str = oObj.getCollationOptions(getLocale(i)); for (int j=0;j<str.length;j++) { - if ((str[j].equals(""))) { + if (str[j].equals("")) { printit = true; } res &= (!str[j].equals("")); @@ -308,7 +308,7 @@ public class _XLocaleData extends MultiMethodTest { for (int i=0;i<7;i++) { String[] str = oObj.getTransliterations(getLocale(i)); for (int j=0;j<str.length;j++) { - if ((str[j].equals(""))) { + if (str[j].equals("")) { printit = true; } res &= (!str[j].equals("")); @@ -355,7 +355,7 @@ public class _XLocaleData extends MultiMethodTest { for (int i=0;i<7;i++) { String[] str = oObj.getReservedWord(getLocale(i)); for (int j=0;j<str.length;j++) { - if ((str[j].equals(""))) { + if (str[j].equals("")) { printit = true; } res &= (!str[j].equals("")); diff --git a/qadevOOo/tests/java/ifc/io/_XPersistObject.java b/qadevOOo/tests/java/ifc/io/_XPersistObject.java index 46b7a765b625..083d0f71c692 100644 --- a/qadevOOo/tests/java/ifc/io/_XPersistObject.java +++ b/qadevOOo/tests/java/ifc/io/_XPersistObject.java @@ -160,7 +160,7 @@ public class _XPersistObject extends MultiMethodTest { persCopy.read(iStream); - bResult = ( persCopy.getServiceName().equals(sname) ); + bResult = persCopy.getServiceName().equals(sname); } diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java index 1051ce8c5bd6..a69e99251580 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java @@ -123,7 +123,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { try{ String filter = "\"Identifier\" = 'BOR02b'"; xComposer.setFilter(filter); - tRes.tested("getFilter()", (oObj.getFilter().equals(filter))); + tRes.tested("getFilter()", oObj.getFilter().equals(filter)); } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -154,7 +154,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { PropertyValue[][] aStructuredFilter = oObj.getStructuredFilter(); xComposer.setFilter(""); xComposer.setStructuredFilter(aStructuredFilter); - tRes.tested("getStructuredFilter()", (oObj.getFilter().equals(complexFilter))); + tRes.tested("getStructuredFilter()", oObj.getFilter().equals(complexFilter)); } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -173,7 +173,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { try{ String group = "\"Identifier\""; xComposer.setGroup(group); - tRes.tested("getGroup()", (oObj.getGroup().equals(group))); + tRes.tested("getGroup()", oObj.getGroup().equals(group)); } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -210,8 +210,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { try{ String clause = "\"Identifier\" = 'BOR02b'"; xComposer.setHavingClause(clause); - tRes.tested("getHavingClause()", ( - oObj.getHavingClause().equals(clause))); + tRes.tested("getHavingClause()", oObj.getHavingClause().equals(clause)); } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -242,7 +241,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { xComposer.setHavingClause(""); xComposer.setStructuredHavingClause(aStructuredHaving); tRes.tested("getStructuredHavingClause()", - (oObj.getHavingClause().equals(complexFilter))); + oObj.getHavingClause().equals(complexFilter)); } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -258,7 +257,7 @@ public class _XSingleSelectQueryAnalyzer extends MultiMethodTest { try{ String order = "\"Identifier\""; xComposer.setOrder(order); - tRes.tested("getOrder()", (oObj.getOrder().equals(order))); + tRes.tested("getOrder()", oObj.getOrder().equals(order)); } catch (com.sun.star.sdbc.SQLException e){ log.println("unexpected Exception: " + e.toString()); diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java index 2134a87eb18a..717d0672d3ae 100644 --- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java +++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java @@ -128,7 +128,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { try{ String filter = "\"Identifier\" = 'BOR02b'"; oObj.setFilter(filter); - tRes.tested("setFilter()", (xQueryAna.getFilter().equals(filter))); + tRes.tested("setFilter()", xQueryAna.getFilter().equals(filter)); } catch (SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -152,7 +152,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { PropertyValue[][] aStructuredFilter = xQueryAna.getStructuredFilter(); oObj.setFilter(""); oObj.setStructuredFilter(aStructuredFilter); - tRes.tested("setStructuredFilter()", (xQueryAna.getFilter().equals(complexFilter))); + tRes.tested("setStructuredFilter()", xQueryAna.getFilter().equals(complexFilter)); } catch (SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -312,7 +312,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { try{ String group = "\"Identifier\""; oObj.setGroup(group); - tRes.tested("setGroup()", (xQueryAna.getGroup().equals(group))); + tRes.tested("setGroup()", xQueryAna.getGroup().equals(group)); } catch (SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -330,8 +330,8 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { try{ String clause = "\"Identifier\" = 'BOR02b'"; oObj.setHavingClause(clause); - tRes.tested("setHavingClause()", ( - xQueryAna.getHavingClause().equals(clause))); + tRes.tested("setHavingClause()", + xQueryAna.getHavingClause().equals(clause)); } catch (SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -367,7 +367,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { oObj.setHavingClause(""); oObj.setStructuredHavingClause(aStructuredHaving); tRes.tested("setStructuredHavingClause()", - (xQueryAna.getHavingClause().equals(complexFilter))); + xQueryAna.getHavingClause().equals(complexFilter)); } catch (SQLException e){ log.println("unexpected Exception: " + e.toString()); @@ -509,7 +509,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest { try{ String order = "\"Identifier\""; oObj.setOrder(order); - tRes.tested("setOrder()", (xQueryAna.getOrder().equals(order))); + tRes.tested("setOrder()", xQueryAna.getOrder().equals(order)); } catch (SQLException e){ log.println("unexpected Exception: " + e.toString()); diff --git a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java index dde20034f968..1758ccb1b5f4 100644 --- a/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java +++ b/qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java @@ -116,7 +116,7 @@ public class _XWarningsSupplier extends MultiMethodTest { try { oObj.clearWarnings(); Object warns = oObj.getWarnings(); - res = (utils.isVoid(warns)); + res = utils.isVoid(warns); } catch (SQLException e) { log.println("Exception occurred :"); e.printStackTrace(log); diff --git a/qadevOOo/tests/java/ifc/text/_XFootnote.java b/qadevOOo/tests/java/ifc/text/_XFootnote.java index 0bb4057802bf..acd7fa5f8f0c 100644 --- a/qadevOOo/tests/java/ifc/text/_XFootnote.java +++ b/qadevOOo/tests/java/ifc/text/_XFootnote.java @@ -85,7 +85,7 @@ public class _XFootnote extends MultiMethodTest { String res = oObj.getLabel(); log.println("verify setLabel result"); - result = (res.equals(str)); + result = res.equals(str); if (result) { log.println(" ... setLabel() - OK"); } diff --git a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java index a7239f819280..7268118dd3dc 100644 --- a/qadevOOo/tests/java/ifc/text/_XPagePrintable.java +++ b/qadevOOo/tests/java/ifc/text/_XPagePrintable.java @@ -95,7 +95,7 @@ public class _XPagePrintable extends MultiMethodTest { Boolean newlandscape = Boolean.valueOf(!landscape.booleanValue()); PrintSettings[8].Value = newlandscape; oObj.setPagePrintSettings(PrintSettings); - res = (oObj.getPagePrintSettings()[8].Value.equals(newlandscape)); + res = oObj.getPagePrintSettings()[8].Value.equals(newlandscape); tRes.tested("setPagePrintSettings()",res); } diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java index 321d2901950b..039658e1dfea 100644 --- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java +++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java @@ -192,7 +192,7 @@ public class ODatasourceBrowser extends TestCase { } // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a text document"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index f6797763ebd5..c3fd3f829ac6 100644 --- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java +++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java @@ -216,7 +216,7 @@ public class GenericModelTest extends TestCase { @Override protected void initialize(TestParameters tParam, PrintWriter log) throws Exception { log.println("creating a textdocument"); - m_xTextDoc = WriterTools.createTextDoc((tParam.getMSF())); + m_xTextDoc = WriterTools.createTextDoc(tParam.getMSF()); m_ConnectionColsed = false; debug = tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE); m_propertiesToSet.clear(); @@ -392,7 +392,7 @@ public class GenericModelTest extends TestCase { utils.copyFile(xMSF, sourceTestDB, destTestDB); m_dbTools = new DBTools( xMSF ); - String tmpDir = utils.getOfficeTemp((xMSF)); + String tmpDir = utils.getOfficeTemp(xMSF); DBTools.DataSourceInfo srcInf = m_dbTools.newDataSourceInfo(); srcInf.URL = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir); diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java index 2bb3f35d2b51..f95a2340d4d8 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java @@ -91,7 +91,7 @@ public class OCheckBoxControl extends TestCase { */ @Override protected void initialize ( TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); } diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java index 010948537d4b..1b5fe16d670b 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java @@ -95,7 +95,7 @@ public class OComboBoxControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index d8845e5f5c7f..77fde0139689 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -229,7 +229,7 @@ public class ODatabaseForm extends TestCase { @Override protected void initialize(TestParameters tParam, PrintWriter log) throws Exception { - tmpDir = utils.getOfficeTemp((tParam.getMSF())); + tmpDir = utils.getOfficeTemp(tParam.getMSF()); origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf"); @@ -296,7 +296,7 @@ public class ODatabaseForm extends TestCase { oldF = utils.getFullURL(origDB); newF = utils.getOfficeTemp(tParam.getMSF()) + tableName + ".dbf"; - } while (!utils.tryOverwriteFile((tParam.getMSF()), oldF, newF) && + } while (!utils.tryOverwriteFile(tParam.getMSF(), oldF, newF) && (uniqueSuffix++ < 50)); } } @@ -322,7 +322,7 @@ public class ODatabaseForm extends TestCase { } log.println("creating a text document"); - xTextDoc = WriterTools.createTextDoc((Param.getMSF())); + xTextDoc = WriterTools.createTextDoc(Param.getMSF()); //initialize test table if (isMySQLDB) { @@ -439,11 +439,8 @@ public class ODatabaseForm extends TestCase { formLoader.load(); try { - oObj = (XForm) AnyConverter.toObject(new Type(XForm.class), - (FormTools.getForms( - WriterTools.getDrawPage( - xTextDoc))) - .getByName("MyForm")); + Object temp1 = FormTools.getForms( WriterTools.getDrawPage(xTextDoc) ).getByName("MyForm"); + oObj = (XForm) AnyConverter.toObject(new Type(XForm.class), temp1); XPropertySet xSetProp = UnoRuntime.queryInterface( XPropertySet.class, oObj); diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java index d80597b12982..7d4dfc9e4c18 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateControl.java +++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java @@ -94,7 +94,7 @@ public class ODateControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java index 4b233ca86347..ae231ace5365 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditControl.java +++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java @@ -95,7 +95,7 @@ public class OEditControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java index 247d56a4a3d8..994e62123e6d 100644 --- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java @@ -94,7 +94,7 @@ public class OFileControlModel extends TestCase { */ @Override protected void initialize(TestParameters tParam, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); log.println("creating a draw document"); xDrawDoc = SOF.createDrawDoc(null); } diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java index 9924e4c1d0e8..11793b31d320 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java @@ -91,7 +91,7 @@ public class OFormattedControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java index 293fcbbf77ed..f608b5d0c7cf 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java +++ b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java @@ -77,7 +77,7 @@ public class OFormsCollection extends TestCase { @Override protected void initialize(TestParameters tParam, PrintWriter log) throws Exception { log.println("creating a draw document"); - xDrawDoc = DrawTools.createDrawDoc((tParam.getMSF())); + xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF()); } /** diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java index 6995574d6b42..bc9b964fa6b0 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java @@ -229,7 +229,7 @@ class OGridControlModelold extends TestCase { */ @Override protected void initialize(TestParameters tParam, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); log.println("creating a draw document"); xDrawDoc = SOF.createDrawDoc(null); } diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java index fd6f571df05a..dea7c00583da 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java @@ -73,7 +73,7 @@ public class OGroupBoxControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java index 7b64604d71a3..388447f505b9 100644 --- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java +++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java @@ -91,7 +91,7 @@ public class OHiddenModel extends TestCase { */ @Override protected void initialize(TestParameters tParam, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF()); log.println("creating a draw document"); xDrawDoc = SOF.createDrawDoc(null); @@ -136,7 +136,7 @@ public class OHiddenModel extends TestCase { log.println("creating a test environment"); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); String objName = "HiddenControl"; XInterface ctrl = SOF.createControl(xDrawDoc, objName); diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java index 11e67319361e..1f55ac59ec16 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java @@ -78,7 +78,7 @@ public class OImageButtonControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java index a13246adc1a8..d859264e1a45 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java @@ -79,7 +79,7 @@ public class OImageControlControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java index da867ae2cc17..03dac5b1a20b 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java @@ -47,7 +47,7 @@ public class OListBoxControl extends TestCase { @Override protected void initialize ( TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) ); + SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() ); log.println( "creating a textdocument" ); xTextDoc = SOF.createTextDoc( null ); } diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java index f8aa38d974a9..843e5c8a9f3f 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java @@ -94,7 +94,7 @@ public class ONumericControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java index 80d4b5bebc9d..4c67dabd96ff 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java @@ -94,7 +94,7 @@ public class OPatternControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java index 7c7ea558906a..0fd3ce626d81 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java @@ -82,7 +82,7 @@ public class ORadioButtonControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java index 76a951bb48ef..ddd5d209899d 100644 --- a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java +++ b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java @@ -42,7 +42,7 @@ public class OScrollBarModel extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception { log.println( "creating a textdocument" ); - xTextDoc = WriterTools.createTextDoc((tParam.getMSF())); + xTextDoc = WriterTools.createTextDoc(tParam.getMSF()); } /** diff --git a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java index d586a849720f..0a3ec02c6155 100644 --- a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java +++ b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java @@ -42,7 +42,7 @@ public class OSpinButtonModel extends TestCase { protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception { log.println( "creating a textdocument" ); - xTextDoc = WriterTools.createTextDoc((tParam.getMSF())); + xTextDoc = WriterTools.createTextDoc(tParam.getMSF()); } /** diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java index 9e0486a0064b..375174149dc8 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java @@ -95,7 +95,7 @@ public class OTimeControl extends TestCase { */ @Override protected void initialize(TestParameters Param, PrintWriter log) throws Exception { - SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); log.println("creating a textdocument"); xTextDoc = SOF.createTextDoc(null); @@ -217,7 +217,7 @@ public class OTimeControl extends TestCase { textComp.addTextListener(listener); tEnv.addObjRelation("TestTextListener", listener); - FormTools.switchDesignOf((Param.getMSF()), xTextDoc); + FormTools.switchDesignOf(Param.getMSF(), xTextDoc); util.utils.waitForEventIdle(Param.getMSF()); return tEnv; diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java index 29a9d0a87002..176d17e39d9a 100644 --- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java +++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java @@ -147,8 +147,7 @@ public class SdXCustomPresentationAccess extends TestCase { // INDEX : _XNameContainer log.println( "adding XNameContainerINDEX as mod relation to environment" ); - tEnv.addObjRelation("XNameContainerINDEX", - (Integer.valueOf(THRCNT)).toString()); + tEnv.addObjRelation("XNameContainerINDEX", Integer.valueOf(THRCNT).toString()); // INSTANCEn : _XNameContainer; _XNameReplace log.println( "adding INSTANCEn as mod relation to environment" ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java index cc4d673f7b90..99bf4e08bd26 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java +++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java @@ -257,7 +257,7 @@ public class SwXMailMerge extends TestCase { String tmpDatabaseFile = tmpDatabaseUrl + databaseName + ".odb"; System.out.println("try to delete '"+tmpDatabaseFile+"'"); - utils.deleteFile((Param.getMSF()), tmpDatabaseFile); + utils.deleteFile(Param.getMSF(), tmpDatabaseFile); tmpDatabaseUrl = "sdbc:dbase:file:///" + tmpDatabaseUrl ; diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java index 9a887af483ea..50fc0c532a1c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java @@ -117,7 +117,7 @@ public class SwXTextPortion extends TestCase { XEnumeration oEnum = oEnumA.createEnumeration(); int n = 0; - while ((oEnum.hasMoreElements())) { + while (oEnum.hasMoreElements()) { param = (XInterface) AnyConverter.toObject(new Type( XInterface.class), oEnum.nextElement()); log.println("Element Nr.: " + n); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java index 5956041a1d4e..b5cf80e3033b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java @@ -115,7 +115,7 @@ public class SwXTextPortionEnumeration extends TestCase { XEnumerationAccess.class, oText); XEnumeration oEnum = oEnumA.createEnumeration(); - while ((oEnum.hasMoreElements())) { + while (oEnum.hasMoreElements()) { param = (XInterface) AnyConverter.toObject(new Type( XInterface.class), oEnum.nextElement()); } diff --git a/qadevOOo/tests/java/mod/_toolkit/TabController.java b/qadevOOo/tests/java/mod/_toolkit/TabController.java index b7708046de8b..7f361567f893 100644 --- a/qadevOOo/tests/java/mod/_toolkit/TabController.java +++ b/qadevOOo/tests/java/mod/_toolkit/TabController.java @@ -91,11 +91,8 @@ public class TabController extends TestCase { XForm form = null; try { - form = (XForm) AnyConverter.toObject(new Type(XForm.class), - (FormTools.getForms( - WriterTools.getDrawPage( - xTextDoc))) - .getByName("MyForm")); + Object temp = FormTools.getForms( WriterTools.getDrawPage(xTextDoc) ).getByName("MyForm"); + form = (XForm) AnyConverter.toObject(new Type(XForm.class), temp); } catch (Exception e) { log.println("Couldn't get Form"); e.printStackTrace(log); diff --git a/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java b/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java index c110b6de4de7..1caf962fe766 100644 --- a/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java @@ -127,8 +127,7 @@ public final class TypeDescription_Test { @Test public void testUnsigned() throws ClassNotFoundException { assertEquals( "TypeDescription for UNSIGNED LONG", "unsigned long", - (TypeDescription.getTypeDescription(Type.UNSIGNED_LONG). - getTypeName())); + TypeDescription.getTypeDescription(Type.UNSIGNED_LONG).getTypeName()); } @Test public void testGetMethodDescription() { @@ -139,8 +138,7 @@ public final class TypeDescription_Test { @Test public void testSequence() throws ClassNotFoundException { assertEquals( "unsigned short", - (TypeDescription.getTypeDescription("[]unsigned short"). - getComponentType().getTypeName())); + TypeDescription.getTypeDescription("[]unsigned short").getComponentType().getTypeName()); } public interface XBase extends XInterface { diff --git a/ridljar/test/com/sun/star/uno/Type_Test.java b/ridljar/test/com/sun/star/uno/Type_Test.java index c80e022f3487..e81142c64ac0 100644 --- a/ridljar/test/com/sun/star/uno/Type_Test.java +++ b/ridljar/test/com/sun/star/uno/Type_Test.java @@ -49,9 +49,7 @@ public final class Type_Test { assertSame( "sequence of sequence of XComponentContext", XComponentContext[][].class, - (new Type( - "[][]com.sun.star.uno.XComponentContext", TypeClass.SEQUENCE). - getZClass())); + new Type("[][]com.sun.star.uno.XComponentContext", TypeClass.SEQUENCE).getZClass()); assertSame( "enum TypeClass", TypeClass.class, new Type("com.sun.star.uno.TypeClass", TypeClass.ENUM).getZClass()); @@ -60,27 +58,20 @@ public final class Type_Test { new Type("com.sun.star.uno.Uik", TypeClass.STRUCT).getZClass()); assertSame( "exception Exception", com.sun.star.uno.Exception.class, - (new Type("com.sun.star.uno.Exception", TypeClass.EXCEPTION). - getZClass())); + new Type("com.sun.star.uno.Exception", TypeClass.EXCEPTION).getZClass()); assertSame( "exception RuntimeException", com.sun.star.uno.RuntimeException.class, - (new Type("com.sun.star.uno.RuntimeException", TypeClass.EXCEPTION). - getZClass())); + new Type("com.sun.star.uno.RuntimeException", TypeClass.EXCEPTION).getZClass()); assertSame( "exception DeploymentException", DeploymentException.class, - (new Type( - "com.sun.star.uno.DeploymentException", TypeClass.EXCEPTION). - getZClass())); + new Type("com.sun.star.uno.DeploymentException", TypeClass.EXCEPTION).getZClass()); assertSame( "interface XInterface", XInterface.class, - (new Type("com.sun.star.uno.XInterface", TypeClass.INTERFACE). - getZClass())); + new Type("com.sun.star.uno.XInterface", TypeClass.INTERFACE).getZClass()); assertSame( "interface XComponentContext", XComponentContext.class, - (new Type( - "com.sun.star.uno.XComponentContext", TypeClass.INTERFACE). - getZClass())); + new Type("com.sun.star.uno.XComponentContext", TypeClass.INTERFACE). getZClass()); assertSame(boolean.class, new Type(boolean.class).getZClass()); assertSame(boolean.class, new Type(Boolean.class).getZClass()); diff --git a/sw/qa/complex/writer/CheckIndexedPropertyValues.java b/sw/qa/complex/writer/CheckIndexedPropertyValues.java index 338f7065e02c..83d58c46cb0c 100644 --- a/sw/qa/complex/writer/CheckIndexedPropertyValues.java +++ b/sw/qa/complex/writer/CheckIndexedPropertyValues.java @@ -35,12 +35,11 @@ public class CheckIndexedPropertyValues { @Test public void checkIndexedPropertyValues() throws com.sun.star.uno.Exception { - XIndexContainer xCont = UnoRuntime.queryInterface( - XIndexContainer.class, - (connection.getComponentContext().getServiceManager(). - createInstanceWithContext( - "com.sun.star.document.IndexedPropertyValues", - connection.getComponentContext()))); + Object instance = connection.getComponentContext().getServiceManager(). + createInstanceWithContext( + "com.sun.star.document.IndexedPropertyValues", + connection.getComponentContext()); + XIndexContainer xCont = UnoRuntime.queryInterface(XIndexContainer.class, instance); assertNotNull("XIndexContainer was queried but returned null.", xCont); PropertyValue[] prop1 = new PropertyValue[1]; diff --git a/sw/qa/complex/writer/CheckNamedPropertyValues.java b/sw/qa/complex/writer/CheckNamedPropertyValues.java index 602cab199482..d09ebb6b2f92 100644 --- a/sw/qa/complex/writer/CheckNamedPropertyValues.java +++ b/sw/qa/complex/writer/CheckNamedPropertyValues.java @@ -35,12 +35,9 @@ public class CheckNamedPropertyValues { @Test public void checkNamedPropertyValues() throws com.sun.star.uno.Exception { - XNameContainer xCont = UnoRuntime.queryInterface( - XNameContainer.class, - (connection.getComponentContext().getServiceManager(). - createInstanceWithContext( - "com.sun.star.document.NamedPropertyValues", - connection.getComponentContext()))); + Object instance = connection.getComponentContext().getServiceManager(). + createInstanceWithContext( "com.sun.star.document.NamedPropertyValues", connection.getComponentContext()); + XNameContainer xCont = UnoRuntime.queryInterface(XNameContainer.class, instance); assertNotNull("XNameContainer was queried but returned null.", xCont); PropertyValue[] prop1 = new PropertyValue[1]; diff --git a/sw/qa/complex/writer/TextPortionEnumerationTest.java b/sw/qa/complex/writer/TextPortionEnumerationTest.java index f534dd263819..694d2f3f064f 100644 --- a/sw/qa/complex/writer/TextPortionEnumerationTest.java +++ b/sw/qa/complex/writer/TextPortionEnumerationTest.java @@ -253,7 +253,7 @@ abstract class ContentNode extends TreeNode return super.toString() + "\tcontent: " + m_Content; } boolean equals(ContentNode other) { - return (other.m_Content.equals(m_Content)); + return other.m_Content.equals(m_Content); } } @@ -4145,8 +4145,8 @@ public class TextPortionEnumerationTest static boolean eq(StringPair i_Left, StringPair i_Right) { - return ((i_Left.First).equals(i_Right.First)) && - ((i_Left.Second).equals(i_Right.Second)); + return (i_Left.First.equals(i_Right.First)) && + (i_Left.Second.equals(i_Right.Second)); } @BeforeClass public static void setUpConnection() throws Exception { diff --git a/testtools/source/servicetests/RemoteServiceTest.java b/testtools/source/servicetests/RemoteServiceTest.java index a176f9cb42a3..e63048bf642d 100644 --- a/testtools/source/servicetests/RemoteServiceTest.java +++ b/testtools/source/servicetests/RemoteServiceTest.java @@ -20,6 +20,7 @@ package servicetests; import com.sun.star.bridge.XBridgeFactory; import com.sun.star.bridge.XInstanceProvider; +import com.sun.star.bridge.XUnoUrlResolver; import com.sun.star.bridge.UnoUrlResolver; import com.sun.star.comp.helper.Bootstrap; import com.sun.star.connection.Acceptor; @@ -44,12 +45,11 @@ public final class RemoteServiceTest extends TestBase { Thread.sleep(5000); // wait for server to start accepting return new TestServiceFactory() { public Object get() throws Exception { - return (UnoUrlResolver.create( - Bootstrap.createInitialComponentContext(null))). - resolve( - "uno:" + CONNECTION_DESCRIPTION + ";" + XUnoUrlResolver resolver = UnoUrlResolver.create(Bootstrap.createInitialComponentContext(null)); + String sUrl = "uno:" + CONNECTION_DESCRIPTION + ";" + PROTOCOL_DESCRIPTION - + ";testtools.servicetests.TestService2"); + + ";testtools.servicetests.TestService2"; + return resolver.resolve(sUrl); } public void dispose() throws Exception { diff --git a/toolkit/test/accessibility/CanvasShape.java b/toolkit/test/accessibility/CanvasShape.java index d16bc1406dd5..19aa983defd8 100644 --- a/toolkit/test/accessibility/CanvasShape.java +++ b/toolkit/test/accessibility/CanvasShape.java @@ -242,7 +242,7 @@ class CanvasShape */ public boolean contains (int x, int y) { - return (maShape.contains (x,y)); + return maShape.contains (x,y); } public void highlight () diff --git a/toolkit/test/accessibility/ov/ContextView.java b/toolkit/test/accessibility/ov/ContextView.java index 943c884f158e..0dc97a67a716 100644 --- a/toolkit/test/accessibility/ov/ContextView.java +++ b/toolkit/test/accessibility/ov/ContextView.java @@ -112,7 +112,7 @@ public class ContextView @Override public String GetTitle () { - return ("Context"); + return "Context"; } /** Listen for changes regarding displayed values. diff --git a/toolkit/test/accessibility/ov/FocusView.java b/toolkit/test/accessibility/ov/FocusView.java index 7cb3c8094ba1..cca1a6a0cf17 100644 --- a/toolkit/test/accessibility/ov/FocusView.java +++ b/toolkit/test/accessibility/ov/FocusView.java @@ -116,7 +116,7 @@ public class FocusView @Override public String GetTitle () { - return ("Focus"); + return "Focus"; } synchronized public void actionPerformed (ActionEvent aEvent) diff --git a/toolkit/test/accessibility/ov/TextView.java b/toolkit/test/accessibility/ov/TextView.java index 1d40c5f48b98..518d5ff50788 100644 --- a/toolkit/test/accessibility/ov/TextView.java +++ b/toolkit/test/accessibility/ov/TextView.java @@ -110,7 +110,7 @@ public class TextView @Override public String GetTitle () { - return ("Text"); + return "Text"; } @Override diff --git a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java index e9dbb3741999..54277a0f4ac5 100644 --- a/unoxml/qa/complex/unoxml/RDFRepositoryTest.java +++ b/unoxml/qa/complex/unoxml/RDFRepositoryTest.java @@ -596,8 +596,7 @@ public class RDFRepositoryTest throw new RuntimeException(); } for (int i = 0; i < left.length; ++i) { - int eq = (left[i].getStringValue().compareTo( - right[i].getStringValue())); + int eq = left[i].getStringValue().compareTo(right[i].getStringValue()); if (eq != 0) return eq; } return 0; diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java index 639338047d15..0c77d92bb146 100644 --- a/wizards/com/sun/star/wizards/db/RelationController.java +++ b/wizards/com/sun/star/wizards/db/RelationController.java @@ -55,7 +55,7 @@ public class RelationController extends CommandName try { ArrayList<String> aReferencedTableVector = new ArrayList<String>(); - XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getExportedKeys((getCatalogName(this)), getSchemaName(), getTableName()); + XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getExportedKeys(getCatalogName(this), getSchemaName(), getTableName()); XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet); while (xResultSet.next()) { diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index 1b6075577cd8..17d12f0a4b32 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -189,11 +189,11 @@ public class Control extends Shape // when we change the border from "3D" to "Flat" if (getControlType() == FormHandler.SOCHECKBOX) { - return ((aPeerSize.Width * oFormHandler.getXPixelFactor())); + return aPeerSize.Width * oFormHandler.getXPixelFactor(); } else { - return ((aPeerSize.Width * oFormHandler.getXPixelFactor()) + 200); + return (aPeerSize.Width * oFormHandler.getXPixelFactor()) + 200; } } } diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 1c1b5ef06e7d..2ed8d286f10a 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -182,7 +182,7 @@ public class ReportFinalizer } public void initialize(RecordParser _CurDBMetaData) { - String FirstCommandName = (_CurDBMetaData.getIncludedCommandNames())[0]; + String FirstCommandName = _CurDBMetaData.getIncludedCommandNames()[0]; String DefaultName = Desktop.getUniqueName(_CurDBMetaData.getReportDocuments(), FirstCommandName); if (!DefaultName.equals(OldDefaultName)) { diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index e45c3dab97c0..c9d776140fd6 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -420,17 +420,17 @@ public class PrimaryKeyHandler implements XFieldSelectionListener } else if (optUseExisting.getState()) { - return (new String[] + return new String[] { lstSinglePrimeKey.getSelectedItem() - }); + }; } else if (optAddAutomatically.getState()) { - return (new String[] + return new String[] { SAUTOMATICKEYFIELDNAME - }); + }; } return null; } diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 759e2f4b3f79..584ab57846a7 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -241,7 +241,7 @@ public class AggregateComponent extends ControlScroller oControlRow = ControlRowVector.get(fieldcount); oControlRow.setVisible(false); } - super.setScrollValue(getScrollValue() - 1, (fieldcount)); + super.setScrollValue(getScrollValue() - 1, fieldcount); super.unregisterControlGroup(fieldcount); } diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 5638da4f5fbf..738b7145a9d6 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -331,7 +331,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< { return sCommandname.substring(sTablePrefix.length()); } - else if ((sCommandname.startsWith(this.sQueryPrefix))) + else if (sCommandname.startsWith(this.sQueryPrefix)) { return sCommandname.substring(sQueryPrefix.length()); } diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 38af3bc0f802..fd7664011c5e 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -334,7 +334,7 @@ public class FilterComponent { boolean bisany = true; int ifilterstate = SOI_MATCHALL; - bisany = (this.optMatchAny.getState()); + bisany = this.optMatchAny.getState(); if (bisany) { ifilterstate = SOI_MATCHANY; @@ -722,8 +722,8 @@ public class FilterComponent Object oValue = Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue"); if (!AnyConverter.isVoid(oValue)) { - String sValue = (String.valueOf(oValue)); - return (!sValue.equals(PropertyNames.EMPTY_STRING)); + String sValue = String.valueOf(oValue); + return !sValue.equals(PropertyNames.EMPTY_STRING); } } } @@ -916,7 +916,7 @@ public class FilterComponent // TODO make a difference between Text and Numbers private Object getValue() { - return (Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue")); + return Helper.getUnoPropertyValue(UnoDialog.getModel(ControlElements[SOTXTVALUE]), "EffectiveValue"); } diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 07560e0a12cd..7801169ca035 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -194,7 +194,7 @@ public class UnoDialog XControl xControl2 = xDlgContainer.getControl(ControlName); XView xView = UnoRuntime.queryInterface(XView.class, xControl2); Size aSize = xView.getSize(); - double dblMAPWidth = (((Integer) Helper.getUnoPropertyValue(xControl2.getModel(), PropertyNames.PROPERTY_WIDTH)).intValue()); + double dblMAPWidth = ((Integer) Helper.getUnoPropertyValue(xControl2.getModel(), PropertyNames.PROPERTY_WIDTH)).intValue(); return ((aSize.Width) / dblMAPWidth); } diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java index 5793f4fd78a6..391232c90207 100644 --- a/xmerge/source/bridge/java/XMergeBridge.java +++ b/xmerge/source/bridge/java/XMergeBridge.java @@ -121,7 +121,7 @@ public class XMergeBridge { origName=origName.substring(origName.lastIndexOf("/")+1,origName.length()); } if (origName.lastIndexOf(".")>=0){ - name = origName.substring(0,(origName.lastIndexOf("."))); + name = origName.substring(0, origName.lastIndexOf(".")); } else{ name=origName; diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java index 8d0eb79b38ca..728aa05ae120 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java @@ -228,6 +228,6 @@ public class Convert implements Cloneable { */ public Document getOfficeDocument(String name, InputStream is) throws IOException { - return(ci.getPluginFactory().createOfficeDocument(name, is)); + return ci.getPluginFactory().createOfficeDocument(name, is); } }
\ No newline at end of file diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java index 2163fc658b96..786e82b77cf9 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java @@ -322,7 +322,7 @@ public class ParaStyle extends Style implements Cloneable { private void setAttribute(int attr, String value) { isSet[attr] = true; try { - this.value[attr] = (((conversionAlgorithm)algor[attr].newInstance())).I(value); + this.value[attr] = ((conversionAlgorithm)algor[attr].newInstance()).I(value); } catch (Exception e) { Debug.log(Debug.ERROR, "Instantiation error", e); } diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java index 8f6603a458ac..28a63cb7d713 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java @@ -89,7 +89,7 @@ public class SheetSettings implements OfficeConstants { * @return The position as a {@code Point}. */ public Point getCursor() { - return (new Point(cursorX, cursorY)); + return new Point(cursorX, cursorY); } /** @@ -124,7 +124,7 @@ public class SheetSettings implements OfficeConstants { */ public Point getSplit() { - return (new Point(splitPointX, splitPointY)); + return new Point(splitPointX, splitPointY); } /** @@ -134,7 +134,7 @@ public class SheetSettings implements OfficeConstants { */ public Point getSplitType() { - return (new Point(splitTypeX, splitTypeY)); + return new Point(splitTypeX, splitTypeY); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java index 98c0d8a420dc..6ce425d205c7 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java @@ -76,7 +76,7 @@ public final class CharacterBaseParagraphMerge implements NodeMergeAlgorithm { int extraChar = 0; int orgDiffCount = diffCount; - TextNodeEntry orgTextNode = (orgNodeList.get(i)); + TextNodeEntry orgTextNode = orgNodeList.get(i); Debug.log(Debug.INFO, "checking node " + (i + 1) + " of " + numNode); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java index 9cf24bf42fdf..fd39536b3082 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java @@ -95,7 +95,7 @@ public final class XmlUtil { case Node.ELEMENT_NODE: Element oldElem = (Element)newNode; String tagName = newNode.getNodeName(); - Element newElem = (docNode.createElement(tagName)); + Element newElem = docNode.createElement(tagName); // copy the attributes NamedNodeMap attrs = oldElem.getAttributes(); diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java index 192777bd50b1..b549743fe308 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java @@ -260,7 +260,7 @@ public class ConverterInfo { * device mime-type. */ public Iterator<String> getDeviceMime() { - return(piDeviceMime.iterator()); + return piDeviceMime.iterator(); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java index 09fd70f41d7a..0fd2320271dc 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java @@ -114,7 +114,7 @@ public final class ConverterInfoMgr { * exist. */ private static Iterator<ConverterInfo> getConverterInfoEnumeration() { - return (converterInfoList.iterator()); + return converterInfoList.iterator(); } /** diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java index 00eaf9d8abbd..acc4d8eabc6e 100644 --- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java +++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java @@ -247,6 +247,6 @@ public class ConverterInfoReader { * @return An {@code Enumeration} of {@code ConverterInfo} objects. */ public Iterator<ConverterInfo> getConverterInfoEnumeration() { - return (converterInfoList.iterator()); + return converterInfoList.iterator(); } }
\ No newline at end of file |