summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-04-26 08:36:04 +0200
committerNoel Grandin <noel@peralex.com>2013-04-26 08:36:04 +0200
commit6f17a2f66fa2a4fec56334783410005c4f2f357a (patch)
tree728696d0f0603783e8d50b9c4c7b43f3016d51ce /framework
parent6d4c1f0d4a623bf7f3b3a0af2ece5c969d5aec77 (diff)
Java cleanup, access static methods using correct syntax
Change-Id: I8443aef43d82de33ac7cb47d40cc5b544f7c9c87
Diffstat (limited to 'framework')
-rw-r--r--framework/qa/complex/XUserInputInterception/EventTest.java6
-rw-r--r--framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java10
-rw-r--r--framework/qa/complex/imageManager/_XComponent.java2
-rw-r--r--framework/qa/complex/imageManager/_XInitialization.java2
-rw-r--r--framework/qa/complex/imageManager/_XTypeProvider.java2
5 files changed, 11 insertions, 11 deletions
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;
}
/**