[Libreoffice-commits] core.git: 4 commits - bean/com bean/qa bridges/test dbaccess/qa framework/qa nlpsolver/ThirdParty odk/examples qadevOOo/qa qadevOOo/runner qadevOOo/tests reportbuilder/java ridljar/com sc/qa scripting/java scripting/workben sw/qa ucb/qa wizards/com
Noel Grandin
noel at peralex.com
Thu Apr 25 23:41:04 PDT 2013
bean/com/sun/star/beans/LocalOfficeWindow.java | 2
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 3
bean/qa/complex/bean/OOoBeanTest.java | 5
bridges/test/testclient.java | 1
dbaccess/qa/complex/dbaccess/PropertyBag.java | 1
framework/qa/complex/XUserInputInterception/EventTest.java | 6
framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 10 -
framework/qa/complex/imageManager/_XComponent.java | 2
framework/qa/complex/imageManager/_XInitialization.java | 2
framework/qa/complex/imageManager/_XTypeProvider.java | 2
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java | 2
odk/examples/DevelopersGuide/Drawing/StyleDemo.java | 2
odk/examples/java/Inspector/Inspector.java | 2
odk/examples/java/Inspector/SourceCodeGenerator.java | 14 +-
odk/examples/java/Spreadsheet/ChartTypeChange.java | 2
odk/examples/java/ToDo/ToDo.java | 52 +++----
qadevOOo/qa/complex/junitskeleton/justatest.java | 40 ++---
qadevOOo/runner/base/java_fat_service.java | 4
qadevOOo/runner/convwatch/SimpleFileSemaphore.java | 10 -
qadevOOo/runner/util/UITools.java | 68 +++++-----
qadevOOo/tests/java/ifc/awt/_XUserInputInterception.java | 6
qadevOOo/tests/java/ifc/sheet/_XEnhancedMouseClickBroadcaster.java | 6
qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java | 6
qadevOOo/tests/java/ifc/text/_NumberingLevel.java | 4
qadevOOo/tests/java/ifc/ui/_XContextMenuInterception.java | 12 -
qadevOOo/tests/java/ifc/ui/dialogs/_XExecutableDialog.java | 2
qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerNotifier.java | 4
qadevOOo/tests/java/mod/_basctl/AccessibleShape.java | 6
qadevOOo/tests/java/mod/_fwl/TypeDetection.java | 4
qadevOOo/tests/java/mod/_sc/ScAccessibleDocument.java | 8 -
qadevOOo/tests/java/mod/_sc/ScAccessibleDocumentPagePreview.java | 8 -
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java | 8 -
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeaderArea.java | 10 -
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java | 6
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewHeaderCell.java | 8 -
qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewTable.java | 10 -
qadevOOo/tests/java/mod/_sc/ScAccessibleSpreadsheet.java | 6
qadevOOo/tests/java/mod/_sc/ScTableSheetsObj.java | 4
qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java | 1
qadevOOo/tests/java/mod/_sc/XMLMetaImporter.java | 1
qadevOOo/tests/java/mod/_sch/AccArea.java | 8 -
qadevOOo/tests/java/mod/_sch/AccAxis.java | 6
qadevOOo/tests/java/mod/_sch/AccDataPoint.java | 8 -
qadevOOo/tests/java/mod/_sch/AccDataSeries.java | 8 -
qadevOOo/tests/java/mod/_sch/AccDiagram.java | 8 -
qadevOOo/tests/java/mod/_sch/AccFloor.java | 8 -
qadevOOo/tests/java/mod/_sch/AccGrid.java | 8 -
qadevOOo/tests/java/mod/_sch/AccLegend.java | 6
qadevOOo/tests/java/mod/_sch/AccLegendEntry.java | 6
qadevOOo/tests/java/mod/_sch/AccStatisticsObject.java | 6
qadevOOo/tests/java/mod/_sch/AccTitle.java | 6
qadevOOo/tests/java/mod/_sch/AccWall.java | 8 -
qadevOOo/tests/java/mod/_sch/AccessibleDocumentView.java | 8 -
qadevOOo/tests/java/mod/_sd/AccessibleDrawDocumentView.java | 8 -
qadevOOo/tests/java/mod/_sd/AccessibleOutlineView.java | 6
qadevOOo/tests/java/mod/_sd/AccessibleSlideView.java | 8 -
qadevOOo/tests/java/mod/_sm/SmEditAccessible.java | 8 -
qadevOOo/tests/java/mod/_sm/SmGraphicAccessible.java | 6
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBox.java | 6
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderBar.java | 6
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxHeaderCell.java | 6
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTable.java | 4
qadevOOo/tests/java/mod/_svtools/AccessibleBrowseBoxTableCell.java | 4
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrl.java | 6
qadevOOo/tests/java/mod/_svtools/AccessibleIconChoiceCtrlEntry.java | 6
qadevOOo/tests/java/mod/_svtools/AccessibleTabBar.java | 6
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPage.java | 8 -
qadevOOo/tests/java/mod/_svtools/AccessibleTabBarPageList.java | 4
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java | 4
qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBoxEntry.java | 6
qadevOOo/tests/java/mod/_svx/AccessibleControlShape.java | 10 -
qadevOOo/tests/java/mod/_svx/AccessibleEditableTextPara.java | 8 -
qadevOOo/tests/java/mod/_svx/AccessibleGraphicShape.java | 6
qadevOOo/tests/java/mod/_svx/AccessibleOLEShape.java | 8 -
qadevOOo/tests/java/mod/_svx/AccessiblePageShape.java | 8 -
qadevOOo/tests/java/mod/_svx/AccessiblePresentationGraphicShape.java | 6
qadevOOo/tests/java/mod/_svx/AccessiblePresentationOLEShape.java | 8 -
qadevOOo/tests/java/mod/_svx/AccessiblePresentationShape.java | 8 -
qadevOOo/tests/java/mod/_svx/AccessibleShape.java | 8 -
qadevOOo/tests/java/mod/_svx/SvxGraphCtrlAccessibleContext.java | 6
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentPageView.java | 6
qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java | 8 -
qadevOOo/tests/java/mod/_sw/SwAccessibleEndnoteView.java | 8 -
qadevOOo/tests/java/mod/_sw/SwAccessibleFooterView.java | 8 -
qadevOOo/tests/java/mod/_sw/SwAccessibleFootnoteView.java | 8 -
qadevOOo/tests/java/mod/_sw/SwAccessibleHeaderView.java | 8 -
qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java | 8 -
qadevOOo/tests/java/mod/_sw/SwAccessibleParagraphView.java | 6
qadevOOo/tests/java/mod/_sw/SwAccessibleTableCellView.java | 12 -
qadevOOo/tests/java/mod/_sw/SwAccessibleTableView.java | 12 -
qadevOOo/tests/java/mod/_sw/SwAccessibleTextEmbeddedObject.java | 8 -
qadevOOo/tests/java/mod/_sw/SwAccessibleTextFrameView.java | 10 -
qadevOOo/tests/java/mod/_sw/SwAccessibleTextGraphicObject.java | 8 -
qadevOOo/tests/java/mod/_sw/SwXBookmark.java | 4
qadevOOo/tests/java/mod/_sw/SwXBookmarks.java | 8 -
qadevOOo/tests/java/mod/_sw/SwXCell.java | 6
qadevOOo/tests/java/mod/_sw/SwXCellRange.java | 6
qadevOOo/tests/java/mod/_sw/SwXDocumentIndex.java | 4
qadevOOo/tests/java/mod/_sw/SwXDocumentIndexes.java | 2
qadevOOo/tests/java/mod/_sw/SwXTableCellText.java | 4
qadevOOo/tests/java/mod/_sw/SwXTableColumns.java | 4
qadevOOo/tests/java/mod/_sw/SwXTableRows.java | 4
qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java | 2
qadevOOo/tests/java/mod/_sw/SwXTextFrame.java | 4
qadevOOo/tests/java/mod/_sw/SwXTextFrameText.java | 2
qadevOOo/tests/java/mod/_sw/SwXTextGraphicObject.java | 2
qadevOOo/tests/java/mod/_sw/SwXTextTable.java | 8 -
qadevOOo/tests/java/mod/_sw/SwXTextTableCursor.java | 4
qadevOOo/tests/java/mod/_sw/SwXTextTableRow.java | 2
qadevOOo/tests/java/mod/_sw/SwXTextTables.java | 10 -
qadevOOo/tests/java/mod/_sw/XMLMetaExporter.java | 1
qadevOOo/tests/java/mod/_sw/XMLMetaImporter.java | 1
qadevOOo/tests/java/mod/_toolkit/AccessibleButton.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessibleCheckBox.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleComboBox.java | 10 -
qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownComboBox.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleEdit.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessibleFixedText.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessibleList.java | 10 -
qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java | 12 -
qadevOOo/tests/java/mod/_toolkit/AccessibleListItem.java | 10 -
qadevOOo/tests/java/mod/_toolkit/AccessibleMenu.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuBar.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuItem.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessibleMenuSeparator.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessiblePopupMenu.java | 12 -
qadevOOo/tests/java/mod/_toolkit/AccessibleRadioButton.java | 12 -
qadevOOo/tests/java/mod/_toolkit/AccessibleScrollBar.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBar.java | 4
qadevOOo/tests/java/mod/_toolkit/AccessibleStatusBarItem.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleTabControl.java | 6
qadevOOo/tests/java/mod/_toolkit/AccessibleTabPage.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleToolBox.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleToolBoxItem.java | 8 -
qadevOOo/tests/java/mod/_toolkit/AccessibleWindow.java | 8 -
qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaExporter.java | 1
qadevOOo/tests/java/mod/_xmloff/Draw/XMLMetaImporter.java | 1
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaExporter.java | 1
qadevOOo/tests/java/mod/_xmloff/Impress/XMLMetaImporter.java | 1
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java | 11 -
ridljar/com/sun/star/uno/UnoRuntime.java | 3
sc/qa/complex/calcPreview/ViewForwarder.java | 32 ++--
scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java | 2
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java | 2
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 2
scripting/java/org/openoffice/idesupport/filter/ExceptParcelFilter.java | 6
scripting/workben/ifc/scripting/SecurityDialogUtil.java | 2
scripting/workben/installer/Final.java | 2
scripting/workben/installer/IdeFinal.java | 2
scripting/workben/installer/IdeVersion.java | 4
scripting/workben/installer/InstUtil.java | 10 -
scripting/workben/installer/NavPanel.java | 2
scripting/workben/installer/Version.java | 4
sw/qa/complex/accessibility/AccessibleRelationSet.java | 6
sw/qa/complex/indeterminateState/CheckIndeterminateState.java | 6
sw/qa/complex/writer/CheckIndex.java | 7 -
sw/qa/complex/writer/VarFields.java | 7 -
ucb/qa/complex/tdoc/CheckContentProvider.java | 6
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 4
wizards/com/sun/star/wizards/ui/PathSelection.java | 2
161 files changed, 536 insertions(+), 586 deletions(-)
New commits:
commit dfb6a625d355a92bef3b85fb1dfdce1da64fde0a
Author: Noel Grandin <noel at peralex.com>
Date: Fri Apr 26 08:38:50 2013 +0200
Java cleanup
-fix constructor declaration
-remove dead copyright notice
Change-Id: I021ef11dd5000a75dba3359fe6d4f49740c3b237
diff --git a/qadevOOo/qa/complex/junitskeleton/justatest.java b/qadevOOo/qa/complex/junitskeleton/justatest.java
index 55985cd..ccd3278 100644
--- a/qadevOOo/qa/complex/junitskeleton/justatest.java
+++ b/qadevOOo/qa/complex/junitskeleton/justatest.java
@@ -16,37 +16,27 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-/**
- * @copyright: Sun Microsystems Inc. 2010
- */
-
package complex.junitskeleton;
public class justatest {
- public void justatest()
- {
- System.out.println("justatest CTor.");
- }
+ public justatest() {
+ System.out.println("justatest CTor.");
+ }
- public void testfkt()
- {
- System.out.println("Test called.");
- }
+ public void testfkt() {
+ System.out.println("Test called.");
+ }
- /**
- * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
- * reset</code> call.
- */
- public static void shortWait()
- {
- try
- {
- Thread.sleep(500) ;
- }
- catch (InterruptedException e)
- {
- System.out.println("While waiting :" + e) ;
+ /**
+ * Sleeps for 0.5 sec. to allow StarOffice to react on <code>
+ * reset</code> call.
+ */
+ public static void shortWait() {
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ System.out.println("While waiting :" + e);
}
}
commit 6f17a2f66fa2a4fec56334783410005c4f2f357a
Author: Noel Grandin <noel at peralex.com>
Date: Fri Apr 26 08:36:04 2013 +0200
Java cleanup, access static methods using correct syntax
Change-Id: I8443aef43d82de33ac7cb47d40cc5b544f7c9c87
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/com/sun/star/beans/LocalOfficeWindow.java
index 90ddbe8..7d81eb0 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 27467f0..c8bafaa 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 c72e18e..bb12bca 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 f6a24cc..debd3ee 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 aedaa2e..4929eec 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 93881d8..b6719a9 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 d6f2e47..0caf919 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 7c39cdb..4be0030 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 a9ceb1c..3b5052d 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 0601da9..45431bd 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 98a1437..9638fd0 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 98ece61..fa45715 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 91a84fb..2e507ff 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 3abb3a1..7d929af 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 2b82d64..8125976 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 0e4a147..802ff1e 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 a1b1cf4..47e5b73 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 4d6922c..6fd2c39 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 6a4c20b..ebeaf00 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 a435a7e..c065f05 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 145c0b2..e87b407 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 28c878e..892850b 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 d8469bb..e9abc11 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 dbc58e1..5adc375 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 e8039b3..91e76db 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 03806dd..4c6c647 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 d4e90be..734c855 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 e1b5019..3d3a8c0 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 cabb17e..e740ca6 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 ba6c952..ec2be5a 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 1955484..134433d 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 2ba1da5..18ddab6 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 61b7b72..dcf0221 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 db9a2b3..d32c195 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 b965975..8687c52 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 200681e..d422509 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 bfb71bb..7085dfa 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 2fa084d..ac1dee8 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 960556d..0f0bce1 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 c732968..9682a4e 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 a098243..a89050d 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 6e55ef3..b02d5c7 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 dad8ee8..077b5fd 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 5b987df..e49f44c 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 daaa7d2..3e2e0e7 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 2927527..786d0a9 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 5068fcb..9c98f0d 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 9ac839f..7738e0c 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 1f08155..1444fd2 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 c3684d1..16c7ad7 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 4a54b86..2735717 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 fec8bd6..6d182f7 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 2995329..d231ef8 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 3636c38..8819bd7 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 db3c0bb..2aa5a39 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 8090866..26c78b8 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 d2e7eff..f8fdff9 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 ab19d14..e1c79d6 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 af8a80c..1187b89 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 659ce9b..3119da3 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 c635444..3e56f08 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 9134ed8..a420433 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 83dd227..80ffc39 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 acae9da..64123d1 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 4c3e28f..03760b4 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 b149734..1f03e3b 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 429e061..52934bd 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 {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list