mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-19 16:40:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
ghidra1
2021-07-15 09:16:06 -04:00
parent 2b1235814d 589752646f
commit f553f5a534
5 changed files with 110 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FGClipboardProvider.java
View File

@@ -18,6 +18,8 @@ package ghidra.app.plugin.core.functiongraph;
import java.awt.Rectangle;
import java.awt.datatransfer.Transferable;
import org.apache.commons.lang3.exception.ExceptionUtils;
import docking.ActionContext;
import docking.widgets.fieldpanel.Layout;
import docking.widgets.fieldpanel.internal.EmptyLayoutBackgroundColorManager;
@@ -32,6 +34,7 @@ import ghidra.app.plugin.core.functiongraph.mvc.FGData;
import ghidra.app.util.viewer.listingpanel.ListingModel;
import ghidra.framework.plugintool.PluginTool;
import ghidra.program.model.address.*;
import ghidra.util.Msg;
import ghidra.util.task.TaskMonitor;
public class FGClipboardProvider extends CodeBrowserClipboardProvider {
@@ -82,11 +85,9 @@ public class FGClipboardProvider extends CodeBrowserClipboardProvider {
return createStringTransferable(g.getBuffer().toString());
}
catch (Exception e) {
String msg = e.getMessage();
if (msg == null) {
msg = e.toString();
}
tool.setStatusInfo("Copy failed: " + msg, true);
String message = "Copy failed: " + ExceptionUtils.getMessage(e);
Msg.error(this, message, e);
tool.setStatusInfo(message, true);
}
return null;