GT-2960 - Docking Actions - test fixes; fixed bug in Delete Table Row

Action that caused its default key binding to get saved
This commit is contained in:
dragonmacher
2019-07-30 14:42:34 -04:00
parent 85a4677312
commit 154fa39cc2
6 changed files with 13 additions and 4 deletions
+1 -1
View File
@@ -24,5 +24,5 @@
<listAttribute key="org.eclipse.jdt.launching.MODULEPATH"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="ghidra.GhidraRun"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Framework Utility"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:+IgnoreUnrecognizedVMOptions -Djava.system.class.loader=ghidra.GhidraClassLoader -Dfile.encoding=UTF8 -Duser.country=US -Duser.language=en -Dsun.java2d.pmoffscreen=false -Dsun.java2d.xrender=false -Dsun.java2d.uiScale=1 -Dsun.java2d.d3d=false -Xdock:name=&quot;Ghidra&quot; -Dvisualvm.display.name=Ghidra"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:+IgnoreUnrecognizedVMOptions -Djava.system.class.loader=ghidra.GhidraClassLoader -Dfile.encoding=UTF8 -Duser.country=US -Duser.language=en -Dsun.java2d.pmoffscreen=false -Dsun.java2d.xrender=true -Dsun.java2d.uiScale=1 -Dsun.java2d.d3d=false -Xdock:name=&quot;Ghidra&quot; -Dvisualvm.display.name=Ghidra"/>
</launchConfiguration>
@@ -64,6 +64,7 @@ public abstract class CompositeEditorProvider extends ComponentProviderAdapter
super(plugin.getTool(), "Composite Editor", plugin.getName());
this.plugin = plugin;
setIcon(EDITOR_ICON);
setTransient();
listeners = WeakDataStructureFactory.createSingleThreadAccessWeakSet();
initializeServices();
}
@@ -19,6 +19,7 @@ import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.MouseEvent;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import javax.swing.*;
@@ -56,7 +57,7 @@ public class OpenVersionedFileDialog extends DataTreeDialog {
private PluginTool tool;
private VersionHistoryPanel historyPanel;
private List<DockingActionIf> popupActions;
private List<DockingActionIf> popupActions = Collections.emptyList();
/**
* Constructor
@@ -200,7 +200,6 @@ public class DeleteTableRowAction extends DockingAction {
// prevent this action from appearing in the toolbar, menus, etc
setToolBarData(null);
setPopupMenuData(null);
setKeyBindingData(null);
tool.addAction(this);
}
@@ -15,6 +15,8 @@
*/
package ghidra.framework.options;
import java.util.Objects;
import javax.swing.KeyStroke;
/**
@@ -84,4 +86,9 @@ class WrappedKeyStroke implements WrappedOption {
public OptionType getOptionType() {
return OptionType.KEYSTROKE_TYPE;
}
@Override
public String toString() {
return Objects.toString(keyStroke);
}
}
@@ -16,6 +16,7 @@
package ghidra.framework.main.datatree;
import java.awt.event.MouseEvent;
import java.util.Collections;
import java.util.List;
import javax.swing.SwingUtilities;
@@ -34,7 +35,7 @@ public class VersionHistoryDialog extends DialogComponentProvider implements Pro
private VersionHistoryPanel versionPanel;
private MyFolderListener listener = new MyFolderListener();
private List<DockingActionIf> popupActions;
private List<DockingActionIf> popupActions = Collections.emptyList();
public VersionHistoryDialog(DomainFile domainFile) {