# HG changeset patch # User igerasim # Date 1537074128 25200 # Node ID ac6e9a2ebc04cd5891bb35f2e2aea3b781dd7c3f # Parent 6c956c88313749d90afe664003b92deccc865941 8210786: Typo s/overriden/overridden/ in several places Reviewed-by: weijun diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/java/security/Identity.java --- a/src/java.base/share/classes/java/security/Identity.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/java/security/Identity.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -351,7 +351,7 @@ /** * Tests for equality between the specified identity and this identity. - * This method should be overriden by subclasses to test for equality. + * This method should be overridden by subclasses to test for equality. * The default behavior is to return true if the names and public keys * are equal. * diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/java/security/Provider.java --- a/src/java.base/share/classes/java/security/Provider.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/java/security/Provider.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1318,7 +1318,7 @@ * {@code "putProviderProperty."+name}, where {@code name} is * the provider name, to see if it's ok to set this provider's property * values. If the default implementation of {@code checkSecurityAccess} - * is used (that is, that method is not overriden), then this results in + * is used (that is, that method is not overridden), then this results in * a call to the security manager's {@code checkPermission} method with * a {@code SecurityPermission("putProviderProperty."+name)} * permission. @@ -1410,7 +1410,7 @@ * the provider name, to see if it's ok to remove this provider's * properties. If the default implementation of * {@code checkSecurityAccess} is used (that is, that method is not - * overriden), then this results in a call to the security manager's + * overridden), then this results in a call to the security manager's * {@code checkPermission} method with a * {@code SecurityPermission("removeProviderProperty."+name)} * permission. diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/java/security/Security.java --- a/src/java.base/share/classes/java/security/Security.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/java/security/Security.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -422,7 +422,7 @@ * method is called with the string {@code "removeProvider."+name} * to see if it's ok to remove the provider. * If the default implementation of {@code checkSecurityAccess} - * is used (i.e., that method is not overriden), then this will result in + * is used (i.e., that method is not overridden), then this will result in * a call to the security manager's {@code checkPermission} method * with a {@code SecurityPermission("removeProvider."+name)} * permission. diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/java/text/RuleBasedCollator.java --- a/src/java.base/share/classes/java/text/RuleBasedCollator.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/java/text/RuleBasedCollator.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -348,7 +348,7 @@ * Compares the character data stored in two different strings based on the * collation rules. Returns information about whether a string is less * than, greater than or equal to another string in a language. - * This can be overriden in a subclass. + * This can be overridden in a subclass. * * @exception NullPointerException if source or target is null. */ @@ -567,7 +567,7 @@ /** * Transforms the string into a series of characters that can be compared * with CollationKey.compareTo. This overrides java.text.Collator.getCollationKey. - * It can be overriden in a subclass. + * It can be overridden in a subclass. */ public synchronized CollationKey getCollationKey(String source) { diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/java/util/Random.java --- a/src/java.base/share/classes/java/util/Random.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/java/util/Random.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -136,7 +136,7 @@ if (getClass() == Random.class) this.seed = new AtomicLong(initialScramble(seed)); else { - // subclass might have overriden setSeed + // subclass might have overridden setSeed this.seed = new AtomicLong(); setSeed(seed); } diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/java/util/StringJoiner.java --- a/src/java.base/share/classes/java/util/StringJoiner.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/java/util/StringJoiner.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -77,7 +77,7 @@ private int len; /** - * When overriden by the user to be non-null via {@link setEmptyValue}, the + * When overridden by the user to be non-null via {@link setEmptyValue}, the * string returned by toString() when no elements have yet been added. * When null, prefix + suffix is used as the empty value. */ diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/javax/crypto/CipherInputStream.java --- a/src/java.base/share/classes/javax/crypto/CipherInputStream.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/javax/crypto/CipherInputStream.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -52,7 +52,7 @@ * method counts only data that have been processed by the encapsulated Cipher. * *

It is crucial for a programmer using this class not to use - * methods that are not defined or overriden in this class (such as a + * methods that are not defined or overridden in this class (such as a * new method or constructor that is later added to one of the super * classes), because the design and implementation of those methods * are unlikely to have considered security impact with regard to diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/javax/crypto/CipherOutputStream.java --- a/src/java.base/share/classes/javax/crypto/CipherOutputStream.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/javax/crypto/CipherOutputStream.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -53,7 +53,7 @@ * alternative to using this class. * *

It is crucial for a programmer using this class not to use - * methods that are not defined or overriden in this class (such as a + * methods that are not defined or overridden in this class (such as a * new method or constructor that is later added to one of the super * classes), because the design and implementation of those methods * are unlikely to have considered security impact with regard to diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java --- a/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/javax/net/ssl/HttpsURLConnection.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,7 +46,7 @@ * However, the implementations can be replaced on a per-class (static) or * per-instance basis. All new HttpsURLConnections instances * will be assigned - * the "default" static values at instance creation, but they can be overriden + * the "default" static values at instance creation, but they can be overridden * by calling the appropriate per-instance set method(s) before * connecting. * diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java --- a/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/share/classes/javax/net/ssl/SSLServerSocket.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,7 +48,7 @@ * authentication is necessary, and whether created sockets should * begin handshaking in client or server mode. The state * inherited by the created SSLSocket can be - * overriden by calling the appropriate methods. + * overridden by calling the appropriate methods. * * @see java.net.ServerSocket * @see SSLSocket diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java --- a/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -105,7 +105,7 @@ return uc; } - // Template method to be overriden by Java Plug-in. [stanleyh] + // Template method to be overridden by Java Plug-in. [stanleyh] // protected URLConnection createFileURLConnection(URL u, File file) { diff -r 6c956c883137 -r ac6e9a2ebc04 src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java --- a/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java Sat Sep 15 13:53:43 2018 -0700 +++ b/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java Sat Sep 15 22:02:08 2018 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -124,7 +124,7 @@ } /** - * Template method to be overriden by Java Plug-in. [stanleyh] + * Template method to be overridden by Java Plug-in. [stanleyh] */ protected URLConnection createFileURLConnection(URL url, File file) { return new FileURLConnection(url, file);