Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 9782 invoked from network); 8 Dec 2006 01:02:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Dec 2006 01:02:49 -0000 Received: (qmail 48690 invoked by uid 500); 8 Dec 2006 01:02:57 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 48619 invoked by uid 500); 8 Dec 2006 01:02:57 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 48608 invoked by uid 99); 8 Dec 2006 01:02:57 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Dec 2006 17:02:57 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Dec 2006 17:02:47 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 9F8C41A9846; Thu, 7 Dec 2006 17:02:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r483762 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/ Date: Fri, 08 Dec 2006 01:02:03 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061208010204.9F8C41A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djd Date: Thu Dec 7 17:02:01 2006 New Revision: 483762 URL: http://svn.apache.org/viewvc?view=rev&rev=483762 Log: DERBY-2138 (partial) Organize imports in impl/sql/catalog for classes that import DataDictionaryContext but do not use it. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java?view=diff&rev=483762&r1=483761&r2=483762 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java Thu Dec 7 17:02:01 2006 @@ -21,37 +21,21 @@ package org.apache.derby.impl.sql.catalog; -import org.apache.derby.iapi.types.TypeId; +import org.apache.derby.catalog.AliasInfo; +import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.reference.JDBC30Translation; -import org.apache.derby.iapi.sql.dictionary.SystemColumn; -import org.apache.derby.catalog.TypeDescriptor; - -import org.apache.derby.iapi.types.DataValueDescriptor; - -import org.apache.derby.iapi.types.DataValueFactory; -import org.apache.derby.iapi.types.RowLocation; - -import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory; -import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; +import org.apache.derby.iapi.services.sanity.SanityManager; +import org.apache.derby.iapi.services.uuid.UUIDFactory; import org.apache.derby.iapi.sql.dictionary.AliasDescriptor; -import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; +import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; +import org.apache.derby.iapi.sql.dictionary.SystemColumn; import org.apache.derby.iapi.sql.dictionary.TupleDescriptor; - -import org.apache.derby.iapi.sql.execute.ExecutionContext; -import org.apache.derby.iapi.sql.execute.ExecIndexRow; import org.apache.derby.iapi.sql.execute.ExecRow; import org.apache.derby.iapi.sql.execute.ExecutionFactory; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.services.uuid.UUIDFactory; - -import org.apache.derby.catalog.AliasInfo; -import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.types.DataValueFactory; /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java?view=diff&rev=483762&r1=483761&r2=483762 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java Thu Dec 7 17:02:01 2006 @@ -21,42 +21,25 @@ package org.apache.derby.impl.sql.catalog; -import org.apache.derby.iapi.types.DataValueDescriptor; - -import org.apache.derby.iapi.types.DataValueFactory; - -import org.apache.derby.iapi.types.TypeId; -import org.apache.derby.iapi.types.RowLocation; - -import org.apache.derby.iapi.types.DataTypeDescriptor; +import java.sql.Types; -import org.apache.derby.iapi.sql.dictionary.SystemColumn; +import org.apache.derby.catalog.ReferencedColumns; +import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.services.sanity.SanityManager; +import org.apache.derby.iapi.services.uuid.UUIDFactory; import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory; -import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; +import org.apache.derby.iapi.sql.dictionary.CheckConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.SubCheckConstraintDescriptor; -import org.apache.derby.iapi.sql.dictionary.CheckConstraintDescriptor; +import org.apache.derby.iapi.sql.dictionary.SystemColumn; import org.apache.derby.iapi.sql.dictionary.TupleDescriptor; -import org.apache.derby.iapi.sql.dictionary.ViewDescriptor; - -import org.apache.derby.iapi.sql.execute.ExecutionContext; import org.apache.derby.iapi.sql.execute.ExecIndexRow; import org.apache.derby.iapi.sql.execute.ExecRow; import org.apache.derby.iapi.sql.execute.ExecutionFactory; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.catalog.ReferencedColumns; -import org.apache.derby.catalog.TypeDescriptor; -import org.apache.derby.iapi.services.uuid.UUIDFactory; -import org.apache.derby.catalog.UUID; - -import java.sql.Types; -import java.util.Properties; +import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.types.DataValueFactory; /** * Factory for creating a SYSCHECKS row. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java?view=diff&rev=483762&r1=483761&r2=483762 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java Thu Dec 7 17:02:01 2006 @@ -21,42 +21,26 @@ package org.apache.derby.impl.sql.catalog; -import org.apache.derby.iapi.types.RowLocation; - +import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.error.StandardException; import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.types.TypeId; -import org.apache.derby.iapi.sql.dictionary.SystemColumn; -import org.apache.derby.catalog.TypeDescriptor; - -import org.apache.derby.iapi.types.DataValueDescriptor; - -import org.apache.derby.iapi.types.DataValueFactory; - +import org.apache.derby.iapi.services.uuid.UUIDFactory; import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory; import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; import org.apache.derby.iapi.sql.dictionary.ConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor; import org.apache.derby.iapi.sql.dictionary.SubCheckConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.SubConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.SubKeyConstraintDescriptor; +import org.apache.derby.iapi.sql.dictionary.SystemColumn; import org.apache.derby.iapi.sql.dictionary.TableDescriptor; import org.apache.derby.iapi.sql.dictionary.TupleDescriptor; - -import org.apache.derby.iapi.services.uuid.UUIDFactory; -import org.apache.derby.catalog.UUID; - -import org.apache.derby.iapi.sql.execute.ExecIndexRow; import org.apache.derby.iapi.sql.execute.ExecRow; -import org.apache.derby.iapi.sql.execute.ExecutionContext; import org.apache.derby.iapi.sql.execute.ExecutionFactory; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.catalog.IndexDescriptor; +import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.types.DataValueFactory; /** * Factory for creating a SYSCONTRAINTS row. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java?view=diff&rev=483762&r1=483761&r2=483762 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java Thu Dec 7 17:02:01 2006 @@ -21,40 +21,22 @@ package org.apache.derby.impl.sql.catalog; -import org.apache.derby.catalog.Dependable; -import org.apache.derby.catalog.DependableFinder; - -import org.apache.derby.iapi.services.uuid.UUIDFactory; -import org.apache.derby.catalog.UUID; - -import org.apache.derby.iapi.types.TypeId; -import org.apache.derby.iapi.sql.dictionary.SystemColumn; +import org.apache.derby.catalog.DependableFinder; import org.apache.derby.catalog.TypeDescriptor; - +import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.reference.SQLState; import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.types.DataValueDescriptor; - -import org.apache.derby.iapi.types.DataValueFactory; -import org.apache.derby.iapi.types.RowLocation; - +import org.apache.derby.iapi.services.uuid.UUIDFactory; import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory; -import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; -import org.apache.derby.iapi.sql.dictionary.DependencyDescriptor; -import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; +import org.apache.derby.iapi.sql.dictionary.DependencyDescriptor; +import org.apache.derby.iapi.sql.dictionary.SystemColumn; import org.apache.derby.iapi.sql.dictionary.TupleDescriptor; - -import org.apache.derby.iapi.sql.execute.ExecutionContext; -import org.apache.derby.iapi.sql.execute.ExecutionFactory; -import org.apache.derby.iapi.sql.execute.ExecIndexRow; import org.apache.derby.iapi.sql.execute.ExecRow; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.catalog.IndexDescriptor; -import org.apache.derby.iapi.reference.SQLState; +import org.apache.derby.iapi.sql.execute.ExecutionFactory; +import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.types.DataValueFactory; /** * Factory for creating a SYSDEPENDSS row. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java?view=diff&rev=483762&r1=483761&r2=483762 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java Thu Dec 7 17:02:01 2006 @@ -21,42 +21,24 @@ package org.apache.derby.impl.sql.catalog; -import org.apache.derby.iapi.types.TypeId; -import org.apache.derby.iapi.sql.dictionary.SystemColumn; -import org.apache.derby.catalog.TypeDescriptor; - -import org.apache.derby.iapi.types.DataValueDescriptor; - -import org.apache.derby.iapi.types.DataValueFactory; -import org.apache.derby.iapi.types.RowLocation; - +import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.services.sanity.SanityManager; +import org.apache.derby.iapi.services.uuid.UUIDFactory; +import org.apache.derby.iapi.sql.StatementType; import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory; -import org.apache.derby.iapi.sql.dictionary.ConstraintDescriptor; -import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.ForeignKeyConstraintDescriptor; -import org.apache.derby.iapi.sql.dictionary.KeyConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.ReferencedKeyConstraintDescriptor; -import org.apache.derby.iapi.sql.dictionary.TupleDescriptor; import org.apache.derby.iapi.sql.dictionary.SubKeyConstraintDescriptor; -import org.apache.derby.iapi.sql.StatementType; - -import org.apache.derby.iapi.sql.execute.ExecutionContext; +import org.apache.derby.iapi.sql.dictionary.SystemColumn; +import org.apache.derby.iapi.sql.dictionary.TupleDescriptor; import org.apache.derby.iapi.sql.execute.ExecIndexRow; import org.apache.derby.iapi.sql.execute.ExecRow; import org.apache.derby.iapi.sql.execute.ExecutionFactory; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.types.RowLocation; - -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.services.uuid.UUIDFactory; -import org.apache.derby.catalog.UUID; -import org.apache.derby.catalog.IndexDescriptor; +import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.types.DataValueFactory; /** * Factory for creating a SYSFOREIGNKEYS row. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java?view=diff&rev=483762&r1=483761&r2=483762 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java Thu Dec 7 17:02:01 2006 @@ -21,39 +21,21 @@ package org.apache.derby.impl.sql.catalog; -import org.apache.derby.iapi.types.TypeId; -import org.apache.derby.iapi.sql.dictionary.SystemColumn; -import org.apache.derby.catalog.TypeDescriptor; - -import org.apache.derby.iapi.types.DataValueDescriptor; - -import org.apache.derby.iapi.types.DataValueFactory; -import org.apache.derby.iapi.types.RowLocation; - +import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.services.sanity.SanityManager; +import org.apache.derby.iapi.services.uuid.UUIDFactory; import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory; -import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; -import org.apache.derby.iapi.sql.dictionary.ConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; import org.apache.derby.iapi.sql.dictionary.KeyConstraintDescriptor; import org.apache.derby.iapi.sql.dictionary.SubKeyConstraintDescriptor; +import org.apache.derby.iapi.sql.dictionary.SystemColumn; import org.apache.derby.iapi.sql.dictionary.TupleDescriptor; - -import org.apache.derby.iapi.sql.execute.ExecIndexRow; -import org.apache.derby.iapi.sql.execute.ExecutionContext; import org.apache.derby.iapi.sql.execute.ExecRow; import org.apache.derby.iapi.sql.execute.ExecutionFactory; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.services.monitor.Monitor; -import org.apache.derby.catalog.UUID; -import org.apache.derby.iapi.services.uuid.UUIDFactory; - -import org.apache.derby.catalog.IndexDescriptor; +import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.types.DataValueFactory; /** * Factory for creating a SYSKEYS row. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java?view=diff&rev=483762&r1=483761&r2=483762 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java Thu Dec 7 17:02:01 2006 @@ -21,37 +21,21 @@ package org.apache.derby.impl.sql.catalog; -import org.apache.derby.iapi.types.DataValueDescriptor; - -import org.apache.derby.iapi.types.TypeId; -import org.apache.derby.iapi.sql.dictionary.SystemColumn; -import org.apache.derby.catalog.TypeDescriptor; - -import org.apache.derby.iapi.types.DataValueFactory; -import org.apache.derby.iapi.types.RowLocation; - +import org.apache.derby.catalog.UUID; +import org.apache.derby.iapi.error.StandardException; +import org.apache.derby.iapi.services.sanity.SanityManager; +import org.apache.derby.iapi.services.uuid.UUIDFactory; import org.apache.derby.iapi.sql.dictionary.CatalogRowFactory; -import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor; import org.apache.derby.iapi.sql.dictionary.DataDescriptorGenerator; import org.apache.derby.iapi.sql.dictionary.DataDictionary; -import org.apache.derby.iapi.sql.dictionary.DataDictionaryContext; +import org.apache.derby.iapi.sql.dictionary.SystemColumn; import org.apache.derby.iapi.sql.dictionary.TupleDescriptor; import org.apache.derby.iapi.sql.dictionary.ViewDescriptor; - -import org.apache.derby.iapi.sql.execute.ExecutionContext; -import org.apache.derby.iapi.sql.execute.ExecIndexRow; import org.apache.derby.iapi.sql.execute.ExecRow; import org.apache.derby.iapi.sql.execute.ExecutionFactory; - -import org.apache.derby.iapi.error.StandardException; - -import org.apache.derby.iapi.services.sanity.SanityManager; - -import org.apache.derby.iapi.services.uuid.UUIDFactory; -import org.apache.derby.catalog.UUID; -import org.apache.derby.catalog.IndexDescriptor; - -import java.util.Properties; +import org.apache.derby.iapi.types.DataValueDescriptor; +import org.apache.derby.iapi.types.DataValueFactory; +import org.apache.derby.iapi.types.TypeId; /** * Factory for creating a SYSVIEWS row.