[Libreoffice-commits] core.git: 3 commits - bean/com bridges/test connectivity/qa dbaccess/qa forms/qa framework/qa javaunohelper/com javaunohelper/test jurt/com jvmfwk/plugins linguistic/qa qadevOOo/runner qadevOOo/tests ridljar/test scripting/java swext/mediawiki sw/qa testtools/source toolkit/test unotools/qa unoxml/qa wizards/com xmerge/source
Noel Grandin
noel at peralex.com
Thu Nov 5 04:55:53 PST 2015
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 2
bridges/test/java_uno/any/TestAny.java | 6
connectivity/qa/complex/connectivity/DBaseDriverTest.java | 8
dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 2
forms/qa/integration/forms/FormControlTest.java | 2
framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java | 2
framework/qa/complex/accelerators/KeyMapping.java | 2
framework/qa/complex/contextMenuInterceptor/ContextMenuInterceptor.java | 24 -
framework/qa/complex/dispatches/Interceptor.java | 2
javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java | 2
javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java | 9
javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java | 14
javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java | 2
javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java | 20 -
javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java | 4
javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java | 4
jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java | 5
jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java | 6
linguistic/qa/complex/linguistic/HangulHanjaConversion.java | 2
qadevOOo/runner/complexlib/ComplexTestCase.java | 2
qadevOOo/runner/helper/BuildEnvTools.java | 2
qadevOOo/runner/helper/ProcessHandler.java | 11
qadevOOo/runner/helper/WindowListener.java | 6
qadevOOo/runner/util/DBTools.java | 7
qadevOOo/runner/util/InstCreator.java | 2
qadevOOo/runner/util/ValueChanger.java | 2
qadevOOo/runner/util/utils.java | 2
qadevOOo/tests/java/ifc/awt/_XControl.java | 2
qadevOOo/tests/java/ifc/beans/_XIntrospection.java | 2
qadevOOo/tests/java/ifc/beans/_XMultiPropertyStates.java | 3
qadevOOo/tests/java/ifc/beans/_XPropertyState.java | 6
qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java | 5
qadevOOo/tests/java/ifc/chart/_XDiagram.java | 2
qadevOOo/tests/java/ifc/connection/_XAcceptor.java | 3
qadevOOo/tests/java/ifc/i18n/_XCalendar.java | 2
qadevOOo/tests/java/ifc/i18n/_XLocaleData.java | 10
qadevOOo/tests/java/ifc/io/_XPersistObject.java | 2
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java | 13
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java | 14
qadevOOo/tests/java/ifc/sdbc/_XWarningsSupplier.java | 2
qadevOOo/tests/java/ifc/text/_XFootnote.java | 2
qadevOOo/tests/java/ifc/text/_XPagePrintable.java | 2
qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java | 20 -
qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java | 10
qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java | 2
qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 4
qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java | 2
qadevOOo/tests/java/mod/_forms/OComboBoxControl.java | 2
qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 13
qadevOOo/tests/java/mod/_forms/ODateControl.java | 2
qadevOOo/tests/java/mod/_forms/OEditControl.java | 2
qadevOOo/tests/java/mod/_forms/OFileControlModel.java | 2
qadevOOo/tests/java/mod/_forms/OFormattedControl.java | 2
qadevOOo/tests/java/mod/_forms/OFormsCollection.java | 2
qadevOOo/tests/java/mod/_forms/OGridControlModel.java | 2
qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java | 2
qadevOOo/tests/java/mod/_forms/OHiddenModel.java | 4
qadevOOo/tests/java/mod/_forms/OImageButtonControl.java | 2
qadevOOo/tests/java/mod/_forms/OImageControlControl.java | 2
qadevOOo/tests/java/mod/_forms/OListBoxControl.java | 2
qadevOOo/tests/java/mod/_forms/ONumericControl.java | 2
qadevOOo/tests/java/mod/_forms/OPatternControl.java | 2
qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java | 2
qadevOOo/tests/java/mod/_forms/OScrollBarModel.java | 2
qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java | 2
qadevOOo/tests/java/mod/_forms/OTimeControl.java | 4
qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java | 3
qadevOOo/tests/java/mod/_sw/SwXMailMerge.java | 2
qadevOOo/tests/java/mod/_sw/SwXTextPortion.java | 2
qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java | 2
qadevOOo/tests/java/mod/_toolkit/TabController.java | 7
ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test.java | 6
ridljar/test/com/sun/star/uno/Type_Test.java | 21 -
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 8
scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java | 32 --
scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java | 6
sw/qa/complex/writer/CheckIndexedPropertyValues.java | 11
sw/qa/complex/writer/CheckNamedPropertyValues.java | 9
sw/qa/complex/writer/TextPortionEnumerationTest.java | 6
swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java | 14
testtools/source/servicetests/RemoteServiceTest.java | 10
toolkit/test/accessibility/AccessibilityTree.java | 5
toolkit/test/accessibility/AccessibleComponentHandler.java | 5
toolkit/test/accessibility/Canvas.java | 11
toolkit/test/accessibility/CanvasShape.java | 2
toolkit/test/accessibility/ov/ContextView.java | 2
toolkit/test/accessibility/ov/FocusView.java | 2
toolkit/test/accessibility/ov/TextView.java | 2
unotools/qa/complex/tempfile/TestHelper.java | 16 -
unoxml/qa/complex/unoxml/RDFRepositoryTest.java | 3
wizards/com/sun/star/wizards/common/JavaTools.java | 8
wizards/com/sun/star/wizards/common/Properties.java | 11
wizards/com/sun/star/wizards/common/PropertySetHelper.java | 7
wizards/com/sun/star/wizards/db/DBMetaData.java | 14
wizards/com/sun/star/wizards/db/RelationController.java | 2
wizards/com/sun/star/wizards/db/TableDescriptor.java | 17 -
wizards/com/sun/star/wizards/db/TypeInspector.java | 7
wizards/com/sun/star/wizards/document/Control.java | 4
wizards/com/sun/star/wizards/form/FormConfiguration.java | 7
wizards/com/sun/star/wizards/form/FormDocument.java | 13
wizards/com/sun/star/wizards/query/Finalizer.java | 13
wizards/com/sun/star/wizards/report/ReportFinalizer.java | 2
wizards/com/sun/star/wizards/table/Finalizer.java | 152 ++++------
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 24 -
wizards/com/sun/star/wizards/table/TableWizard.java | 11
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 2
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 2
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 23 -
wizards/com/sun/star/wizards/ui/FilterComponent.java | 8
wizards/com/sun/star/wizards/ui/UnoDialog.java | 2
xmerge/source/bridge/java/XMergeBridge.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/Convert.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java | 8
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java | 36 --
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SheetSettings.java | 6
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/ConverterCapabilitiesImpl.java | 9
xmerge/source/xmerge/java/org/openoffice/xmerge/merger/merge/CharacterBaseParagraphMerge.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java | 16 -
xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java | 2
xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java | 2
124 files changed, 384 insertions(+), 542 deletions(-)
New commits:
commit 3f50c6e050ea922cb720ec88a9f38c991b1906cd
Author: Noel Grandin <noel at peralex.com>
Date: Thu Nov 5 14:53:35 2015 +0200
java: remove ((unnecessary)) parentheses
Change-Id: I39fbe3a260c8dbfc203662c54eec4db064b88195
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index d58a30f..93ca72b 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 7749fde..f1c89dc 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 7a3b0936..03db632 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 eac4820..773a019 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 a5226e0..d8d1c06 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 79e562a..fd3637b 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 fa3a999..2a37129 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 44ba2a2..40e8f24 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 e3280c1..25f1798 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 26d9464..ab2a381 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 24187ff..ac175d3 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 43decf3..a287944 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 b7e479d2..b407c46 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 56bc0b9..4ece6ae 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 2c10aa7..b967ee7 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 de40b07..d517f0c 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 008b982..ec796ae 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 dc019a4..2ca7351 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 1dd1da4..0f3c06a 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 c8c96ed..79d7d17 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 80b9639..c74f93d 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 b7df9cc..ca7337a 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 3d02e73..de51ea2 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 d8f7610..686f09a 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 102bf7f..e04595a 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 d94daef..e7060dc 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 46b7a76..083d0f7 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 1051ce8..a69e992 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 2134a87..717d067 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 dde2003..1758ccb 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 0bb4057..acd7fa5 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 a7239f8..7268118 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 321d290..039658e 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 f679776..c3fd3f8 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 2bb3f35..f95a234 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 0109485..1b5fe16 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 d8845e5..77fde01 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 d80597b..7d4dfc9 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 4b233ca..ae231ac 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 247d56a..994e621 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 9924e4c..11793b3 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 293fcbb..f608b5d 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 6995574..bc9b964 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 fd6f571..dea7c00 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 7b64604..388447f 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 11e6731..1f55ac5 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 a13246a..d859264 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 da867ae..03dac5b 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 f8aa38d..843e5c8 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 80d4b5b..4c67dab 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 7c7ea55..0fd3ce6 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 76a951b..ddd5d20 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 d586a84..0a3ec02 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 9e0486a..3751741 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 29a9d0a..176d17e 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 cc4d673..99bf4e0 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 9a887af..50fc0c5 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 5956041..b5cf80e 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 b770804..7f36156 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 c110b6d..1caf962 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 c80e022..e81142c 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 338f706..83d58c4 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 602cab1..d09ebb6 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 f534dd2..694d2f3 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 a176f9c..e63048b 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 d16bc14..19aa983 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 943c884..0dc97a6 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 7cb3c80..cca1a6a 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 1d40c5f..518d5ff 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 e9dbb37..54277a0 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 6393380..0c77d92 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 1b60755..17d12f0 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 1c1b5ef..2ed8d28 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 e45c3da..c9d7761 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 759e2f4..584ab57 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 5638da4..738b714 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 38af3bc..fd76640 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 07560e0..7801169 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 5793f4f..391232c 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 8d0eb79..728aa05 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 2163fc6..786e82b 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 8f6603a..28a63cb 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 98c0d8a..6ce425d 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 9cf24bf..fd39536 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 192777b..b549743 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 09fd70f..0fd2320 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 00eaf9d..acc4d8e 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
commit b73db446ac9681fdfc4ad602c6da7ce3e36a8588
Author: Noel Grandin <noel at peralex.com>
Date: Thu Nov 5 14:16:35 2015 +0200
java: combine nested if statements
Change-Id: I0457b81668e9427a3c8d6a4af93438b7fb2bb7ba
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index a61edc0..e0fa145 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -569,13 +569,10 @@ public class InterfaceContainer implements Cloneable
while (itColl.hasNext())
{
Object o= itColl.next();
- if (o != null)
+ if (o != null && UnoRuntime.areSame(o, curElem))
{
- if (UnoRuntime.areSame(o, curElem))
- {
- bExists= true;
- break;
- }
+ bExists= true;
+ break;
}
}
}
diff --git a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
index 550a497..b9c67e6 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
@@ -61,9 +61,8 @@ public class SharedLibraryLoader_Test {
sharedLibraryLoader = null;
System.out.println("*******************************************************************");
System.out.println("Test: <<< instantiate SharedLibraryLoader >>>");
- if ( sharedLibraryLoaderFactory == null )
- if ( ! test_getSharedLibraryLoaderFactory() )
- return false;
+ if ( sharedLibraryLoaderFactory == null && ! test_getSharedLibraryLoaderFactory() )
+ return false;
sharedLibraryLoader = UnoRuntime.queryInterface(
XImplementationLoader.class, sharedLibraryLoaderFactory.createInstance() );
@@ -83,9 +82,8 @@ public class SharedLibraryLoader_Test {
System.out.println("*******************************************************************");
System.out.println("Test: <<< load native ServiceManager >>>");
- if ( sharedLibraryLoader == null )
- if ( ! test_instantiateSharedLibraryLoader() )
- return false;
+ if ( sharedLibraryLoader == null && ! test_instantiateSharedLibraryLoader() )
+ return false;
System.err.println("- get the native ServiceManger factory");
XSingleServiceFactory aSMgrFac =
@@ -108,9 +106,8 @@ public class SharedLibraryLoader_Test {
{
System.out.println("*******************************************************************");
System.out.println("Test: <<< load native SimpleRegistry >>>");
- if ( sharedLibraryLoader == null )
- if ( ! test_instantiateSharedLibraryLoader() )
- return false;
+ if ( sharedLibraryLoader == null && ! test_instantiateSharedLibraryLoader() )
+ return false;
System.err.println("- get factory of the Registry");
XSingleServiceFactory aRegFac =
@@ -134,9 +131,8 @@ public class SharedLibraryLoader_Test {
System.out.println("*******************************************************************");
System.out.println("Test: <<< register SharedLibraryLoader at the Registry >>>");
- if ( simpleRegistry == null )
- if ( ! test_loadNativeSimpleRegistry() )
- return false;
+ if ( simpleRegistry == null && ! test_loadNativeSimpleRegistry() )
+ return false;
com.sun.star.registry.XRegistryKey regKey = simpleRegistry.getRootKey();
result = SharedLibraryLoader.writeRegistryServiceInfo( null, regKey );
diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index a43cb09..6146317 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@ -109,9 +109,8 @@ public class BridgeFactory implements XBridgeFactory/*, XEventListener*/ {
for(int i = 0; i < iBridges.length; ++ i) {
XBridge xBridge = UnoRuntime.queryInterface(XBridge.class, iBridges[i]);
- if(xBridge != null) {
- if(xBridge.getName().equals(sName))
- throw new BridgeExistsException(sName + " already exists");
+ if(xBridge != null && xBridge.getName().equals(sName)) {
+ throw new BridgeExistsException(sName + " already exists");
}
}
}
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
index c20e02a..dfb27e9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
+++ b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
@@ -36,10 +36,8 @@ public class JREProperties
try
{
boolean bNoAccess = false;
- if(args.length > 0)
- {
- if (args[0].equals("noaccessibility"))
- bNoAccess = true;
+ if(args.length > 0 && args[0].equals("noaccessibility")) {
+ bNoAccess = true;
}
//We need to be able to switch this part off because
diff --git a/qadevOOo/runner/helper/ProcessHandler.java b/qadevOOo/runner/helper/ProcessHandler.java
index 999a009..607c1f2 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -509,14 +509,11 @@ public class ProcessHandler
}
}
- if (bKillProcessAfterTimeout)
+ if (bKillProcessAfterTimeout && !isFinished)
{
- if (!isFinished)
- {
- log.println("Going to destroy the process!!");
- m_aProcess.destroy();
- log.println("Process has been destroyed!");
- }
+ log.println("Going to destroy the process!!");
+ m_aProcess.destroy();
+ log.println("Process has been destroyed!");
}
return isFinished();
diff --git a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
index 8b5bb5c..3f08e3e 100644
--- a/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XTolerantMultiPropertySet.java
@@ -237,9 +237,8 @@ public class _XTolerantMultiPropertySet extends MultiMethodTest {
try {
PropertyState state = pState.getPropertyState(pName);
- if (state.equals(PropertyState.DIRECT_VALUE)) {
- if (isUsable(pName)) direct.add(pName);
- }
+ if (state.equals(PropertyState.DIRECT_VALUE) && isUsable(pName))
+ direct.add(pName);
} catch (com.sun.star.beans.UnknownPropertyException e) {
log.println("Property '" + pName + "'");
}
diff --git a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java
index afc10f1..ebd7226 100644
--- a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java
+++ b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java
@@ -326,12 +326,10 @@ public class _XMultiSelectionSupplier extends MultiMethodTest {
log.println("nextElement()-object and expected object 'selections["+i+"]' are equal: "+compRes);
- if (!compRes) {
- if ((selections[i]) instanceof Object[]){
- if (((Object[])selections[i])[0] instanceof Integer) {
- log.println("Getting: "+((Integer) ((Object[])shouldElement)[0]).intValue());
- log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue());
- }
+ if (!compRes && (selections[i]) instanceof Object[]) {
+ if (((Object[])selections[i])[0] instanceof Integer) {
+ log.println("Getting: "+((Integer) ((Object[])shouldElement)[0]).intValue());
+ log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue());
}
}
bOK &= compRes;
@@ -399,12 +397,10 @@ public class _XMultiSelectionSupplier extends MultiMethodTest {
log.println("nextElement()-object and expected object 'selections["+i+"]' are equal: "+compRes);
- if (!compRes) {
- if ((selections[i]) instanceof Object[]){
- if (((Object[])selections[i])[0] instanceof Integer) {
- log.println("Getting: "+((Integer) ((Object[])shouldElement)[0]).intValue());
- log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue());
- }
+ if (!compRes && (selections[i]) instanceof Object[]){
+ if (((Object[])selections[i])[0] instanceof Integer) {
+ log.println("Getting: "+((Integer) ((Object[])shouldElement)[0]).intValue());
+ log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue());
}
}
bOK &= compRes;
diff --git a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
index d601f1f..c0059c7 100644
--- a/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
+++ b/qadevOOo/tests/java/ifc/view/_XSelectionSupplier.java
@@ -128,12 +128,10 @@ public class _XSelectionSupplier extends MultiMethodTest {
compRes = util.ValueComparer.equalValue(selections[i], curSelection);
}
log.println("selected object and current selection are equal: "+compRes);
- if (!compRes) {
- if ((selections[i]) instanceof Object[]){
- if (((Object[])selections[i])[0] instanceof Integer) {
- log.println("Getting: "+((Integer) ((Object[])curSelection)[0]).intValue());
- log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue());
- }
+ if (!compRes && (selections[i]) instanceof Object[]){
+ if (((Object[])selections[i])[0] instanceof Integer) {
+ log.println("Getting: "+((Integer) ((Object[])curSelection)[0]).intValue());
+ log.println("Expected: "+((Integer) ((Object[])selections[i])[0]).intValue());
}
}
res &= compRes;
diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
index f92662e..f58a9d8 100644
--- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
+++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java
@@ -114,11 +114,9 @@ public class ParcelDescriptor {
}
public String getLanguage() {
- if (language == null) {
- if (document != null) {
- Element e = document.getDocumentElement();
- language = e.getAttribute("language");
- }
+ if (language == null && document != null) {
+ Element e = document.getDocumentElement();
+ language = e.getAttribute("language");
}
return language;
diff --git a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
index dfbac7c..bf4f29a 100644
--- a/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
+++ b/scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java
@@ -98,25 +98,23 @@ public class UnoPkgContainer extends ParcelContainer {
try {
DeployedUnoPackagesDB db = getUnoPackagesDB();
- if (db != null) {
- if (db.removePackage(language, url)) {
- writeUnoPackageDB(db);
- ParcelContainer container = registeredPackages.get(url);
-
- if (!container.hasElements()) {
- // When all libraries within a package bundle
- // ( for this language ) are removed also
- // remove the container from its parent
- // Otherwise, a container ( with no containees )
- // representing the uno package bundle will
- // still exist and so will get displayed
- if (container.parent() != null) {
- container.parent().removeChildContainer(container);
- }
+ if (db != null && db.removePackage(language, url)) {
+ writeUnoPackageDB(db);
+ ParcelContainer container = registeredPackages.get(url);
+
+ if (!container.hasElements()) {
+ // When all libraries within a package bundle
+ // ( for this language ) are removed also
+ // remove the container from its parent
+ // Otherwise, a container ( with no containees )
+ // representing the uno package bundle will
+ // still exist and so will get displayed
+ if (container.parent() != null) {
+ container.parent().removeChildContainer(container);
}
-
- registeredPackages.remove(url);
}
+
+ registeredPackages.remove(url);
}
} catch (Exception e) {
//TODO revisit exception handling and exception here
diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
index 4e2059b..6413745 100644
--- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
+++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java
@@ -235,10 +235,8 @@ public class UCBStreamHandler extends URLStreamHandler {
// TODO don't depend on result of available() or size()
// just read stream 'till complete
- if (sz == 0) {
- if (xInputStream.available() > 0) {
- sz = xInputStream.available();
- }
+ if (sz == 0 && xInputStream.available() > 0) {
+ sz = xInputStream.available();
}
LogUtils.DEBUG("size of file " + path + " is " + sz);
diff --git a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
index f583447..4ef0895 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/EditPageParser.java
@@ -130,24 +130,18 @@ public class EditPageParser extends HTMLEditorKit.ParserCallback
else if ( t == HTML.Tag.TEXTAREA )
{
String sName = ( String ) a.getAttribute( HTML.Attribute.NAME );
- if ( sName != null )
+ if ( sName != null && sName.equalsIgnoreCase( "wpTextbox1" ) )
{
- if ( sName.equalsIgnoreCase( "wpTextbox1" ) )
- {
- m_nWikiArticleStart = pos;
- }
+ m_nWikiArticleStart = pos;
}
}
else if ( t == HTML.Tag.DIV )
{
String sId = ( String ) a.getAttribute( HTML.Attribute.ID );
sClass = ( String ) a.getAttribute( HTML.Attribute.CLASS );
- if ( sId != null )
+ if ( sId != null && sId.equalsIgnoreCase( "contentSub" ) )
{
- if ( sId.equalsIgnoreCase( "contentSub" ) )
- {
- m_bHTMLStartFound = true;
- }
+ m_bHTMLStartFound = true;
}
if ( sClass != null )
{
diff --git a/toolkit/test/accessibility/AccessibilityTree.java b/toolkit/test/accessibility/AccessibilityTree.java
index d750bf7..fdf4417 100644
--- a/toolkit/test/accessibility/AccessibilityTree.java
+++ b/toolkit/test/accessibility/AccessibilityTree.java
@@ -365,9 +365,8 @@ public class AccessibilityTree
{
AccTreeNode aNode = (AccTreeNode)aObject;
XAccessibleContext xContext = aNode.getContext();
- if (xContext != null)
- if (xContext.getAccessibleRole() >= 100)
- return true;
+ if (xContext != null && xContext.getAccessibleRole() >= 100)
+ return true;
}
return false;
}
diff --git a/toolkit/test/accessibility/AccessibleComponentHandler.java b/toolkit/test/accessibility/AccessibleComponentHandler.java
index 7420a00..229612b 100644
--- a/toolkit/test/accessibility/AccessibleComponentHandler.java
+++ b/toolkit/test/accessibility/AccessibleComponentHandler.java
@@ -115,8 +115,7 @@ class AccessibleComponentHandler
public void update (AccessibleTreeNode aNode)
{
maChildList.clear();
- if (aNode instanceof AccTreeNode)
- if (((AccTreeNode)aNode).getComponent() != null)
- maChildList.setSize (4);
+ if (aNode instanceof AccTreeNode && ((AccTreeNode)aNode).getComponent() != null)
+ maChildList.setSize (4);
}
}
diff --git a/toolkit/test/accessibility/Canvas.java b/toolkit/test/accessibility/Canvas.java
index c254ed6..e9149ff 100644
--- a/toolkit/test/accessibility/Canvas.java
+++ b/toolkit/test/accessibility/Canvas.java
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list