db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1394480 - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/ client/org/apache/derby/client/net/ drda/org/apache/derby/impl/drda/ engine/org/apache/derby/iapi/services/loader/ engine/org/apache/derby/iapi/services/locks/ engine/org...
Date Fri, 05 Oct 2012 12:26:42 GMT
Author: kahatlen
Date: Fri Oct  5 12:26:41 2012
New Revision: 1394480

URL: http://svn.apache.org/viewvc?rev=1394480&view=rev
Log:
Fix some common typos in code comments.

Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageBuilder.java Fri Oct  5 12:26:41
2012
@@ -753,9 +753,9 @@ public class MessageBuilder extends Task
 
     /**
      * Replace a substring with some equivalent. For example, we would
-     * like to replace "<" with "&lt;" in the error messages.
+     * like to replace "&lt;" with "&amp;lt;" in the error messages.
      * Add any substrings you would like to replace in the code below.
-     * Be aware that the first paramter to the replaceAll() method is
+     * Be aware that the first parameter to the replaceAll() method is
      * interpreted as a regular expression.
      *
      * @param input 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java Fri Oct
 5 12:26:41 2012
@@ -162,7 +162,7 @@ public class  NetConnection40 extends or
      * applied to the database operation.
      * @return true if the connection is valid, false otherwise
      * @exception SQLException if the parameter value is illegal or if a
-     * database error has occured
+     * database error has occurred
      */
     public boolean isValid(int timeout) throws SQLException {
         // Validate that the timeout has a legal value
@@ -253,8 +253,8 @@ public class  NetConnection40 extends or
 
     /**
      * <code>setClientInfo</code> will throw a
-     * <code>SQLClientInfoException</code> uless the <code>properties</code>
-     * paramenter is empty, since Derby does not support any
+     * <code>SQLClientInfoException</code> unless the <code>properties</code>
+     * parameter is empty, since Derby does not support any
      * properties. All the property keys in the
      * <code>properties</code> parameter are added to failedProperties
      * of the exception thrown, with REASON_UNKNOWN_PROPERTY as the

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAResultSet.java Fri Oct  5
12:26:41 2012
@@ -172,7 +172,7 @@ class DRDAResultSet
     }
 
     /**
-     * get resultset /out paramter precision
+     * get resultset /out parameter precision
      * @param index -starting with 1
      * @return precision of column
      */
@@ -197,7 +197,7 @@ class DRDAResultSet
     }
 
     /**
-     * get resultset /out paramter scale
+     * get resultset /out parameter scale
      * @param index -starting with 1
      * @return scale of column
      */

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Fri Oct  5
12:26:41 2012
@@ -1160,7 +1160,7 @@ class DRDAStatement
     }
 
     /**
-     * get resultset /out paramter precision
+     * get resultset /out parameter precision
      * @param index -starting with 1
      * @return precision of column
      */
@@ -1181,7 +1181,7 @@ class DRDAStatement
     }
 
     /**
-     * get resultset /out paramter scale
+     * get resultset /out parameter scale
      * @param index -starting with 1
      * @return scale of column
      */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java
Fri Oct  5 12:26:41 2012
@@ -169,11 +169,11 @@ public class ClassInspector
 	 * Find a public method that implements a given signature.
 	 * The signature is given using the full Java class names of the types.
 	 <BR>
-	 * A untyped null paramter is indicated by passing in an empty string ("")
+	 * A untyped null parameter is indicated by passing in an empty string ("")
 	 * as its class name.
 	 <BR>
-	 If receiverType respresents an interface then the methods of java.lang.Object
-	 arer included in the candidate list.
+	 If receiverType represents an interface then the methods of java.lang.Object
+	 are included in the candidate list.
 	 <BR>
 	 If the caller is simply checking to see that a public method with the
 	 specified name exists, regardless of the signature, exists, then the
@@ -203,7 +203,7 @@ public class ClassInspector
 	 * @param isParam		Array of booleans telling whether parameter is a ?.
 	 * @param staticMethod	Find a static method.
 	   @param repeatLastParameter If true the last parameter may be repeated any number of times
(total count must be greater than one).
-	   If false the laste parameter is matched as usual. This also requires an exact match on
the last parameter type.
+	   If false the last parameter is matched as usual. This also requires an exact match on
the last parameter type.
 	 *
 	 * @return	A Member representing the matching method.  Returns null
 	 *			if no such method.
