Skip to content

[#1884] update PrologCodeWriter and update unit test #1887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
laurentschoelens wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[#1884] update PrologCodeWriter and update unit test #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions jaxb-ri/codemodel/codemodel/src/main/java/com/sun/codemodel/writer/PrologCodeWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2026 Contributors to the Eclipse Foundation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -55,13 +56,17 @@ public Writer openSource(JPackage pkg, String fileName) throws IOException {

// write prolog if this is a java source file
if( prolog != null ) {
out.println( "//" );
out.println("//");

String s = prolog;
int idx;
while( (idx=s.indexOf('\n'))!=-1 ) {
out.println("// "+ s.substring(0,idx) );
s = s.substring(idx+1);
out.println("// " + s.substring(0, idx));
s = s.substring(idx + 1);
}
// can have extra comment content after last newline
if (!s.isEmpty()) {
out.println("// " + s);
}
out.println("//");
out.println();
Expand Down
11 changes: 5 additions & 6 deletions jaxb-ri/xjc/src/test/java/com/sun/tools/xjc/OptionsJUTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (c) 2011, 2023 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2026 Contributors to the Eclipse Foundation. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0, which is available at
Expand Down Expand Up @@ -68,8 +69,7 @@ public void testCreateCodeWriter() throws JClassAlreadyExistsException, IOExcept
FileInputStream fis = new FileInputStream(cls);
//same string in UTF-8 is 1byte shorter on JDK6 than on JDK5
//therefore final check is for 'contains' and not for 'endsWith'
byte[] in = new byte[13];
fis.read(in);
byte[] in = fis.readAllBytes();
fis.close();
cls.delete();
String inStr = new String(in, StandardCharsets.UTF_8);
Expand All @@ -84,8 +84,7 @@ public void testCreateCodeWriter() throws JClassAlreadyExistsException, IOExcept
jcm.build(o.createCodeWriter());
cls = new File(o.targetDir, "test/TestClass.java");
fis = new FileInputStream(cls);
in = new byte[26];
fis.read(in);
in = fis.readAllBytes();
fis.close();
cls.delete();
inStr = new String(in, StandardCharsets.UTF_16);
Expand All @@ -98,12 +97,12 @@ public void testCreateCodeWriter() throws JClassAlreadyExistsException, IOExcept
cls = new File(o.targetDir, "test/TestClass.java");
fis = new FileInputStream(cls);
//this should handle also UTF-32...
in = new byte[84];
fis.read(in);
in = fis.readAllBytes();
fis.close();
cls.delete();
inStr = new String(in, Charset.defaultCharset().name());
assertTrue("Got: '" + inStr + "'", inStr.contains("// This f"));
assertTrue("Got: '" + inStr + "'", inStr.contains("// Generated on:"));
} finally {
Locale.setDefault(locale);
}
Expand Down
Loading