Kaydet (Commit) 3f50c6e0 authored tarafından Noel Grandin's avatar Noel Grandin

java: remove ((unnecessary)) parentheses

Change-Id: I39fbe3a260c8dbfc203662c54eec4db064b88195
üst b73db446
......@@ -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" ) )
......
......@@ -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();
}
}
......@@ -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);
......
......@@ -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) {
......
......@@ -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
......
......@@ -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)
......
......@@ -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);
......
......@@ -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);
}
}
......@@ -118,7 +118,7 @@ public final class XInputStreamToInputStreamAdapter extends InputStream {
throw newEx;
}
return (bytesRead);
return bytesRead;
}
@Override
......
......@@ -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;
......
......@@ -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
......
......@@ -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) {
......
......@@ -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) {
......
......@@ -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);
......
......@@ -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);
......
......@@ -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 ) {
......
......@@ -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;
......
......@@ -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;
}
......
......@@ -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());
......
......@@ -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);
}
......
......@@ -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());
}
......
......@@ -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 {
......
......@@ -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);
}
......
......@@ -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) ;
......
......@@ -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);
......
......@@ -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(""));
......
......@@ -160,7 +160,7 @@ public class _XPersistObject extends MultiMethodTest {
persCopy.read(iStream);
bResult = ( persCopy.getServiceName().equals(sname) );
bResult = persCopy.getServiceName().equals(sname);
}
......
......@@ -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());
......
......@@ -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());
......
......@@ -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);
......
......@@ -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");
}
......
......@@ -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);
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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 );
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -94,7 +94,7 @@ public class ODateControl extends TestCase {
*/
@Overrid