Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Wed, 05 Jul 2017 21:10:50 +0200
changeset 34852 bd26599f2098
parent 34851 3359dd18cde0 (diff)
parent 34848 a3eed4c1badb (current diff)
child 34858 ec69df775846
Merge
jdk/src/java.base/share/classes/sun/misc/CompoundEnumeration.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/DoubleConsts.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/FloatConsts.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java file | annotate | diff | comparison | revisions
jdk/src/java.base/share/classes/sun/misc/FormattedFloatingDecimal.java file | annotate | diff | comparison | revisions
jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html file | annotate | diff | comparison | revisions
jdk/test/javax/sound/midi/MidiDeviceProvider/FakeInfo.java file | annotate | diff | comparison | revisions
jdk/test/javax/sound/midi/MidiDeviceProvider/NullInfo.java file | annotate | diff | comparison | revisions
jdk/test/javax/sound/midi/MidiDeviceProvider/UnsupportedInfo.java file | annotate | diff | comparison | revisions
jdk/test/sun/misc/FloatingDecimal/OldFDBigIntForTest.java file | annotate | diff | comparison | revisions
jdk/test/sun/misc/FloatingDecimal/OldFloatingDecimalForTest.java file | annotate | diff | comparison | revisions
jdk/test/sun/misc/FloatingDecimal/TestFDBigInteger.java file | annotate | diff | comparison | revisions
jdk/test/sun/misc/FloatingDecimal/TestFloatingDecimal.java file | annotate | diff | comparison | revisions 
--- a/jaxws/.hgtags	Wed Jul 05 21:10:44 2017 +0200
+++ b/jaxws/.hgtags	Wed Jul 05 21:10:50 2017 +0200
@@ -344,3 +344,4 @@
 b55cebc47555293cf9c2aefb3bf63c56e847ab19 jdk-9+96
 7293db4716ee25b814e14f738b9acfb85700e3fa jdk-9+97
 67c84077edc3db6b24998b35970b37c01aae985e jdk-9+98
+97b31ca0dd77483cf20ff99a033a455673639578 jdk-9+99
--- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java	Wed Jul 05 21:10:44 2017 +0200
+++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java	Wed Jul 05 21:10:50 2017 +0200
@@ -31,10 +31,10 @@
  * <p> <b> Usage: </b> </p>
  *
  * <p>
- * Some Java types do not map naturally to a XML representation, for
+ * Some Java types do not map naturally to an XML representation, for
  * example {@code HashMap} or other non JavaBean classes. Conversely,
- * a XML repsentation may map to a Java type but an application may
- * choose to accesss the XML representation using another Java
+ * an XML representation may map to a Java type but an application may
+ * choose to access the XML representation using another Java
  * type. For example, the schema to Java binding rules bind
  * xs:DateTime by default to XmlGregorianCalendar. But an application
  * may desire to bind xs:DateTime to a custom type,
jdk-sandbox