Fix table actions in sorted table

ubfx · ubfx · commit 948c4254c469 · 2025-02-17T22:13:13.000+01:00
diff --git a/src/main/java/bindiffhelper/BinDiffHelperProvider.java b/src/main/java/bindiffhelper/BinDiffHelperProvider.java
@@ -407,16 +407,15 @@ protected void doDiffWork() {
 
 		table.addMouseListener(new MouseAdapter() {
 			public void mousePressed(MouseEvent e) {
+				var entry = ctm.getEntry(table.convertRowIndexToModel(table.getSelectedRow()));
+				
 				if (e.getClickCount() == 2 && table.getSelectedRow() != -1) {
-					var entry = ctm.getEntry(table.getSelectedRow());
-					//cvs.goTo(new ProgramLocation(program, entry.primaryAddress), true);
 					PluginEvent ev = new ProgramLocationPluginEvent(null, new ProgramLocation(program, entry.primaryAddress), program);
 					tool.firePluginEvent(ev);
 					
 					if (secondary.prog != null && secondary.df != null) {
 						Address secAddress = secondary.prog.getAddressFactory().getDefaultAddressSpace()
 								.getAddress(entry.secondaryAddress);
-						//secondary.cvs.goTo(new ProgramLocation(secondary.prog, secAddress), true);
 						PluginEvent secev = new ProgramLocationPluginEvent(null, new ProgramLocation(secondary.prog, secAddress), secondary.prog);
 						
 						for (var consumer : secondary.df.getConsumers()) {
@@ -430,7 +429,6 @@ public void mousePressed(MouseEvent e) {
 					String pname = program.getDomainFile().getName().toString();
 					String pname2 = secondary.prog.getDomainFile().getName().toString();
 
-					var entry = ctm.getEntry(table.getSelectedRow());
 					try {
 						Function function = program.getListing().getFunctionAt(entry.primaryAddress);
 						Address secAddress = addrSpace2.getAddress(entry.secondaryAddress);
diff --git a/src/main/java/bindiffhelper/ToggleCheckSelectedAction.java b/src/main/java/bindiffhelper/ToggleCheckSelectedAction.java
@@ -25,12 +25,12 @@ public ToggleCheckSelectedAction(BinDiffHelperPlugin plugin) {
 
 	@Override
 	public void actionPerformed(ActionContext context) {
-		// TODO Auto-generated method stub
 		if (plugin.provider.table != null) {
 			for (var i : plugin.provider.table.getSelectedRows()) {
-				Boolean currentlyChecked = (Boolean) plugin.provider.ctm.getValueAt(i, 0);
+				int id = plugin.provider.table.convertRowIndexToModel(i);
+				Boolean currentlyChecked = (Boolean) plugin.provider.ctm.getValueAt(id, 0);
 
-				plugin.provider.ctm.setValueAt(!currentlyChecked, i, 0);
+				plugin.provider.ctm.setValueAt(!currentlyChecked, id, 0);
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ public ToggleCheckSelectedAction(BinDiffHelperPlugin plugin) {`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public void actionPerformed(ActionContext context) {`
`28`		`- // TODO Auto-generated method stub`
`29`	`28`	`if (plugin.provider.table != null) {`
`30`	`29`	`for (var i : plugin.provider.table.getSelectedRows()) {`
`31`		`- Boolean currentlyChecked = (Boolean) plugin.provider.ctm.getValueAt(i, 0);`
	`30`	`+ int id = plugin.provider.table.convertRowIndexToModel(i);`
	`31`	`+ Boolean currentlyChecked = (Boolean) plugin.provider.ctm.getValueAt(id, 0);`
`32`	`32`
`33`		`- plugin.provider.ctm.setValueAt(!currentlyChecked, i, 0);`
	`33`	`+ plugin.provider.ctm.setValueAt(!currentlyChecked, id, 0);`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`