From bf9ed117fbea13a54419329bb7b24e898a5c00c1 Mon Sep 17 00:00:00 2001 From: Vladimir Kotal Date: Tue, 2 Sep 2025 13:39:03 +0200 Subject: [PATCH] rename to avoid confusion with Object.equals() --- .../java/org/opengrok/indexer/search/context/LineMatcher.java | 4 ++-- .../org/opengrok/indexer/search/context/PhraseMatcher.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/LineMatcher.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/LineMatcher.java index 6804658a0e2..4bf79052399 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/LineMatcher.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/LineMatcher.java @@ -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 . */ package org.opengrok.indexer.search.context; @@ -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; } diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/PhraseMatcher.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/PhraseMatcher.java index e02e6a75a8c..52bf8576c07 100644 --- a/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/PhraseMatcher.java +++ b/opengrok-indexer/src/main/java/org/opengrok/indexer/search/context/PhraseMatcher.java @@ -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. @@ -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. }