empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From franci...@apache.org
Subject svn commit: r1021491 - in /incubator/empire-db/trunk: empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/ empire-db/src/main/java/org/apache/empire/db/ empire-db/src/main/java/org/apache/empire/db/derby/ empire-db/src...
Date Mon, 11 Oct 2010 20:07:25 GMT
Author: francisdb
Date: Mon Oct 11 20:07:24 2010
New Revision: 1021491

URL: http://svn.apache.org/viewvc?rev=1021491&view=rev
Log:
EMPIREDB-86 Correct some typos in the javadocs (by Marcio Mazza)

Modified:
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java
    incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/h2/DBDatabaseDriverH2.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/DBDatabaseDriverHSql.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/DBDatabaseDriverOracle.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java
    incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java
    incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java
(original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleApp.java
Mon Oct 11 20:07:24 2010
@@ -189,10 +189,7 @@ public class SampleApp 
 	}
 
     /**
-     * <PRE>
      * Returns the correspondig DatabaseDriver for a given database provider / vendor
-     * Valid Providers are "oracle", "sqlserver" and "hsqldb".
-     * </PRE>
      */
     private static DBDatabaseDriver getDatabaseDriver(String provider, Connection conn)
     {
@@ -277,10 +274,10 @@ public class SampleApp 
 	 */
 	private static void createDatabase(DBDatabaseDriver driver, Connection conn)
     {
-		// create DLL for Database Definition
+		// create DDL for Database Definition
 	    DBSQLScript script = new DBSQLScript();
 		db.getCreateDDLScript(driver, script);
-		// Show DLL Statement
+		// Show DDL Statement
 		System.out.println(script.toString());
 		// Execute Script
 		script.run(driver, conn, false);

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java
(original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleConfig.java
Mon Oct 11 20:07:24 2010
@@ -23,7 +23,7 @@ import org.apache.empire.xml.XMLConfigur
 /**
  * <PRE>
  * The SampleConfig class provides access to configuration settings.
- * The configruation will be read from a xml configuration file (usually config.xml) 
+ * The configuration will be read from a xml configuration file (usually config.xml) 
  * Thus the default values here will be overridden. 
  * </PRE>
  */

Modified: incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
(original)
+++ incubator/empire-db/trunk/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
Mon Oct 11 20:07:24 2010
@@ -30,7 +30,7 @@ import org.apache.empire.db.DBTableColum
  * <PRE>
  * This file contains the definition of the data model in Java.
  * The SampleDB data model consists of two tables and a foreign key relation.
- * The tables are defined as nested classes here, but you may put the in separate files if
you want.
+ * The tables are defined as nested classes here, but you may put them in separate files
if you want to.
  *
  * PLEASE NOTE THE NAMING CONVENTION:
  * Since all tables, views and columns are declared as "final" constants they are all in
upper case.
@@ -67,7 +67,7 @@ public class SampleDB extends DBDatabase
             // Primary Key
             setPrimaryKey(DEPARTMENT_ID);
             // Set other Indexes
-            addIndex("DEARTMENT_NAME_IDX", true, new DBColumn[] { NAME });
+            addIndex("DEPARTMENT_NAME_IDX", true, new DBColumn[] { NAME });
             // Set timestamp column for save updates
             setTimestampColumn(UPDATE_TIMESTAMP);
         }

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
Mon Oct 11 20:07:24 2010
@@ -37,11 +37,8 @@ import org.apache.empire.db.expr.set.DBS
 
 /**
  * This abstract class handles the creation of the SQL-Commands. 
- * There are methods to create SQL-Commandos, like update, insert,
+ * There are methods to create SQL-Commands, like update, insert,
  * delete and select.
- * <P>
- * 
- *
  */
 public abstract class DBCommand extends DBCommandExpr
     implements Cloneable
@@ -212,7 +209,7 @@ public abstract class DBCommand extends 
     }
 
     /**
-     * Adds a list of columns to the select phrase of an sql statement.
+     * Adds a collection of columns to the select phrase of an sql statement.
      * 
      * @param columns the column expressions to add
      */

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
Mon Oct 11 20:07:24 2010
@@ -421,7 +421,7 @@ public abstract class DBDatabase extends
     }
 
     /**
-     * Returns the tables which has been defined in the database.
+     * Returns the tables which have been defined in the database.
      * 
      * @return db tables.
      */
