better way to escape generated comments in javadoc
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ClassSelector.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ClassSelector.java
index 3d04298..90fed06 100644
--- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ClassSelector.java
+++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/ClassSelector.java
@@ -20,7 +20,6 @@
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JJavaName;
import com.sun.codemodel.JPackage;
-import com.sun.codemodel.util.JavadocEscapeWriter;
import com.sun.istack.NotNull;
import com.sun.tools.xjc.model.CBuiltinLeafInfo;
import com.sun.tools.xjc.model.CClassInfo;
@@ -391,10 +390,10 @@
// then schema fragment
StringWriter out = new StringWriter();
- out.write("<pre>\n");
- SchemaWriter sw = new SchemaWriter(new JavadocEscapeWriter(out));
+ out.write("<pre>{@code\n");
+ SchemaWriter sw = new SchemaWriter(out);
sc.visit(sw);
- out.write("</pre>");
+ out.write("}</pre>");
append(bean,out.toString());
}
diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java
index bfde631..a189c08 100644
--- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java
+++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/SimpleTypeBuilder.java
@@ -27,7 +27,6 @@
import jakarta.xml.bind.DatatypeConverter;
import com.sun.codemodel.JJavaName;
-import com.sun.codemodel.util.JavadocEscapeWriter;
import org.glassfish.jaxb.core.v2.WellKnownNamespace;
import com.sun.tools.xjc.ErrorReceiver;
import com.sun.tools.xjc.model.CBuiltinLeafInfo;
@@ -552,14 +551,14 @@
{// compute Javadoc
StringWriter out = new StringWriter();
- SchemaWriter sw = new SchemaWriter(new JavadocEscapeWriter(out));
+ SchemaWriter sw = new SchemaWriter(out);
type.visit((XSVisitor)sw);
if(javadoc!=null) javadoc += "\n\n";
else javadoc = "";
javadoc += Messages.format( Messages.JAVADOC_HEADING, type.getName() )
- +"\n<pre>\n"+out.getBuffer()+"</pre>";
+ +"\n<pre>{@code\n"+out.getBuffer()+"}</pre>";
}
