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

GT-1 removed return value on setEnabled() in DockingAction

Browse Source
This commit is contained in:
ghidravore
2020-07-24 15:22:39 -04:00
parent 38af2fbff2
commit a3ea51aff8
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/table/TableComponentProvider.java
+2 -1
View File
@@ -305,7 +305,8 @@ public class TableComponentProvider<T> extends ComponentProviderAdapter
return; return;
} }
boolean wasEnabled = selectionNavigationAction.setEnabled(false); // disable navigation events from updates boolean wasEnabled = selectionNavigationAction.isEnabled();
selectionNavigationAction.setEnabled(false); // disable navigation events from updates
int[] selectedRows = threadedTable.getSelectedRows(); int[] selectedRows = threadedTable.getSelectedRows();
Ghidra/Features/Base/src/main/java/ghidra/util/table/AbstractSelectionNavigationAction.java
+2 -3
View File
@@ -74,12 +74,11 @@ public abstract class AbstractSelectionNavigationAction extends ToggleDockingAct
@Override @Override
// overridden to toggle the selection listener when the action is disabled // overridden to toggle the selection listener when the action is disabled
public boolean setEnabled(boolean enable) { public void setEnabled(boolean enable) {
boolean oldValue = super.setEnabled(enable); super.setEnabled(enable);
boolean installListener = enable && isSelected(); boolean installListener = enable && isSelected();
toggleSelectionListening(installListener); toggleSelectionListening(installListener);
return oldValue;
} }
@Override @Override
Ghidra/Framework/Docking/src/main/java/docking/DockingActionProxy.java
+2 -3
View File
@@ -123,9 +123,8 @@ public class DockingActionProxy
} }
@Override @Override
public boolean setEnabled(boolean newValue) { public void setEnabled(boolean newValue) {
boolean oldValue = dockingAction.setEnabled(newValue); dockingAction.setEnabled(newValue);
return oldValue;
} }
@Override @Override
Ghidra/Framework/Docking/src/main/java/docking/action/DockingAction.java
+2 -3
View File
@@ -217,13 +217,12 @@ public abstract class DockingAction implements DockingActionIf {
} }
@Override @Override
public boolean setEnabled(boolean newValue) { public void setEnabled(boolean newValue) {
if (isEnabled == newValue) { if (isEnabled == newValue) {
return isEnabled; return;
} }
isEnabled = newValue; isEnabled = newValue;
firePropertyChanged(ENABLEMENT_PROPERTY, !isEnabled, isEnabled); firePropertyChanged(ENABLEMENT_PROPERTY, !isEnabled, isEnabled);
return !isEnabled;
} }
@Override @Override
Ghidra/Framework/Docking/src/main/java/docking/action/DockingActionIf.java
+1 -2
View File
@@ -113,9 +113,8 @@ public interface DockingActionIf extends HelpDescriptor {
* Enables or disables the action * Enables or disables the action
* *
* @param newValue true to enable the action, false to disable it * @param newValue true to enable the action, false to disable it
* @return the enabled value of the action after this call
*/ */
public boolean setEnabled(boolean newValue); public void setEnabled(boolean newValue);
/** /**
* Sets whether or not this action should be activated using the default tool context if the * Sets whether or not this action should be activated using the default tool context if the