Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ private void removeAndReplaceClass(List<ClassOutline> removeClasses, ClassOutlin
var removeClass = classOutline.implClass;
removeFromParentContainer(removeClass);
var jPackage = removeClass.getPackage();
removeFromObjectFactory(jPackage, removeClass);
removeFromDebugClass(removeClass);

outline.getClasses().forEach(c -> {
var definedClass = c.implClass;
Expand All @@ -112,6 +114,34 @@ private void removeAndReplaceClass(List<ClassOutline> removeClasses, ClassOutlin
});
}

private void removeFromDebugClass(JDefinedClass removeClass) {
var codeModel = removeClass.owner();
var defaultPackage = codeModel._package("");
var debugClass = defaultPackage._getClass("JAXBDebug");
if (debugClass == null) {
return;
}
var classes = defaultPackage.classes();
while (classes.hasNext()) {
if (classes.next() == debugClass) {
classes.remove();
break;
}
}
}

private void removeFromObjectFactory(JPackage jPackage, JDefinedClass removeClass) {
if (jPackage == null) {
return;
}
var objectFactoryClass = jPackage._getClass("ObjectFactory");
if (objectFactoryClass == null) {
return;
}
objectFactoryClass.methods().removeIf(method ->
ClassNameDetector.detect(method.type().fullName(), removeClass.fullName()));
}

private void removeFromParentContainer(JDefinedClass definedClass) {
var parentContainer = definedClass.parentContainer();

Expand Down