diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/Binding.java b/src/java.base/share/classes/jdk/internal/foreign/abi/Binding.java index b5f1c012a7a12..8581c8003e366 100644 --- a/src/java.base/share/classes/jdk/internal/foreign/abi/Binding.java +++ b/src/java.base/share/classes/jdk/internal/foreign/abi/Binding.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 2022, 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 @@ -811,8 +811,8 @@ private Allocate(long size, long alignment) { this.alignment = alignment; } - private static MemorySegment allocateBuffer(long size, long allignment, Context context) { - return context.allocator().allocate(size, allignment); + private static MemorySegment allocateBuffer(long size, long alignment, Context context) { + return context.allocator().allocate(size, alignment); } public long size() { diff --git a/src/java.logging/share/classes/java/util/logging/LogManager.java b/src/java.logging/share/classes/java/util/logging/LogManager.java index 2d277602a4ace..39d35244c8029 100644 --- a/src/java.logging/share/classes/java/util/logging/LogManager.java +++ b/src/java.logging/share/classes/java/util/logging/LogManager.java @@ -159,7 +159,7 @@ public class LogManager { // be able to see a partially constructed 'props' object. // (seeing a partially constructed 'props' object can result in // NPE being thrown in Hashtable.get(), because it leaves the door - // open for props.getProperties() to be called before the construcor + // open for props.getProperties() to be called before the constructor // of Hashtable is actually completed). private volatile Properties props = new Properties(); private static final Level defaultLevel = Level.INFO; diff --git a/src/java.logging/share/classes/java/util/logging/Logger.java b/src/java.logging/share/classes/java/util/logging/Logger.java index 0dc602c2c2486..04d1c1a9c339b 100644 --- a/src/java.logging/share/classes/java/util/logging/Logger.java +++ b/src/java.logging/share/classes/java/util/logging/Logger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -2511,7 +2511,7 @@ private LoggerBundle getEffectiveLoggerBundle() { return lb; } else if (b != null) { // either lb.userBundle is null or getResourceBundle() is - // overriden + // overridden final String rbName = getResourceBundleName(); return LoggerBundle.get(rbName, b); } diff --git a/src/java.logging/share/classes/java/util/logging/XMLFormatter.java b/src/java.logging/share/classes/java/util/logging/XMLFormatter.java index a4f4224801135..c0242686921c0 100644 --- a/src/java.logging/share/classes/java/util/logging/XMLFormatter.java +++ b/src/java.logging/share/classes/java/util/logging/XMLFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -175,7 +175,7 @@ public String format(LogRecord record) { // date field, using the ISO_INSTANT formatter. DateTimeFormatter.ISO_INSTANT.formatTo(instant, sb); } else { - // If useInstant is false - we will keep the 'old' formating + // If useInstant is false - we will keep the 'old' formatting appendISO8601(sb, instant.toEpochMilli()); } sb.append("\n"); diff --git a/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java index 9f70ee77d1ecc..634953dd8a578 100644 --- a/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java +++ b/src/java.naming/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2022, 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 @@ -43,7 +43,7 @@ */ public interface PoolCallback { /** - * Releases a useable connection back to the pool. + * Releases a usable connection back to the pool. * * @param conn The connection to release. * @return true if the connection released; false if the connection diff --git a/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java index f7fdba49c74d9..14dca7d528449 100644 --- a/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java +++ b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/AtomicDirContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -31,7 +31,7 @@ /** * Direct subclasses of AtomicDirContext must provide implementations for * the abstract a_ DirContext methods, and override the a_ Context methods - * (which are no longer abstract because they have been overriden by + * (which are no longer abstract because they have been overridden by * PartialCompositeDirContext with dummy implementations). * * If the subclass implements the notion of implicit nns, diff --git a/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java index 11b15044161f0..314f46305b74a 100644 --- a/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java +++ b/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/ComponentDirContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -30,7 +30,7 @@ /* Direct subclasses of ComponentDirContext must provide implementations for * the abstract c_ DirContext methods, and override the c_ Context methods - * (which are no longer abstract because they have been overriden by + * (which are no longer abstract because they have been overridden by * AtomicContext, the direct superclass of PartialDSCompositeContext). * * If the subclass is supports implicit nns, it must override all the diff --git a/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java index 62753e792f0c8..d2d110fbf8513 100644 --- a/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java +++ b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -25,7 +25,7 @@ /** * Given an enumeration of candidates, check whether each - * item in enumeration satifies the given filter. + * item in enumeration satisfies the given filter. * Each item is a Binding and the following is used to get its * attributes for used by the filter: * diff --git a/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java index 26e01a70c0153..5bfa0b76a0337 100644 --- a/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java +++ b/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -82,7 +82,7 @@ public boolean check(Attributes targetAttrs) throws NamingException { * Utility routines used by member classes */ - // does some pre-processing on the string to make it look exactly lik + // does some pre-processing on the string to make it look exactly like // what the parser expects. This only needs to be called once. protected void normalizeFilter() { skipWhiteSpace(); // get rid of any leading whitespaces @@ -400,7 +400,7 @@ private boolean substringMatch(String proto, String value) { !value.toLowerCase(Locale.ENGLISH).startsWith( subStrs.nextToken().toLowerCase(Locale.ENGLISH))) { if(debug) { - System.out.println("faild initial test"); + System.out.println("failed initial test"); } return false; } @@ -421,7 +421,7 @@ private boolean substringMatch(String proto, String value) { // do we need to end with the last token? if(proto.charAt(proto.length() - 1) != WILDCARD_TOKEN && currentPos != value.length() ) { - if(debug) {System.out.println("faild final test");} + if(debug) {System.out.println("failed final test");} return false; } diff --git a/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java b/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java index 47f2c8e1ddf60..0e1dc83a521a7 100644 --- a/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java +++ b/src/java.naming/share/classes/javax/naming/directory/BasicAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2022, 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 @@ -76,7 +76,7 @@ public class BasicAttributes implements Attributes { private boolean ignoreCase = false; // The 'key' in attrs is stored in the 'right case'. - // If ignoreCase is true, key is aways lowercase. + // If ignoreCase is true, key is always lowercase. // If ignoreCase is false, key is stored as supplied by put(). // %%% Not declared "private" due to bug 4064984. transient Hashtable attrs = new Hashtable<>(11); diff --git a/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java b/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java index 2979871aaaced..f2a0f7eff6e4c 100644 --- a/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java +++ b/src/java.prefs/windows/classes/java/util/prefs/WindowsPreferences.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -776,7 +776,7 @@ protected String[] keysSpi() throws BackingStoreException{ /** * Implements {@code AbstractPreferences} {@code childrenNamesSpi()} method. - * Calls Windows registry to retrive children of this node. + * Calls Windows registry to retrieve children of this node. * Throws a BackingStoreException and logs a warning message, * if Windows registry is not available. */ diff --git a/src/java.rmi/share/classes/java/rmi/MarshalledObject.java b/src/java.rmi/share/classes/java/rmi/MarshalledObject.java index 628a317290025..739d7aa28d4c2 100644 --- a/src/java.rmi/share/classes/java/rmi/MarshalledObject.java +++ b/src/java.rmi/share/classes/java/rmi/MarshalledObject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -224,7 +224,7 @@ public boolean equals(Object obj) { if (objBytes.length != other.objBytes.length) return false; - //!! There is talk about adding an array comparision method + //!! There is talk about adding an array comparison method //!! at 1.2 -- if so, this should be rewritten. -arnold for (int i = 0; i < objBytes.length; ++i) { if (objBytes[i] != other.objBytes[i]) diff --git a/src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java b/src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java index 5ff1e38f83153..b9397c6af8146 100644 --- a/src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java +++ b/src/java.rmi/share/classes/java/rmi/server/LoaderHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -70,7 +70,7 @@ Class loadClass(String name) * @param name the name of the class to load * @return the Class object representing the loaded class * @throws MalformedURLException - * if the codebase paramater + * if the codebase parameter * contains an invalid URL * @throws ClassNotFoundException * if a definition for the class could not diff --git a/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java index 7ee253e5dc889..c2877a11eb360 100644 --- a/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java +++ b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -324,7 +324,7 @@ public static Class loadProxyClass(String codebase, String[] interfaces, * {@link RMIClassLoaderSpi#getClassLoader(String)} method * of the provider instance, passing codebase as the argument. * - *

If there is a security manger, its checkPermission + *

If there is a security manager, its checkPermission * method will be invoked with a * RuntimePermission("getClassLoader") permission; * this could result in a SecurityException. diff --git a/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java index 2b33377e11230..fa4ffa728cfa3 100644 --- a/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java +++ b/src/java.rmi/share/classes/java/rmi/server/RMIClassLoaderSpi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2022, 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 @@ -151,7 +151,7 @@ public abstract Class loadProxyClass(String codebase, * Returns a class loader that loads classes from the given codebase * URL path. * - *

If there is a security manger, its checkPermission + *

If there is a security manager, its checkPermission * method will be invoked with a * RuntimePermission("getClassLoader") permission; * this could result in a SecurityException. diff --git a/src/java.rmi/share/classes/sun/rmi/log/LogHandler.java b/src/java.rmi/share/classes/sun/rmi/log/LogHandler.java index 67ef3fa11a150..e6b59e54fcb4c 100644 --- a/src/java.rmi/share/classes/sun/rmi/log/LogHandler.java +++ b/src/java.rmi/share/classes/sun/rmi/log/LogHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2022, 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 @@ -33,8 +33,8 @@ * A LogHandler represents snapshots and update records as serializable * objects. * - * This implementation does not know how to create an initial snaphot or - * apply an update to a snapshot. The client must specifiy these methods + * This implementation does not know how to create an initial snapshot or + * apply an update to a snapshot. The client must specify these methods * via a subclass. * * @see ReliableLog @@ -61,7 +61,7 @@ public LogHandler() {} /** * Writes the snapshot object to a stream. This callback is - * invoked when the client calls the snaphot method of ReliableLog. + * invoked when the client calls the snapshot method of ReliableLog. * @param out the output stream * @param value the snapshot * @exception Exception can raise any exception diff --git a/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java b/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java index 3a79e162e45cb..8b3586b40a0fd 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java +++ b/src/java.rmi/share/classes/sun/rmi/server/LoaderHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -710,7 +710,7 @@ private static Class loadProxyClass(ClassLoader loader, Class[] interfaces } /* - * Load Class objects for the names in the interfaces array fron + * Load Class objects for the names in the interfaces array from * the given class loader. * * We pass classObjs and nonpublic arrays to avoid needing a @@ -882,7 +882,7 @@ private static Loader lookupLoader(final URL[] urls, * A matching loader was not found, so create a new class * loader instance for the requested codebase URL path and * parent class loader. The instance is created within an - * access control context retricted to the permissions + * access control context restricted to the permissions * necessary to load classes from its codebase URL path. */ AccessControlContext acc = getLoaderAccessControlContext(urls); diff --git a/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java b/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java index 326edf2590c29..0e41b5615b5be 100644 --- a/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java +++ b/src/java.rmi/share/classes/sun/rmi/server/UnicastRef.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ -400,7 +400,7 @@ public void invoke(RemoteCall call) throws Exception { } catch (RuntimeException e) { /* * REMIND: Since runtime exceptions are no longer wrapped, - * we can't assue that the connection was left in + * we can't assume that the connection was left in * a reusable state. Is this okay? */ clientRefLog.log(Log.BRIEF, "exception: ", e); diff --git a/src/java.rmi/share/classes/sun/rmi/transport/GC.java b/src/java.rmi/share/classes/sun/rmi/transport/GC.java index 4344460134cb2..f15a46beacaca 100644 --- a/src/java.rmi/share/classes/sun/rmi/transport/GC.java +++ b/src/java.rmi/share/classes/sun/rmi/transport/GC.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2022, 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 @@ -110,7 +110,7 @@ public void run() { long d = maxObjectInspectionAge(); if (d >= l) { /* Do a full collection. There is a remote possibility - * that a full collection will occurr between the time + * that a full collection will occur between the time * we sample the inspection age and the time the GC * actually starts, but this is sufficiently unlikely * that it doesn't seem worth the more expensive JVM @@ -177,7 +177,7 @@ private static void setLatencyTarget(long ms) { public static class LatencyRequest implements Comparable { - /* Instance counter, used to generate unique identifers */ + /* Instance counter, used to generate unique identifiers */ private static long counter = 0; /* Sorted set of active latency requests */ diff --git a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java index 3495d3fab05e4..f261e3670710d 100644 --- a/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java +++ b/src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2022, 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 @@ private static String getHostnameProperty() { /** * Find host name of local machine. Property "java.rmi.server.hostname" * is used if set, so server administrator can compensate for the possible - * inablility to get fully qualified host name from VM. + * inability to get fully qualified host name from VM. */ static { localHostKnown = true; @@ -130,7 +130,7 @@ private static String getHostnameProperty() { localHost = FQDN.attemptFQDN(localAddr); } else { /* default to using ip addresses, names will - * work across seperate domains. + * work across separate domains. */ localHost = localAddr.getHostAddress(); } diff --git a/src/java.scripting/share/classes/javax/script/SimpleScriptContext.java b/src/java.scripting/share/classes/javax/script/SimpleScriptContext.java index b80500c03ee9d..5fcb0209107e7 100644 --- a/src/java.scripting/share/classes/javax/script/SimpleScriptContext.java +++ b/src/java.scripting/share/classes/javax/script/SimpleScriptContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -95,7 +95,7 @@ public SimpleScriptContext() { /** * Package-private constructor to avoid needless creation of reader and writers. - * It is the caller's responsability to initialize the engine scope. + * It is the caller's responsibility to initialize the engine scope. * * @param reader the reader * @param writer the writer diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java index f9d6a0e64ebbd..3687c395560fc 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -397,7 +397,7 @@ public SyncProvider run() throws SyncFactoryException { onInsertRow = false; insertRow = null; - // set the warninings + // set the warnings sqlwarn = new SQLWarning(); rowsetWarning = new RowSetWarning(); @@ -446,7 +446,7 @@ public SyncProvider run() throws SyncFactoryException { * optimistic provider com.sun.rowset.providers.RIOptimisticProvider. *

* In addition, the following properties can be associated with the - * provider to assist in determining the choice of the synchronizaton + * provider to assist in determining the choice of the synchronization * provider such as: *

* More specific detailes are available in the SyncFactory - * and SyncProvider specificiations later in this document. + * and SyncProvider specifications later in this document. *

* @param env a Hashtable object with a list of desired * synchronization providers @@ -967,8 +967,8 @@ public void acceptChanges(Connection con) throws SyncProviderException{ * Before returning, this method moves the cursor before the first row * and sends a rowSetChanged event to all registered * listeners. - * @throws SQLException if an error is occurs rolling back the RowSet - * state to the definied original value. + * @throws SQLException if an error occurs rolling back the RowSet + * state to the defined original value. * @see javax.sql.RowSetListener#rowSetChanged */ public void restoreOriginal() throws SQLException { @@ -1108,7 +1108,7 @@ public void undoUpdate() throws SQLException { /** * Returns a new RowSet object backed by the same data as * that of this CachedRowSetImpl object and sharing a set of cursors - * with it. This allows cursors to interate over a shared set of rows, providing + * with it. This allows cursors to iterate over a shared set of rows, providing * multiple views of the underlying data. * * @return a RowSet object that is a copy of this CachedRowSetImpl @@ -1285,7 +1285,7 @@ public CachedRowSet createCopyNoConstraints() throws SQLException { /** * Converts this CachedRowSetImpl object to a collection - * of tables. The sample implementation utilitizes the TreeMap + * of tables. The sample implementation utilizes the TreeMap * collection type. * This class guarantees that the map will be in ascending key order, * sorted according to the natural order for the key's class. @@ -1312,7 +1312,7 @@ public Collection toCollection() throws SQLException { /** * Returns the specified column of this CachedRowSetImpl object * as a Collection object. This method makes a copy of the - * column's data and utilitizes the Vector to establish the + * column's data and utilizes the Vector to establish the * collection. The Vector class implements a growable array * objects allowing the individual components to be accessed using an * an integer index similar to that of an array. @@ -1348,7 +1348,7 @@ public Collection toCollection(int column) throws SQLException { /** * Returns the specified column of this CachedRowSetImpl object * as a Collection object. This method makes a copy of the - * column's data and utilitizes the Vector to establish the + * column's data and utilizes the Vector to establish the * collection. The Vector class implements a growable array * objects allowing the individual components to be accessed using an * an integer index similar to that of an array. @@ -1734,7 +1734,7 @@ public String getString(int columnIndex) throws SQLException { * @param columnIndex the first column is 1, the second * is 2, and so on; must be 1 or larger * and equal to or less than the number of columns in the rowset - * @return the column value as a boolean in the Java progamming language; + * @return the column value as a boolean in the Java programming language; * if the value is SQL NULL, the result is false * @throws SQLException if (1) the given column index is out of bounds, * (2) the cursor is not on one of this rowset's rows or its @@ -2438,7 +2438,7 @@ public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException * (2) the cursor is not on one of this rowset's rows or its * insert row, or (3) the designated column does not store an * SQL BINARY, VARBINARY or LONGVARBINARY - * The bold type indicates the SQL type that this method is recommened + * The bold type indicates the SQL type that this method is recommended * to retrieve. * @see #getBinaryStream(String) */ @@ -2818,7 +2818,7 @@ public java.io.InputStream getUnicodeStream(String columnName) throws SQLExcepti * (2) the cursor is not on one of this rowset's rows or its * insert row, or (3) the designated column does not store an * SQL BINARY, VARBINARY or LONGVARBINARY - * The bold type indicates the SQL type that this method is recommened + * The bold type indicates the SQL type that this method is recommended * to retrieve. * @see #getBinaryStream(int) * @@ -3516,7 +3516,7 @@ public boolean absolute( int row ) throws SQLException { throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.absolute").toString()); } - if (row > 0) { // we are moving foward + if (row > 0) { // we are moving forward if (row > numRows) { // fell off the end afterLast(); @@ -3872,7 +3872,7 @@ public boolean rowDeleted() throws SQLException { } /** - * Indicates whether the given SQL data type is a numberic type. + * Indicates whether the given SQL data type is a numeric type. * * @param type one of the constants from java.sql.Types * @return true if the given type is NUMERIC,' @@ -5985,7 +5985,7 @@ public Clob getClob(String colName) throws SQLException { /** * Retrieves the value of the designated column in this * CachedRowSetImpl object as an Array object - * in the Java programming langugage. + * in the Java programming language. * * @param colName a String object that must match the * SQL name of a column in this rowset, ignoring case @@ -6269,7 +6269,7 @@ public Connection getConnection() throws SQLException{ * with the given RowSetMetaData object. * * @param md a RowSetMetaData object instance containing - * metadata about the columsn in the rowset + * metadata about the columns in the rowset * @throws SQLException if invalid meta data is supplied to the * rowset */ @@ -6385,7 +6385,7 @@ private void makeRowOriginal(Row row) { /** * Marks all rows in this rowset as being original rows. Any updates * made to the rows become the original values for the rowset. - * Calls to the method setOriginal connot be reversed. + * Calls to the method setOriginal cannot be reversed. * * @throws SQLException if an error occurs */ @@ -6804,7 +6804,7 @@ public java.net.URL getURL(String columnName) throws SQLException { * object is returned. Subsequent CachedRowSetImpl warnings will * be chained to this SQLWarning. All RowSetWarnings * warnings are generated in the disconnected environment and remain a - * seperate warning chain to that provided by the getWarnings + * separate warning chain to that provided by the getWarnings * method. * *

The warning chain is automatically cleared each time a new @@ -6864,7 +6864,7 @@ private String buildTableName(String command) throws SQLException { int idxWhere = tabName.toLowerCase().indexOf("where"); /** - * Adding the addtional check for conditions following the table name. + * Adding the additional check for conditions following the table name. * If a condition is found truncate it. **/ @@ -7240,7 +7240,7 @@ public void rowSetPopulated(RowSetEvent event, int numRows) throws SQLException * * @param data the ResultSet object containing the data * to be read into this CachedRowSetImpl object - * @param start the integer specifing the position in the + * @param start the integer specifying the position in the * ResultSet object to popultate the * CachedRowSetImpl object. * @throws SQLException if an error occurs; or the max row setting is @@ -7421,7 +7421,7 @@ public boolean nextPage() throws SQLException { /** * This is the setter function for setting the size of the page, which specifies - * how many rows have to be retrived at a time. + * how many rows have to be retrieved at a time. * * @param size which is the page size * @throws SQLException if size is less than zero or greater than max rows. @@ -7526,7 +7526,7 @@ public boolean absolutePage(int page) throws SQLException{ int counter; if( page <= 0 ){ - throw new SQLException("Absolute positoin is invalid"); + throw new SQLException("Absolute position is invalid"); } counter = 0; @@ -7551,7 +7551,7 @@ else if(counter == page){ /** * Goes to the page number passed as the parameter from the current page. - * The parameter can take postive or negative value accordingly. + * The parameter can take positive or negative value accordingly. * @param page , the page loaded on a call to this function * @return true if the page exists false otherwise * @throws SQLException if an error occurs @@ -7629,7 +7629,7 @@ public boolean firstPage() throws SQLException { */ /** - * Retrives the last page of data as specified by the page size. + * Retrieves the last page of data as specified by the page size. * @return boolean value tur if present on the last page, false otherwise * @throws SQLException if called before populate or if an error occurs. */ diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java index 087a90840e23b..fff699c38472f 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -451,8 +451,8 @@ public void moveToInsertRow() throws SQLException { /** * This is explanation for the overriding of the updateXXX functions. - * These functions have been overriden to ensure that only correct - * values that pass the criteria for the filter are actaully inserted. + * These functions have been overridden to ensure that only correct + * values that pass the criteria for the filter are actually inserted. * The evaluation of whether a particular value passes the criteria * of the filter is done using the evaluate function in the Predicate * interface. diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java b/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java index aaf3a5bc6f25c..9ed35e219e16c 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/JdbcRowSetResourceBundle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2022, 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 @@ -132,7 +132,7 @@ public static JdbcRowSetResourceBundle getJdbcRowSetResourceBundle() * This method returns an enumerated handle of the keys * which correspond to values translated to various locales. * - * @return an enumeration of keys which have messages tranlated to + * @return an enumeration of keys which have messages translated to * corresponding locales. */ @SuppressWarnings("rawtypes") diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java index 1be3f0697b47c..24d0c99186033 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -406,12 +406,12 @@ public void addRowSet(RowSet[] rowset, * Returns a Collection of the RowSet object instances * currently residing with the instance of the JoinRowSet * object instance. This should return the 'n' number of RowSet contained - * within the JOIN and maintain any updates that have occoured while in + * within the JOIN and maintain any updates that have occurred while in * this union. * * @return A Collection of the added RowSet * object instances - * @throws SQLException if an error occours generating a collection + * @throws SQLException if an error occurs generating a collection * of the originating RowSets contained within the JOIN. */ @SuppressWarnings("rawtypes") @@ -424,7 +424,7 @@ public Collection getRowSets() throws SQLException { * with the JoinRowSet object instance. * * @return a string array of the RowSet names - * @throws SQLException if an error occours retrieving the RowSet names + * @throws SQLException if an error occurs retrieving the RowSet names * @see CachedRowSet#setTableName */ public String[] getRowSetNames() throws SQLException { @@ -633,10 +633,10 @@ private void initJOIN(CachedRowSet rowset) throws SQLException { // Now we have two rowsets crsInternal and cRowset which need // to be INNER JOIN'ED to form a new rowset // Compare table1.MatchColumn1.value1 == { table2.MatchColumn2.value1 - // ... upto table2.MatchColumn2.valueN } + // ... up to table2.MatchColumn2.valueN } // ... // Compare table1.MatchColumn1.valueM == { table2.MatchColumn2.value1 - // ... upto table2.MatchColumn2.valueN } + // ... up to table2.MatchColumn2.valueN } // // Assuming first rowset has M rows and second N rows. @@ -682,7 +682,7 @@ private void initJOIN(CachedRowSet rowset) throws SQLException { if (match) { int p; - int colc = 0; // reset this variable everytime you loop + int colc = 0; // reset this variable every time you loop // re create a JoinRowSet in crsTemp object crsTemp.moveToInsertRow(); @@ -863,8 +863,8 @@ private void initJOIN(CachedRowSet rowset) throws SQLException { * strings description of JOIN or provide a textual description to assist * applications using a JoinRowSet. * - * @return whereClause a textual or SQL descripition of the logical - * WHERE cluase used in the JoinRowSet instance + * @return whereClause a textual or SQL description of the logical + * WHERE clause used in the JoinRowSet instance * @throws SQLException if an error occurs in generating a representation * of the WHERE clause. */ @@ -1769,7 +1769,7 @@ public Object getObject(String columnName) throws SQLException { /** * Retrieves the value of the designated column in this * JoinRowSetImpl object as an Object in - * the Java programming lanugage, using the given + * the Java programming language, using the given * java.util.Map object to custom map the value if * appropriate. * @@ -2185,7 +2185,7 @@ public boolean rowUpdated() throws SQLException { * false will always be returned if it does not detect updates. * * @return true if the column updated - * false otherwse + * false otherwise * @throws SQLException if the cursor is on the insert row or not * on a valid row * @see DatabaseMetaData#updatesAreDetected @@ -3428,7 +3428,7 @@ public Statement getStatement() throws SQLException { /** * Retrieves the value of the designated column in this * JoinRowSetImpl object as a Ref object - * in the Java programming lanugage. + * in the Java programming language. * * @param columnIndex the first column is 1, the second * is 2, and so on; must be 1 or larger @@ -3446,7 +3446,7 @@ public Ref getRef(int columnIndex) throws SQLException { /** * Retrieves the value of the designated column in this * JoinRowSetImpl object as a Blob object - * in the Java programming lanugage. + * in the Java programming language. * * @param columnIndex the first column is 1, the second * is 2, and so on; must be 1 or larger @@ -3464,7 +3464,7 @@ public Blob getBlob(int columnIndex) throws SQLException { /** * Retrieves the value of the designated column in this * JoinRowSetImpl object as a Clob object - * in the Java programming lanugage. + * in the Java programming language. * * @param columnIndex the first column is 1, the second * is 2, and so on; must be 1 or larger @@ -3482,7 +3482,7 @@ public Clob getClob(int columnIndex) throws SQLException { /** * Retrieves the value of the designated column in this * JoinRowSetImpl object as an Array object - * in the Java programming lanugage. + * in the Java programming language. * * @param columnIndex the first column is 1, the second * is 2, and so on; must be 1 or larger @@ -3503,7 +3503,7 @@ public Array getArray(int columnIndex) throws SQLException { /** * Retrieves the value of the designated column in this * JoinRowSetImpl object as a Ref object - * in the Java programming lanugage. + * in the Java programming language. * * @param columnName a String object that must match the * SQL name of a column in this rowset, ignoring case @@ -3520,7 +3520,7 @@ public Ref getRef(String columnName) throws SQLException { /** * Retrieves the value of the designated column in this * JoinRowSetImpl object as a Blob object - * in the Java programming lanugage. + * in the Java programming language. * * @param columnName a String object that must match the * SQL name of a column in this rowset, ignoring case @@ -3538,7 +3538,7 @@ public Blob getBlob(String columnName) throws SQLException { /** * Retrieves the value of the designated column in this * JoinRowSetImpl object as a Clob object - * in the Java programming lanugage. + * in the Java programming language. * * @param columnName a String object that must match the * SQL name of a column in this rowset, ignoring case @@ -3556,7 +3556,7 @@ public Clob getClob(String columnName) throws SQLException { /** * Retrieves the value of the designated column in this * JoinRowSetImpl object as an Array object - * in the Java programming lanugage. + * in the Java programming language. * * @param columnName a String object that must match the * SQL name of a column in this rowset, ignoring case @@ -3712,7 +3712,7 @@ public java.sql.Timestamp getTimestamp(String columnName, Calendar cal) throws S * with the given RowSetMetaData object. * * @param md a RowSetMetaData object instance containing - * metadata about the columsn in the rowset + * metadata about the columns in the rowset * @throws SQLException if invalid meta data is supplied to the * rowset */ @@ -4050,7 +4050,7 @@ public void execute() throws SQLException { * connection to the datasource * @throws SQLException if an invalid Connection is supplied * or an error occurs in establishing the connection to the - * data soure + * data source * @see java.sql.Connection */ public void execute(Connection conn) throws SQLException { @@ -4226,7 +4226,7 @@ public void removeRowSetListener(RowSetListener listener) { /** * Converts this JoinRowSetImpl object to a collection - * of tables. The sample implementation utilitizes the TreeMap + * of tables. The sample implementation utilizes the TreeMap * collection type. * This class guarantees that the map will be in ascending key order, * sorted according to the natural order for the key's class. @@ -4246,7 +4246,7 @@ public Collection toCollection() throws SQLException { /** * Returns the specified column of this JoinRowSetImpl object * as a Collection object. This method makes a copy of the - * column's data and utilitizes the Vector to establish the + * column's data and utilizes the Vector to establish the * collection. The Vector class implements a growable array * objects allowing the individual components to be accessed using an * an integer index similar to that of an array. @@ -4268,7 +4268,7 @@ public Collection toCollection(int column) throws SQLException { /** * Returns the specified column of this JoinRowSetImpl object * as a Collection object. This method makes a copy of the - * column's data and utilitizes the Vector to establish the + * column's data and utilizes the Vector to establish the * collection. The Vector class implements a growable array * objects allowing the individual components to be accessed using an * an integer index similar to that of an array. diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties index f84ede5eb41b3..83738d94afdf2 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/RowSetResourceBundle.properties @@ -95,7 +95,7 @@ joinrowsetimpl.numnotequal = Number of elements in rowset not equal to match col joinrowsetimpl.notdefined = This is not a defined type of join joinrowsetimpl.notsupported = This type of join is not supported joinrowsetimpl.initerror = JoinRowSet initialization error -joinrowsetimpl.genericerr = Genric joinrowset intial error +joinrowsetimpl.genericerr = Generic joinrowset initial error joinrowsetimpl.emptyrowset = Empty rowset cannot be added to this JoinRowSet #JdbcRowSetImpl exceptions diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java index 21b9614d7466d..6e4d36716516f 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -603,9 +603,9 @@ private boolean updateOriginalRow(CachedRowSet crs) // reset boolNull if it had been set boolNull = true; - /** This addtional checking has been added when the current value + /** This additional checking has been added when the current value * in the DB is null, but the DB had a different value when the - * data was actaully fetched into the CachedRowSet. + * data was actually fetched into the CachedRowSet. **/ if(rsval == null && orig != null) { @@ -638,7 +638,7 @@ else if(rsval != null && (!rsval.equals(orig))) objVal = rsval; } else if ( (orig == null || curr == null) ) { - /** Adding the additonal condition of checking for "flag" + /** Adding the additional condition of checking for "flag" * boolean variable, which would otherwise result in * building a invalid query, as the comma would not be * added to the query string. @@ -1171,7 +1171,7 @@ private void initSQLStatements(CachedRowSet caller) throws SQLException { deleteCmd = "DELETE FROM " + buildTableName(dbmd, catalog, schema, table); /* - * set the key desriptors that will be + * set the key descriptors that will be * needed to construct where clauses. */ buildKeyDesc(caller); diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java index bde850e9964f9..7fad769cb2dd0 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/SyncResolverImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2022, 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 @@ -302,7 +302,7 @@ public void setResolvedValue(int index, Object obj) throws SQLException { * values of a particular row after they have been resolved by * the user to synchronize back to datasource. * @throws SQLException if synchronization does not happen properly - * maybe beacuse {@code Connection} has timed out. + * maybe because {@code Connection} has timed out. **/ private void writeData(CachedRowSet row) throws SQLException { crw.updateResolvedConflictToDB(row, crw.getReader().connect((RowSetInternal)crsSync)); @@ -661,8 +661,8 @@ public void acceptChanges(Connection con) throws SyncProviderException{ * Before returning, this method moves the cursor before the first row * and sends a {@code rowSetChanged} event to all registered * listeners. - * @throws SQLException if an error is occurs rolling back the RowSet - * state to the definied original value. + * @throws SQLException if an error occurs rolling back the RowSet + * state to the defined original value. * @see javax.sql.RowSetListener#rowSetChanged */ public void restoreOriginal() throws SQLException { @@ -742,7 +742,7 @@ public void undoUpdate() throws SQLException { /** * Returns a new {@code RowSet} object backed by the same data as * that of this {@code CachedRowSetImpl} object and sharing a set of cursors - * with it. This allows cursors to interate over a shared set of rows, providing + * with it. This allows cursors to iterate over a shared set of rows, providing * multiple views of the underlying data. * * @return a {@code RowSet} object that is a copy of this {@code CachedRowSetImpl} @@ -851,7 +851,7 @@ public CachedRowSet createCopyNoConstraints() throws SQLException { /** * Converts this {@code CachedRowSetImpl} object to a collection - * of tables. The sample implementation utilitizes the {@code TreeMap} + * of tables. The sample implementation utilizes the {@code TreeMap} * collection type. * This class guarantees that the map will be in ascending key order, * sorted according to the natural order for the key's class. @@ -872,7 +872,7 @@ public Collection toCollection() throws SQLException { /** * Returns the specified column of this {@code CachedRowSetImpl} object * as a {@code Collection} object. This method makes a copy of the - * column's data and utilitizes the {@code Vector} to establish the + * column's data and utilizes the {@code Vector} to establish the * collection. The {@code Vector} class implements a growable array * objects allowing the individual components to be accessed using an * an integer index similar to that of an array. @@ -895,7 +895,7 @@ public Collection toCollection(int column) throws SQLException { /** * Returns the specified column of this {@code CachedRowSetImpl} object * as a {@code Collection} object. This method makes a copy of the - * column's data and utilitizes the {@code Vector} to establish the + * column's data and utilizes the {@code Vector} to establish the * collection. The {@code Vector} class implements a growable array * objects allowing the individual components to be accessed using an * an integer index similar to that of an array. @@ -1124,7 +1124,7 @@ public String getString(int columnIndex) throws SQLException { * @param columnIndex the first column is {@code 1}, the second * is {@code 2}, and so on; must be {@code 1} or larger * and equal to or less than the number of columns in the rowset - * @return the column value as a {@code boolean} in the Java progamming language; + * @return the column value as a {@code boolean} in the Java programming language; * if the value is SQL {@code NULL}, the result is {@code false} * @throws SQLException if (1) the given column index is out of bounds, * (2) the cursor is not on one of this rowset's rows or its @@ -1467,7 +1467,7 @@ public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException * (2) the cursor is not on one of this rowset's rows or its * insert row, or (3) the designated column does not store an * SQL {@code BINARY, VARBINARY} or {@code LONGVARBINARY}. - * The bold type indicates the SQL type that this method is recommened + * The bold type indicates the SQL type that this method is recommended * to retrieve. * @see #getBinaryStream(String) */ @@ -1829,7 +1829,7 @@ public java.io.InputStream getUnicodeStream(String columnName) throws SQLExcepti * (2) the cursor is not on one of this rowset's rows or its * insert row, or (3) the designated column does not store an * SQL {@code BINARY, VARBINARY} or {@code LONGVARBINARY} - * The bold type indicates the SQL type that this method is recommened + * The bold type indicates the SQL type that this method is recommended * to retrieve. * @see #getBinaryStream(int) * @@ -3938,7 +3938,7 @@ public Clob getClob(String colName) throws SQLException { /** * Retrieves the value of the designated column in this * {@code CachedRowSetImpl} object as an {@code Array} object - * in the Java programming langugage. + * in the Java programming language. * * @param colName a {@code String} object that must match the * SQL name of a column in this rowset, ignoring case @@ -4113,7 +4113,7 @@ public Connection getConnection() throws SQLException{ * with the given {@code RowSetMetaData} object. * * @param md a {@code RowSetMetaData} object instance containing - * metadata about the columsn in the rowset + * metadata about the columns in the rowset * @throws SQLException if invalid meta data is supplied to the * rowset */ @@ -4168,7 +4168,7 @@ public void setOriginalRow() throws SQLException { /** * Marks all rows in this rowset as being original rows. Any updates * made to the rows become the original values for the rowset. - * Calls to the method {@code setOriginal} connot be reversed. + * Calls to the method {@code setOriginal} cannot be reversed. * * @throws SQLException if an error occurs */ @@ -4491,7 +4491,7 @@ public java.net.URL getURL(String columnName) throws SQLException { * object is returned. Subsequent {@code CachedRowSetImpl} warnings will * be chained to this {@code SQLWarning}. All {@code RowSetWarnings} * warnings are generated in the disconnected environment and remain a - * seperate warning chain to that provided by the {@code getWarnings} + * separate warning chain to that provided by the {@code getWarnings} * method. * *

The warning chain is automatically cleared each time a new @@ -4760,7 +4760,7 @@ public void rowSetPopulated(RowSetEvent event, int numRows) throws SQLException * * @param data the {@code ResultSet} object containing the data * to be read into this {@code CachedRowSetImpl} object - * @param start the integer specifing the position in the + * @param start the integer specifying the position in the * {@code ResultSet} object to popultate the * {@code CachedRowSetImpl} object. * @throws SQLException if an error occurs; or the max row setting is @@ -4786,7 +4786,7 @@ public boolean nextPage() throws SQLException { /** * This is the setter function for setting the size of the page, which specifies - * how many rows have to be retrived at a time. + * how many rows have to be retrieved at a time. * * @param size which is the page size * @throws SQLException if size is less than zero or greater than max rows. diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java index a252a272d275b..91e3ce0d77738 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -625,7 +625,7 @@ public boolean writeData(RowSetInternal caller) { /** * This function has been added for the processing of special characters - * lik <,>,'," and & in the data to be serialized. These have to be taken + * like <,>,'," and & in the data to be serialized. These have to be taken * of specifically or else there will be parsing error while trying to read * the contents of the XML file. **/ diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java index 40e42bca31b8c..e5f25f8a1680b 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ * a RowSet object. *

* A rowset consists of its properties, metadata, and data values. An XML document - * representating a rowset includes the values in these three categories along with + * representing a rowset includes the values in these three categories along with * appropriate XML tags to identify them. It also includes a top-level XML tag for * the rowset and three section tags identifying the three categories of values. *

diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java index 754c80603f505..334ef3db898ef 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -37,7 +37,7 @@ * providing optimistic synchronization with a relational datastore * using any JDBC technology-enabled driver. * - *

1.0 Backgroud

+ *

1.0 Background

* This synchronization provider is registered with the * SyncFactory by default as the * com.sun.rowset.providers.RIOptimisticProvider. @@ -47,7 +47,7 @@ * interface implementations. As a reference implementation, * RIOptimisticProvider provides a * fully functional implementation offering a medium grade classification of - * syncrhonization, namely GRADE_CHECK_MODIFIED_AT_COMMIT. A + * synchronization, namely GRADE_CHECK_MODIFIED_AT_COMMIT. A * disconnected RowSet implementation using the * RIOptimisticProvider can expect the writer to * check only rows that have been modified in the RowSet against @@ -171,7 +171,7 @@ public RowSetReader getRowSetReader() { /** * Returns the SyncProvider grade of synchronization that * RowSet objects can expect when using this - * implementation. As an optimisic synchonization provider, the writer + * implementation. As an optimistic synchronization provider, the writer * will only check rows that have been modified in the RowSet * object. */ diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java index d15516d4d63d4..189971a796a93 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIXMLProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2022, 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 @@ -169,10 +169,10 @@ public XmlWriter getXmlWriter() throws SQLException { /** * Returns the SyncProvider grade of syncrhonization that * RowSet object instances can expect when using this - * implementation. As this implementation provides no synchonization + * implementation. As this implementation provides no synchronization * facilities to the XML data source, the lowest grade is returned. * - * @return the SyncProvider syncronization grade of this + * @return the SyncProvider synchronization grade of this * provider; must be one of the following constants: *
      *          SyncProvider.GRADE_NONE,
@@ -236,8 +236,8 @@ public String getVersion() {
     }
 
     /**
-     * Returns the vendor name of the Reference Implemntation Optimistic
-     * Syncchronication Provider
+     * Returns the vendor name of the Reference Implementation Optimistic
+     * Synchronization Provider
      *
      * @return the String detailing the vendor name of this
      *      SyncProvider
diff --git a/src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java b/src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java
index 867813af91522..93a6eee7d1e40 100644
--- a/src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java
+++ b/src/java.sql/share/classes/java/sql/SQLFeatureNotSupportedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2022, 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
@@ -29,7 +29,7 @@
  * The subclass of {@link SQLException} thrown when the SQLState class value is '0A'
  * ( the value is 'zero' A).
  * This indicates that the JDBC driver does not support an optional JDBC feature.
- * Optional JDBC features can fall into the fallowing categories:
+ * Optional JDBC features can fall into the following categories:
  *
  *