Alissa Bonas has uploaded a new change for review. Change subject: core: refactor ADSyntaxChecker ......................................................................
core: refactor ADSyntaxChecker Several small changes in ADSyntaxChecker - no logic changes, just removing commented out code and simplify expressions. Change-Id: Ie3bc6887d86431f13db8af5e2992fc21e7b632be Signed-off-by: Alissa Bonas <[email protected]> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java 1 file changed, 8 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/27742/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java index 63f2299..523f690 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/ADSyntaxChecker.java @@ -76,7 +76,7 @@ if (searchCharArr.length >= idx + 2) { // Check that this // maybe a plural // Validate that the next character is an 's' - if (mPluralAC.validate(searchText.substring(idx + 1, idx + 1 + 1))) { + if (mPluralAC.validate(searchText.substring(idx + 1, idx + 2))) { // Then just move things along. idx++; StringBuilder sb = new StringBuilder(nextObject); @@ -111,9 +111,7 @@ curConditionField = nextObject; curStartPos = idx + 1; - } else if (!AdConditionFieldAC.validateCompletion(nextObject)) // && - // (!mSortbyAC.validateCompletion(nextObject))) - { + } else if (!AdConditionFieldAC.validateCompletion(nextObject)) { retval.setErr(SyntaxError.INVALID_CONDITION_FILED, curStartPos, idx + 1); return retval; } @@ -161,8 +159,8 @@ // Doing this condition to identify whether this is the last // searchObject and no space is predicted !! if (final2) { - if (((curChar == ' ') || (idx + 1 == searchCharArr.length)) && (betweenDoubleQuotes == false) - && (addObjFlag == false)) { + if (((curChar == ' ') || (idx + 1 == searchCharArr.length)) && !betweenDoubleQuotes + && !addObjFlag) { strRealObj = strRealObj.trim(); if (mNonSpaceRegexp.IsMatch(strRealObj)) { addObjFlag = true; @@ -171,7 +169,7 @@ } } } else { - if ((curChar == ' ') && (betweenDoubleQuotes == false) && (addObjFlag == false)) { + if ((curChar == ' ') && !betweenDoubleQuotes && !addObjFlag) { strRealObj = strRealObj.trim(); if (mNonSpaceRegexp.IsMatch(strRealObj)) { addObjFlag = true; @@ -231,9 +229,9 @@ case CONDITION_FIELD: String[] tmpCompletions = AdConditionFieldAC.getCompletion(curPartialWord); ArrayList<String> nonDuplicates = new ArrayList<String>(); - for (int itr = 0; itr < tmpCompletions.length; itr++) { - if (!retval.contains(SyntaxObjectType.CONDITION_FIELD, tmpCompletions[itr])) { - nonDuplicates.add(tmpCompletions[itr]); + for (String completion :tmpCompletions) { + if (!retval.contains(SyntaxObjectType.CONDITION_FIELD, completion)) { + nonDuplicates.add(completion); } } retval.addToACList(nonDuplicates.toArray(new String[] {})); -- To view, visit http://gerrit.ovirt.org/27742 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3bc6887d86431f13db8af5e2992fc21e7b632be Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alissa Bonas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