@@ -451,7 +451,7 @@ public abstract class DBDatabase extends
      * Adds a foreign key relation to the database.
      * <P>
      * @param reference a reference for a source and target column pair
-     * @return true if the relations was successfully created.
+     * @return true if the relations were successfully created.
      */
     public final boolean addRelation(DBRelation.DBReference reference)
     {
@@ -468,7 +468,7 @@ public abstract class DBDatabase extends
      * 
      * @param ref1 a reference for a source and target column pair
      * @param ref2 a reference for a source and target column pair
-     * @return true if the relations was successfully created.
+     * @return true if the relations were successfully created.
      */
     public final boolean addRelation(DBRelation.DBReference ref1, DBRelation.DBReference
ref2)
     {
@@ -488,7 +488,7 @@ public abstract class DBDatabase extends
      * @param name the relation name
      * @param references a list of source and target column pairs
      * 
-     * @return true if the relations was successfully created.
+     * @return true if the relations were successfully created.
      */
     public boolean addRelation(String name, DBRelation.DBReference[] references)
     {
@@ -508,9 +508,9 @@ public abstract class DBDatabase extends
     }
 
     /**
-     * Returns the tables which has been defined in the database.
+     * Returns the relations which have been defined in the database.
      * 
-     * @return db tables.
+     * @return db relations.
      */
     public List<DBRelation> getRelations()
     {
@@ -537,9 +537,9 @@ public abstract class DBDatabase extends
     }
 
     /**
-     * Returns the tables which has been defined in the database.
+     * Returns the views which have been defined in the database.
      * 
-     * @return db tables.
+     * @return db views.
      */
     public List<DBView> getViews()
     {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
Mon Oct 11 20:07:24 2010
@@ -38,8 +38,8 @@ import org.apache.empire.commons.ErrorOb
 import org.apache.empire.commons.Errors;
 import org.apache.empire.commons.ObjectUtils;
 import org.apache.empire.commons.StringUtils;
-import org.apache.empire.data.DataType;
 import org.apache.empire.data.DataMode;
+import org.apache.empire.data.DataType;
 
 
 /**
@@ -587,7 +587,7 @@ public abstract class DBDatabaseDriver e
      * @param type the sql data type of the supplied value
      * @return the sql string representing this value
      */
-    public String getValueString(Object value, DataType type)
+    public final String getValueString(Object value, DataType type)
     { 
         if (ObjectUtils.isEmpty(value))
         {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java (original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java Mon
Oct 11 20:07:24 2010
@@ -39,7 +39,7 @@ import org.apache.empire.db.expr.column.
 
 /**
  * This class is the base class for all the DBTable,
- * CBView and DBQuery classes this class contains all the columns of the
+ * DBView and DBQuery classes this class contains all the columns of the
  * tables, views or queries
  * <P>
  * 

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/derby/DBDatabaseDriverDerby.java
Mon Oct 11 20:07:24 2010
@@ -456,7 +456,7 @@ public class DBDatabaseDriverDerby exten
         // Create the table
         if (script.addStmt(sql) == false)
             return false;
-        // Create other Indizes (except primary key)
+        // Create other Indexes (except primary key)
         Iterator<DBIndex> indexes = t.getIndexes().iterator();
         while (indexes.hasNext())
         {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/h2/DBDatabaseDriverH2.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/h2/DBDatabaseDriverH2.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/h2/DBDatabaseDriverH2.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/h2/DBDatabaseDriverH2.java
Mon Oct 11 20:07:24 2010
@@ -455,7 +455,7 @@ public class DBDatabaseDriverH2 extends 
         // Create the table
         if (script.addStmt(sql) == false)
             return false;
-        // Create other Indizes (except primary key)
+        // Create other Indexes (except primary key)
         Iterator<DBIndex> indexes = t.getIndexes().iterator();
         while (indexes.hasNext())
         {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/DBDatabaseDriverHSql.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/DBDatabaseDriverHSql.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/DBDatabaseDriverHSql.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/DBDatabaseDriverHSql.java
Mon Oct 11 20:07:24 2010
@@ -438,7 +438,7 @@ public class DBDatabaseDriverHSql extend
         // Create the table
         if (script.addStmt(sql) == false)
             return false;
-        // Create other Indizes (except primary key)
+        // Create other Indexes (except primary key)
         Iterator<DBIndex> indexes = t.getIndexes().iterator();
         while (indexes.hasNext())
         {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java
Mon Oct 11 20:07:24 2010
@@ -552,7 +552,7 @@ public class DBDatabaseDriverMySQL exten
         // Create the table
         if (script.addStmt(sql) == false)
             return false;
-        // Create other Indizes (except primary key)
+        // Create other Indexes (except primary key)
         Iterator<DBIndex> indexes = t.getIndexes().iterator();
         while (indexes.hasNext())
         {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/DBDatabaseDriverOracle.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/DBDatabaseDriverOracle.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/DBDatabaseDriverOracle.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/DBDatabaseDriverOracle.java
Mon Oct 11 20:07:24 2010
@@ -527,7 +527,7 @@ public class DBDatabaseDriverOracle exte
         DBDatabase db = t.getDatabase();
         if (script.addStmt(sql) == false)
             return false;
-        // Create other Indizes (except primary key)
+        // Create other Indexes (except primary key)
         Iterator<DBIndex> indexes = t.getIndexes().iterator();
         while (indexes.hasNext())
         {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java
Mon Oct 11 20:07:24 2010
@@ -598,7 +598,7 @@ public class DBDatabaseDriverPostgreSQL 
         // Create the table
         if (script.addStmt(sql) == false)
             return false;
-        // Create other Indizes (except primary key)
+        // Create other Indexes (except primary key)
         Iterator<DBIndex> indexes = t.getIndexes().iterator();
         while (indexes.hasNext())
         {

Modified: incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/sqlserver/DBDatabaseDriverMSSQL.java
Mon Oct 11 20:07:24 2010
@@ -545,7 +545,7 @@ public class DBDatabaseDriverMSSQL exten
         // Create the table
         if (script.addStmt(sql) == false)
             return false;
-        // Create other Indizes (except primary key)
+        // Create other Indexes (except primary key)
         Iterator<DBIndex> indexes = t.getIndexes().iterator();
         while (indexes.hasNext())
         {

Modified: incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java?rev=1021491&r1=1021490&r2=1021491&view=diff
==============================================================================
--- incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java
(original)
+++ incubator/empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/ObjectUtilsTest.java
Mon Oct 11 20:07:24 2010
@@ -294,7 +294,7 @@ public class ObjectUtilsTest
 	 * .
 	 */
 	@Test
-	@Ignore("fix multitreaded stuff")
+	@Ignore("fix multithreaded stuff")
 	public void testGetDateObjectLocale()
 	{
 		fail("Not yet implemented");
@@ -305,7 +305,7 @@ public class ObjectUtilsTest
 	 * {@link org.apache.empire.commons.ObjectUtils#getDate(java.lang.Object)}.
 	 */
 	@Test
-	@Ignore("fix multitreaded stuff")
+	@Ignore("fix multithreaded stuff")
 	public void testGetDateObject()
 	{
 		fail("Not yet implemented");
@@ -317,7 +317,7 @@ public class ObjectUtilsTest
 	 * .
 	 */
 	@Test
-	@Ignore("fix multitreaded stuff")
+	@Ignore("fix multithreaded stuff")
 	public void testFormatDate()
 	{
 		fail("Not yet implemented");



Mime
View raw message