--- a/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java Fri Nov 01 21:45:02 2013 +0400
@@ -227,7 +227,7 @@
// Exist in basic.properties (though we might want to override)
fileDescriptionText = UIManager.getString("FileChooser.fileDescriptionText");
directoryDescriptionText = UIManager.getString("FileChooser.directoryDescriptionText");
- newFolderErrorText = getString("FileChooser.newFolderErrorText", "Error occured during folder creation");
+ newFolderErrorText = getString("FileChooser.newFolderErrorText", "Error occurred during folder creation");
saveButtonText = UIManager.getString("FileChooser.saveButtonText");
openButtonText = UIManager.getString("FileChooser.openButtonText");
--- a/jdk/src/macosx/classes/com/apple/laf/resources/aqua.properties Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/macosx/classes/com/apple/laf/resources/aqua.properties Fri Nov 01 21:45:02 2013 +0400
@@ -38,7 +38,7 @@
############ FILE CHOOSER STRINGS #############
FileChooser.fileDescription.textAndMnemonic=Generic File
FileChooser.directoryDescription.textAndMnemonic=Directory
-FileChooser.newFolderError.textAndMnemonic=Error occured during folder creation
+FileChooser.newFolderError.textAndMnemonic=Error occurred during folder creation
FileChooser.newFolderErrorSeparator= :
FileChooser.acceptAllFileFilter.textAndMnemonic=All Files
FileChooser.cancelButton.textAndMnemonic=Cancel
--- a/jdk/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java Fri Nov 01 21:45:02 2013 +0400
@@ -123,7 +123,7 @@
"The vertical position, in millimeters, where the image should be rendered on media " },
{ "HorizontalPixelOffset",
- "The horizonal position, in pixels, where the image should be rendered onto a raster display" },
+ "The horizontal position, in pixels, where the image should be rendered onto a raster display" },
{ "VerticalPixelOffset",
"The vertical position, in pixels, where the image should be rendered onto a raster display" },
--- a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java Fri Nov 01 21:45:02 2013 +0400
@@ -111,7 +111,7 @@
if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINEST)) {
SNMP_ADAPTOR_LOGGER.logp(Level.FINEST, SnmpSubRequestHandler.class.getName(),
"run", "[" + Thread.currentThread() +
- "]:an Snmp error occured during the operation", x);
+ "]:an Snmp error occurred during the operation", x);
}
}
catch(Exception x) {
@@ -119,7 +119,7 @@
if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINEST)) {
SNMP_ADAPTOR_LOGGER.logp(Level.FINEST, SnmpSubRequestHandler.class.getName(),
"run", "[" + Thread.currentThread() +
- "]:a generic error occured during the operation", x);
+ "]:a generic error occurred during the operation", x);
}
}
if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINER)) {
--- a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubNextRequestHandler.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubNextRequestHandler.java Fri Nov 01 21:45:02 2013 +0400
@@ -127,7 +127,7 @@
if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINEST)) {
SNMP_ADAPTOR_LOGGER.logp(Level.FINEST, SnmpSubRequestHandler.class.getName(),
"run", "[" + Thread.currentThread() +
- "]:an Snmp error occured during the operation", x);
+ "]:an Snmp error occurred during the operation", x);
}
}
catch(Exception x) {
@@ -135,7 +135,7 @@
if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINEST)) {
SNMP_ADAPTOR_LOGGER.logp(Level.FINEST, SnmpSubRequestHandler.class.getName(),
"run", "[" + Thread.currentThread() +
- "]:a generic error occured during the operation", x);
+ "]:a generic error occurred during the operation", x);
}
}
if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINER)) {
--- a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubRequestHandler.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubRequestHandler.java Fri Nov 01 21:45:02 2013 +0400
@@ -231,7 +231,7 @@
if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINEST)) {
SNMP_ADAPTOR_LOGGER.logp(Level.FINEST, SnmpSubRequestHandler.class.getName(),
"run", "[" + Thread.currentThread() +
- "]:an Snmp error occured during the operation", x);
+ "]:an Snmp error occurred during the operation", x);
}
}
catch(Exception x) {
@@ -239,7 +239,7 @@
if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINEST)) {
SNMP_ADAPTOR_LOGGER.logp(Level.FINEST, SnmpSubRequestHandler.class.getName(),
"run", "[" + Thread.currentThread() +
- "]:a generic error occured during the operation", x);
+ "]:a generic error occurred during the operation", x);
}
}
if (SNMP_ADAPTOR_LOGGER.isLoggable(Level.FINER)) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Fri Nov 01 21:45:02 2013 +0400
@@ -377,7 +377,7 @@
env.failure("Attempt to launch main class \"" + clname + "\" failed.");
}
} else {
- env.failure("No main class specifed and no current default defined.");
+ env.failure("No main class specified and no current default defined.");
}
} else {
clname = t.nextToken();
@@ -428,7 +428,7 @@
env.failure("Attempt to attach to port \"" + portName + "\" failed.");
}
} else {
- env.failure("No port specifed and no current default defined.");
+ env.failure("No port specified and no current default defined.");
}
} else {
portName = t.nextToken();
--- a/jdk/src/share/classes/com/sun/tools/script/shell/init.js Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/com/sun/tools/script/shell/init.js Fri Nov 01 21:45:02 2013 +0400
@@ -806,7 +806,7 @@
out = arguments[2];
break;
default:
- println("XSL tranform requires 2 or 3 arguments");
+ println("XSL transform requires 2 or 3 arguments");
return;
}
--- a/jdk/src/share/classes/com/sun/tools/script/shell/messages.properties Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/com/sun/tools/script/shell/messages.properties Fri Nov 01 21:45:02 2013 +0400
@@ -36,7 +36,7 @@
script engine for language {0} can not be found
engine.info=\
- Language {0} {1} implemention "{2}" {3}
+ Language {0} {1} implementation "{2}" {3}
encoding.unsupported=\
encoding {0} is not supported
--- a/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Fri Nov 01 21:45:02 2013 +0400
@@ -360,7 +360,7 @@
MODELMBEAN_LOGGER.logp(Level.FINER,
RequiredModelMBean.class.getName(),
"setManagedResource(Object,String)",
- "Managed Resouce Type is not supported: " + mr_type);
+ "Managed Resource Type is not supported: " + mr_type);
}
throw new InvalidTargetObjectTypeException(mr_type);
}
@@ -369,7 +369,7 @@
MODELMBEAN_LOGGER.logp(Level.FINER,
RequiredModelMBean.class.getName(),
"setManagedResource(Object,String)",
- "Managed Resouce is valid");
+ "Managed Resource is valid");
}
managedResource = mr;
--- a/jdk/src/share/classes/javax/swing/KeyboardManager.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/javax/swing/KeyboardManager.java Fri Nov 01 21:45:02 2013 +0400
@@ -208,7 +208,7 @@
public boolean fireKeyboardAction(KeyEvent e, boolean pressed, Container topAncestor) {
if (e.isConsumed()) {
- System.out.println("Aquired pre-used event!");
+ System.out.println("Acquired pre-used event!");
Thread.dumpStack();
}
--- a/jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java Fri Nov 01 21:45:02 2013 +0400
@@ -116,7 +116,7 @@
index = Collections.binarySearch(cycle, aComponent, comparator);
} catch (ClassCastException e) {
if (log.isLoggable(PlatformLogger.Level.FINE)) {
- log.fine("### During the binary search for " + aComponent + " the exception occured: ", e);
+ log.fine("### During the binary search for " + aComponent + " the exception occurred: ", e);
}
return -1;
}
--- a/jdk/src/share/classes/javax/swing/text/AbstractDocument.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/javax/swing/text/AbstractDocument.java Fri Nov 01 21:45:02 2013 +0400
@@ -1367,7 +1367,7 @@
currWriter = Thread.currentThread();
numWriters = 1;
} catch (InterruptedException e) {
- throw new Error("Interrupted attempt to aquire write lock");
+ throw new Error("Interrupted attempt to acquire write lock");
}
}
@@ -1409,7 +1409,7 @@
}
numReaders += 1;
} catch (InterruptedException e) {
- throw new Error("Interrupted attempt to aquire read lock");
+ throw new Error("Interrupted attempt to acquire read lock");
}
}
--- a/jdk/src/share/classes/sun/awt/AppContext.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/sun/awt/AppContext.java Fri Nov 01 21:45:02 2013 +0400
@@ -430,7 +430,7 @@
try {
w.dispose();
} catch (Throwable t) {
- log.finer("exception occured while disposing app context", t);
+ log.finer("exception occurred while disposing app context", t);
}
}
AccessController.doPrivileged(new PrivilegedAction<Void>() {
--- a/jdk/src/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java Fri Nov 01 21:45:02 2013 +0400
@@ -188,7 +188,7 @@
sendTrap(trap, list);
}catch(Exception e) {
log.error("handleNotification",
- "Exception occured : " + e);
+ "Exception occurred : " + e);
}
}
}
@@ -243,7 +243,7 @@
adaptor.snmpV2Trap(peer, trap, list, null);
}catch(Exception e) {
log.error("sendTrap",
- "Exception occured while sending trap to [" +
+ "Exception occurred while sending trap to [" +
target + "]. Exception : " + e);
log.debug("sendTrap",e);
}
--- a/jdk/src/share/classes/sun/misc/ExtensionDependency.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/sun/misc/ExtensionDependency.java Fri Nov 01 21:45:02 2013 +0400
@@ -265,7 +265,7 @@
* the jar file.
* </p>
*
- * @param extensionName key in the attibute list
+ * @param extensionName key in the attribute list
* @param attr manifest file attributes
* @param file installed extension jar file to compare the requested
* extension against.
--- a/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java Fri Nov 01 21:45:02 2013 +0400
@@ -1132,7 +1132,7 @@
throws IOException
{
if (types.length != names.length) {
- throw new Error("paramter type and name arrays different sizes");
+ throw new Error("parameter type and name arrays different sizes");
}
for (int i = 0; i < types.length; i++) {
@@ -1213,7 +1213,7 @@
throws IOException
{
if (types.length != names.length) {
- throw new Error("paramter type and name arrays different sizes");
+ throw new Error("parameter type and name arrays different sizes");
}
boolean readObject = false;
--- a/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/sun/security/jgss/krb5/InitialToken.java Fri Nov 01 21:45:02 2013 +0400
@@ -192,7 +192,7 @@
if (krbCredMessage.length > 0x0000ffff)
throw new GSSException(GSSException.FAILURE, -1,
- "Incorrect messsage length");
+ "Incorrect message length");
writeLittleEndian(krbCredMessage.length, temp);
checksumBytes[pos++] = temp[0];
--- a/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java Fri Nov 01 21:45:02 2013 +0400
@@ -360,7 +360,7 @@
if (internal_mech == null) {
// return wth failure
throw new GSSException(errorCode, -1,
- "supported mechansim from server is null");
+ "supported mechanism from server is null");
}
// get the negotiated result
@@ -911,7 +911,7 @@
return mechContext.isEstablished();
} else {
if (DEBUG) {
- System.out.println("The underlying mechansim context has " +
+ System.out.println("The underlying mechanism context has " +
"not been initialized");
}
return false;
@@ -1024,7 +1024,7 @@
return peerName;
} else {
if (DEBUG) {
- System.out.println("The underlying mechansim context has " +
+ System.out.println("The underlying mechanism context has " +
"not been initialized");
}
return null;
@@ -1040,7 +1040,7 @@
return myName;
} else {
if (DEBUG) {
- System.out.println("The underlying mechansim context has " +
+ System.out.println("The underlying mechanism context has " +
"not been initialized");
}
return null;
--- a/jdk/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java Fri Nov 01 21:45:02 2013 +0400
@@ -450,9 +450,9 @@
"User cancelled operation. No file was chosen.");
} else if (retval == ERROR_OPTION) {
JOptionPane.showMessageDialog(frame,
- "An error occured. No file was chosen.");
+ "An error occurred. No file was chosen.");
} else {
- JOptionPane.showMessageDialog(frame, "Unknown operation occured.");
+ JOptionPane.showMessageDialog(frame, "Unknown operation occurred.");
}
}
--- a/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c Fri Nov 01 21:45:02 2013 +0400
@@ -598,16 +598,16 @@
throwOutOfMemoryError(env, 0);
return;
}
- TRACE1(", converting %d attibutes", jLength);
+ TRACE1(", converting %d attributes", jLength);
for (i=0; i<(*ckpLength); i++) {
- TRACE1(", getting %d. attibute", i);
+ TRACE1(", getting %d. attribute", i);
jAttribute = (*env)->GetObjectArrayElement(env, jArray, i);
if ((*env)->ExceptionCheck(env)) {
freeCKAttributeArray(*ckpArray, i);
return;
}
TRACE1(", jAttribute = %d", jAttribute);
- TRACE1(", converting %d. attibute", i);
+ TRACE1(", converting %d. attribute", i);
(*ckpArray)[i] = jAttributeToCKAttribute(env, jAttribute);
if ((*env)->ExceptionCheck(env)) {
freeCKAttributeArray(*ckpArray, i);
--- a/jdk/src/share/sample/nio/chatserver/ClientReader.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/share/sample/nio/chatserver/ClientReader.java Fri Nov 01 21:45:02 2013 +0400
@@ -58,7 +58,7 @@
}
/**
- * Runs a cycle of doing a beforeRead action and then inquiring a new
+ * Runs a cycle of doing a beforeRead action and then enqueuing a new
* read on the client. Handles closed channels and errors while reading.
* If the client is still connected a new round of actions are called.
*/
--- a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java Fri Nov 01 21:45:02 2013 +0400
@@ -1173,7 +1173,7 @@
}
if (target == activeWindow && target != focusedWindow) {
// Happens when an owned window is currently focused
- focusLog.fine("Focus is on child window - transfering it back to the owner");
+ focusLog.fine("Focus is on child window - transferring it back to the owner");
handleWindowFocusInSync(-1);
return true;
}
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java Fri Nov 01 21:45:02 2013 +0400
@@ -266,7 +266,7 @@
private void checkForException() throws IOException {
if (exception == null)
return;
- StringBuffer message = new StringBuffer("An exception occured" +
+ StringBuffer message = new StringBuffer("An exception occurred" +
" during the execution of select(): \n");
message.append(exception);
message.append('\n');
--- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Klist.java Fri Nov 01 21:45:02 2013 +0400
@@ -336,7 +336,7 @@
System.out.println(" name\t name of credentials cache or " +
" keytab with the prefix. File-based cache or "
+ "keytab's prefix is FILE:.");
- System.out.println(" -c specifes that credential cache is to be " +
+ System.out.println(" -c specifies that credential cache is to be " +
"listed");
System.out.println(" -k specifies that key tab is to be listed");
System.out.println(" options for credentials caches:");
--- a/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java Wed Oct 30 20:54:42 2013 +0400
+++ b/jdk/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java Fri Nov 01 21:45:02 2013 +0400
@@ -381,12 +381,12 @@
}
}
} catch (KrbException e) {
- System.err.println("Error occured while deleting the entry. "+
+ System.err.println("Error occurred while deleting the entry. "+
"Deletion failed.");
e.printStackTrace();
System.exit(-1);
} catch (IOException e) {
- System.err.println("Error occured while deleting the entry. "+
+ System.err.println("Error occurred while deleting the entry. "+
" Deletion failed.");
e.printStackTrace();
System.exit(-1);