diff options
144 files changed, 520 insertions, 519 deletions
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java index 90ddbe8a8311..7d81eb041619 100644 --- a/bean/com/sun/star/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/beans/LocalOfficeWindow.java @@ -274,7 +274,7 @@ public class LocalOfficeWindow aWatchedThread = null; stop(); - if ( aThread.interrupted() ) + if ( Thread.interrupted() ) throw new InterruptedException(); } diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java index 27467f051c5b..c8bafaa6e9a0 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java @@ -315,8 +315,9 @@ public class LocalOfficeConnection { try { + Thread.currentThread(); // try to connect to soffice - Thread.currentThread().sleep( 500 ); + Thread.sleep( 500 ); aInitialObject = resolve(xLocalContext, mURL); } catch( com.sun.star.connection.NoConnectException aEx ) diff --git a/bean/qa/complex/bean/OOoBeanTest.java b/bean/qa/complex/bean/OOoBeanTest.java index c72e18e25647..bb12bca5aa05 100644 --- a/bean/qa/complex/bean/OOoBeanTest.java +++ b/bean/qa/complex/bean/OOoBeanTest.java @@ -19,7 +19,6 @@ package complex.bean; import java.awt.event.*; -import java.awt.event.KeyEvent; import com.sun.star.comp.beans.OOoBean; import com.sun.star.uno.UnoRuntime; @@ -483,7 +482,7 @@ public class OOoBeanTest for (; i < 1; i++) { EventQueue q = Toolkit.getDefaultToolkit().getSystemEventQueue(); - q.invokeAndWait( new Runnable() { + EventQueue.invokeAndWait( new Runnable() { public void run() { try { @@ -499,7 +498,7 @@ public class OOoBeanTest }); // #2 Thread.sleep(1000); - q.invokeAndWait( new Runnable() { + EventQueue.invokeAndWait( new Runnable() { public void run() { try { diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java index f6a24cc15520..debd3ee6012c 100644 --- a/framework/qa/complex/XUserInputInterception/EventTest.java +++ b/framework/qa/complex/XUserInputInterception/EventTest.java @@ -517,15 +517,15 @@ public class EventTest { try{ // get the position and the range of a scroll bar - XWindow xWindow = at.getCurrentWindow( + XWindow xWindow = AccessibilityTools.getCurrentWindow( getMSF(), xModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext xPanel = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); + XAccessibleContext xPanel = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); XAccessibleComponent xPanelCont = UnoRuntime.queryInterface(XAccessibleComponent.class, xPanel); // the position of the panel diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java index aedaa2ea75d6..4929eecc1c3f 100644 --- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java +++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java @@ -246,14 +246,14 @@ public class CheckContextMenuInterceptor { xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0)); - xRoot = at.getAccessibleObject(xWindow); + xRoot = AccessibilityTools.getAccessibleObject(xWindow); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { System.out.println("Couldn't get Window"); } - XAccessibleContext oPopMenu = at.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU); + XAccessibleContext oPopMenu = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU); System.out.println("ImplementationName: " + util.utils.getImplName(oPopMenu)); @@ -307,11 +307,11 @@ public class CheckContextMenuInterceptor System.out.println("try to open contex menu..."); AccessibilityTools at = new AccessibilityTools(); - xWindow = at.getCurrentWindow(xMSF, aModel); + xWindow = AccessibilityTools.getCurrentWindow(xMSF, aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XInterface oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); + XInterface oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); XAccessibleComponent window = UnoRuntime.queryInterface(XAccessibleComponent.class, oObj); diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java index 93881d8bd1a8..b6719a9e7aaa 100644 --- a/framework/qa/complex/imageManager/_XComponent.java +++ b/framework/qa/complex/imageManager/_XComponent.java @@ -66,7 +66,7 @@ public class _XComponent { public _XComponent(TestParameters tEnv, XComponent oObj) { this.tEnv = tEnv; - this.oObj = oObj; + _XComponent.oObj = oObj; } /** diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java index d6f2e47d8c5f..0caf9190657f 100644 --- a/framework/qa/complex/imageManager/_XInitialization.java +++ b/framework/qa/complex/imageManager/_XInitialization.java @@ -46,7 +46,7 @@ public class _XInitialization { public _XInitialization(TestParameters tEnv, XInitialization oObj) { this.tEnv = tEnv; - this.oObj = oObj; + _XInitialization.oObj = oObj; } /** diff --git a/framework/qa/complex/imageManager/_XTypeProvider.java b/framework/qa/complex/imageManager/_XTypeProvider.java index 7c39cdb561bd..4be0030979f2 100644 --- a/framework/qa/complex/imageManager/_XTypeProvider.java +++ b/framework/qa/complex/imageManager/_XTypeProvider.java @@ -44,7 +44,7 @@ public class _XTypeProvider { public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) { this.tEnv = tEnv; - this.oObj = oObj; + _XTypeProvider.oObj = oObj; } /** diff --git a/odk/examples/java/Inspector/Inspector.java b/odk/examples/java/Inspector/Inspector.java index a9ceb1c5a3a2..3b5052d7041b 100644 --- a/odk/examples/java/Inspector/Inspector.java +++ b/odk/examples/java/Inspector/Inspector.java @@ -129,7 +129,7 @@ public class Inspector{ public String getIDLPath(){ String sRetPath = getSDKPath(); if (m_oIntrospector.isValidSDKInstallationPath(sRetPath)){ - sRetPath = m_oIntrospector.addToPath(sRetPath, sIDLDOCUMENTSUBFOLDER); + sRetPath = Introspector.addToPath(sRetPath, sIDLDOCUMENTSUBFOLDER); } else{ sRetPath = ""; diff --git a/odk/examples/java/Inspector/SourceCodeGenerator.java b/odk/examples/java/Inspector/SourceCodeGenerator.java index 0601da98b4a8..45431bd86f38 100644 --- a/odk/examples/java/Inspector/SourceCodeGenerator.java +++ b/odk/examples/java/Inspector/SourceCodeGenerator.java @@ -613,7 +613,7 @@ class UnoObjectDefinition{ case TypeClass.INTERFACE_METHOD_value: case TypeClass.INTERFACE_value: case TypeClass.PROPERTY_value: - String sShortClassName = m_oIntrospector.getShortClassName(getTypeName()); + String sShortClassName = Introspector.getShortClassName(getTypeName()); sCentralVariableStemName = getVariableNameforUnoObject(sShortClassName); default: sCentralVariableStemName = SVARIABLENAME; @@ -726,7 +726,7 @@ class UnoObjectDefinition{ case TypeClass.INTERFACE_METHOD_value: case TypeClass.INTERFACE_value: case TypeClass.PROPERTY_value: - String sShortClassName = m_oIntrospector.getShortClassName(getTypeName()); + String sShortClassName = Introspector.getShortClassName(getTypeName()); sVariableStemName = getVariableNameforUnoObject(sShortClassName); default: } @@ -999,7 +999,7 @@ class UnoObjectDefinition{ } public String getqueryInterfaceSourceCode(String _sClassName, String _sReturnVariableName, String _sIncomingObjectName){ - String sShortClassName = m_oIntrospector.getShortClassName(_sClassName); + String sShortClassName = Introspector.getShortClassName(_sClassName); return "\t" + _sReturnVariableName + " = (" + sShortClassName + ") UnoRuntime.queryInterface(" + sShortClassName + ".class, " + _sIncomingObjectName + ");\n"; } @@ -1020,7 +1020,7 @@ class UnoObjectDefinition{ sReturn = _sClassName; } else{ - sReturn = m_oIntrospector.getShortClassName(_sClassName); + sReturn = Introspector.getShortClassName(_sClassName); } return sReturn; } @@ -1562,9 +1562,9 @@ class UnoObjectDefinition{ sReturn = _sClassName.replace('.', '/'); } else{ - String sModuleName = m_oIntrospector.getModuleName(_sClassName); - sModuleName = m_oIntrospector.getShortClassName(sModuleName); - sReturn = getCSSNameSpaceString() + "::" + sModuleName + "::" + m_oIntrospector.getShortClassName(_sClassName); + String sModuleName = Introspector.getModuleName(_sClassName); + sModuleName = Introspector.getShortClassName(sModuleName); + sReturn = getCSSNameSpaceString() + "::" + sModuleName + "::" + Introspector.getShortClassName(_sClassName); } return sReturn; } diff --git a/odk/examples/java/Spreadsheet/ChartTypeChange.java b/odk/examples/java/Spreadsheet/ChartTypeChange.java index 98a143762cab..9638fd0ba865 100644 --- a/odk/examples/java/Spreadsheet/ChartTypeChange.java +++ b/odk/examples/java/Spreadsheet/ChartTypeChange.java @@ -250,7 +250,7 @@ public class ChartTypeChange { for ( int intX = 0; intX < stringValues[ intY ].length; intX++ ) { // Insert the value to the cell, specified by intY and intX. - this.insertIntoCell( intY, intX, + ChartTypeChange.insertIntoCell( intY, intX, stringValues[ intY ][ intX ], xspreadsheet, "" ); } } diff --git a/odk/examples/java/ToDo/ToDo.java b/odk/examples/java/ToDo/ToDo.java index 98ece6192583..fa457156978a 100644 --- a/odk/examples/java/ToDo/ToDo.java +++ b/odk/examples/java/ToDo/ToDo.java @@ -231,29 +231,29 @@ public class ToDo { new Object[][] { objectSortedHolidays }; // Row index - int intRowTo = this.INT_ROW_FROM - 1; + int intRowTo = ToDoImpl.INT_ROW_FROM - 1; // Getting the feature of the first cell String sFeature = this.getStringFromCell(xcellrange, intRowTo + 1, - this.INT_COLUMN_FEATURE); + ToDoImpl.INT_COLUMN_FEATURE); // Determine the last row with an entry in the first column while ( ( sFeature != null ) && ( !sFeature.equals( "" ) ) ) { intRowTo++; sFeature = this.getStringFromCell( xcellrange, - intRowTo + 1, this.INT_COLUMN_FEATURE ); + intRowTo + 1, ToDoImpl.INT_COLUMN_FEATURE ); } // Setting the last row to be calculated final int INT_ROW_TO = intRowTo + 1; // Deleting cells which will be recalculated - for ( int intRow = this.INT_ROW_FROM; intRow < INT_ROW_TO + 5; + for ( int intRow = ToDoImpl.INT_ROW_FROM; intRow < INT_ROW_TO + 5; intRow++ ) { - for ( int intColumn = this.INT_COLUMN_STARTDATE; - intColumn <= this.INT_COLUMN_END_DAY_OF_WEEK; + for ( int intColumn = ToDoImpl.INT_COLUMN_STARTDATE; + intColumn <= ToDoImpl.INT_COLUMN_END_DAY_OF_WEEK; intColumn++ ) { this.setStringToCell(xcellrange, intRow, intColumn, ""); } @@ -261,13 +261,13 @@ public class ToDo { /* Clearing the background color of the due date cells and setting the hyperlink to the bugtracker */ - for (int intRow = this.INT_ROW_FROM; intRow < INT_ROW_TO; intRow++) + for (int intRow = ToDoImpl.INT_ROW_FROM; intRow < INT_ROW_TO; intRow++) { // Querying for the interface XPropertySet for the cell // providing the due date XPropertySet xpropertyset = UnoRuntime.queryInterface(XPropertySet.class, xcellrange.getCellByPosition( - this.INT_COLUMN_DUEDATE, + ToDoImpl.INT_COLUMN_DUEDATE, intRow )); // Changing the background color of the cell to white @@ -276,7 +276,7 @@ public class ToDo { // Getting the cell of the bug id XCell xcell = xcellrange.getCellByPosition( - this.INT_COLUMN_FEATURE, intRow ); + ToDoImpl.INT_COLUMN_FEATURE, intRow ); // Querying for the interface XSimpleText XSimpleText xsimpletext = UnoRuntime.queryInterface( XSimpleText.class, xcell ); @@ -333,7 +333,7 @@ public class ToDo { } // Processing all features/bugs in the table - for (int intRow = this.INT_ROW_FROM; intRow < INT_ROW_TO; intRow++) + for (int intRow = ToDoImpl.INT_ROW_FROM; intRow < INT_ROW_TO; intRow++) { // Getting the cell of the column "Needed Days" in the // current row @@ -345,7 +345,7 @@ public class ToDo { // Getting the content of a specified cell String sStatus = this.getStringFromCell( xcellrange, - intRow, this.INT_COLUMN_STATUS ); + intRow, ToDoImpl.INT_COLUMN_STATUS ); /* Testing if the number of needed days is greater than zero and if @@ -365,13 +365,13 @@ public class ToDo { // Set the start date in the specified cell of the table this.setStringToCell(xcellrange, intRow, - this.INT_COLUMN_STARTDATE, sDate); + ToDoImpl.INT_COLUMN_STARTDATE, sDate); // For the start day set the day of week in the specified // cell of the table this.setDayOfWeek( gregCalStartDate, xcellrange, intRow, - this.INT_COLUMN_START_DAY_OF_WEEK ); + ToDoImpl.INT_COLUMN_START_DAY_OF_WEEK ); // Getting the end date after a specified number of workdays GregorianCalendar gregCalEndDate = @@ -385,12 +385,12 @@ public class ToDo { // Set the end date in the specified cell of the table this.setStringToCell( xcellrange, intRow, - this.INT_COLUMN_ENDDATE, sDate ); + ToDoImpl.INT_COLUMN_ENDDATE, sDate ); // For the end day set the day of week in the specified // cell of the table this.setDayOfWeek(gregCalEndDate, xcellrange, - intRow, this.INT_COLUMN_END_DAY_OF_WEEK); + intRow, ToDoImpl.INT_COLUMN_END_DAY_OF_WEEK); // Set the initial date for the next loop gregCalStartDate = ( GregorianCalendar ) @@ -398,7 +398,7 @@ public class ToDo { // Get the due date from the table String sDueDate = this.getStringFromCell( - xcellrange, intRow, this.INT_COLUMN_DUEDATE ); + xcellrange, intRow, ToDoImpl.INT_COLUMN_DUEDATE ); // Testing if the due date is not empty if ( !sDueDate.equals( "" ) ) { @@ -427,7 +427,7 @@ public class ToDo { this.getGregorianCalendarFromString( this.getStringFromCell( xcellrange, intRowToInsert, - this.INT_COLUMN_STARTDATE ) ); + ToDoImpl.INT_COLUMN_STARTDATE ) ); // Testing if we have to search for an earlier date // to begin @@ -441,7 +441,7 @@ public class ToDo { // the current row String sStartDate = this.getStringFromCell( xcellrange, intRowToInsert, - this.INT_COLUMN_STARTDATE ); + ToDoImpl.INT_COLUMN_STARTDATE ); // Search until a valid start date is found while ( sStartDate.equals( "" ) ) { @@ -452,7 +452,7 @@ public class ToDo { // in the current row sStartDate = this.getStringFromCell( xcellrange, intRowToInsert, - this.INT_COLUMN_STARTDATE ); + ToDoImpl.INT_COLUMN_STARTDATE ); } // Get the GregorianCalender format for the @@ -481,7 +481,7 @@ public class ToDo { xfunctionaccess); String sPreviousDueDate = this.getStringFromCell( xcellrange, intRowToInsert, - this.INT_COLUMN_DUEDATE ); + ToDoImpl.INT_COLUMN_DUEDATE ); GregorianCalendar gregCalPreviousDueDate = null; @@ -499,7 +499,7 @@ public class ToDo { XPropertySet xpropertyset = UnoRuntime.queryInterface( XPropertySet.class, xcellrange.getCellByPosition( - this.INT_COLUMN_DUEDATE, + ToDoImpl.INT_COLUMN_DUEDATE, intRow ) ); // Changing the background color of the cell @@ -552,12 +552,12 @@ public class ToDo { intRow = intRowToInsert - 1; // Tests at which line we want to insert - if ( intRow >= this.INT_ROW_FROM ) { + if ( intRow >= ToDoImpl.INT_ROW_FROM ) { // Get the start date gregCalStartDate = this.getGregorianCalendarFromString( this.getStringFromCell( xcellrange, - intRow,this.INT_COLUMN_ENDDATE)); + intRow,ToDoImpl.INT_COLUMN_ENDDATE)); } else { // Set the start date with the absolute s @@ -845,8 +845,8 @@ public class ToDo { XCellRange xcellrange, XFunctionAccess xfunctionaccess ) { try { - int intRow = this.INT_ROW_HOLIDAYS_START; - int intColumn = this.INT_COLUMN_HOLIDAYS_START; + int intRow = ToDoImpl.INT_ROW_HOLIDAYS_START; + int intColumn = ToDoImpl.INT_COLUMN_HOLIDAYS_START; double dHolidayStart = xcellrange.getCellByPosition( intColumn, intRow ).getValue(); diff --git a/qadevOOo/runner/base/java_fat_service.java b/qadevOOo/runner/base/java_fat_service.java index 91a84fb2a9c8..2e507ff1e7f4 100644 --- a/qadevOOo/runner/base/java_fat_service.java +++ b/qadevOOo/runner/base/java_fat_service.java @@ -92,7 +92,7 @@ public class java_fat_service implements TestBase { } if (tCase == null) { - sumIt.summarizeDown(entry,entry.ErrorMsg); + Summarizer.summarizeDown(entry,entry.ErrorMsg); LogWriter sumObj = (LogWriter)dcl.getInstance( (String)param.get("OutProducer")); sumObj.initialize(entry,true); @@ -117,7 +117,7 @@ public class java_fat_service implements TestBase { tEnv = null; } if (tEnv == null) { - sumIt.summarizeDown(entry,"Couldn't create "+tCase.getObjectName()); + Summarizer.summarizeDown(entry,"Couldn't create "+tCase.getObjectName()); LogWriter sumObj = (LogWriter)dcl.getInstance( (String)param.get("OutProducer")); sumObj.initialize(entry,true); diff --git a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java index 3abb3a1e21e3..7d929afad26e 100644 --- a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java +++ b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java @@ -77,7 +77,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ // check if resource is available, if not, wait. if ( _aSemaphore.exists() ) { - m_aLog.get().println( "Active wait since " + nCount + "sec.."); + GlobalLogWriter.get().println( "Active wait since " + nCount + "sec.."); nCount ++; sleep( 1 ); } @@ -87,7 +87,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ if ( _aSemaphore.exists() ) { // ups - m_aLog.get().println( "ups..."); + GlobalLogWriter.get().println( "ups..."); } else { @@ -106,11 +106,11 @@ public class SimpleFileSemaphore /* extends *//* implements */ catch (java.io.FileNotFoundException fne) { - m_aLog.get().println( "caught: FileNotFoundException"); + GlobalLogWriter.get().println( "caught: FileNotFoundException"); } catch(java.io.IOException ie) { - m_aLog.get().println( "caught: IOException"); + GlobalLogWriter.get().println( "caught: IOException"); } } @@ -125,7 +125,7 @@ public class SimpleFileSemaphore /* extends *//* implements */ } else { - m_aLog.get().println("Could be a problem here? No resource block found."); + GlobalLogWriter.get().println("Could be a problem here? No resource block found."); } } diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java index 2b82d649e907..812597627789 100644 --- a/qadevOOo/runner/util/UITools.java +++ b/qadevOOo/runner/util/UITools.java @@ -72,8 +72,8 @@ public class UITools { private static XAccessible makeRoot(XMultiServiceFactory msf, XModel aModel) { - XWindow xWindow = mAT.getCurrentWindow(msf, aModel); - return mAT.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow(msf, aModel); + return AccessibilityTools.getAccessibleObject(xWindow); } @@ -98,7 +98,7 @@ public class UITools { private static XAccessible makeRoot(XWindow xWindow) { - return mAT.getAccessibleObject(xWindow); + return AccessibilityTools.getAccessibleObject(xWindow); } /** @@ -119,7 +119,7 @@ public class UITools { public void setTextEditFiledText(String textfiledName, String stringToSet) throws java.lang.Exception { - XInterface oTextField = mAT.getAccessibleObjectForRole(mXRoot, + XInterface oTextField = AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.TEXT, textfiledName); setString(oTextField, stringToSet); } @@ -132,7 +132,7 @@ public class UITools { */ public XAccessibleContext getButton(String buttonName) throws java.lang.Exception { - return mAT.getAccessibleObjectForRole + return AccessibilityTools.getAccessibleObjectForRole (mXRoot, AccessibleRole.PUSH_BUTTON, buttonName); } @@ -145,7 +145,7 @@ public class UITools { public void clickButton(String buttonName) throws java.lang.Exception { - XAccessibleContext oButton =mAT.getAccessibleObjectForRole + XAccessibleContext oButton =AccessibilityTools.getAccessibleObjectForRole (mXRoot, AccessibleRole.PUSH_BUTTON, buttonName); if (oButton == null){ throw new Exception("Could not get button '" + buttonName + "'"); @@ -172,7 +172,7 @@ public class UITools { */ private boolean clickToggleButton(String buttonName, boolean toBePressed) { - XAccessibleContext oButton =mAT.getAccessibleObjectForRole + XAccessibleContext oButton =AccessibilityTools.getAccessibleObjectForRole (mXRoot, AccessibleRole.TOGGLE_BUTTON, buttonName); if (oButton != null){ @@ -227,7 +227,7 @@ public class UITools { throws java.lang.Exception { try { - XInterface xRB =mAT.getAccessibleObjectForRole(mXRoot, + XInterface xRB =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.RADIO_BUTTON, buttonName); return (Integer) getValue(xRB); @@ -245,7 +245,7 @@ public class UITools { */ public XInterface getGraphic(String GraphicName) throws java.lang.Exception { - return mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.GRAPHIC, + return AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.GRAPHIC, GraphicName); } @@ -260,7 +260,7 @@ public class UITools { throws java.lang.Exception { try { - XInterface xRB =mAT.getAccessibleObjectForRole(mXRoot, AccessibleRole.RADIO_BUTTON, buttonName); + XInterface xRB =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.RADIO_BUTTON, buttonName); if(xRB == null) System.out.println("AccessibleObjectForRole couldn't be found for " + buttonName); XAccessibleValue oValue = UnoRuntime.queryInterface(XAccessibleValue.class, xRB); @@ -288,17 +288,17 @@ public class UITools { try { XAccessibleContext xListBox = null; - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + xListBox =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.COMBO_BOX, ListBoxName); if (xListBox == null){ - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + xListBox =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.PANEL, ListBoxName); } XAccessible xListBoxAccess = UnoRuntime.queryInterface(XAccessible.class, xListBox); // if a List is not pulled to be open all entries are not visiblle, therefore the // boolean argument - XAccessibleContext xList =mAT.getAccessibleObjectForRole( + XAccessibleContext xList =AccessibilityTools.getAccessibleObjectForRole( xListBoxAccess, AccessibleRole.LIST, true); XAccessibleSelection xListSelect = UnoRuntime.queryInterface(XAccessibleSelection.class, xList); @@ -325,16 +325,16 @@ public class UITools { XAccessibleContext xListBox = null; XAccessibleContext xList = null; - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + xListBox =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.COMBO_BOX, ListBoxName); if (xListBox == null){ - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + xListBox =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.PANEL, ListBoxName); } if (xListBox == null){ // get the list of TreeListBox - xList =mAT.getAccessibleObjectForRole(mXRoot, + xList =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.TREE, ListBoxName); // all other list boxes have a children of kind of LIST @@ -343,7 +343,7 @@ public class UITools { XAccessible xListBoxAccess = UnoRuntime.queryInterface(XAccessible.class, xListBox); // if a List is not pulled to be open all entries are not visiblle, therefore the // boolean argument - xList =mAT.getAccessibleObjectForRole( + xList =AccessibilityTools.getAccessibleObjectForRole( xListBoxAccess, AccessibleRole.LIST, true); } @@ -387,16 +387,16 @@ public class UITools { XAccessibleContext xListBox = null; XAccessibleContext xList = null; - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + xListBox =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.COMBO_BOX, ListBoxName); if (xListBox == null){ - xListBox =mAT.getAccessibleObjectForRole(mXRoot, + xListBox =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.PANEL, ListBoxName); } if (xListBox == null){ // get the list of TreeListBox - xList =mAT.getAccessibleObjectForRole(mXRoot, + xList =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.TREE, ListBoxName); // all other list boxes have a children of kind of LIST @@ -405,7 +405,7 @@ public class UITools { XAccessible xListBoxAccess = UnoRuntime.queryInterface(XAccessible.class, xListBox); // if a List is not pulled to be open all entries are not visiblle, therefore the // boolean argument - xList =mAT.getAccessibleObjectForRole( + xList =AccessibilityTools.getAccessibleObjectForRole( xListBoxAccess, AccessibleRole.LIST, true); } @@ -440,7 +440,7 @@ public class UITools { throws java.lang.Exception { try{ - XInterface xNumericField =mAT.getAccessibleObjectForRole( + XInterface xNumericField =AccessibilityTools.getAccessibleObjectForRole( mXRoot, AccessibleRole.TEXT, NumericFieldName); UnoRuntime.queryInterface( XAccessibleEditableText.class, xNumericField); @@ -462,7 +462,7 @@ public class UITools { throws java.lang.Exception { try{ - XInterface xNumericField =mAT.getAccessibleObjectForRole( + XInterface xNumericField =AccessibilityTools.getAccessibleObjectForRole( mXRoot, AccessibleRole.TEXT, NumericFieldName); return getString(xNumericField); @@ -526,7 +526,7 @@ public class UITools { Double retValue = null; String sValue = getNumericFieldValue(NumericFieldName); String sAmount = removeCharactersFromCurrencyString(sValue); - retValue = retValue.valueOf(sAmount); + retValue = Double.valueOf(sAmount); return retValue; @@ -548,10 +548,10 @@ public class UITools { { String TextFieldText = null; try{ - XAccessibleContext xTextField =mAT.getAccessibleObjectForRole(mXRoot, + XAccessibleContext xTextField =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.SCROLL_PANE, TextFieldName); XAccessible xTextFieldAccess = UnoRuntime.queryInterface(XAccessible.class, xTextField); - XAccessibleContext xFrame =mAT.getAccessibleObjectForRole( + XAccessibleContext xFrame =AccessibilityTools.getAccessibleObjectForRole( xTextFieldAccess, AccessibleRole.TEXT_FRAME); for (int i=0;i<xFrame.getAccessibleChildCount();i++) { try { @@ -588,7 +588,7 @@ public class UITools { throws java.lang.Exception { try { - XInterface xCheckBox =mAT.getAccessibleObjectForRole(mXRoot, + XInterface xCheckBox =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.CHECK_BOX, CheckBoxName); XAccessibleValue xCheckBoxValue = UnoRuntime.queryInterface(XAccessibleValue.class, xCheckBox); xCheckBoxValue.setCurrentValue(Value); @@ -609,7 +609,7 @@ public class UITools { throws java.lang.Exception { try { - XInterface xCheckBox =mAT.getAccessibleObjectForRole(mXRoot, + XInterface xCheckBox =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.CHECK_BOX, CheckBoxName); XAccessibleValue xCheckBoxValue = UnoRuntime.queryInterface(XAccessibleValue.class, xCheckBox); @@ -630,7 +630,7 @@ public class UITools { { String cMessage = null; try{ - XAccessibleContext xMessage =mAT.getAccessibleObjectForRole(mXRoot, + XAccessibleContext xMessage =AccessibilityTools.getAccessibleObjectForRole(mXRoot, AccessibleRole.LABEL); XInterface xMessageInterface = UnoRuntime.queryInterface(XInterface.class, xMessage); @@ -666,7 +666,7 @@ public class UITools { for (int i=0; i < count ; i++){ XTopWindow xTopWindow = tk.getTopWindow(i); - XAccessible xAcc = mAT.getAccessibleObject(xTopWindow); + XAccessible xAcc = AccessibilityTools.getAccessibleObject(xTopWindow); String accName = xAcc.getAccessibleContext().getAccessibleName(); if (debug){ @@ -689,7 +689,7 @@ public class UITools { public void clickMiddleOfAccessibleObject(short role, String name){ - XAccessibleContext xAcc =mAT.getAccessibleObjectForRole(mXRoot, role, name); + XAccessibleContext xAcc =AccessibilityTools.getAccessibleObjectForRole(mXRoot, role, name); XAccessibleComponent aComp = UnoRuntime.queryInterface( XAccessibleComponent.class, xAcc); @@ -721,7 +721,7 @@ public class UITools { } public void doubleClickMiddleOfAccessibleObject(short role, String name) { - XAccessibleContext xAcc =mAT.getAccessibleObjectForRole(mXRoot, role, name); + XAccessibleContext xAcc =AccessibilityTools.getAccessibleObjectForRole(mXRoot, role, name); XAccessibleComponent aComp = UnoRuntime.queryInterface( XAccessibleComponent.class, xAcc); @@ -765,7 +765,7 @@ public class UITools { */ public void printAccessibleTree(PrintWriter log) { - mAT.printAccessibleTree(log, mXRoot); + AccessibilityTools.printAccessibleTree(log, mXRoot); } @@ -776,7 +776,7 @@ public class UITools { * @param debugIsActive prints only if this parameter is set to TRUE */ public void printAccessibleTree(PrintWriter log, boolean debugIsActive) { - mAT.printAccessibleTree(log, mXRoot, debugIsActive); + AccessibilityTools.printAccessibleTree(log, mXRoot, debugIsActive); } } diff --git a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java index 0e4a1474074e..802ff1e93c07 100644 --- a/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java +++ b/qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java @@ -463,15 +463,15 @@ public class _XUserInputInterception extends MultiMethodTest { util.DesktopTools.bringWindowToFront(xModel); - XWindow xWindow = at.getCurrentWindow( + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) tParam.getMSF(), xModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext xPanel = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); + XAccessibleContext xPanel = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); XAccessibleComponent xPanelCont = UnoRuntime.queryInterface(XAccessibleComponent.class, xPanel); // the position of the panel diff --git a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java index a1b1cf4b1053..47e5b73e5495 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java +++ b/qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java @@ -77,11 +77,11 @@ public class _XEnhancedMouseClickBroadcaster extends MultiMethodTest { log.println("try to open contex menu..."); AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)tParam.getMSF(), docModel); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)tParam.getMSF(), docModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XInterface oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); + XInterface oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); XAccessibleComponent window = UnoRuntime.queryInterface( XAccessibleComponent.class, oObj); diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java index 4d6922cec0d0..6fd2c3983dc7 100644 --- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java +++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java @@ -173,10 +173,10 @@ public class _XRangeSelection extends MultiMethodTest { XModel xModel = UnoRuntime.queryInterface(XModel.class, xSheetDoc); System.out.println("Name: " + xModel.getCurrentController().getFrame().getName()); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)tParam.getMSF(), xModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)tParam.getMSF(), xModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext ctx = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE ); + XAccessibleContext ctx = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE ); XAccessibleComponent AccessibleSpreadsheet = UnoRuntime.queryInterface(XAccessibleComponent.class,ctx); diff --git a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java index 6a4c20b8c609..ebeaf004b4f3 100644 --- a/qadevOOo/tests/java/ifc/text/_NumberingLevel.java +++ b/qadevOOo/tests/java/ifc/text/_NumberingLevel.java @@ -77,9 +77,9 @@ public class _NumberingLevel { */ public _NumberingLevel(LogWriter log, TestParameters tParam, PropertyValue[] propertyValues){ - this.PropertyArray = propertyValues; + _NumberingLevel.PropertyArray = propertyValues; - this.log = log; + _NumberingLevel.log = log; //key = PropertyName, value = Ooptional NumberingLevel.put("Adjust", new Boolean(false)); diff --git a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java index a435a7e784e0..c065f059a583 100644 --- a/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java +++ b/qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java @@ -114,13 +114,13 @@ public class _XContextMenuInterception extends MultiMethodTest { xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0)); - xRoot = at.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + xRoot = AccessibilityTools.getAccessibleObject(xWindow); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println("Couldn't get Window"); } - XAccessibleContext oPopMenu = at.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU,true); + XAccessibleContext oPopMenu = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU,true); log.println("ImplementationName: " + util.utils.getImplName(oPopMenu)); @@ -156,11 +156,11 @@ public class _XContextMenuInterception extends MultiMethodTest { log.println("try to open contex menu..."); AccessibilityTools at = new AccessibilityTools(); - xWindow = at.getCurrentWindow(xMSF, xModel); + xWindow = AccessibilityTools.getCurrentWindow(xMSF, xModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XInterface oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); + XInterface oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); XAccessibleComponent window = UnoRuntime.queryInterface( XAccessibleComponent.class, oObj); diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java index 145c0b2847a1..e87b407115bf 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java @@ -159,7 +159,7 @@ public class _XExecutableDialog extends MultiMethodTest { if (eThread.isAlive()) { log.println("Interrupting Thread"); eThread.interrupt(); - eThread.yield(); + Thread.yield(); } } catch (Exception e) { // who cares ;-) diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java index 28c878ede2a4..892850bdc8ff 100644 --- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java +++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java @@ -237,7 +237,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { if (eThread.isAlive()) { log.println("Interrupting Thread"); eThread.interrupt(); - eThread.yield(); + Thread.yield(); } } catch (Exception e) { // who cares ;-) @@ -264,7 +264,7 @@ public class _XFilePickerNotifier extends MultiMethodTest { if (eThread.isAlive()) { log.println("second interrupt"); eThread.interrupt(); - eThread.yield(); + Thread.yield(); } XExecutableDialog exD = UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java index d8469bb1ca69..e9abc115640c 100644 --- a/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_basctl/AccessibleShape.java @@ -108,11 +108,11 @@ public class AccessibleShape extends TestCase { final XWindow basicIDE = xFrame.getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(basicIDE); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(basicIDE); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java index dbc58e14db36..5adc3755c952 100644 --- a/qadevOOo/tests/java/mod/_fwl/TypeDetection.java +++ b/qadevOOo/tests/java/mod/_fwl/TypeDetection.java @@ -143,8 +143,8 @@ public class TypeDetection extends TestCase { String fileURL = null; try { xTextDoc = SOF.createTextDoc( null ); - XInterface xBookMark = SOF.createBookmark( xTextDoc ); - SOF.insertTextContent( xTextDoc, (XTextContent) xBookMark ); + XInterface xBookMark = SOfficeFactory.createBookmark( xTextDoc ); + SOfficeFactory.insertTextContent( xTextDoc, (XTextContent) xBookMark ); fileURL = utils.getOfficeTemp((XMultiServiceFactory)Param.getMSF() ); fileURL = fileURL + "bookmarks.oot"; diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java index e8039b302c47..91e76dba66f1 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java @@ -87,11 +87,11 @@ public class ScAccessibleDocument extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT, ""); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT, ""); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); log.println("ImplementationName " + utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java index 03806dd04c03..4c6c647d4f45 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java @@ -156,11 +156,11 @@ public class ScAccessibleDocumentPagePreview extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentContainerWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole + oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.DOCUMENT, ""); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java index d4e90be7851d..734c8556b036 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java @@ -143,14 +143,14 @@ public class ScAccessiblePageHeader extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole + oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.HEADER, ""); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java index e1b50192dabb..3d3a8c0e9c87 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java @@ -138,11 +138,11 @@ public class ScAccessiblePageHeaderArea extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentContainerWindow( (XMultiServiceFactory) Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); try { - oObj = at.getAccessibleObjectForRole + oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.HEADER, "").getAccessibleChild(0); XAccessibleContext cont = UnoRuntime.queryInterface(XAccessibleContext.class, oObj); XAccessibleStateSet StateSet = cont.getAccessibleStateSet(); @@ -154,12 +154,12 @@ public class ScAccessiblePageHeaderArea extends TestCase { } log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); XAccessibleContext zoomIn = - at.getAccessibleObjectForRole(xRoot,AccessibleRole.PUSH_BUTTON, "Zoom In"); + AccessibilityTools.getAccessibleObjectForRole(xRoot,AccessibleRole.PUSH_BUTTON, "Zoom In"); final XAccessibleAction pressZoom = UnoRuntime.queryInterface(XAccessibleAction.class, zoomIn); tEnv.addObjRelation("EventProducer", diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java index cabb17eb24f1..e740ca62e526 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java @@ -164,10 +164,10 @@ public class ScAccessiblePreviewCell extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), xModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), xModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL, true); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL, true); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java index ba6c952132eb..ec2be5a4471e 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java @@ -245,14 +245,14 @@ public class ScAccessiblePreviewHeaderCell extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), xModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), xModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE, "A"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE, "A"); if (oObj == null) { log.println("Version with a fixed #103863#"); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL, true); } diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java index 195548477793..134433dc9ad0 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java @@ -167,19 +167,19 @@ public class ScAccessiblePreviewTable extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentContainerWindow((XMultiServiceFactory)Param.getMSF(), xModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow((XMultiServiceFactory)Param.getMSF(), xModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log,xRoot, Param.getBool(PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log,xRoot, Param.getBool(PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); log.println("ImplementationName " + utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment( oObj ); XAccessibleContext zoomIn = - at.getAccessibleObjectForRole(xRoot,AccessibleRole.PUSH_BUTTON, "Zoom In"); + AccessibilityTools.getAccessibleObjectForRole(xRoot,AccessibleRole.PUSH_BUTTON, "Zoom In"); log.println("Getting "+ zoomIn.getAccessibleName()); diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java index 2ba1da5fadea..18ddab6e6661 100644 --- a/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java +++ b/qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java @@ -109,10 +109,10 @@ public class ScAccessibleSpreadsheet extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), xModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), xModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE ); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE ); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java index 61b7b72d6b89..dcf0221dd21a 100644 --- a/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java +++ b/qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java @@ -123,7 +123,7 @@ public class ScTableSheetsObj extends TestCase { XSpreadsheet oSecondSheet = null; try { - oSecondSheet = SOF.createSpreadsheet(xSpreadsheetDoc); + oSecondSheet = SOfficeFactory.createSpreadsheet(xSpreadsheetDoc); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException("Couldn't create instances", e); @@ -145,7 +145,7 @@ public class ScTableSheetsObj extends TestCase { "adding INSTANCE" + n +" as mod relation to environment" ); tEnv.addObjRelation( "INSTANCE" + n, - SOF.createSpreadsheet(xSpreadsheetDoc) ); + SOfficeFactory.createSpreadsheet(xSpreadsheetDoc) ); } } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sch/AccArea.java b/qadevOOo/tests/java/mod/_sch/AccArea.java index db9a2b3372c5..d32c195076ec 100644 --- a/qadevOOo/tests/java/mod/_sch/AccArea.java +++ b/qadevOOo/tests/java/mod/_sch/AccArea.java @@ -63,12 +63,12 @@ public class AccArea extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccArea"); diff --git a/qadevOOo/tests/java/mod/_sch/AccAxis.java b/qadevOOo/tests/java/mod/_sch/AccAxis.java index b965975b315e..8687c52f4c3f 100644 --- a/qadevOOo/tests/java/mod/_sch/AccAxis.java +++ b/qadevOOo/tests/java/mod/_sch/AccAxis.java @@ -63,10 +63,10 @@ public class AccAxis extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccAxis"); diff --git a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java index 200681ed8fb1..d422509e24ed 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataPoint.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataPoint.java @@ -63,12 +63,12 @@ public class AccDataPoint extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccDataPoint"); oObj = cont; diff --git a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java index bfb71bbb8f97..7085dfaaa514 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDataSeries.java +++ b/qadevOOo/tests/java/mod/_sch/AccDataSeries.java @@ -63,12 +63,12 @@ public class AccDataSeries extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccDataSeries"); oObj = cont; diff --git a/qadevOOo/tests/java/mod/_sch/AccDiagram.java b/qadevOOo/tests/java/mod/_sch/AccDiagram.java index 2fa084db3665..ac1dee8ceb5c 100644 --- a/qadevOOo/tests/java/mod/_sch/AccDiagram.java +++ b/qadevOOo/tests/java/mod/_sch/AccDiagram.java @@ -63,12 +63,12 @@ public class AccDiagram extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccDiagram"); oObj = cont; diff --git a/qadevOOo/tests/java/mod/_sch/AccFloor.java b/qadevOOo/tests/java/mod/_sch/AccFloor.java index 960556dce48c..0f0bce11d62c 100644 --- a/qadevOOo/tests/java/mod/_sch/AccFloor.java +++ b/qadevOOo/tests/java/mod/_sch/AccFloor.java @@ -86,12 +86,12 @@ public class AccFloor extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccFloor"); diff --git a/qadevOOo/tests/java/mod/_sch/AccGrid.java b/qadevOOo/tests/java/mod/_sch/AccGrid.java index c732968b94e7..9682a4ea8e5f 100644 --- a/qadevOOo/tests/java/mod/_sch/AccGrid.java +++ b/qadevOOo/tests/java/mod/_sch/AccGrid.java @@ -63,12 +63,12 @@ public class AccGrid extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccGrid"); diff --git a/qadevOOo/tests/java/mod/_sch/AccLegend.java b/qadevOOo/tests/java/mod/_sch/AccLegend.java index a0982436f1ba..a89050d7617b 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegend.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegend.java @@ -63,10 +63,10 @@ public class AccLegend extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccLegend"); diff --git a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java index 6e55ef304806..b02d5c71cf99 100644 --- a/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java +++ b/qadevOOo/tests/java/mod/_sch/AccLegendEntry.java @@ -63,10 +63,10 @@ public class AccLegendEntry extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccLegendEntry"); diff --git a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java index dad8ee860bf1..077b5fd16b29 100644 --- a/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java +++ b/qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java @@ -67,10 +67,10 @@ public class AccStatisticsObject extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccStatisticsObject"); diff --git a/qadevOOo/tests/java/mod/_sch/AccTitle.java b/qadevOOo/tests/java/mod/_sch/AccTitle.java index 5b987df224ed..e49f44cb1881 100644 --- a/qadevOOo/tests/java/mod/_sch/AccTitle.java +++ b/qadevOOo/tests/java/mod/_sch/AccTitle.java @@ -63,10 +63,10 @@ public class AccTitle extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccTitle"); diff --git a/qadevOOo/tests/java/mod/_sch/AccWall.java b/qadevOOo/tests/java/mod/_sch/AccWall.java index daaa7d20cb23..3e2e0e750c8a 100644 --- a/qadevOOo/tests/java/mod/_sch/AccWall.java +++ b/qadevOOo/tests/java/mod/_sch/AccWall.java @@ -86,12 +86,12 @@ public class AccWall extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext cont = at.getAccessibleObjectForRole( + XAccessibleContext cont = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.SHAPE, "", "AccWall"); oObj = cont; diff --git a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java index 2927527b80be..786d0a941166 100644 --- a/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java @@ -51,15 +51,15 @@ public class AccessibleDocumentView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); if (oObj == null) { log.println("DocumentView hasn't the role 'Document'"); log.println("trying the role 'Shape'"); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); } log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java index 5068fcb18f17..9c98f0d69d2b 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java @@ -100,16 +100,16 @@ public class AccessibleDrawDocumentView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow ( + XWindow xWindow = AccessibilityTools.getCurrentWindow ( (XMultiServiceFactory)Param.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); //com.sun.star.accessibility.AccessibleRole - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); log.println("ImplementationName "+utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java index 9ac839f75ef6..7738e0c02de8 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java @@ -66,11 +66,11 @@ public class AccessibleOutlineView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow ( + XWindow xWindow = AccessibilityTools.getCurrentWindow ( (XMultiServiceFactory)Param.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); log.println("ImplementationName "+utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java index 1f081555e3c3..1444fd24a49f 100644 --- a/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java +++ b/qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java @@ -73,13 +73,13 @@ public class AccessibleSlideView extends TestCase { shortWait(); - XWindow xWindow = at.getCurrentWindow ( + XWindow xWindow = AccessibilityTools.getCurrentWindow ( (XMultiServiceFactory)Param.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); System.out.println("ImplementationName "+utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java index c3684d16f10d..16c7ad744130 100644 --- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java @@ -110,14 +110,14 @@ public class SmEditAccessible extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole + oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.PANEL, "", "SmEditAccessible"); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); tEnv.addObjRelation("Destroy", new Boolean(true)); diff --git a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java index 4a54b860c7c3..2735717910bd 100644 --- a/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java +++ b/qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java @@ -112,10 +112,10 @@ public class SmGraphicAccessible extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole + oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.DOCUMENT, "Formula"); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java index fec8bd66031b..6d182f76b32e 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java @@ -152,11 +152,11 @@ public class AccessibleBrowseBox extends TestCase { XWindow xWindow = secondController.getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", "AccessibleBrowseBox"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", "AccessibleBrowseBox"); log.println("ImplementationName: " + util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java index 29953296f6a8..d231ef86ebc8 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java @@ -198,11 +198,11 @@ public class AccessibleBrowseBoxHeaderBar extends TestCase { XWindow xWindow = secondController.getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); log.println("ImplementationName: " + util.utils.getImplName(oObj)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java index 3636c38232f2..8819bd7bd1f2 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java @@ -194,11 +194,11 @@ public class AccessibleBrowseBoxHeaderCell extends TestCase { XWindow xWindow = secondController.getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.ROW_HEADER); log.println("ImplementationName: "+ util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java index db3c0bbe739c..2aa5a398102e 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java @@ -191,9 +191,9 @@ public class AccessibleBrowseBoxTable extends TestCase { XWindow xWindow = secondController.getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE, "Table"); log.println("ImplementationName: " + util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java index 809086651fdb..26c78b88b5c9 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java @@ -182,9 +182,9 @@ public class AccessibleBrowseBoxTableCell extends TestCase { XWindow xWindow = secondController.getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); log.println("ImplementationName: "+util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java index d2e7effb02e9..f8fdff936c2c 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java @@ -208,11 +208,11 @@ public class AccessibleIconChoiceCtrl extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); - XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext closeButton = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java index ab19d1476e08..e1c79d618910 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java @@ -205,12 +205,12 @@ public class AccessibleIconChoiceCtrlEntry extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.LABEL, "Internet"); - XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext closeButton = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); accCloseButton = UnoRuntime.queryInterface(XAccessibleAction.class, closeButton); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java index af8a80c73e50..1187b89891a3 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java @@ -106,9 +106,9 @@ public class AccessibleTabBar extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xDoc). getCurrentController().getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); log.println("ImplementationName: " + util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java index 659ce9b2522d..3119da31e47d 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java @@ -140,10 +140,10 @@ public class AccessibleTabBarPage extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Sheet1"); - XAccessibleContext acc = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Sheet2"); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Sheet1"); + XAccessibleContext acc = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Sheet2"); XAccessibleComponent accComp = UnoRuntime.queryInterface( XAccessibleComponent.class, acc); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java index c6354443b7c8..3e56f0837687 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java @@ -142,9 +142,9 @@ public class AccessibleTabBarPageList extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB_LIST); log.println("ImplementationName: " + util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java index 9134ed856ef1..a420433489c3 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java @@ -172,9 +172,9 @@ public class AccessibleTreeListBox extends TestCase { XWindow xWindow = secondController.getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); log.println("ImplementationName: "+ util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java index 83dd22756976..80ffc39eb802 100644 --- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java +++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java @@ -227,11 +227,11 @@ public class AccessibleTreeListBoxEntry extends TestCase { XWindow xWindow = secondController.getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.LABEL, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.LABEL, "Bibliography"); log.println("ImplementationName: " + util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java index acae9da9a4fc..64123d171691 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java @@ -81,16 +81,16 @@ public class AccessibleControlShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); utils.shortWait(5000); - XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); + AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, // "Button"); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Button"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Button"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java index 4c3e28f5c3c8..03760b4de45b 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java @@ -65,12 +65,12 @@ public class AccessibleEditableTextPara extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext InputLine = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME,"Input line"); + XAccessibleContext InputLine = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME,"Input line"); try { oObj = InputLine.getAccessibleChild(0); XAccessibleEditableText et = UnoRuntime.queryInterface(XAccessibleEditableText.class, oObj); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java index b149734aaba0..1f03e3b28997 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java @@ -87,13 +87,13 @@ public class AccessibleGraphicShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); // oObj = at.getAccessibleObjectForRole // (xRoot, AccessibleRole.SHAPE, "GraphicObject"); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java index 429e061671ca..52934bd8c145 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java @@ -108,14 +108,14 @@ public class AccessibleOLEShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // oObj = at.getAccessibleObjectForRole // (xRoot, AccessibleRole.SHAPE, "OLEShape"); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "OLEShape"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "OLEShape"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java index d0f723e97248..0a6220987685 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java @@ -82,14 +82,14 @@ public class AccessiblePageShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SHAPE, // "PageShape"); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "PageShape"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "PageShape"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java index 61fbd7cf0e0d..c4febe7dc935 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java @@ -106,12 +106,12 @@ public class AccessiblePresentationGraphicShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); // oObj = at.getAccessibleObjectForRole // (xRoot, AccessibleRole.SHAPE, "GraphicObject"); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "GraphicObject"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java index d4cbf2fcd8f2..6803c3f526e1 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java @@ -114,13 +114,13 @@ public class AccessiblePresentationOLEShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // oObj = at.getAccessibleObjectForRole // (xRoot, AccessibleRole.SHAPE, "ImpressOLE"); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressOLE"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressOLE"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java index 13fb69e5c269..14b980110945 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java @@ -101,13 +101,13 @@ public class AccessiblePresentationShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // oObj = at.getAccessibleObjectForRole // (xRoot, AccessibleRole.SHAPE, "ImpressHandout"); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressHandout"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "ImpressHandout"); log.println("Implementation Name: "+utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java index 683a1bb5a3bc..f7a9c2387396 100644 --- a/qadevOOo/tests/java/mod/_svx/AccessibleShape.java +++ b/qadevOOo/tests/java/mod/_svx/AccessibleShape.java @@ -86,14 +86,14 @@ public class AccessibleShape extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow ((XMultiServiceFactory)tParam.getMSF(),aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // oObj = at.getAccessibleObjectForRole // (xRoot, AccessibleRole.SHAPE, "Rectangle"); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Rectangle"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.UNKNOWN, "Rectangle"); // create test environment here TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java index a8e56268d38a..541bbf9b50cf 100644 --- a/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java +++ b/qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java @@ -135,11 +135,11 @@ public class SvxGraphCtrlAccessibleContext extends TestCase{ XWindow xWindow = UnoRuntime.queryInterface(XWindow.class,tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java index d116123e78cd..e9c097711f9e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java @@ -118,10 +118,10 @@ public class SwAccessibleDocumentPageView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT ); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT ); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java index cb512e761511..714d3c2901ba 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java @@ -99,13 +99,13 @@ public class SwAccessibleDocumentView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java index 4aa5c4be7351..f94515e0be2e 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java @@ -115,13 +115,13 @@ public class SwAccessibleEndnoteView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.END_NOTE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.END_NOTE); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java index 736639c0a987..15cb7ddfb635 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java @@ -129,13 +129,13 @@ public class SwAccessibleFooterView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTER); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTER); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java index ec2a1db402f1..af45d5dd3c2f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java @@ -116,13 +116,13 @@ public class SwAccessibleFootnoteView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTNOTE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.FOOTNOTE); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java index 9d51b5c5db79..7b6dcd44d372 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java @@ -119,13 +119,13 @@ public class SwAccessibleHeaderView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.HEADER); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.HEADER); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index 9ddfac3b6ae9..fc3e2c6106af 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -173,14 +173,14 @@ public class SwAccessiblePageView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); System.out.println("Panel: "+AccessibleRole.PANEL); System.out.println("ScrollPane: "+AccessibleRole.SCROLL_PANE); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL,"Page"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL,"Page"); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java index 63988cfb5830..c1928be73673 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java @@ -71,10 +71,10 @@ public class SwAccessibleParagraphView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PARAGRAPH); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PARAGRAPH); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java index 573b0ca94f39..9c68878552c5 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java @@ -71,7 +71,7 @@ public class SwAccessibleTableCellView extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory) Param.getMSF()); try { - oTable = SOF.createTextTable(xTextDoc); + oTable = SOfficeFactory.createTextTable(xTextDoc); } catch (com.sun.star.uno.Exception e) { e.printStackTrace(log); throw new StatusException("Couldn't create TextTable : " + @@ -79,7 +79,7 @@ public class SwAccessibleTableCellView extends TestCase { } try { - SOF.insertTextContent(xTextDoc, oTable); + SOfficeFactory.insertTextContent(xTextDoc, oTable); } catch (com.sun.star.lang.IllegalArgumentException e) { e.printStackTrace(log); throw new StatusException("Couldn't insert text content :" + @@ -91,14 +91,14 @@ public class SwAccessibleTableCellView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE_CELL); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); final XAccessibleSelection accSel = UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java index e20761c837a4..e54a1599f96f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java @@ -73,7 +73,7 @@ public class SwAccessibleTableView extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)Param.getMSF()); try { - oTable = SOF.createTextTable( xTextDoc ); + oTable = SOfficeFactory.createTextTable( xTextDoc ); } catch ( com.sun.star.uno.Exception e ) { e.printStackTrace( log ); throw new StatusException("Couldn't create TextTable : " + @@ -81,7 +81,7 @@ public class SwAccessibleTableView extends TestCase { } try { - SOF.insertTextContent(xTextDoc, oTable ); + SOfficeFactory.insertTextContent(xTextDoc, oTable ); } catch ( com.sun.star.lang.IllegalArgumentException e ) { e.printStackTrace( log ); throw new StatusException("Couldn't insert text content :" @@ -92,13 +92,13 @@ public class SwAccessibleTableView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TABLE); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java index d805a5afbdaa..6d2ef55e278c 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java @@ -70,13 +70,13 @@ public class SwAccessibleTextEmbeddedObject extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.EMBEDDED_OBJECT); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.EMBEDDED_OBJECT); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java index 977e8482faec..2503d38ef4e2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java @@ -83,7 +83,7 @@ public class SwAccessibleTextFrameView extends TestCase { // creating Frames log.println( "creating Frames" ); try { - oFrame1 = SOF.createTextFrame(xTextDoc, 500, 500); + oFrame1 = SOfficeFactory.createTextFrame(xTextDoc, 500, 500); oPropSet = UnoRuntime.queryInterface( XPropertySet.class, oFrame1 ); oPropSet.setPropertyValue("AnchorType", @@ -103,13 +103,13 @@ public class SwAccessibleTextFrameView extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT_FRAME); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java index 765778b9e3c2..ee63c3dd0e45 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java @@ -92,13 +92,13 @@ public class SwAccessibleTextGraphicObject extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.GRAPHIC); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.GRAPHIC); log.println("ImplementationName " + utils.getImplName(oObj)); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); TestEnvironment tEnv = new TestEnvironment(oObj); diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java index 72fbd60e1f0a..13543e806a0b 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBookmark.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBookmark.java @@ -89,8 +89,8 @@ public class SwXBookmark extends TestCase { Object instance = null; log.println( "creating a test environment" ); try { - oObj = SOF.createBookmark( xTextDoc ); - SOF.insertTextContent( xTextDoc, (XTextContent) oObj ); + oObj = SOfficeFactory.createBookmark( xTextDoc ); + SOfficeFactory.insertTextContent( xTextDoc, (XTextContent) oObj ); instance = SOF.createInstance(xTextDoc,"com.sun.star.text.Bookmark"); } catch ( com.sun.star.uno.Exception e ) { e.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java index 3307b8a7ac9a..5ea99e608709 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java +++ b/qadevOOo/tests/java/mod/_sw/SwXBookmarks.java @@ -87,10 +87,10 @@ public class SwXBookmarks extends TestCase { log.println( "creating a test environment" ); try { - oObj = SOF.createBookmark( xTextDoc ); - SOF.insertTextContent( xTextDoc, (XTextContent) oObj ); - oObj = SOF.createBookmark( xTextDoc ); - SOF.insertTextContent( xTextDoc, (XTextContent) oObj ); + oObj = SOfficeFactory.createBookmark( xTextDoc ); + SOfficeFactory.insertTextContent( xTextDoc, (XTextContent) oObj ); + oObj = SOfficeFactory.createBookmark( xTextDoc ); + SOfficeFactory.insertTextContent( xTextDoc, (XTextContent) oObj ); } catch( com.sun.star.uno.Exception e ) { e.printStackTrace( log ); throw new StatusException( "Couldn't create Bookmark", e ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXCell.java b/qadevOOo/tests/java/mod/_sw/SwXCell.java index a6f3aefc08f1..257c699aeccf 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXCell.java +++ b/qadevOOo/tests/java/mod/_sw/SwXCell.java @@ -92,18 +92,18 @@ public class SwXCell extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); log.println( "creating a test environment" ); try { - oTable = SOF.createTextTable(xTextDoc, 3, 4); + oTable = SOfficeFactory.createTextTable(xTextDoc, 3, 4); } catch ( com.sun.star.uno.Exception e ) { log.println("Unable to create TextTable..."); e.printStackTrace(log); } try { - SOF.insertTextContent( xTextDoc, oTable ); + SOfficeFactory.insertTextContent( xTextDoc, oTable ); } catch ( com.sun.star.lang.IllegalArgumentException e ) { log.println("Unable to insert TextContent..."); e.printStackTrace(log); } - oObj = SOF.getFirstTableCell( oTable ); + oObj = SOfficeFactory.getFirstTableCell( oTable ); log.println( " creating a new environment for bodytext object" ); TestEnvironment tEnv = new TestEnvironment( oObj ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java index 1e8d11795fb5..a60f1b56f901 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXCellRange.java +++ b/qadevOOo/tests/java/mod/_sw/SwXCellRange.java @@ -93,7 +93,7 @@ public class SwXCellRange extends TestCase { XTextTable the_table = null; XInterface oObj = null; try { - the_table = SOF.createTextTable( xTextDoc ); + the_table = SOfficeFactory.createTextTable( xTextDoc ); the_table.initialize(5, 5); } catch ( com.sun.star.uno.Exception e ) { e.printStackTrace( log ); @@ -101,9 +101,9 @@ public class SwXCellRange extends TestCase { +e.getMessage(),e); } - if( SOF.getTableCollection( xTextDoc ).getCount() == 0 ) { + if( SOfficeFactory.getTableCollection( xTextDoc ).getCount() == 0 ) { try { - SOF.insertTextContent(xTextDoc, the_table ); + SOfficeFactory.insertTextContent(xTextDoc, the_table ); } catch (com.sun.star.lang.IllegalArgumentException e) { e.printStackTrace( log ); throw new StatusException("Couldn't create TextTable : " diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java index 335571066319..8111ea596bf4 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java @@ -98,8 +98,8 @@ public class SwXDocumentIndex extends TestCase { SOfficeFactory SOF = SOfficeFactory.getFactory((XMultiServiceFactory)tParam.getMSF()); log.println( "creating a test environment" ); try { - xTC = SOF.createIndex(xTextDoc, "com.sun.star.text.DocumentIndex"); - instance = SOF.createIndex(xTextDoc, "com.sun.star.text.DocumentIndex"); + xTC = SOfficeFactory.createIndex(xTextDoc, "com.sun.star.text.DocumentIndex"); + instance = SOfficeFactory.createIndex(xTextDoc, "com.sun.star.text.DocumentIndex"); } catch ( com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java index b2dd757a2521..d4ff191f42f6 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java +++ b/qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java @@ -95,7 +95,7 @@ public class SwXDocumentIndexes extends TestCase { XTextContent xTC = null; try { - xTC = SOF.createIndex(xTextDoc,"com.sun.star.text.ContentIndex"); + xTC = SOfficeFactory.createIndex(xTextDoc,"com.sun.star.text.ContentIndex"); } catch ( com.sun.star.uno.Exception e) { e.printStackTrace(log); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java index 00957a74b650..700780ee1eac 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableCellText.java @@ -119,7 +119,7 @@ public class SwXTableCellText extends TestCase { log.println( "Creating a test environment" ); try { - oTable = SOF.createTextTable( xTextDoc ); + oTable = SOfficeFactory.createTextTable( xTextDoc ); } catch ( com.sun.star.uno.Exception e ) { e.printStackTrace( log ); throw new StatusException("Couldn't create TextTable : " @@ -127,7 +127,7 @@ public class SwXTableCellText extends TestCase { } try { - SOF.insertTextContent(xTextDoc, oTable ); + SOfficeFactory.insertTextContent(xTextDoc, oTable ); } catch ( com.sun.star.lang.IllegalArgumentException e ) { e.printStackTrace( log ); throw new StatusException("Couldn't insert text content : " diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java index 0728df18eafb..c69741a6ec69 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableColumns.java @@ -94,7 +94,7 @@ public class SwXTableColumns extends TestCase { log.println( "creating a test environment" ); try { - oTable = SOF.createTextTable( xTextDoc ); + oTable = SOfficeFactory.createTextTable( xTextDoc ); } catch ( com.sun.star.uno.Exception e ) { e.printStackTrace( log ); throw new StatusException("Couldn't create TextTable: " @@ -102,7 +102,7 @@ public class SwXTableColumns extends TestCase { } try { - SOF.insertTextContent(xTextDoc, oTable ); + SOfficeFactory.insertTextContent(xTextDoc, oTable ); } catch ( com.sun.star.lang.IllegalArgumentException e ) { e.printStackTrace( log ); throw new StatusException("Couldn't insert text content: " diff --git a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java index dd0e488859c8..6bc037557633 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTableRows.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTableRows.java @@ -89,7 +89,7 @@ public class SwXTableRows extends TestCase { log.println( "creating a test environment" ); SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() ); try { - oTable = SOF.createTextTable( xTextDoc ); + oTable = SOfficeFactory.createTextTable( xTextDoc ); } catch ( com.sun.star.uno.Exception e ) { e.printStackTrace( log ); throw new StatusException("Couldn't create TextTable: " @@ -97,7 +97,7 @@ public class SwXTableRows extends TestCase { } try { - SOF.insertTextContent(xTextDoc, oTable ); + SOfficeFactory.insertTextContent(xTextDoc, oTable ); } catch ( com.sun.star.lang.IllegalArgumentException e ) { e.printStackTrace( log ); throw new StatusException("Couldn't insert text content: " diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java index b44ee22d828c..c4808493a4c9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java @@ -139,7 +139,7 @@ public class SwXTextEmbeddedObject extends TestCase { tEnv.addObjRelation("NoAttach", "SwXTextEmbeddedObject"); - XTextFrame aFrame = SOF.createTextFrame(xTextDoc, 500, 500); + XTextFrame aFrame = SOfficeFactory.createTextFrame(xTextDoc, 500, 500); XText oText = xTextDoc.getText(); XTextCursor oCursor = oText.createTextCursor(); XTextContent the_content = UnoRuntime.queryInterface( diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java index 7f7b54b6be5a..0ce4d3b1dfeb 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrame.java @@ -92,8 +92,8 @@ public class SwXTextFrame extends TestCase { Object instance = null; try { - oFrame1 = SOF.createTextFrame(xTextDoc, 500, 500); - oFrame2 = SOF.createTextFrame(xTextDoc, 1500, 1500); + oFrame1 = SOfficeFactory.createTextFrame(xTextDoc, 500, 500); + oFrame2 = SOfficeFactory.createTextFrame(xTextDoc, 1500, 1500); oPropSet = UnoRuntime.queryInterface( XPropertySet.class, oFrame1); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java index 41302376bc21..614e4b9bb7f9 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java @@ -101,7 +101,7 @@ public class SwXTextFrameText extends TestCase { //////////////////////////////////// try { - oFrame1 = SOF.createTextFrame(xTextDoc, 500, 500); + oFrame1 = SOfficeFactory.createTextFrame(xTextDoc, 500, 500); oPropSet = UnoRuntime.queryInterface (XPropertySet.class, oFrame1 ); //AnchorTypes: 0 = paragraph, 1 = as char, 2 = page, diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java index 93c907d9d722..31d8e57f251f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java @@ -106,7 +106,7 @@ public class SwXTextGraphicObject extends TestCase { (xTextDoc,"com.sun.star.text.GraphicObject"); instance = SOF.createInstance (xTextDoc,"com.sun.star.text.GraphicObject"); - xTextFrame = SOF.createTextFrame(xTextDoc, 500, 500); + xTextFrame = SOfficeFactory.createTextFrame(xTextDoc, 500, 500); } catch (Exception ex) { log.println("Couldn't create instance"); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java index 83a8f30b1bc0..c977ce963474 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTable.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTable.java @@ -86,8 +86,8 @@ public class SwXTextTable extends TestCase { Object instance = null; try { - oObj = SOF.createTextTable(xTextDoc); - instance = SOF.createTextTable(xTextDoc); + oObj = SOfficeFactory.createTextTable(xTextDoc); + instance = SOfficeFactory.createTextTable(xTextDoc); } catch (com.sun.star.uno.Exception uE) { uE.printStackTrace(log); throw new StatusException("Couldn't create testobj : " + @@ -101,9 +101,9 @@ public class SwXTextTable extends TestCase { log.println("Creating instance..."); tEnv = new TestEnvironment(oObj); - if (SOF.getTableCollection(xTextDoc).getCount() == 0) { + if (SOfficeFactory.getTableCollection(xTextDoc).getCount() == 0) { try { - SOF.insertTextContent(xTextDoc, oObj); + SOfficeFactory.insertTextContent(xTextDoc, oObj); } catch (com.sun.star.lang.IllegalArgumentException uE) { uE.printStackTrace(log); throw new StatusException("Couldn't create TextTable : " + diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java index 7991f9a7fe42..33e5da3b5fd2 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java @@ -88,8 +88,8 @@ public class SwXTextTableCursor extends TestCase { XTextTable oTable = null; try { - oTable = SOF.createTextTable( xTextDoc ); - SOF.insertTextContent(xTextDoc, oTable ); + oTable = SOfficeFactory.createTextTable( xTextDoc ); + SOfficeFactory.insertTextContent(xTextDoc, oTable ); } catch( com.sun.star.uno.Exception uE ) { uE.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java index 7c2522fb6756..24ff4eda9d2f 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java @@ -77,7 +77,7 @@ public class SwXTextTableRow extends TestCase { try { log.println("creating a texttable"); - oTable = SOF.createTextTable(xTextDoc,5,5); + oTable = SOfficeFactory.createTextTable(xTextDoc,5,5); } catch( Exception e ) { e.printStackTrace(log); } diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java index 4b32dde504d4..abbd3a1dbaac 100644 --- a/qadevOOo/tests/java/mod/_sw/SwXTextTables.java +++ b/qadevOOo/tests/java/mod/_sw/SwXTextTables.java @@ -93,8 +93,8 @@ public class SwXTextTables extends TestCase { TestEnvironment tEnv = null; XTextTable oTable = null; try { - oTable = SOF.createTextTable( xTextDoc ); - SOF.insertTextContent(xTextDoc, oTable ); + oTable = SOfficeFactory.createTextTable( xTextDoc ); + SOfficeFactory.insertTextContent(xTextDoc, oTable ); } catch( Exception uE ) { uE.printStackTrace( log ); @@ -105,8 +105,8 @@ public class SwXTextTables extends TestCase { // Number two XTextTable oTable2 = null; try { - oTable2 = SOF.createTextTable( xTextDoc ); - SOF.insertTextContent(xTextDoc, oTable2 ); + oTable2 = SOfficeFactory.createTextTable( xTextDoc ); + SOfficeFactory.insertTextContent(xTextDoc, oTable2 ); } catch( Exception uE ) { uE.printStackTrace( log ); @@ -128,7 +128,7 @@ public class SwXTextTables extends TestCase { tEnv.addObjRelation( "ROW", new Integer( nRow ) ); tEnv.addObjRelation( "COL", new Integer( nCol ) ); try { - tEnv.addObjRelation( "INST", SOF.createTextTable( xTextDoc )); + tEnv.addObjRelation( "INST", SOfficeFactory.createTextTable( xTextDoc )); } catch( Exception uE ) { uE.printStackTrace( log ); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java index 442b6afe892f..79f8199e5723 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java @@ -115,11 +115,11 @@ public class AccessibleButton extends lib.TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Cancel"); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java index c90287d6f4c4..7460dd19ca56 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java @@ -137,17 +137,17 @@ public class AccessibleCheckBox extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Cancel"); action = UnoRuntime.queryInterface( XAccessibleAction.class, oObj); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.CHECK_BOX); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.CHECK_BOX); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java index 9c0df6b2d89a..2898aac4f102 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java @@ -108,14 +108,14 @@ public class AccessibleComboBox extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Cancel"); action = UnoRuntime.queryInterface( XAccessibleAction.class, oObj); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB_LIST); XAccessibleSelection xAccSel = UnoRuntime.queryInterface( @@ -129,8 +129,8 @@ public class AccessibleComboBox extends TestCase { } util.utils.shortWait(Param.getInt("ShortWait")); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", "AccessibleComboBox"); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java index d019b47d8b99..4eac734ec462 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java @@ -76,13 +76,13 @@ public class AccessibleDropDownComboBox extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentContainerWindow( + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( (XMultiServiceFactory) Param.getMSF(), xTextDoc); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.COMBO_BOX, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.COMBO_BOX, "", "AccessibleDropDownComboBox"); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java index 3be2b9dc1414..c53199768c28 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java @@ -77,15 +77,15 @@ public class AccessibleDropDownListBox extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) Param.getMSF(), xTextDoc); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.COMBO_BOX, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.COMBO_BOX, "", "AccessibleDropDownListBox"); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java index d206276cff56..5d6730751fdd 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java @@ -142,14 +142,14 @@ public class AccessibleEdit extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); action = UnoRuntime.queryInterface( XAccessibleAction.class, oObj); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TEXT); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java index f7f236016b68..ef85c6534c4e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java @@ -140,11 +140,11 @@ public class AccessibleFixedText extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XAccessible xRoot = at.getAccessibleObject(xWinDlg); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWinDlg); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.LABEL); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.LABEL); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java index 8a42da8c3b03..d10248760bd7 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleList.java @@ -119,19 +119,19 @@ public class AccessibleList extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // obtaining 'Close' button - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); action = UnoRuntime.queryInterface( XAccessibleAction.class, oObj); // Selecting 'New Document' tab try { - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); XAccessibleSelection xAccSel = UnoRuntime.queryInterface( XAccessibleSelection.class, @@ -144,7 +144,7 @@ public class AccessibleList extends TestCase { log.println("# Getting the ListBox"); - XAccessibleContext parent = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext parent = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", "com.sun.star.comp.toolkit.AccessibleListBox"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java index a78727b638c8..142a42a238f6 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java @@ -143,20 +143,20 @@ public class AccessibleListBox extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // obtaining 'Close' button - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); action = UnoRuntime.queryInterface( XAccessibleAction.class, oObj); // Selecting 'New Document' tab try { - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); XAccessibleSelection xAccSel = UnoRuntime.queryInterface( XAccessibleSelection.class, @@ -167,10 +167,10 @@ public class AccessibleListBox extends TestCase { throw new StatusException("Can't switch to required tab", e); } - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL, "", "com.sun.star.comp.toolkit.AccessibleListBox"); - Object list = at.getAccessibleObjectForRole(at.SearchedAccessible, + Object list = AccessibilityTools.getAccessibleObjectForRole(AccessibilityTools.SearchedAccessible, AccessibleRole.LIST); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java index fd458dfc9226..12dbf443917b 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java @@ -140,19 +140,19 @@ public class AccessibleListItem extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); // obtaining 'Close' button - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); action = UnoRuntime.queryInterface( XAccessibleAction.class, oObj); // Selecting 'New Document' tab try { - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TREE); XAccessibleSelection xAccSel = UnoRuntime.queryInterface( XAccessibleSelection.class, @@ -163,7 +163,7 @@ public class AccessibleListItem extends TestCase { throw new StatusException("Can't switch to required tab", e); } - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.LIST_ITEM,"Spr"); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.LIST_ITEM,"Spr"); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java index 8e1bb35b444c..7d943d0039af 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java @@ -98,10 +98,10 @@ public class AccessibleMenu extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext menubar = at.getAccessibleObjectForRole(xRoot, + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + XAccessibleContext menubar = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR); XInterface oObj = null; Object menu2 = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java index ae607c887f82..f894aaf4c138 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java @@ -78,11 +78,11 @@ public class AccessibleMenuBar extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc). getCurrentController().getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XInterface oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR); + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + XInterface oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR); log.println("ImplementationName " + utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java index deae6ac00bbf..2d0d3de63373 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java @@ -103,10 +103,10 @@ public class AccessibleMenuItem extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, atw); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext MenuBar = at.getAccessibleObjectForRole(xRoot, + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + XAccessibleContext MenuBar = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR); try { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java index c1c732127f21..5a4862999caa 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java @@ -79,10 +79,10 @@ public class AccessibleMenuSeparator extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XModel.class, xTextDoc). getCurrentController().getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext MenuBar = at.getAccessibleObjectForRole(xRoot, + AccessibilityTools.printAccessibleTree(log, xRoot, Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + XAccessibleContext MenuBar = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.MENU_BAR); XAccessibleAction act = null; XInterface oObj = null; diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java index 949739325122..c1eba57c4ff9 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java @@ -142,13 +142,13 @@ public class AccessiblePopupMenu extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) tParam.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); XAccessibleComponent window = UnoRuntime.queryInterface( XAccessibleComponent.class, oObj); @@ -176,14 +176,14 @@ public class AccessiblePopupMenu extends TestCase { xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0)); - xRoot = at.getAccessibleObject(xWindow); + xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); } catch (com.sun.star.lang.IndexOutOfBoundsException e) { log.println("Couldn't get Window"); } - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.POPUP_MENU); log.println("ImplementationName: " + util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java index 3d585fba9eb3..03ff54130e4d 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java @@ -224,9 +224,9 @@ public class AccessibleRadioButton extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext iconChoiceCtrl = at.getAccessibleObjectForRole( + XAccessibleContext iconChoiceCtrl = AccessibilityTools.getAccessibleObjectForRole( xRoot, AccessibleRole.TREE, "IconChoiceControl"); @@ -241,17 +241,17 @@ public class AccessibleRadioButton extends TestCase { e.printStackTrace(log); } - at.printAccessibleTree(log,xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log,xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.RADIO_BUTTON, "Web"); - XAccessibleContext anotherButton = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext anotherButton = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.RADIO_BUTTON, "FTP"); - XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext closeButton = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java index b769bc469721..22a1a7a8c6cb 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java @@ -142,13 +142,13 @@ public class AccessibleScrollBar extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) tParam.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.SCROLL_BAR); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.SCROLL_BAR); final XAccessibleAction act = UnoRuntime.queryInterface( XAccessibleAction.class, oObj); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java index 37263dc83b2b..d335bdd7b29e 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java @@ -139,9 +139,9 @@ public class AccessibleStatusBar extends TestCase { UnoRuntime.queryInterface(XModel.class, xTextDoc). getCurrentController().getFrame().getContainerWindow(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.STATUS_BAR); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.STATUS_BAR); log.println("ImplementationName: " + util.utils.getImplName(oObj)); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java index 5c5f369fa53e..ad87485b340f 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java @@ -144,14 +144,14 @@ public class AccessibleStatusBarItem extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentContainerWindow( + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( (XMultiServiceFactory) tParam.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - XAccessibleContext statusbar = at.getAccessibleObjectForRole(xRoot, + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + XAccessibleContext statusbar = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.STATUS_BAR); try { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java index aca8510a7127..992ba66ff52a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java @@ -216,12 +216,12 @@ public class AccessibleTabControl extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB_LIST); - XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext closeButton = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java index d3ec2967714a..975f67374a3c 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java @@ -223,16 +223,16 @@ public class AccessibleTabPage extends TestCase { XWindow xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext closeButton = at.getAccessibleObjectForRole(xRoot, + XAccessibleContext closeButton = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PUSH_BUTTON, "Close"); accCloseButton = UnoRuntime.queryInterface( XAccessibleAction.class, closeButton); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB); log.println("ImplementationName: " + util.utils.getImplName(oObj)); @@ -248,7 +248,7 @@ public class AccessibleTabPage extends TestCase { shortWait(); - XInterface xEventInt = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Variables"); + XInterface xEventInt = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PAGE_TAB, "Variables"); final XAccessibleComponent eventAccComp = UnoRuntime.queryInterface( XAccessibleComponent.class, xEventInt); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java index e2269c94e341..328c2fab391a 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java @@ -135,11 +135,11 @@ public class AccessibleToolBox extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.TOOL_BAR); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TOOL_BAR); log.println("ImplementationName: " + util.utils.getImplName(oObj)); @@ -147,7 +147,7 @@ public class AccessibleToolBox extends TestCase { tEnv.addObjRelation("LimitedBounds", "yes"); - XAccessible acc = at.getAccessibleObject(oObj); + XAccessible acc = AccessibilityTools.getAccessibleObject(oObj); XAccessible child = null; try { diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java index dcd0b8236f96..6b7e81e024ac 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java @@ -151,15 +151,15 @@ public class AccessibleToolBoxItem extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentContainerWindow( + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow( (XMultiServiceFactory) tParam.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TOGGLE_BUTTON, "Bold"); diff --git a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java index 0b57f11cb9e8..fae72b1c13fb 100644 --- a/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java +++ b/qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java @@ -157,15 +157,15 @@ public class AccessibleWindow extends TestCase { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow( + XWindow xWindow = AccessibilityTools.getCurrentWindow( (XMultiServiceFactory) tParam.getMSF(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - at.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); + AccessibilityTools.printAccessibleTree(log, xRoot, tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE)); - oObj = at.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.PANEL); log.println("ImplementationName: " + util.utils.getImplName(oObj)); diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java index a2fb84848da4..1ebde7d98094 100644 --- a/ridljar/com/sun/star/uno/UnoRuntime.java +++ b/ridljar/com/sun/star/uno/UnoRuntime.java @@ -605,7 +605,8 @@ public class UnoRuntime { try { b.dispose(); } catch (InterruptedException e) { - Thread.currentThread().interrupted(); + Thread.currentThread(); + Thread.interrupted(); throw new RuntimeException( "Unexpected exception in UnoRuntime.reset: " + e); } catch (IOException e) { diff --git a/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.java index 7d3fd9c76b31..192bffb14214 100644 --- a/sc/qa/complex/calcPreview/ViewForwarder.java +++ b/sc/qa/complex/calcPreview/ViewForwarder.java @@ -283,12 +283,12 @@ public class ViewForwarder { // get the accessible content AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow(mXMSF, aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessible parent = null; try { - parent = at.getAccessibleObjectForRole + parent = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.HEADER, "").getAccessibleChild(0); oObj = parent.getAccessibleContext().getAccessibleChild(0); } catch (com.sun.star.lang.IndexOutOfBoundsException iabe) { @@ -376,7 +376,7 @@ public class ViewForwarder { } try { - parent = at.getAccessibleObjectForRole + parent = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.FOOTER, "").getAccessibleChild(0); } catch (com.sun.star.lang.IndexOutOfBoundsException iabe) { fail(iabe.getMessage()); @@ -434,7 +434,7 @@ public class ViewForwarder { } try { - parent = at.getAccessibleObjectForRole + parent = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.DOCUMENT, "").getAccessibleChild(0); } catch (com.sun.star.lang.IndexOutOfBoundsException iabe) { fail(iabe.getMessage()); @@ -694,12 +694,12 @@ public class ViewForwarder { // get the accessible content AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow(mXMSF, aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessible parent = null; try { - parent = at.getAccessibleObjectForRole + parent = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.HEADER, "").getAccessibleChild(0); oObj = parent.getAccessibleContext().getAccessibleChild(0); } catch (com.sun.star.lang.IndexOutOfBoundsException iabe) { @@ -750,7 +750,7 @@ public class ViewForwarder { try { - parent = at.getAccessibleObjectForRole + parent = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.FOOTER, "").getAccessibleChild(0); } catch (com.sun.star.lang.IndexOutOfBoundsException iabe) { fail(iabe.getMessage()); @@ -900,8 +900,8 @@ public class ViewForwarder { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow(mXMSF, xModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, xModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); // System.out.println("ImplementationName " + utils.getImplName(oObj)); @@ -917,13 +917,13 @@ public class ViewForwarder { XAccessible parent = null; try { - System.out.println("Count: " +at.getAccessibleObjectForRole + System.out.println("Count: " +AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.TABLE, "").getAccessibleChildCount()); // parent = at.getAccessibleObjectForRole // (xRoot, AccessibleRole.TABLE, "").getAccessibleChild(0); // oObj = parent.getAccessibleContext().getAccessibleChild(1); System.out.println("Getting child 2"); - oObj = at.getAccessibleObjectForRole + oObj = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.TABLE, "").getAccessibleChild(2); } catch (com.sun.star.lang.IndexOutOfBoundsException iabe) { fail(iabe.getMessage()); @@ -1056,12 +1056,12 @@ public class ViewForwarder { // get the accessible content AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow(mXMSF, aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow(mXMSF, aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); XAccessible parent = null; try { - XAccessibleContext con = at.getAccessibleObjectForRole + XAccessibleContext con = AccessibilityTools.getAccessibleObjectForRole (xRoot, AccessibleRole.SHAPE, ""); System.out.println("Name of AccessibleContext: " + con.getAccessibleName()); oObj = con; 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 24e7b8c27540..27254a42d0b5 100644 --- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java +++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java @@ -48,7 +48,7 @@ public class UCBStreamHandler extends URLStreamHandler { { LogUtils.DEBUG( "UCBStreamHandler ctor, scheme = " + scheme ); this.m_xContext = ctxt; - this.m_ucbscheme = scheme; + UCBStreamHandler.m_ucbscheme = scheme; this.m_xSimpleFileAccess = xSFA; } diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java index 73ce9c59505c..e62f41ebedfd 100644 --- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java +++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java @@ -278,7 +278,7 @@ class ScriptImpl implements XScript result = ctxt.evaluateString(scope, source, "<stdin>", 1, null); - result = ctxt.toString(result); + result = Context.toString(result); return result; } catch (JavaScriptException jse) { diff --git a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java index 2cbbf146cd8b..9110562a6342 100644 --- a/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java +++ b/scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java @@ -28,14 +28,14 @@ public class ExceptParcelFilter implements FileFilter { public void setParcelToRemove(String parcelName) { - this.parcelName = parcelName; + ExceptParcelFilter.parcelName = parcelName; } public static ExceptParcelFilter getInstance() { return filter; } public boolean validate(String name) { - if (name.startsWith(this.parcelName)) + if (name.startsWith(ExceptParcelFilter.parcelName)) return true; return false; } @@ -43,7 +43,7 @@ public class ExceptParcelFilter implements FileFilter { public String toString() { StringBuffer buf = new StringBuffer(DESCRIPTION + ": "); - buf.append("<" + this.parcelName + ">"); + buf.append("<" + ExceptParcelFilter.parcelName + ">"); return buf.toString(); } diff --git a/scripting/workben/ifc/scripting/SecurityDialogUtil.java b/scripting/workben/ifc/scripting/SecurityDialogUtil.java index bbd2ee33aa4d..1fdfc3d9fffe 100644 --- a/scripting/workben/ifc/scripting/SecurityDialogUtil.java +++ b/scripting/workben/ifc/scripting/SecurityDialogUtil.java @@ -100,7 +100,7 @@ public void run() AccessibilityTools at = new AccessibilityTools(); XWindow xWindow = UnoRuntime.queryInterface( XWindow.class,tk.getActiveTopWindow()); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); xCon = xRoot.getAccessibleContext(); } catch (Exception e) diff --git a/scripting/workben/installer/Final.java b/scripting/workben/installer/Final.java index 95d2a39d5b05..51646315d2b1 100644 --- a/scripting/workben/installer/Final.java +++ b/scripting/workben/installer/Final.java @@ -76,7 +76,7 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install nav.enableNext(false); nav.enableBack(false); nav.enableCancel(false); - ArrayList<?> locations = wizard.getLocations(); + ArrayList<?> locations = InstallWizard.getLocations(); //System.out.println("here "+locations.size()); // Returned 1 String progpath=null; diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java index bfc4b4b0766f..2d91929358ab 100644 --- a/scripting/workben/installer/IdeFinal.java +++ b/scripting/workben/installer/IdeFinal.java @@ -73,7 +73,7 @@ public class IdeFinal extends javax.swing.JPanel implements ActionListener, Inst nav.enableNext(false); nav.enableBack(false); nav.enableCancel(false); - ArrayList<?> locations = wizard.getLocations(); + ArrayList<?> locations = InstallWizard.getLocations(); //System.out.println("here "+locations.size()); // Returned 1 String progpath=null; diff --git a/scripting/workben/installer/IdeVersion.java b/scripting/workben/installer/IdeVersion.java index 229eeed44f97..052e3f07811d 100644 --- a/scripting/workben/installer/IdeVersion.java +++ b/scripting/workben/installer/IdeVersion.java @@ -175,12 +175,12 @@ public class IdeVersion extends javax.swing.JPanel implements ActionListener, Ta public void actionPerformed(ActionEvent ev) { - wizard.clearLocations(); + InstallWizard.clearLocations(); int len = tableModel.data.size(); for (int i = 0; i < len; i++) { ArrayList<?> list = tableModel.data.get(i); if (((Boolean)list.get(0)).booleanValue() == true) - wizard.storeLocation((String)list.get(2)); + InstallWizard.storeLocation((String)list.get(2)); } //System.out.println(wizard.getLocations()); diff --git a/scripting/workben/installer/InstUtil.java b/scripting/workben/installer/InstUtil.java index 05d265d147ff..c6a713153e87 100644 --- a/scripting/workben/installer/InstUtil.java +++ b/scripting/workben/installer/InstUtil.java @@ -427,24 +427,24 @@ public class InstUtil { File f = null; try { - f = inst.buildSversionLocation(); + f = InstUtil.buildSversionLocation(); } catch (IOException e) { e.printStackTrace(); System.out.println(e.getMessage()); } - if (!inst.verifySversionExists(f)) { + if (!InstUtil.verifySversionExists(f)) { System.err.println("Problem with sversion.ini"); } try { - Properties vers = inst.getOfficeVersions(f); + Properties vers = InstUtil.getOfficeVersions(f); } catch (IOException e) { e.printStackTrace(); System.err.println(e); } - System.out.println(inst.getJavaVersion()); - if (!inst.isCorrectJavaVersion()) { + System.out.println(InstUtil.getJavaVersion()); + if (!InstUtil.isCorrectJavaVersion()) { System.err.println("Not correct Java Version"); } } diff --git a/scripting/workben/installer/NavPanel.java b/scripting/workben/installer/NavPanel.java index b1738ddad4f7..cee9fc53ead8 100644 --- a/scripting/workben/installer/NavPanel.java +++ b/scripting/workben/installer/NavPanel.java @@ -36,7 +36,7 @@ public class NavPanel extends JPanel implements ActionListener { gridBagConstraints1 = new java.awt.GridBagConstraints(); gridBagConstraints1.insets = new java.awt.Insets(1, 1, 1, 1); - gridBagConstraints1.anchor = gridBagConstraints1.WEST; + gridBagConstraints1.anchor = GridBagConstraints.WEST; gridBagConstraints2 = new java.awt.GridBagConstraints(); gridBagConstraints2.gridx = 2; diff --git a/scripting/workben/installer/Version.java b/scripting/workben/installer/Version.java index 17ec8e7c3230..d1c7c819f6f4 100644 --- a/scripting/workben/installer/Version.java +++ b/scripting/workben/installer/Version.java @@ -208,12 +208,12 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table public void actionPerformed(ActionEvent ev) { - wizard.clearLocations(); + InstallWizard.clearLocations(); int len = tableModel.data.size(); for (int i = 0; i < len; i++) { ArrayList<?> list = tableModel.data.get(i); if (((Boolean)list.get(0)).booleanValue() == true) - wizard.storeLocation((String)list.get(2)); + InstallWizard.storeLocation((String)list.get(2)); } //System.out.println(wizard.getLocations()); diff --git a/sw/qa/complex/accessibility/AccessibleRelationSet.java b/sw/qa/complex/accessibility/AccessibleRelationSet.java index 1e649784a7fa..d28470f0ff36 100644 --- a/sw/qa/complex/accessibility/AccessibleRelationSet.java +++ b/sw/qa/complex/accessibility/AccessibleRelationSet.java @@ -171,10 +171,10 @@ public class AccessibleRelationSet { AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentWindow(factory, aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentWindow(factory, aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - XAccessibleContext ctx = at.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); + XAccessibleContext ctx = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.DOCUMENT); para1 = ctx.getAccessibleChild(0); para2 = ctx.getAccessibleChild(1); diff --git a/sw/qa/complex/indeterminateState/CheckIndeterminateState.java b/sw/qa/complex/indeterminateState/CheckIndeterminateState.java index 68f1d0a232ab..c76c1364b607 100644 --- a/sw/qa/complex/indeterminateState/CheckIndeterminateState.java +++ b/sw/qa/complex/indeterminateState/CheckIndeterminateState.java @@ -70,10 +70,10 @@ public class CheckIndeterminateState { XInterface oObj = null; AccessibilityTools at = new AccessibilityTools(); - XWindow xWindow = at.getCurrentContainerWindow(getFactory(), aModel); - XAccessible xRoot = at.getAccessibleObject(xWindow); + XWindow xWindow = AccessibilityTools.getCurrentContainerWindow(getFactory(), aModel); + XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow); - oObj = at.getAccessibleObjectForRole(xRoot, + oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, AccessibleRole.TOGGLE_BUTTON, "Bold"); assertNotNull("Found a TOGGLE_BUTTON", oObj); diff --git a/ucb/qa/complex/tdoc/CheckContentProvider.java b/ucb/qa/complex/tdoc/CheckContentProvider.java index 7e82ba795a08..45ead7e4c276 100644 --- a/ucb/qa/complex/tdoc/CheckContentProvider.java +++ b/ucb/qa/complex/tdoc/CheckContentProvider.java @@ -302,14 +302,14 @@ public class CheckContentProvider { private void checkInterfaces(boolean hasParent) { // check the XTypeProvider interface _XTypeProvider xTypeProvider = new _XTypeProvider(); - xTypeProvider.oObj = UnoRuntime.queryInterface(XTypeProvider.class, xContent); + _XTypeProvider.oObj = UnoRuntime.queryInterface(XTypeProvider.class, xContent); // xTypeProvider.log = log; assertNotNull("getImplementationId()", xTypeProvider._getImplementationId()); assertNotNull("getTypes()", xTypeProvider._getTypes()); // check the XSewrviceInfo interface _XServiceInfo xServiceInfo = new _XServiceInfo(); - xServiceInfo.oObj = UnoRuntime.queryInterface(XServiceInfo.class, xContent); + _XServiceInfo.oObj = UnoRuntime.queryInterface(XServiceInfo.class, xContent); // xServiceInfo.log = log; assertNotNull("getImplementationName()", xServiceInfo._getImplementationName()); assertNotNull("getSupportedServiceNames()", xServiceInfo._getSupportedServiceNames()); @@ -372,7 +372,7 @@ public class CheckContentProvider { // check the XComponent interface _XComponent xComponent = new _XComponent(); - xComponent.oObj = UnoRuntime.queryInterface(XComponent.class, xContent); + _XComponent.oObj = UnoRuntime.queryInterface(XComponent.class, xContent); // xComponent.log = log; assertNotNull("addEventListener()", xComponent._addEventListener()); assertNotNull("removeEventListener()", xComponent._removeEventListener()); diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 691d74faa32b..604aecd63358 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -577,8 +577,8 @@ public class AggregateComponent extends ControlScroller private void settovoid() { - CurUnoDialog.deselectListBox(xFieldListBox); - CurUnoDialog.deselectListBox(xFunctionListBox); + UnoDialog.deselectListBox(xFieldListBox); + UnoDialog.deselectListBox(xFunctionListBox); } protected class ItemListenerImpl implements com.sun.star.awt.XItemListener diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java b/wizards/com/sun/star/wizards/ui/PathSelection.java index 3d57ed957a1b..f8436f088818 100644 --- a/wizards/com/sun/star/wizards/ui/PathSelection.java +++ b/wizards/com/sun/star/wizards/ui/PathSelection.java @@ -138,7 +138,7 @@ public class PathSelection FileAccess myFA = new FileAccess(xMSF); xSaveTextBox.setText(myFA.getPath(sStorePath, null)); sDefaultDirectory = FileAccess.getParentDir(sStorePath); - sDefaultName = myFA.getFilename(sStorePath); + sDefaultName = FileAccess.getFilename(sStorePath); } break; default: |