Kaydet (Commit) 6f17a2f6 authored tarafından Noel Grandin's avatar Noel Grandin

Java cleanup, access static methods using correct syntax

Change-Id: I8443aef43d82de33ac7cb47d40cc5b544f7c9c87
üst 6d4c1f0d
......@@ -274,7 +274,7 @@ public class LocalOfficeWindow
aWatchedThread = null;
stop();
if ( aThread.interrupted() )
if ( Thread.interrupted() )
throw new InterruptedException();
}
......
......@@ -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 )
......
......@@ -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 {
......
......@@ -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
......
......@@ -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);
......
......@@ -66,7 +66,7 @@ public class _XComponent {
public _XComponent(TestParameters tEnv, XComponent oObj) {
this.tEnv = tEnv;
this.oObj = oObj;
_XComponent.oObj = oObj;
}
/**
......
......@@ -46,7 +46,7 @@ public class _XInitialization {
public _XInitialization(TestParameters tEnv, XInitialization oObj) {
this.tEnv = tEnv;
this.oObj = oObj;
_XInitialization.oObj = oObj;
}
/**
......
......@@ -44,7 +44,7 @@ public class _XTypeProvider {
public _XTypeProvider(TestParameters tEnv, XTypeProvider oObj) {
this.tEnv = tEnv;
this.oObj = oObj;
_XTypeProvider.oObj = oObj;
}
/**
......
......@@ -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 = "";
......
......@@ -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;
}
......
......@@ -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, "" );
}
}
......
......@@ -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);
......
......@@ -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.");
}
}
......
......@@ -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
......
......@@ -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);
......
......@@ -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);
......
......@@ -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));
......
......@@ -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);
......
......@@ -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 ;-)
......
......@@ -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(
......
......@@ -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 );
......
......@@ -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";
......
......@@ -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);
......
......@@ -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));
......
......@@ -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);
......
......@@ -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",
......
......@@ -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));
......
......@@ -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);
}
......
......@@ -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());
......
......@@ -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));
......
......@@ -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);
......
......@@ -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");
......
......@@ -63,10 +63,10 @@ public class AccAxis extends TestCase {
AccessibilityTools at = new AccessibilityTools();
XWindow xWindow = at.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), aModel);