@@ -319,7 +319,7 @@ public class ClassInspector
 
 	/**
 	 * Find a public field  for a class.
-	   This follows the sematics of the java compiler for locating a field.
+	   This follows the semantics of the java compiler for locating a field.
 	   This means if a field fieldName exists in the class with package, private or
 	   protected then an error is raised. Even if the field hides a field fieldName
 	   in a super-class/super--interface. See the JVM spec on fields.
@@ -404,7 +404,7 @@ public class ClassInspector
 	 * Find a public constructor that implements a given signature.
 	 * The signature is given using the full Java class names of the types.
 	 <BR>
-	 * A untyped null paramter is indicated by passing in an empty string ("")
+	 * A untyped null parameter is indicated by passing in an empty string ("")
 	 * as its class name. 
 	 *
 	 * @param receiverType	The class name of the receiver

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java Fri
Oct  5 12:26:41 2012
@@ -33,7 +33,7 @@ import java.util.Hashtable;
 	database shared, update and exclusive locks. 
 	<P>
 	The lock manager uses this ordered protocol to determine if a lock request on a
-	Lockable <TT> L </TT> with qualifier <TT> Q1 </TT> in compatiblity
space
+	Lockable <TT> L </TT> with qualifier <TT> Q1 </TT> in compatibility
space
 	<TT> CS1 </TT> can be granted:
 	<OL>
 	<LI>If no locks are held on <TT> L </TT> in any compatability space then
the
@@ -63,7 +63,7 @@ import java.util.Hashtable;
 	object then its equals() method must reflect that, e.g. by testing equality
 	of its fields. In this case the first Lockable to be locked will be kept
 	by lock manager as the key for the lock. Thus even after the first caller
-	unlocks the obejct, its reference will still be kept by the lock manager.
+	unlocks the object, its reference will still be kept by the lock manager.
 	Thus Lockable's that per value equality must be designed so that they
 	are never re-used for different lockable concepts.
 	<BR>
@@ -117,7 +117,7 @@ public interface Lockable {
 
 	/**
 		If this lockable object wants to participate in a diagnostic virtual
-		lock table, then put any relavent attributes of this lock into the
+		lock table, then put any relevant attributes of this lock into the
 		attributes list (the attribute must be an immutable object).  The list
 		of attributes of interest to the virtual lock table can be found in
 		VirtualLockTable. The toString method will be called by the VirtualTable
@@ -127,8 +127,8 @@ public interface Lockable {
 		interested in this kind of lockable object.  The bits are defined in
 		VirtualLockTable.  For instance, the user may only ask
 		for TABLE_AND_ROWLOCK and if this is not a table or row lock, then
-		don't paritipate. 
-		@param attributes if this decides to participate, put all relavent
+		don't participate.
+		@param attributes if this decides to participate, put all relevant
 		attributes into the Hashtable.  The complete list of interesting
 		attributes is listed in VirtualLockTable.
 		The following attributes must be present for all participating

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
Fri Oct  5 12:26:41 2012
@@ -54,7 +54,7 @@ public interface ConglomerateFactory ext
      * Code which names conglomerates depends on this range currently, but
      * could be easily changed to handle larger ranges.   One hex digit seemed
      * reasonable for the number of conglomerate types currently implemented
-     * (heap, btree) and those that might be implmented in the future: gist, 
+     * (heap, btree) and those that might be implemented in the future: gist,
      * gist btree, gist rtree, hash, others? ).
      * <p>
      *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java Fri
Oct  5 12:26:41 2012
@@ -927,7 +927,7 @@ public interface RawStoreFactory extends
     public void createFinished() throws StandardException;
 
     /**
-     * Get JBMS properties relavent to raw store
+     * Get JBMS properties relevant to raw store
      *
      * @exception StandardException Standard Derby exception policy.
      */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java Fri
Oct  5 12:26:41 2012
@@ -224,7 +224,7 @@ public interface LogFactory extends Corr
         public boolean inReplicationMasterMode();
 
 	/**
-		Get JBMS properties relavent to the log factory
+		Get JBMS properties relevant to the log factory
 		@exception StandardException Standard Derby Error Policy
 	 */
 	public void getLogFactoryProperties(PersistentSet set) 
@@ -336,7 +336,7 @@ public interface LogFactory extends Corr
      *
      * <P>MT - synchronization provided by caller - RawStore boot,
      * This method is called while re-encrypting the database 
-     * at databse boot time. 
+     * at database boot time.
      */
     public void startNewLogFile() throws StandardException;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection40.java Fri
Oct  5 12:26:41 2012
@@ -87,7 +87,7 @@ public class EmbedConnection40
      *
      * @return true if the connection is valid, false otherwise
      * @exception SQLException if the parameter value is illegal or if a
