From 78e0aca0fd9121428855a1118e3e61236ad1f6ba Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Thu, 9 Mar 2017 00:47:27 +0100 Subject: [PATCH] Fix some typos --- .../src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java | 2 +- .../main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java | 2 +- .../release-documentation/src/docbook/tools-schemagen-ant-task.xml | 2 +- ...s-guide-schema-generation-invoking-schemagen-programatically.xml | 2 +- jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ap/Options.java | 2 +- .../src/test/java/com/sun/tools/jxc/model/nav/ApNavigatorTest.java | 4 ++-- jaxb-ri/pom.xml | 2 +- .../impl/src/main/java/com/sun/xml/bind/AccessorFactoryImpl.java | 2 +- .../impl/src/main/java/com/sun/xml/bind/v2/runtime/BinderImpl.java | 2 +- .../src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java | 6 +++--- .../java/com/sun/xml/bind/v2/runtime/reflect/AdaptedAccessor.java | 2 +- .../main/java/com/sun/xml/bind/v2/util/ByteArrayOutputStreamEx.java | 2 +- .../com/sun/xml/bind/serializer/AbortSerializationException.java | 2 +- .../main/java/com/sun/tools/xjc/generator/bean/BeanGenerator.java | 2 +- .../java/com/sun/tools/xjc/generator/bean/field/AbstractField.java | 2 +- .../main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java | 2 +- .../xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java | 6 +++--- jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CClassInfo.java | 2 +- jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CElementInfo.java | 2 +- .../com/sun/tools/xjc/reader/xmlschema/bindinfo/BIProperty.java | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java index 5eb51481..a07e7c2a 100644 --- a/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/ArrayInfo.java @@ -42,7 +42,7 @@ package com.sun.xml.bind.v2.model.core; /** * Stand-alone array that can be marshalled/unmarshalled on its own - * (without being part of any encloding {@link ClassInfo}.) + * (without being part of any enclosing {@link ClassInfo}.) * *

* Most of the times arrays are treated as properties of their enclosing classes, diff --git a/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java index 4aed4dd4..1269212f 100644 --- a/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java +++ b/jaxb-ri/core/src/main/java/com/sun/xml/bind/v2/model/core/BuiltinLeafInfo.java @@ -46,7 +46,7 @@ import javax.xml.namespace.QName; * JAXB spec designates a few Java classes to be mapped to leaves in XML. * *

- * Built-in leaves also have another priviledge; specifically, they often + * Built-in leaves also have another privilege; specifically, they often * have more than one XML type names associated with it. * * @author Kohsuke Kawaguchi diff --git a/jaxb-ri/docs/release-documentation/src/docbook/tools-schemagen-ant-task.xml b/jaxb-ri/docs/release-documentation/src/docbook/tools-schemagen-ant-task.xml index ebb23bcb..7935b801 100644 --- a/jaxb-ri/docs/release-documentation/src/docbook/tools-schemagen-ant-task.xml +++ b/jaxb-ri/docs/release-documentation/src/docbook/tools-schemagen-ant-task.xml @@ -166,7 +166,7 @@ holder. Control the file name of the generated schema. This element takes a mandatory namespace attribute and - a mandaotry file attribute. When this element is + a mandatory file attribute. When this element is present, the schema document generated for the specified namespace will be placed in the specified file name. diff --git a/jaxb-ri/docs/release-documentation/src/docbook/users-guide-schema-generation-invoking-schemagen-programatically.xml b/jaxb-ri/docs/release-documentation/src/docbook/users-guide-schema-generation-invoking-schemagen-programatically.xml index b2e980a9..c364863f 100644 --- a/jaxb-ri/docs/release-documentation/src/docbook/users-guide-schema-generation-invoking-schemagen-programatically.xml +++ b/jaxb-ri/docs/release-documentation/src/docbook/users-guide-schema-generation-invoking-schemagen-programatically.xml @@ -108,7 +108,7 @@ context.generateSchema(new MySchemaOutputResolver());]]> Native Java API The above two interfaces are built on top of externally - committed contracts, so they'll evolve only in a compatibile way. The + committed contracts, so they'll evolve only in a compatible way. The downside is that the amount of control you can exercise over them would be limited. diff --git a/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ap/Options.java b/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ap/Options.java index 71932465..8c97797a 100644 --- a/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ap/Options.java +++ b/jaxb-ri/jxc/src/main/java/com/sun/tools/jxc/ap/Options.java @@ -56,7 +56,7 @@ public class Options { public static final String DISABLE_XML_SECURITY = "-disableXmlSecurity"; - // honor CLASSPATH environment variable, but it will be overrided by -cp + // honor CLASSPATH environment variable, but it will be overridden by -cp public String classpath = System.getenv("CLASSPATH"); public File targetDir = null; diff --git a/jaxb-ri/jxc/src/test/java/com/sun/tools/jxc/model/nav/ApNavigatorTest.java b/jaxb-ri/jxc/src/test/java/com/sun/tools/jxc/model/nav/ApNavigatorTest.java index 42eb91cf..cc007eff 100644 --- a/jaxb-ri/jxc/src/test/java/com/sun/tools/jxc/model/nav/ApNavigatorTest.java +++ b/jaxb-ri/jxc/src/test/java/com/sun/tools/jxc/model/nav/ApNavigatorTest.java @@ -80,13 +80,13 @@ public final class ApNavigatorTest { enumElement3.getKind(); result = ElementKind.ENUM_CONSTANT; enumElement4.getKind(); result = ElementKind.ENUM_CONSTANT; //Redefine the hashCode() for test enum's - it will gives us an assurance that - // all elements will have predifined order when they will be added to incorrect + // all elements will have predefined order when they will be added to incorrect // HashSet container in getEnumConstants() enumElement1.hashCode(); result = 4; enumElement2.hashCode(); result = 3; enumElement3.hashCode(); result = 2; enumElement4.hashCode(); result = 1; - //We want to return here a predifined clazz members + //We want to return here a predefined clazz members env.getElementUtils().getAllMembers(clazz); result = Arrays.asList(enumElement1, enumElement2, enumElement3, enumElement4); } diff --git a/jaxb-ri/pom.xml b/jaxb-ri/pom.xml index 7d77f216..78d02b4a 100644 --- a/jaxb-ri/pom.xml +++ b/jaxb-ri/pom.xml @@ -155,7 +155,7 @@ holder. 1.0 ${project.build.directory}/endorsed - + ${user.dir}/tools/javadoc-link 1.7 false diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactoryImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactoryImpl.java index 340b2666..6c0df79b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactoryImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/AccessorFactoryImpl.java @@ -76,7 +76,7 @@ public class AccessorFactoryImpl implements InternalAccessorFactory { * @param bean the class to be processed. * @param field the field within the class to be accessed. * @param readOnly the isStatic value of the field's modifier. - * @param supressWarning supress security warning about accessing fields through reflection + * @param supressWarning suppress security warning about accessing fields through reflection * @return Accessor the accessor for this field */ public Accessor createFieldAccessor(Class bean, Field field, boolean readOnly, boolean supressWarning) { diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BinderImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BinderImpl.java index d0fe273d..0d1f6a8e 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BinderImpl.java +++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BinderImpl.java @@ -192,7 +192,7 @@ public class BinderImpl extends Binder { // TODO // for now just marshal - // TODO: object model independenc + // TODO: object model independence Element e = (Element)xmlNode; Node ns = e.getNextSibling(); Node p = e.getParentNode(); diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java index 58596a1d..76153e3f 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java +++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java @@ -167,7 +167,7 @@ public abstract class Accessor implements Receiver { } catch (AccessorException e) { Loader.handleGenericException(e, true); } catch (IllegalAccessError iae) { - // throw UnmarshalException instead IllegalAccesssError | Issue 475 + // throw UnmarshalException instead IllegalAccessError | Issue 475 Loader.handleGenericError(iae); } } @@ -218,7 +218,7 @@ public abstract class Accessor implements Receiver { } /** - * Flag that will be set to true after issueing a warning + * Flag that will be set to true after issuing a warning * about the lack of permission to access non-public fields. */ private static boolean accessWarned = false; @@ -425,7 +425,7 @@ public abstract class Accessor implements Receiver { } /** - * A version of {@link GetterSetterReflection} thaat doesn't have any getter. + * A version of {@link GetterSetterReflection} that doesn't have any getter. *

*

* This provides a user-friendly error message. diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedAccessor.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedAccessor.java index 5f2f9bb8..ecdc4a1b 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedAccessor.java +++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/AdaptedAccessor.java @@ -57,7 +57,7 @@ final class AdaptedAccessor extends Accessor core; private final Class> adapter; - /*pacakge*/ AdaptedAccessor(Class targetType, Accessor extThis, Class> adapter) { + /*package*/ AdaptedAccessor(Class targetType, Accessor extThis, Class> adapter) { super(targetType); this.core = extThis; this.adapter = adapter; diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/ByteArrayOutputStreamEx.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/ByteArrayOutputStreamEx.java index d98186a0..fa81ac58 100644 --- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/ByteArrayOutputStreamEx.java +++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/util/ByteArrayOutputStreamEx.java @@ -71,7 +71,7 @@ public final class ByteArrayOutputStreamEx extends ByteArrayOutputStream { public void readFrom(InputStream is) throws IOException { while(true) { if(count==buf.length) { - // realllocate + // reallocate byte[] data = new byte[buf.length*2]; System.arraycopy(buf,0,data,0,buf.length); buf = data; diff --git a/jaxb-ri/runtime/jaxb1/src/main/java/com/sun/xml/bind/serializer/AbortSerializationException.java b/jaxb-ri/runtime/jaxb1/src/main/java/com/sun/xml/bind/serializer/AbortSerializationException.java index 50b74bb5..9d190d9a 100644 --- a/jaxb-ri/runtime/jaxb1/src/main/java/com/sun/xml/bind/serializer/AbortSerializationException.java +++ b/jaxb-ri/runtime/jaxb1/src/main/java/com/sun/xml/bind/serializer/AbortSerializationException.java @@ -47,7 +47,7 @@ import org.xml.sax.SAXException; * * This exception derives SAXException since * many interfaces we internally use are based on SAX - * and it's easy to propage SAXException. + * and it's easy to propagate SAXException. * * @since JAXB1.0 */ diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/generator/bean/BeanGenerator.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/generator/bean/BeanGenerator.java index acfe36f8..6b0ef6db 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/generator/bean/BeanGenerator.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/generator/bean/BeanGenerator.java @@ -163,7 +163,7 @@ public final class BeanGenerator implements Outline { * returns a {@link Outline} which will in turn * be used to further generate marshaller/unmarshaller, * or null if the processing fails (errors should have been - * reported to the error recevier.) + * reported to the error receiver.) */ public static Outline generate(Model model, ErrorReceiver _errorReceiver) { diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/generator/bean/field/AbstractField.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/generator/bean/field/AbstractField.java index ac316536..cad67a3c 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/generator/bean/field/AbstractField.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/generator/bean/field/AbstractField.java @@ -312,7 +312,7 @@ abstract class AbstractField implements FieldOutline { jtype = jtype.unboxify(); // when generating code for 1.4, the runtime can't infer that ArrayList derives - // from Collection (because List isn't parameterized), so always expclitly + // from Collection (because List isn't parameterized), so always explicitly // generate @XmlElement(type=...) if( !jtype.equals(exposedType) || (getOptions().runtime14 && prop.isCollection())) { if(xew == null) xew = getXew(checkWrapper, field); diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java index 690a62a1..6b744783 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/AbstractCTypeInfoImpl.java @@ -56,7 +56,7 @@ import com.sun.xml.xsom.XmlString; *

* The inheritance of {@link TypeUse} by {@link CTypeInfo} * isn't a normal inheritance (see {@link CTypeInfo} for more.) - * This class implments methods on {@link TypeUse} for {@link CTypeInfo}. + * This class implements methods on {@link TypeUse} for {@link CTypeInfo}. * * @author Kohsuke Kawaguchi */ diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java index 75dac1d7..1112b87d 100644 --- a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java +++ b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/model/CBuiltinLeafInfo.java @@ -193,7 +193,7 @@ public abstract class CBuiltinLeafInfo implements CNonElement, BuiltinLeafInfo