Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 09:35:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4915_Dan_fixPlotColumnIssues--SQUASHED' into patch

Browse Source
This commit is contained in:
Ryan Kurtz
2025-03-03 13:00:08 -05:00
parent 973a0ea1c3 2aedd75059
commit 73810bb7b9
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Debug/ProposedUtils/src/main/java/docking/widgets/table/RangeCursorTableHeaderRenderer.java
+5 -4
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,9 +42,10 @@ public class RangeCursorTableHeaderRenderer<N extends Number & Comparable<N>>
setSavedTable(null); setSavedTable(null);
return true; return true;
} }
int count = model.getColumnCount(); int count = savedTable.getColumnCount();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (model.getColumn(i) == col) { int j = savedTable.convertColumnIndexToModel(i);
if (model.getColumn(j) == col) {
return false; return false;
} }
} }
Ghidra/Framework/Docking/src/main/java/docking/widgets/table/RowObjectTableModel.java
+4 -4
View File
@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,8 +31,8 @@ public interface RowObjectTableModel<T> extends TableModel {
public static TableModel unwrap(TableModel m) { public static TableModel unwrap(TableModel m) {
TableModel model = m; TableModel model = m;
while (model instanceof WrappingTableModel) { while (model instanceof WrappingTableModel wrapper) {
model = ((WrappingTableModel) model).getWrappedModel(); model = wrapper.getWrappedModel();
} }
return model; return model;
} }