From c77547e2aec2e698d9c8848712917047b6a7ef37 Mon Sep 17 00:00:00 2001 From: Erik Bruchez Date: Sat, 18 Jan 2025 14:08:05 -0800 Subject: [PATCH] Refactor: rename param for clarity --- .../org/orbeon/oxf/xforms/control/XFormsControl.scala | 8 ++++---- .../orbeon/oxf/xforms/control/XFormsValueControl.scala | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xforms-runtime/shared/src/main/scala/org/orbeon/oxf/xforms/control/XFormsControl.scala b/xforms-runtime/shared/src/main/scala/org/orbeon/oxf/xforms/control/XFormsControl.scala index a9bc15d92f1..abb667b7d17 100644 --- a/xforms-runtime/shared/src/main/scala/org/orbeon/oxf/xforms/control/XFormsControl.scala +++ b/xforms-runtime/shared/src/main/scala/org/orbeon/oxf/xforms/control/XFormsControl.scala @@ -177,15 +177,15 @@ class XFormsControl( def hasJavaScriptInitialization = false def compareExternalMaybeClientValue( - previousValueOpt : Option[String], - previousControlOpt : Option[XFormsControl], - collector : ErrorEventCollector + clientValueOpt : Option[String], + previousControlOpt: Option[XFormsControl], + collector : ErrorEventCollector ): Boolean = // NOTE: See https://github.com/orbeon/orbeon-forms/issues/2857. We might consider removing this // optimization as it is dangerous. `XFormsValueControl` works around it by calling // `compareExternalUseExternalValue` directly. (previousControlOpt exists (_ eq self)) && (getInitialLocal eq getCurrentLocal) || - compareExternalUseExternalValue(previousValueOpt, previousControlOpt, collector) + compareExternalUseExternalValue(clientValueOpt, previousControlOpt, collector) // Compare this control with another control, as far as the comparison is relevant for the external world. def compareExternalUseExternalValue( diff --git a/xforms-runtime/shared/src/main/scala/org/orbeon/oxf/xforms/control/XFormsValueControl.scala b/xforms-runtime/shared/src/main/scala/org/orbeon/oxf/xforms/control/XFormsValueControl.scala index 448c8da6a3c..3a037dc22b5 100644 --- a/xforms-runtime/shared/src/main/scala/org/orbeon/oxf/xforms/control/XFormsValueControl.scala +++ b/xforms-runtime/shared/src/main/scala/org/orbeon/oxf/xforms/control/XFormsValueControl.scala @@ -273,14 +273,14 @@ trait XFormsValueControl extends XFormsSingleNodeControl { } final override def compareExternalMaybeClientValue( - previousValueOpt : Option[String], - previousControlOpt : Option[XFormsControl], - collector : ErrorEventCollector + clientValueOpt : Option[String], + previousControlOpt: Option[XFormsControl], + collector : ErrorEventCollector ): Boolean = // NOTE: Call `compareExternalUseExternalValue` directly so as to avoid check on // `(previousControlOpt exists (_ eq this)) && (getInitialLocal eq getCurrentLocal)` which // causes part of https://github.com/orbeon/orbeon-forms/issues/2857. - compareExternalUseExternalValue(previousValueOpt orElse (previousControlOpt flatMap (_.asInstanceOf[XFormsValueControl].externalValueOpt(collector))), previousControlOpt, collector) + compareExternalUseExternalValue(clientValueOpt orElse (previousControlOpt flatMap (_.asInstanceOf[XFormsValueControl].externalValueOpt(collector))), previousControlOpt, collector) override def compareExternalUseExternalValue( previousExternalValue: Option[String],