-     * database error has occured
+     * database error has occurred
      */
     public boolean isValid(int timeout) throws SQLException {
         // Validate that the timeout has a legal value
@@ -133,8 +133,8 @@ public class EmbedConnection40
     
     /**
      * <code>setClientInfo</code> will throw a
-     * <code>SQLClientInfoException</code> uless the <code>properties</code>
-     * paramenter is empty, since Derby does not support any
+     * <code>SQLClientInfoException</code> unless the <code>properties</code>
+     * parameter is empty, since Derby does not support any
      * properties. All the property keys in the
      * <code>properties</code> parameter are added to failedProperties
      * of the exception thrown, with REASON_UNKNOWN_PROPERTY as the

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
Fri Oct  5 12:26:41 2012
@@ -1731,7 +1731,7 @@ public class EmbedDatabaseMetaData exten
 		//then the "if" statement below will use those types values
 		//for ?s. If there are still some ?s in the IN list that are left 
 		//with unassigned values, then we will set those ? to NULL.
-		// So paramter 4 will be "T" for TABLE, 5 will be "V" for VIEW, 6 will be
+		// So parameter 4 will be "T" for TABLE, 5 will be "V" for VIEW, 6 will be
 		// "A" for SYNONYM, 7 will be "S" for system table in 
 		//TABLETYPE IN (?, ?, ?, ?)
 		// If the user hasn't asked for any specific table types then all

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
Fri Oct  5 12:26:41 2012
@@ -4517,7 +4517,7 @@ public final class	DataDictionaryImpl
 			 *is with NOCOMPILE option of create statement/boot time SPS,
 			 *SPS statement is not compiled to find out the parameter info.
 			 *Because of the parameter info was not inserted at SPSDescriptor 
-			 *creation time. As this is the first time we are compiling paramter
+			 *creation time. As this is the first time we are compiling parameter
 			 *infor should be inserted instead of the update.
 			 */
 			addSPSParams(spsd, tc);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
Fri Oct  5 12:26:41 2012
@@ -763,7 +763,7 @@ public class StaticMethodCallNode extend
 
 					if (parameterType.endsWith("[]")) {
 
-						// constructor  - setting up correct paramter type info
+						// constructor  - setting up correct parameter type info
 						MethodBuilder constructor = acb.getConstructor();
 						acb.pushThisAsActivation(constructor);
 						constructor.callMethod(VMOpcode.INVOKEINTERFACE, null,
@@ -1168,7 +1168,7 @@ public class StaticMethodCallNode extend
 
 				MethodBuilder constructor = acb.getConstructor();
 
-				// constructor  - setting up correct paramter type info
+				// constructor  - setting up correct parameter type info
 				acb.pushThisAsActivation(constructor);
 				constructor.callMethod(VMOpcode.INVOKEINTERFACE, null,
 									"getParameterValueSet", ClassName.ParameterValueSet, 0);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
Fri Oct  5 12:26:41 2012
@@ -665,7 +665,7 @@ public class TernaryOperatorNode extends
 		}
 
 		/*
-		 * Is there a ? paramter for the third arg.  It will be an int.
+		 * Is there a ? parameter for the third arg.  It will be an int.
 		 */
 		if( rightOperand.requiresTypeFromContext())
 		{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java Fri Oct
 5 12:26:41 2012
@@ -1219,7 +1219,7 @@ public final class RawStore implements R
 	}
 
 	/**
-	 * Get JBMS properties relavent to raw store
+	 * Get JBMS properties relevant to raw store
 	 * @exception StandardException Standard Derby Error Policy
 	 */
 	public void getRawStoreProperties(PersistentSet set)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Fri Oct  5 12:26:41 2012
@@ -2110,7 +2110,7 @@ public class BaseDataFileFactory
     public void encryptAllContainers(RawTransaction t) throws StandardException
     {
         containerEncrypter = new EncryptOrDecryptData(this);
-        // encrypt all the conatiners in the databse
+        // encrypt all the containers in the database
         containerEncrypter.encryptAllContainers(t);
     }
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
Fri Oct  5 12:26:41 2012
@@ -455,7 +455,7 @@ abstract class FileContainer 
 		else
 		{
 			// we don't need to completely re-initialize the header
-			// just re-initialize the relavent fields
+			// just re-initialize the relevant fields
 			initContainerHeader(false);
 		}
 
@@ -1086,7 +1086,7 @@ abstract class FileContainer 
 
 		byte[] array = byteArray.getArray();
 		
-		// now extract the relavent information from array - basically 
+		// now extract the relevant information from array - basically
 		// duplicate the code in readHeaderFromArray 
 		ArrayInputStream inStream = new ArrayInputStream(array);
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
Fri Oct  5 12:26:41 2012
@@ -914,7 +914,7 @@ public class StreamFileContainer impleme
         {
 
 			// an exception during the restore of a user column, this doesn't
-			// make the databse corrupt, just that this field is inaccessable
+			// make the database corrupt, just that this field is inaccessable
 			if (inUserCode) 
             { 
 
@@ -959,7 +959,7 @@ public class StreamFileContainer impleme
 			}
 
 			// an exception during the restore of a user column, this doesn't
-			// make the databse corrupt, just that this field is inaccessable
+			// make the database corrupt, just that this field is inaccessable
 			throw StandardException.newException(
                 SQLState.DATA_STORABLE_READ_MISSING_CLASS, cnfe, 
                 logicalDataIn.getErrorInfo());

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java Fri
Oct  5 12:26:41 2012
@@ -432,7 +432,7 @@ public final class LogToFile implements 
     private boolean inReplicationSlaveMode = false;
     /** If this exception is set while in replication slave mode, the 
      * exception will be thrown by the thread doing recovery will. 
-     * Effectively, this whill shut down the database */
+     * Effectively, this will shut down the database. */
     private volatile StandardException replicationSlaveException = null;
 
     /** True if the database has been booted in replication slave pre
@@ -527,7 +527,7 @@ public final class LogToFile implements 
 	 * transaction is on disk. With out write  sync , log is written to the 
 	 * disk and then fsync() is used on commits to make log is written to the 
 	 * disk for sure. On most of the OS , fsync() calls are expensive. 
-	 * On heavey commit oriented systems , file sync make the system run slow. 
+	 * On heavy commit oriented systems, file sync make the system run slow.
 	 * This problem is solved by using write sync on preallocated log file. 
 	 * write sync is much faster than doing write and file sync to a file. 
 	 * File should be preallocated for write syncs to perform better than
@@ -570,7 +570,8 @@ public final class LogToFile implements 
 	*/
 
 	/**
-		Once the log factory is makred as corrupt then the raw sto
+     * Once the log factory is marked as corrupt then the raw store will
+     * shut down.
 	*/
 	public StandardException markCorrupt(StandardException originalError) {
 
@@ -4309,7 +4310,7 @@ public final class LogToFile implements 
      *
      * <P>MT - synchronization provided by caller - RawStore boot,
      * This method is called while re-encrypting the database 
-     * at databse boot time. 
+     * at database boot time.
      */
     public void startNewLogFile() throws StandardException
     {
@@ -4852,7 +4853,7 @@ public final class LogToFile implements 
 	public static final String TEST_LOG_SWITCH_LOG = SanityManager.DEBUG ? "TEST_LOG_SWITCH_LOG"
: null ;
 
 	/**
-	  Set to true if we want the up comming log record to be only partially
+	  Set to true if we want the upcoming log record to be only partially
 	  written.  The database is corrupted if not immediately shutdown.
 	  Set TEST_LOG_PARTIAL_LOG_WRITE_NUM_BYTES to the number of bytes to write
 	  out, default is 1 byte.
@@ -5363,20 +5364,20 @@ public final class LogToFile implements 
 	 * Attribute.RESTORE_FROM (Delete the whole database if it exists and then 
      * restore it from backup)
 	 * Attribute.ROLL_FORWARD_RECOVERY_FROM:(Perform Rollforward Recovery;
-	 * except for the log directory everthing else is replced  by the copy  from
+	 * except for the log directory everything else is replaced by the copy from
 	 * backup. log files in the backup are copied to the existing online log 
      * directory.
 	 *
-	 * In cases of RESTORE_FROM whole databases directoy is 
+	 * In case of RESTORE_FROM, the whole database directory
 	 * is removed in Directory.java while restoring service.properties
 	 * so even the log directory is removed.
-	 * In case of CREATE_FROM , log directoy will not exist if 
-	 * we came so far bacause it should fail if a database already exists.
-	 * In case ROLL_FORWARD_RECOVERY_FROM log directotry should not be removed.
+	 * In case of CREATE_FROM, log directory will not exist if
+	 * we came so far because it should fail if a database already exists.
+	 * In case ROLL_FORWARD_RECOVERY_FROM log directory should not be removed.
 	 * So only thing that needs to be done here is create a
 	 * a log directory if it does not exists and copy the 
 	 * log files(including control files) that exists in the backup from which 
-     * we are are trying to restore the database to the onlie log directory.
+     * we are are trying to restore the database to the online log directory.
 	 */
 	private boolean restoreLogs(Properties properties) throws StandardException
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java Fri
Oct  5 12:26:41 2012
@@ -142,7 +142,7 @@ public class ReadOnly implements LogFact
 	}
 
 	/**
-	  @exception StandardException functionality not implmented
+	  @exception StandardException functionality not implemented
 	*/
 	public void setTruncationLWM(UUID name, LogInstant instant) throws StandardException
 	{
@@ -155,7 +155,7 @@ public class ReadOnly implements LogFact
 
 
 	/**
-	  @exception StandardException functionality not implmented
+	  @exception StandardException functionality not implemented
 	*/
 	public void removeTruncationLWM(UUID name,
 							 RawStoreFactory rawStoreFactory, 
@@ -171,7 +171,7 @@ public class ReadOnly implements LogFact
 
 
 	/**
-	  @exception StandardException functionality not implmented
+	  @exception StandardException functionality not implemented
 	*/
 	public LogInstant getTruncationLWM(UUID name) throws StandardException
 	{
@@ -183,7 +183,7 @@ public class ReadOnly implements LogFact
 	}
 
 	/**
-	  @exception StandardException functionality not implmented
+	  @exception StandardException functionality not implemented
 	*/
 	public void removeTruncationLWM(UUID name) throws StandardException
 	{
@@ -195,7 +195,7 @@ public class ReadOnly implements LogFact
 	}
 
 	/**
-	  @exception StandardException functionality not implmented
+	  @exception StandardException functionality not implemented
 	*/
 	public ScanHandle openFlushedScan(DatabaseInstant i, int groupsIWant)
 		 throws StandardException
@@ -208,7 +208,7 @@ public class ReadOnly implements LogFact
 	}
 
 	/**
-	  @exception StandardException functionality not implmented
+	  @exception StandardException functionality not implemented
 	*/
 	public LogScan openForwardsScan(LogInstant startAt,LogInstant stopAt)
 		 throws StandardException
@@ -238,7 +238,7 @@ public class ReadOnly implements LogFact
 	}
 
 	/**
-	  @exception StandardException functionality not implmented
+	  @exception StandardException functionality not implemented
 	  */
 	public LogScan openForwardsFlushedScan(LogInstant startAt)
 		 throws StandardException
@@ -279,7 +279,7 @@ public class ReadOnly implements LogFact
 	}
 
 	/**
-		Get JBMS properties relavent to the log factory
+		Get JBMS properties relevant to the log factory
 	 */
 	public void getLogFactoryProperties(PersistentSet set) 
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
Fri Oct  5 12:26:41 2012
@@ -951,7 +951,7 @@ public class TransactionTable implements
 
 		@param id transaction Id
 		@param tran the transaction that was made to assume the transactionID
-		and all other relavent information stored in the transaction table
+		and all other relevant information stored in the transaction table
 		@return true if transaction can be found, false otherwise
 	*/
 	boolean findAndAssumeTransaction(

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
Fri Oct  5 12:26:41 2012
@@ -39,7 +39,7 @@ import java.io.ObjectInput;
 import java.io.IOException;
 
 /**
-	Transaction table entry is used to store all relavent information of a
+	Transaction table entry is used to store all relevant information of a
 	transaction into the transaction table for the use of checkpoint, recovery,
 	Transaction management during Quiesce state, and for dumping transaction table.  Only works
 	with the following classes: TransactionTable, XactFactory, Xact

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
Fri Oct  5 12:26:41 2012
@@ -1993,7 +1993,7 @@ private void dropTable(Statement s) thro
  * @param query          string with the query to execute.
  * @param expectedResult Null for this means that the passed query is 
  * expected to return an empty resultset. If not empty, then the resultset
- * from the query should match this paramter
+ * from the query should match this parameter
  *
  * @throws SQLException
  */

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java Fri
Oct  5 12:26:41 2012
@@ -49,7 +49,7 @@ public class JDBCDataSource {
     
     /**
      * Return a new DataSource corresponding to the current
-     * configuration except that the databse name is different.
+     * configuration except that the database name is different.
      */
     public static javax.sql.DataSource getDataSource(String dbName)
     {

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java?rev=1394480&r1=1394479&r2=1394480&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
(original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
Fri Oct  5 12:26:41 2012
@@ -37,7 +37,7 @@ public class DB_GrantRevoke {
 	 * Generate Grant & Revoke statements if sqlAuthorization is on
 	 * 
 	 * @param conn Connection to use
-	 * @param at10_6 True if the databse level is 10.6 or higher
+	 * @param at10_6 True if the database level is 10.6 or higher
 	 */
 	public static void doAuthorizations(Connection conn, boolean at10_6)
 		throws SQLException {



Mime
View raw message