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

Merge pull request #3 from alexkogon/refactorXPathMakerAndFixBug

Browse Source 
refactorXPathMakerAndFixBug
This commit is contained in:
Edward Jakubowski
2015-09-10 21:54:27 -04:00
parent a98ee0d632 91a080c708
commit 8fadd8f28f
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,6 +108,10 @@ public class XpathManager implements Runnable{
} }
public String buildXpathStatement() { public String buildXpathStatement() {
return buildXpathStatement(false, 20, 30);
}
public String buildXpathStatement(boolean useFullTextMatching, int maxParentTextLength, int maxTextLength) {
String builtXpath = ""; String builtXpath = "";
try { try {
String xml = this.windowsXmlTextPane.getText(); String xml = this.windowsXmlTextPane.getText();
@@ -131,8 +135,8 @@ public class XpathManager implements Runnable{
String parentTxtOrig = Api.getWindowText(parent); String parentTxtOrig = Api.getWindowText(parent);
String parentTxtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(parentTxtOrig); String parentTxtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(parentTxtOrig);
if (!parentTxtStr.isEmpty()) { if (!parentTxtStr.isEmpty()) {
if (parentTxtOrig.length() > 20) {// if the parent text is too long only test the first 20 characters if (parentTxtOrig.length() > maxParentTextLength) {// if the parent text is too long only test the first maxParentTextLength characters
parentTxtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(parentTxtOrig.substring(0, 20)); parentTxtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(parentTxtOrig.substring(0, maxParentTextLength));
parentTxtStr = " and starts-with(@text,'" + parentTxtStr + "')"; parentTxtStr = " and starts-with(@text,'" + parentTxtStr + "')";
} }
else else
@@ -153,8 +157,8 @@ public class XpathManager implements Runnable{
} }
if (resultList.size() == 0) { //some reason a window might have a parent window that is not associated with it's child (orphans!!) if (resultList.size() == 0) { //some reason a window might have a parent window that is not associated with it's child (orphans!!)
if (!txtStr.isEmpty()) { if (!txtStr.isEmpty()) {
if (parentTxtOrig.length() > 30) {// if the text is too long only test the first 20 characters if (txtStr.length() > maxTextLength) {// if the text is too long only test the first maxTextLength characters
txtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(txtStr.substring(0, 30)); txtStr = WindowsEnumeratedXml.escapeXmlAttributeValue(txtStr.substring(0, maxTextLength));
txtStr = " and starts-with(@text,'" + txtStr + "')"; txtStr = " and starts-with(@text,'" + txtStr + "')";
} }
else else