rik/jlibwinapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always use text to match xpath

Browse Source
This commit is contained in:
Alex Kogon
2015-09-10 14:52:43 +02:00
parent 91a080c708
commit f016d77eab
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/synthuse/XpathManager.java
View File

@@ -52,7 +52,8 @@ public class XpathManager implements Runnable{
@Override @Override
public void run() { public void run() {
String results = buildXpathStatement(); //@TODO (AJK) create separate action to use text mathing
String results = buildXpathStatement(true,50,50);
events.executionCompleted(hwnd, results); events.executionCompleted(hwnd, results);
} }
@@ -143,7 +144,22 @@ public class XpathManager implements Runnable{
parentTxtStr = " and @text='" + parentTxtStr + "'"; parentTxtStr = " and @text='" + parentTxtStr + "'";
} }
if (!parentClassStr.isEmpty()) if (!parentClassStr.isEmpty())
builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "']"; {
if (!txtStr.isEmpty()&&useFullTextMatching) {
if (txtStr.length() > maxTextLength) {// if the text is too long only test the first maxTextLength characters
txtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(txtStr.substring(0, maxTextLength));
txtStr = " and starts-with(@text,'" + txtStr + "')";
}
else
txtStr = " and @text='" + txtStr + "'";
builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "'" + txtStr + "]";
}
else
{
builtXpath = "//win[@class='" + parentClassStr + "'" + parentTxtStr + "]/win[@class='" + classStr + "']";
}
}
System.out.println(builtXpath);
resultList = WindowsEnumeratedXml.evaluateXpathGetValues(xml, builtXpath); resultList = WindowsEnumeratedXml.evaluateXpathGetValues(xml, builtXpath);
if (resultList.size() > 1) { // if there are still multiple results add position to the xpath if (resultList.size() > 1) { // if there are still multiple results add position to the xpath
int position = 1; int position = 1;