Skip to content

Commit 41eb765

Browse files
committed
JAXB marshaller System.out comments out.
1 parent 677227e commit 41eb765

File tree

13 files changed

+139
-86
lines changed

13 files changed

+139
-86
lines changed

sources/net.sf.j2s.core/.classpath

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
4+
<attributes>
5+
<attribute name="module" value="true"/>
6+
</attributes>
7+
</classpathentry>
48
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
59
<classpathentry kind="src" path="src"/>
610
<classpathentry kind="output" path="bin"/>

sources/net.sf.j2s.core/.settings/org.eclipse.jdt.core.prefs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,17 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
88
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
99
org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
1010
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
11+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
12+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
13+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
14+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
15+
org.eclipse.jdt.core.compiler.compliance=11
16+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
17+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
18+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1119
org.eclipse.jdt.core.compiler.problem.APILeak=warning
1220
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
21+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1322
org.eclipse.jdt.core.compiler.problem.autoboxing=warning
1423
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
1524
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -19,6 +28,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
1928
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
2029
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
2130
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
31+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
2232
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
2333
org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
2434
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -100,3 +110,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
100110
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
101111
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
102112
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
113+
org.eclipse.jdt.core.compiler.release=disabled
114+
org.eclipse.jdt.core.compiler.source=11
-274 KB
Binary file not shown.
-4 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200408084722
1+
20200409140611
-274 KB
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200408084722
1+
20200409140611
-274 KB
Binary file not shown.

sources/net.sf.j2s.java.core/src/swingjs/xml/JSJAXBMarshaller.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ private void writeTypeAdapter(JSJAXBField field, Object value) throws JAXBExcept
424424
try {
425425
output((String) adapter.marshal(value));
426426
} catch (Exception e) {
427-
System.out.println("JSJAXBMarshaller " + e + " trying to marshal " + field.text);
427+
//System.out.println("JSJAXBMarshaller " + e + " trying to marshal " + field.text);
428428
outputSimple(field, value);
429429
}
430430
}
@@ -446,7 +446,7 @@ private void writeSchema(JSJAXBField field, Object value) throws JAXBException {
446446
default:
447447
if (!JSJAXBField.isknownSchemaType(field.xmlSchemaType)
448448
&& cantmarshall.indexOf(field.xmlSchemaType) < 0) {
449-
System.out.println("JSJAXBMarshaller schema not supported " + field.xmlSchemaType);
449+
//System.out.println("JSJAXBMarshaller schema not supported " + field.xmlSchemaType);
450450
cantmarshall += ";" + field.xmlSchemaType;
451451
}
452452
// fall through //
@@ -633,7 +633,7 @@ private void output(String s) throws JAXBException {
633633
if (writer != null) {
634634

635635

636-
System.out.println((s.startsWith("<") ? "\n" : "") + s);
636+
//System.out.println((s.startsWith("<") ? "\n" : "") + s);
637637

638638
writer.write(s);
639639
} else if (outputStream != null) {

0 commit comments

Comments
 (0)