From be058f69ff8f181c8f4ac0d39db955cb265853dc Mon Sep 17 00:00:00 2001
From: Tony Germano <tony@germano.name>
Date: Sat, 4 Apr 2026 06:54:36 -0400
Subject: [PATCH] Fix: bug in JXTreeTable.getEditingRow

org.jdesktop.swingx.JXTreeTable contains the following (decompiled) methods

    public boolean isHierarchical(int column) {
       if (column >= 0 && column < this.getColumnCount()) {
          return this.getHierarchicalColumn() == column;
       } else {
          throw new IllegalArgumentException("column must be valid, was" + column);
       }
    }

    public int getEditingRow() {
       if (this.editingRow == -1) {
          return -1;
       } else {
          return this.isHierarchical(this.editingColumn) ? -1 : this.editingRow;
       }
    }

Exceptions are thrown, especially on macOS clients, when getEditingRow
is called while not editing, causing isHeirarchical to be called when
editingColumn is -1.

This commit overrides getEditingRow to protect against that condition.

Issue: https://github.com/OpenIntegrationEngine/engine/issues/272
Signed-off-by: Tony Germano <tony@germano.name>
---
 .../connect/client/ui/SortableTreeTable.java  | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/client/src/com/mirth/connect/client/ui/SortableTreeTable.java b/client/src/com/mirth/connect/client/ui/SortableTreeTable.java
index adeac3a8d2..9ee6de93f5 100644
--- a/client/src/com/mirth/connect/client/ui/SortableTreeTable.java
+++ b/client/src/com/mirth/connect/client/ui/SortableTreeTable.java
@@ -1,11 +1,6 @@
-/*
- * Copyright (c) Mirth Corporation. All rights reserved.
- * 
- * http://www.mirthcorp.com
- * 
- * The software in this package is published under the terms of the MPL license a copy of which has
- * been included with this distribution in the LICENSE.txt file.
- */
+// SPDX-License-Identifier: MPL-2.0
+// SPDX-FileCopyrightText: Mirth Corporation
+// SPDX-FileCopyrightText: 2026 Tony Germano <tony@germano.name>
 
 package com.mirth.connect.client.ui;
 
@@ -135,6 +130,18 @@ public void setSortOrder(int columnIndex, SortOrder sortOrder) {
         sortModel.setSortOptions(sortModel.getColumnName(columnIndex), order);
     }
 
+    // This fixes a bug in the super implementation where isHierarchical(int) can be
+    // called when editingColumn has a value of -1, which causes an exception to be
+    // thrown.
+    @Override
+    public int getEditingRow() {
+        if (editingRow == -1 || editingColumn == -1 || isHierarchical(editingColumn)) {
+            return -1;
+        } else {
+            return editingRow;
+        }
+    }
+
     // ======================================================= private methods
 
     private void getSortParams() {
@@ -145,4 +152,4 @@ private void getSortParams() {
         sortColumn = sortModel.getSortColumnIndex();
     }
 
-}
\ No newline at end of file
+}