From f493555623fb36bb51e78a4630483271ed36afe7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Aug 2014 13:16:37 +0200 Subject: java: remove some casting in lib.TestParameters#getMSF where the return value is always cast to XMultiServiceFactory, so just do the cast in the method and avoid noise at the call sites. Change-Id: I3a2e06ac6edb3c6021eda6442032db57aaa22e13 --- qadevOOo/tests/java/mod/_forms/GenericModelTest.java | 4 ++-- qadevOOo/tests/java/mod/_forms/OButtonControl.java | 2 +- qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java | 2 +- qadevOOo/tests/java/mod/_forms/OComboBoxControl.java | 2 +- qadevOOo/tests/java/mod/_forms/OCurrencyControl.java | 2 +- qadevOOo/tests/java/mod/_forms/ODatabaseForm.java | 10 +++++----- 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/ONavigationBarControl.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 ++-- 24 files changed, 31 insertions(+), 31 deletions(-) (limited to 'qadevOOo/tests/java/mod/_forms') diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java index db79e6b0d213..8109ae63cee0 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 { */ protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a textdocument"); - m_xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) tParam.getMSF())); + m_xTextDoc = WriterTools.createTextDoc((tParam.getMSF())); m_ConnectionColsed = false; debug = tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE); m_propertiesToSet.clear(); @@ -370,7 +370,7 @@ public class GenericModelTest extends TestCase { PrintWriter log) { XInterface oObj = null; XControlShape aShape = null; - XMultiServiceFactory xMSF = (XMultiServiceFactory) Param.getMSF(); + XMultiServiceFactory xMSF = Param.getMSF(); try{ log.println("adding contol shape '" + m_kindOfControl + "'"); diff --git a/qadevOOo/tests/java/mod/_forms/OButtonControl.java b/qadevOOo/tests/java/mod/_forms/OButtonControl.java index 5cc64c8a5ca8..752909d85581 100644 --- a/qadevOOo/tests/java/mod/_forms/OButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OButtonControl.java @@ -84,7 +84,7 @@ public class OButtonControl extends TestCase { * Creates a text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java index f698c2a4433d..b536bb95c32d 100644 --- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java @@ -92,7 +92,7 @@ public class OCheckBoxControl extends TestCase { * Creates a new text document. */ protected void initialize ( TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( ((XMultiServiceFactory)Param.getMSF()) ); + SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java index 1afe97ec982a..ffe88d6dbfd0 100644 --- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java @@ -96,7 +96,7 @@ public class OComboBoxControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java index d8ee4393d218..aa93efb2a202 100644 --- a/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java +++ b/qadevOOo/tests/java/mod/_forms/OCurrencyControl.java @@ -96,7 +96,7 @@ public class OCurrencyControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java index 464c00d50b1c..755a5713cb0f 100644 --- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java +++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java @@ -232,11 +232,11 @@ public class ODatabaseForm extends TestCase { protected void initialize(TestParameters tParam, PrintWriter log) { //log.println( "creating a draw document" ); //xTextDoc = WriterTools.createTextDoc(t((XMultiServiceFactory) Param.getMSF)); - tmpDir = utils.getOfficeTemp(((XMultiServiceFactory) tParam.getMSF())); + tmpDir = utils.getOfficeTemp((tParam.getMSF())); origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf"); - dbTools = new DBTools( (XMultiServiceFactory)tParam.getMSF(), log ); + dbTools = new DBTools( tParam.getMSF(), log ); // creating DataSource and registering it in DatabaseContext String dbURL = (String) tParam.get("test.db.url"); @@ -298,9 +298,9 @@ public class ODatabaseForm extends TestCase { do { tableName = "ODatabaseForm_tmp" + uniqueSuffix; oldF = utils.getFullURL(origDB); - newF = utils.getOfficeTemp((XMultiServiceFactory) tParam.getMSF()) + tableName + + newF = utils.getOfficeTemp(tParam.getMSF()) + tableName + ".dbf"; - } while (!utils.tryOverwriteFile(((XMultiServiceFactory) tParam.getMSF()), oldF, newF) && + } while (!utils.tryOverwriteFile((tParam.getMSF()), oldF, newF) && (uniqueSuffix++ < 50)); } } @@ -325,7 +325,7 @@ public class ODatabaseForm extends TestCase { } log.println("creating a text document"); - xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) Param.getMSF())); + xTextDoc = WriterTools.createTextDoc((Param.getMSF())); //initialize test table if (isMySQLDB) { diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java index 1318aad9c8b2..20d534b5bdea 100644 --- a/qadevOOo/tests/java/mod/_forms/ODateControl.java +++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java @@ -95,7 +95,7 @@ public class ODateControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java index 3636c487358f..224dc0120da2 100644 --- a/qadevOOo/tests/java/mod/_forms/OEditControl.java +++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java @@ -96,7 +96,7 @@ public class OEditControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java index 931e1fc167fc..5ced66e56103 100644 --- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java @@ -95,7 +95,7 @@ public class OFileControlModel extends TestCase { * Creates Draw document where controls are placed. */ protected void initialize(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); try { log.println("creating a draw document"); diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java index e76ada4407ce..d0be922ff9e5 100644 --- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java +++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java @@ -92,7 +92,7 @@ public class OFormattedControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java index a0554eb987cc..8fec646b1692 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 { */ protected void initialize(TestParameters tParam, PrintWriter log) { log.println("creating a draw document"); - xDrawDoc = DrawTools.createDrawDoc(((XMultiServiceFactory) 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 b2e40975be59..1f3faaac1980 100644 --- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java +++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java @@ -262,7 +262,7 @@ class OGridControlModelold extends TestCase { * Creates Drawing document. */ protected void initialize(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); log.println("creating a draw document"); diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java index e055a5f2feaf..31020d53a82d 100644 --- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java @@ -74,7 +74,7 @@ public class OGroupBoxControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java index 689fd972b5e0..2c45dc939cea 100644 --- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java +++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java @@ -92,7 +92,7 @@ public class OHiddenModel extends TestCase { * Creates Drawing document. */ protected void initialize(TestParameters tParam, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) tParam.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF())); try { log.println("creating a draw document"); @@ -141,7 +141,7 @@ public class OHiddenModel extends TestCase { log.println("creating a test environment"); // get a soffice factory object - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) 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 751bb12bc6de..432816831cff 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java @@ -79,7 +79,7 @@ public class OImageButtonControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java index 6a184896c61e..c324c1d36407 100644 --- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java +++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java @@ -80,7 +80,7 @@ public class OImageControlControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java index ca4d5cb22e1c..0fe543fb2ff2 100644 --- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java +++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java @@ -48,7 +48,7 @@ public class OListBoxControl extends TestCase { XTextDocument xTextDoc; protected void initialize ( TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory( ((XMultiServiceFactory) Param.getMSF()) ); + SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) ); try { log.println( "creating a textdocument" ); diff --git a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java index e99c832bd6d3..3d2fb2f1425a 100644 --- a/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONavigationBarControl.java @@ -49,7 +49,7 @@ public class ONavigationBarControl extends TestCase { * Creates a text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory) Param.getMSF()); + SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF()); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java index 95467c74dd80..bb2119a7bf42 100644 --- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java +++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java @@ -95,7 +95,7 @@ public class ONumericControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java index b56e442e95e0..fecfbcdb5f76 100644 --- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java +++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java @@ -95,7 +95,7 @@ public class OPatternControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java index d15a961544a9..e687538e074d 100644 --- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java +++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java @@ -83,7 +83,7 @@ public class ORadioButtonControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java index d83ecbcb2409..183b1bc2e4eb 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 ) { log.println( "creating a textdocument" ); - xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) 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 3dea0c2f06e5..630ebd224eba 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 ) { log.println( "creating a textdocument" ); - xTextDoc = WriterTools.createTextDoc(((XMultiServiceFactory) 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 fc4eb5a849a3..581cde0c15cc 100644 --- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java +++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java @@ -96,7 +96,7 @@ public class OTimeControl extends TestCase { * Creates a new text document. */ protected void initialize(TestParameters Param, PrintWriter log) { - SOfficeFactory SOF = SOfficeFactory.getFactory(((XMultiServiceFactory) Param.getMSF())); + SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF())); try { log.println("creating a textdocument"); @@ -228,7 +228,7 @@ public class OTimeControl extends TestCase { textComp.addTextListener(listener); tEnv.addObjRelation("TestTextListener", listener); - FormTools.switchDesignOf(((XMultiServiceFactory) Param.getMSF()), xTextDoc); + FormTools.switchDesignOf((Param.getMSF()), xTextDoc); shortWait(); return tEnv; -- cgit