github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Fixing javadoc (Closes #8570)

Browse Source
This commit is contained in:
Ryan Kurtz
2025-10-17 05:30:38 -04:00
parent 92713fc844
commit 656c39d307
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Framework/Generic/src/main/java/generic/timer/ExpiringSwingTimer.java
View File

@@ -32,7 +32,7 @@ import utility.function.Dummy;
*/
public class ExpiringSwingTimer extends GhidraSwingTimer {
private static int DEFAULT_EXPIRE_MS = 750;
private static final int DEFAULT_EXPIRE_MS = 750;
private static Set<ExpiringSwingTimer> instances = new HashSet<>();

26
GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/typestubs/JavadocConverter.java
View File

@@ -15,25 +15,12 @@
*/
package ghidra.doclets.typestubs;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.QualifiedNameable;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.element.*;
import javax.lang.model.type.*;
import com.sun.source.doctree.*;
@@ -218,9 +205,7 @@ public class JavadocConverter extends DocConverter {
if (tag instanceof HtmlDocTree html) {
yield htmlConverter.convertHtml(html, el, it);
}
else {
yield tag.toString();
}
yield tag.toString();
}
case SPEC -> "";
case SERIAL -> "";
@@ -352,6 +337,9 @@ public class JavadocConverter extends DocConverter {
*/
private static String getConstantValue(VariableElement el, ValueTree tag) {
Object value = el.getConstantValue();
if (value == null) {
return "";
}
TextTree format = tag.getFormat();
if (format != null) {
try {