Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-04 05:24:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-2-dragonmacher-err-log-dialog-patch-2' into patch
(Closes #4251)
This commit is contained in:
Ryan Kurtz
2022-05-16 11:17:40 -04:00
parent e3a751ca46 0fb347dbc5
commit 8971a72e9b
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Docking/src/main/java/docking/ErrLogDialog.java
+1 -16
View File
@@ -18,8 +18,6 @@ package docking;
import java.awt.*; import java.awt.*;
import java.awt.event.ComponentAdapter; import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent; import java.awt.event.ComponentEvent;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*; import java.util.*;
import java.util.List; import java.util.List;
@@ -119,8 +117,7 @@ public class ErrLogDialog extends AbstractErrDialog {
String hostname = getHostnameString(); String hostname = getHostnameString();
if (hostname != null) { if (hostname != null) {
sb.append("Workstation: "); sb.append(hostname);
sb.append(getHostname());
sb.append(EOL); sb.append(EOL);
} }
return sb.toString(); return sb.toString();
@@ -146,18 +143,6 @@ public class ErrLogDialog extends AbstractErrDialog {
return "Workstation: " + name; return "Workstation: " + name;
} }
private Object getHostname() {
String hostname = "<unknown>";
try {
InetAddress addr = InetAddress.getLocalHost();
hostname = addr.getCanonicalHostName();
}
catch (UnknownHostException e) {
// ignore
}
return hostname;
}
public static void setErrorReporter(ErrorReporter errorReporter) { public static void setErrorReporter(ErrorReporter errorReporter) {
ErrLogDialog.errorReporter = errorReporter; ErrLogDialog.errorReporter = errorReporter;
} }