diff options
14 files changed, 18 insertions, 18 deletions
diff --git a/json/src/main/java/org/json/JSONTokener.java b/json/src/main/java/org/json/JSONTokener.java index 3a82ab93f8..b6ac04df93 100644 --- a/json/src/main/java/org/json/JSONTokener.java +++ b/json/src/main/java/org/json/JSONTokener.java @@ -148,7 +148,7 @@ public class JSONTokener { case '#': /* * Skip a # hash end-of-line comment. The JSON RFC doesn't - * specify this behaviour, but it's required to parse + * specify this behavior, but it's required to parse * existing documents. See http://b/2571423. */ skipToEndOfLine(); diff --git a/junit/src/main/java/junit/extensions/TestDecorator.java b/junit/src/main/java/junit/extensions/TestDecorator.java index 6b5144ab2a..cfbd021626 100644 --- a/junit/src/main/java/junit/extensions/TestDecorator.java +++ b/junit/src/main/java/junit/extensions/TestDecorator.java @@ -5,7 +5,7 @@ import junit.framework.*; /** * A Decorator for Tests. Use TestDecorator as the base class * for defining new test decorators. Test decorator subclasses - * can be introduced to add behaviour before or after a test + * can be introduced to add behavior before or after a test * is run. * */ @@ -16,7 +16,7 @@ public class TestDecorator extends Assert implements Test { fTest= test; } /** - * The basic run behaviour. + * The basic run behavior. */ public void basicRun(TestResult result) { fTest.run(result); diff --git a/luni/src/main/java/java/io/ByteArrayInputStream.java b/luni/src/main/java/java/io/ByteArrayInputStream.java index 8765e9a078..4052e1633f 100644 --- a/luni/src/main/java/java/io/ByteArrayInputStream.java +++ b/luni/src/main/java/java/io/ByteArrayInputStream.java @@ -98,7 +98,7 @@ public class ByteArrayInputStream extends InputStream { */ @Override public void close() throws IOException { - // Do nothing on close, this matches JDK behaviour. + // Do nothing on close, this matches JDK behavior. } /** diff --git a/luni/src/main/java/java/net/URI.java b/luni/src/main/java/java/net/URI.java index 2d3b1d4e15..da6897007a 100644 --- a/luni/src/main/java/java/net/URI.java +++ b/luni/src/main/java/java/net/URI.java @@ -450,7 +450,7 @@ public final class URI implements Comparable<URI>, Serializable { * * @param forceServer true to always throw if the authority cannot be * parsed. If false, this method may still throw for some kinds of - * errors; this unpredictable behaviour is consistent with the RI. + * errors; this unpredictable behavior is consistent with the RI. */ private void parseAuthority(boolean forceServer) throws URISyntaxException { if (authority == null) { @@ -534,7 +534,7 @@ public final class URI implements Comparable<URI>, Serializable { * * @param forceServer true to always throw if the host cannot be parsed. If * false, this method may still throw for some kinds of errors; this - * unpredictable behaviour is consistent with the RI. + * unpredictable behavior is consistent with the RI. */ private boolean isValidHost(boolean forceServer, String host) throws URISyntaxException { if (host.startsWith("[")) { diff --git a/luni/src/main/java/java/nio/FileChannelImpl.java b/luni/src/main/java/java/nio/FileChannelImpl.java index d7baefda67..5f00b4a675 100644 --- a/luni/src/main/java/java/nio/FileChannelImpl.java +++ b/luni/src/main/java/java/nio/FileChannelImpl.java @@ -435,7 +435,7 @@ abstract class FileChannelImpl extends FileChannel { /* * FIXME: currently the port library always modifies the * position to given size. not sure it is a bug or intended - * behaviour, so I always reset the position to proper value as + * behavior, so I always reset the position to proper value as * Java Spec. */ position(position > size ? size : position); diff --git a/luni/src/main/java/java/text/DecimalFormat.java b/luni/src/main/java/java/text/DecimalFormat.java index 65f96d8bb3..393b34ddef 100644 --- a/luni/src/main/java/java/text/DecimalFormat.java +++ b/luni/src/main/java/java/text/DecimalFormat.java @@ -1117,7 +1117,7 @@ public class DecimalFormat extends NumberFormat { } /** - * Sets the behaviour of the parse method. If set to {@code true} then all + * Sets the behavior of the parse method. If set to {@code true} then all * the returned objects will be of type {@code BigDecimal}. * * @param newValue diff --git a/luni/src/main/java/javax/xml/transform/ErrorListener.java b/luni/src/main/java/javax/xml/transform/ErrorListener.java index 08491329e0..321c5fe856 100644 --- a/luni/src/main/java/javax/xml/transform/ErrorListener.java +++ b/luni/src/main/java/javax/xml/transform/ErrorListener.java @@ -50,7 +50,7 @@ public interface ErrorListener { * Receive notification of a warning. * * <p>{@link javax.xml.transform.Transformer} can use this method to report - * conditions that are not errors or fatal errors. The default behaviour + * conditions that are not errors or fatal errors. The default behavior * is to take no action.</p> * * <p>After invoking this method, the Transformer must continue with diff --git a/luni/src/main/java/javax/xml/transform/Transformer.java b/luni/src/main/java/javax/xml/transform/Transformer.java index 09503ccc2e..c94a9ef089 100644 --- a/luni/src/main/java/javax/xml/transform/Transformer.java +++ b/luni/src/main/java/javax/xml/transform/Transformer.java @@ -240,7 +240,7 @@ public abstract class Transformer { * * <p>If any of the argument keys are not recognized and are not * namespace qualified, the property will be ignored and not returned. - * In other words the behaviour is not orthogonal with + * In other words the behavior is not orthogonal with * {@link #setOutputProperties setOutputProperties}.</p> * * @return A copy of the set of output properties in effect for diff --git a/luni/src/main/java/javax/xml/validation/SchemaFactory.java b/luni/src/main/java/javax/xml/validation/SchemaFactory.java index 43db936c4b..7d3a1f6f23 100644 --- a/luni/src/main/java/javax/xml/validation/SchemaFactory.java +++ b/luni/src/main/java/javax/xml/validation/SchemaFactory.java @@ -586,7 +586,7 @@ public abstract class SchemaFactory { * in the same order as the sources. Section 4.2.3 of the XML Schema * recommendation describes the options processors have in this * regard. While a processor should be consistent in its treatment of - * JAXP schema sources and XML Schema imports, the behaviour between + * JAXP schema sources and XML Schema imports, the behavior between * JAXP-compliant parsers may vary; in particular, parsers may choose * to ignore all but the first <import> for a given namespace, * regardless of information provided in schemaLocation. diff --git a/luni/src/main/java/libcore/icu/CharsetDecoderICU.java b/luni/src/main/java/libcore/icu/CharsetDecoderICU.java index c44095daf8..c008d0c8a8 100644 --- a/luni/src/main/java/libcore/icu/CharsetDecoderICU.java +++ b/luni/src/main/java/libcore/icu/CharsetDecoderICU.java @@ -178,9 +178,9 @@ public final class CharsetDecoderICU extends CharsetDecoder { } /** - * Decodes one or more bytes. The default behaviour of the converter + * Decodes one or more bytes. The default behavior of the converter * is stop and report if an error in input stream is encountered. - * To set different behaviour use @see CharsetDecoder.onMalformedInput() + * To set different behavior use @see CharsetDecoder.onMalformedInput() * This method allows a buffer by buffer conversion of a data stream. * The state of the conversion is saved between calls to convert. * Among other things, this means multibyte input sequences can be diff --git a/luni/src/main/java/libcore/icu/CharsetEncoderICU.java b/luni/src/main/java/libcore/icu/CharsetEncoderICU.java index 31413c0a11..2284adfb28 100644 --- a/luni/src/main/java/libcore/icu/CharsetEncoderICU.java +++ b/luni/src/main/java/libcore/icu/CharsetEncoderICU.java @@ -199,9 +199,9 @@ public final class CharsetEncoderICU extends CharsetEncoder { } /** - * Encodes one or more chars. The default behaviour of the + * Encodes one or more chars. The default behavior of the * converter is stop and report if an error in input stream is encountered. - * To set different behaviour use @see CharsetEncoder.onMalformedInput() + * To set different behavior use @see CharsetEncoder.onMalformedInput() * @param in buffer to decode * @param out buffer to populate with decoded result * @return result of decoding action. Returns CoderResult.UNDERFLOW if the decoding diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java index a983155d7d..8b15ec8bf8 100644 --- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java +++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/file/Handler.java @@ -44,7 +44,7 @@ public class Handler extends URLStreamHandler { } /** - * The behaviour of this method is the same as openConnection(URL). + * The behavior of this method is the same as openConnection(URL). * <code>proxy</code> is not used in FileURLConnection. * * @param url diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java index ebaeda9f81..ec1662fd9d 100644 --- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java +++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/HttpConnection.java @@ -60,7 +60,7 @@ public final class HttpConnection { this.address = config; /* - * Try each of the host's addresses for best behaviour in mixed IPv4/IPv6 + * Try each of the host's addresses for best behavior in mixed IPv4/IPv6 * environments. See http://b/2876927 * TODO: add a hidden method so that Socket.tryAllAddresses can does this for us */ diff --git a/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java b/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java index 89c2321bf6..46845b6b37 100644 --- a/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java +++ b/luni/src/main/java/org/apache/harmony/xml/dom/DOMConfigurationImpl.java @@ -29,7 +29,7 @@ import org.w3c.dom.Node; /** * A minimal implementation of DOMConfiguration. This implementation uses inner - * parameter instances to centralize each parameter's behaviour. + * parameter instances to centralize each parameter's behavior. */ public final class DOMConfigurationImpl implements DOMConfiguration { |