Merge 6d4c16e into 5e9c47f

hwf1324 · web-flow · commit 2b3e13e7ef07 · 2025-06-27T14:03:49.000+10:00
diff --git a/source/NVDAObjects/JAB/__init__.py b/source/NVDAObjects/JAB/__init__.py
@@ -1,12 +1,11 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2023 NV Access Limited, Leonard de Ruijter, Joseph Lee, Renaud Paquay, pvagner
+# Copyright (C) 2006-2025 NV Access Limited, Leonard de Ruijter, Joseph Lee, Renaud Paquay, pvagner, hwf1324
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
 import ctypes
 import re
 from typing import (
-	Dict,
 	Any,
 )
 import eventHandler
@@ -22,7 +21,7 @@
 from logHandler import log
 from locationHelper import RectLTWH
 
-JABRolesToNVDARoles: Dict[str, controlTypes.Role] = {
+JABRolesToNVDARoles: dict[str, controlTypes.Role] = {
 	"alert": controlTypes.Role.DIALOG,
 	"column header": controlTypes.Role.TABLECOLUMNHEADER,
 	"canvas": controlTypes.Role.CANVAS,
@@ -127,6 +126,8 @@ def _processHtml(text: str) -> str:
 
 
 class JABTextInfo(textInfos.offsets.OffsetsTextInfo):
+	obj: "JAB"
+
 	def _getOffsetFromPoint(self, x: int, y: int) -> int:
 		info = self.obj.jabContext.getAccessibleTextInfo(x, y)
 		offset = max(min(info.indexAtPoint, info.charCount - 1), 0)
@@ -171,6 +172,9 @@ def _getStoryLength(self) -> int:
 			self._storyLength = textInfo.charCount
 		return self._storyLength
 
+	def _getStoryText(self) -> str:
+		return self._getTextRange(0, self._getStoryLength())
+
 	def _getTextRange(self, start: int, end: int) -> str:
 		# Java needs end of range as last character, not one past the last character
 		text = self.obj.jabContext.getAccessibleTextRange(start, end - 1)
@@ -191,7 +195,7 @@ def _getLineOffsets(self, offset: int) -> tuple[int, int]:
 		return (start, end)
 
 	def _getParagraphOffsets(self, offset: int) -> tuple[int, int]:
-		return self._getLineOffsets(offset)
+		return super()._getLineOffsets(offset)
 
 	def _getFormatFieldAndOffsets(self, offset: int, formatConfig, calculateOffsets=True):
 		attribs: JABHandler.AccessibleTextAttributesInfo
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -10,6 +10,8 @@
 
 ### Bug Fixes
 
+* Fixed support for paragraph mouse text unit in Java applications. (#18231, @hwf1324)
+
 ### Changes for Developers
 
 Please refer to [the developer guide](https://download.nvaccess.org/documentation/developerGuide.html#API) for information on NVDA's API deprecation and removal process.
