Skip to content

rename to avoid confusion with Object.equals() #4841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2025
Merged

rename to avoid confusion with Object.equals() #4841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/LineMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

/*
* Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
* Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
*/
package org.opengrok.indexer.search.context;
Expand Down Expand Up @@ -56,7 +56,7 @@ public abstract class LineMatcher {
* the check will return true if the only difference between the strings
* is difference in case.
*/
boolean equal(String s1, String s2) {
boolean equalStrings(String s1, String s2) {
return compareStrings(s1, s2) == 0;
}

Expand Down
4 changes: 2 additions & 2 deletions opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/PhraseMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class PhraseMatcher extends LineMatcher {

@Override
public int match(String token) {
if (equal(token, phraseTerms[cur])) {
if (equalStrings(token, phraseTerms[cur])) {
if (cur < phraseTerms.length - 1) {
cur++;
return WAIT; //matching.
Expand All @@ -46,7 +46,7 @@ public int match(String token) {
return MATCHED; //matched!
} else if (cur > 0) {
cur = 0;
if (equal(token, phraseTerms[cur])) {
if (equalStrings(token, phraseTerms[cur])) {
cur++;
return WAIT; //matching.
}
Expand Down
Loading