From 2aedd750593732bab8dbccb13a1247944c712d61 Mon Sep 17 00:00:00 2001 From: Dan <46821332+nsadeveloper789@users.noreply.github.com> Date: Mon, 3 Mar 2025 17:09:42 +0000 Subject: [PATCH] GP-4915: Scan view columns, not model columns, to detect Plot removal. --- .../widgets/table/RangeCursorTableHeaderRenderer.java | 9 +++++---- .../java/docking/widgets/table/RowObjectTableModel.java | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/table/RangeCursorTableHeaderRenderer.java b/Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/table/RangeCursorTableHeaderRenderer.java index 9d84999390..60c7d24ecc 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/table/RangeCursorTableHeaderRenderer.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/table/RangeCursorTableHeaderRenderer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,9 +42,10 @@ public class RangeCursorTableHeaderRenderer> setSavedTable(null); return true; } - int count = model.getColumnCount(); + int count = savedTable.getColumnCount(); for (int i = 0; i < count; i++) { - if (model.getColumn(i) == col) { + int j = savedTable.convertColumnIndexToModel(i); + if (model.getColumn(j) == col) { return false; } } diff --git a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/RowObjectTableModel.java b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/RowObjectTableModel.java index a86166f507..4569188040 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/RowObjectTableModel.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/widgets/table/RowObjectTableModel.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,8 +31,8 @@ public interface RowObjectTableModel extends TableModel { public static TableModel unwrap(TableModel m) { TableModel model = m; - while (model instanceof WrappingTableModel) { - model = ((WrappingTableModel) model).getWrappedModel(); + while (model instanceof WrappingTableModel wrapper) { + model = wrapper.getWrappedModel(); } return model; }