GT-3624 - Datatypes Provider - fixed preview window issues: odd font

size for structures; Copy of preview text was missing newlines; enum
rendering of negative values used too many digits
This commit is contained in:
dragonmacher 2020-08-03 18:16:09 -04:00
parent 3be8657ff3
commit 2e6e3d1a96
4 changed files with 25 additions and 24 deletions

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;
}
/**