yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GT-3624-dragonmacher-datatypes-preview'

Browse source
This commit is contained in:
ghidravore 2020-08-04 16:57:12 -04:00
commit 3ec58674f5
4 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Ghidra/Framework/Generic/src/main/java/ghidra/util/HTMLUtilities.java
View file

@ -17,7 +17,6 @@ package ghidra.util;
import java.awt.*;
import java.util.List;
import java.util.StringTokenizer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -797,21 +796,11 @@ public class HTMLUtilities {
// formatting tags (like <B>, <FONT>, etc). So, just normalize the text, not
// preserving any of the line breaks.
//
String condensed = condense(updated);
return condensed;
}
private static String condense(String text) {
// replace newlines, as they are sometimes inserted where two words were expected to
// contain no whitespace
String updated = text.replaceAll("\\n", "");
StringTokenizer tokenizer = new StringTokenizer(updated);
StringBuilder buffy = new StringBuilder();
while (tokenizer.hasMoreTokens()) {
buffy.append(tokenizer.nextToken()).append(" ");
}
return buffy.toString().trim();
// Note: Calling this method here causes unwanted removal of newlines. If the original
// need for this call is found, this can be revisited.
// (see history for condense() code)
// String condensed = condense(updated);
return updated;
}
/**