Menu
▾
▴
[Aplaws-commit] r735 - in ccm-core/trunk/src/com/redhat/persistence: . common engine/rdbms metadata oql pdl profiler/rdbms
|
From: <ssk...@vh...> - 2005-09-01 12:36:34
|
Author: sskracic Date: 2005-09-01 14:27:29 +0200 (Thu, 01 Sep 2005) New Revision: 735 Modified: ccm-core/trunk/src/com/redhat/persistence/Session.java ccm-core/trunk/src/com/redhat/persistence/common/SQLParser.jj ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/EventSwitch.java ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java ccm-core/trunk/src/com/redhat/persistence/metadata/Qualias.java ccm-core/trunk/src/com/redhat/persistence/oql/AbstractJoin.java ccm-core/trunk/src/com/redhat/persistence/oql/All.java ccm-core/trunk/src/com/redhat/persistence/oql/Code.java ccm-core/trunk/src/com/redhat/persistence/oql/Define.java ccm-core/trunk/src/com/redhat/persistence/oql/Equals.java ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java ccm-core/trunk/src/com/redhat/persistence/oql/Exists.java ccm-core/trunk/src/com/redhat/persistence/oql/Expression.java ccm-core/trunk/src/com/redhat/persistence/oql/Filter.java ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java ccm-core/trunk/src/com/redhat/persistence/oql/Get.java ccm-core/trunk/src/com/redhat/persistence/oql/Indentor.java ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java ccm-core/trunk/src/com/redhat/persistence/oql/Main.java ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java ccm-core/trunk/src/com/redhat/persistence/oql/OQLParser.jj ccm-core/trunk/src/com/redhat/persistence/oql/Or.java ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java ccm-core/trunk/src/com/redhat/persistence/oql/QValue.java ccm-core/trunk/src/com/redhat/persistence/oql/Query.java ccm-core/trunk/src/com/redhat/persistence/oql/Static.java ccm-core/trunk/src/com/redhat/persistence/oql/Variable.java ccm-core/trunk/src/com/redhat/persistence/pdl/PDL.java ccm-core/trunk/src/com/redhat/persistence/pdl/PDLParser.jj ccm-core/trunk/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java Log: NFC: getting rid of remaining wildcard imports in ccm-core/src. Modified: ccm-core/trunk/src/com/redhat/persistence/Session.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/Session.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/Session.java 2005-09-01 12:27:29 UTC (rev 735) @@ -28,9 +28,17 @@ import com.redhat.persistence.metadata.Property; import com.redhat.persistence.metadata.Role; import com.redhat.persistence.metadata.Root; -import com.redhat.persistence.oql.*; +import com.redhat.persistence.oql.All; +import com.redhat.persistence.oql.And; +import com.redhat.persistence.oql.Define; +import com.redhat.persistence.oql.Equals; +import com.redhat.persistence.oql.Exists; import com.redhat.persistence.oql.Expression; -import com.redhat.persistence.oql.Query; +import com.redhat.persistence.oql.Filter; +import com.redhat.persistence.oql.Get; +import com.redhat.persistence.oql.Join; +import com.redhat.persistence.oql.Literal; +import com.redhat.persistence.oql.Variable; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; Modified: ccm-core/trunk/src/com/redhat/persistence/common/SQLParser.jj =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/common/SQLParser.jj 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/common/SQLParser.jj 2005-09-01 12:27:29 UTC (rev 735) @@ -8,8 +8,9 @@ package com.redhat.persistence.common; -import java.util.*; -import java.io.*; +import java.io.Reader; +import java.util.ArrayList; +import java.util.Collection; /** * SQLParser @@ -42,11 +43,11 @@ m_mapper = mapper; } - public void initialize(java.io.Reader reader) { + public void initialize(Reader reader) { initialize(reader, m_mapper); } - public void initialize(java.io.Reader reader, Mapper mapper) { + public void initialize(Reader reader, Mapper mapper) { m_assigns.clear(); m_mapper = mapper; m_sql = new SQL(); Modified: ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/EventSwitch.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/EventSwitch.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/EventSwitch.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,9 +18,33 @@ */ package com.redhat.persistence.engine.rdbms; -import com.redhat.persistence.*; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.AddEvent; +import com.redhat.persistence.Condition; +import com.redhat.persistence.CreateEvent; +import com.redhat.persistence.DeleteEvent; +import com.redhat.persistence.Event; +import com.redhat.persistence.ObjectEvent; +import com.redhat.persistence.PropertyEvent; +import com.redhat.persistence.PropertyMap; +import com.redhat.persistence.RemoveEvent; +import com.redhat.persistence.SetEvent; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.JoinFrom; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.JoinTo; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Qualias; +import com.redhat.persistence.metadata.Role; +import com.redhat.persistence.metadata.SQLBlock; +import com.redhat.persistence.metadata.Static; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.Value; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; Modified: ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,7 @@ */ package com.redhat.persistence.engine.rdbms; -import java.sql.*; +import java.sql.SQLException; /** * StatementLifecycle Modified: ccm-core/trunk/src/com/redhat/persistence/metadata/Qualias.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/metadata/Qualias.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/metadata/Qualias.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,7 @@ */ package com.redhat.persistence.metadata; -import com.redhat.persistence.common.*; +import com.redhat.persistence.common.Path; /** * Qualias Modified: ccm-core/trunk/src/com/redhat/persistence/oql/AbstractJoin.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/AbstractJoin.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/AbstractJoin.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,8 +18,15 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; -import java.util.*; +import com.redhat.persistence.metadata.Alias; +import com.redhat.persistence.metadata.Link; +import com.redhat.persistence.metadata.Model; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Role; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** * AbstractJoin Modified: ccm-core/trunk/src/com/redhat/persistence/oql/All.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/All.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/All.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,9 +18,13 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.SQLBlock; +import java.util.Collections; +import java.util.Iterator; +import java.util.Map; /** * All Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Code.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Code.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Code.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,13 +18,33 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLToken; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.JoinFrom; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.JoinTo; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.MetadataException; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.SQLBlock; import com.redhat.persistence.metadata.Static; - -import java.io.*; -import java.util.*; - +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.Value; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Define.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Define.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Define.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,9 +18,14 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.Model; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Role; +import java.util.Iterator; +import java.util.Map.Entry; +import java.util.Map; /** * Define Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Equals.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Equals.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Equals.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,8 @@ */ package com.redhat.persistence.oql; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * Equals Modified: ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,16 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; - +import com.redhat.persistence.common.CompoundKey; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.UniqueKey; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.commons.collections.list.*; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Exists.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Exists.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Exists.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,9 @@ */ package com.redhat.persistence.oql; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** * Exists Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Expression.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Expression.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Expression.java 2005-09-01 12:27:29 UTC (rev 735) @@ -19,8 +19,6 @@ package com.redhat.persistence.oql; import com.redhat.persistence.common.Path; -import com.redhat.persistence.metadata.*; -import java.util.*; /** * Expression Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Filter.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Filter.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Filter.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,8 +18,6 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; -import java.util.*; /** * Filter Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,22 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; - +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLToken; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.UniqueKey; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.commons.collections.primitives.*; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Get.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Get.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Get.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,13 +18,28 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLToken; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.JoinFrom; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.JoinTo; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Qualias; import com.redhat.persistence.metadata.Static; - -import java.io.*; -import java.util.*; - +import com.redhat.persistence.metadata.Value; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Indentor.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Indentor.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Indentor.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,8 @@ */ package com.redhat.persistence.oql; -import java.io.*; +import java.io.IOException; +import java.io.Writer; /** * Indentor Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,12 +18,17 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.*; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.PropertyMap; +import com.redhat.persistence.common.CompoundKey; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Root; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; -import java.util.*; - /** * Literal * Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Main.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Main.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Main.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,12 +18,13 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.pdl.*; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.pdl.PDL; +import java.io.FileReader; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; -import java.io.*; -import java.util.*; - /** * Main * Modified: ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,15 @@ */ package com.redhat.persistence.oql; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; import org.apache.commons.collections.list.*; -import java.util.*; - /** * MultiMap * Modified: ccm-core/trunk/src/com/redhat/persistence/oql/OQLParser.jj =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/OQLParser.jj 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/OQLParser.jj 2005-09-01 12:27:29 UTC (rev 735) @@ -7,10 +7,15 @@ package com.redhat.persistence.oql; -import java.lang.reflect.*; -import java.math.*; -import java.util.*; -import java.io.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * OQLParser Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Or.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Or.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Or.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,6 @@ */ package com.redhat.persistence.oql; -import java.util.*; /** * Or Modified: ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,24 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; - +import com.redhat.persistence.common.CompoundKey; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.ForeignKey; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.UniqueKey; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; +import java.util.Set; import org.apache.commons.collections.list.*; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/redhat/persistence/oql/QValue.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/QValue.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/QValue.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,9 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; /** * QValue Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Query.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Query.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Query.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,15 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.metadata.Root; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.commons.collections.map.LRUMap; -import java.util.*; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Static.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Static.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Static.java 2005-09-01 12:27:29 UTC (rev 735) @@ -19,14 +19,22 @@ package com.redhat.persistence.oql; import com.redhat.persistence.ProtoException; -import com.redhat.persistence.common.*; +import com.redhat.persistence.common.CompoundKey; import com.redhat.persistence.common.ParseException; -import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLParser; +import com.redhat.persistence.common.SQLToken; import com.redhat.persistence.metadata.ObjectType; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import java.io.*; -import java.util.*; - /** * Static * Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Variable.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Variable.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Variable.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,9 +18,6 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; /** * Variable Modified: ccm-core/trunk/src/com/redhat/persistence/pdl/PDL.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/pdl/PDL.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/pdl/PDL.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,14 +18,67 @@ */ package com.redhat.persistence.pdl; -import com.arsdigita.util.*; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.pdl.nodes.*; - -import java.io.*; -import java.util.*; - +import com.arsdigita.util.WrappedError; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.common.SQLParser; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.DataOperation; +import com.redhat.persistence.metadata.ForeignKey; +import com.redhat.persistence.metadata.JoinFrom; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.JoinTo; +import com.redhat.persistence.metadata.Link; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.Model; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Qualias; +import com.redhat.persistence.metadata.Role; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.SQLBlock; +import com.redhat.persistence.metadata.Static; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.UniqueKey; +import com.redhat.persistence.metadata.Value; +import com.redhat.persistence.pdl.nodes.AST; +import com.redhat.persistence.pdl.nodes.AggressiveLoadNd; +import com.redhat.persistence.pdl.nodes.AssociationNd; +import com.redhat.persistence.pdl.nodes.BindingNd; +import com.redhat.persistence.pdl.nodes.ColumnNd; +import com.redhat.persistence.pdl.nodes.DataOperationNd; +import com.redhat.persistence.pdl.nodes.DbTypeNd; +import com.redhat.persistence.pdl.nodes.EventNd; +import com.redhat.persistence.pdl.nodes.FileNd; +import com.redhat.persistence.pdl.nodes.IdentifierNd; +import com.redhat.persistence.pdl.nodes.JavaClassNd; +import com.redhat.persistence.pdl.nodes.JoinNd; +import com.redhat.persistence.pdl.nodes.JoinPathNd; +import com.redhat.persistence.pdl.nodes.MappingNd; +import com.redhat.persistence.pdl.nodes.Node; +import com.redhat.persistence.pdl.nodes.ObjectKeyNd; +import com.redhat.persistence.pdl.nodes.ObjectTypeNd; +import com.redhat.persistence.pdl.nodes.PathNd; +import com.redhat.persistence.pdl.nodes.PropertyNd; +import com.redhat.persistence.pdl.nodes.QualiasNd; +import com.redhat.persistence.pdl.nodes.ReferenceKeyNd; +import com.redhat.persistence.pdl.nodes.SQLBlockNd; +import com.redhat.persistence.pdl.nodes.SuperNd; +import com.redhat.persistence.pdl.nodes.TypeNd; +import com.redhat.persistence.pdl.nodes.UniqueKeyNd; +import java.io.FileReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/pdl/PDLParser.jj =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/pdl/PDLParser.jj 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/pdl/PDLParser.jj 2005-09-01 12:27:29 UTC (rev 735) @@ -7,7 +7,32 @@ package com.redhat.persistence.pdl; -import com.redhat.persistence.pdl.nodes.*; +import com.redhat.persistence.pdl.nodes.AggressiveLoadNd; +import com.redhat.persistence.pdl.nodes.AssociationNd; +import com.redhat.persistence.pdl.nodes.BindingNd; +import com.redhat.persistence.pdl.nodes.ColumnNd; +import com.redhat.persistence.pdl.nodes.DataOperationNd; +import com.redhat.persistence.pdl.nodes.DbTypeNd; +import com.redhat.persistence.pdl.nodes.EventNd; +import com.redhat.persistence.pdl.nodes.FileNd; +import com.redhat.persistence.pdl.nodes.IdentifierNd; +import com.redhat.persistence.pdl.nodes.ImportNd; +import com.redhat.persistence.pdl.nodes.JavaClassNd; +import com.redhat.persistence.pdl.nodes.JoinNd; +import com.redhat.persistence.pdl.nodes.JoinPathNd; +import com.redhat.persistence.pdl.nodes.MappingNd; +import com.redhat.persistence.pdl.nodes.ModelNd; +import com.redhat.persistence.pdl.nodes.Node; +import com.redhat.persistence.pdl.nodes.ObjectKeyNd; +import com.redhat.persistence.pdl.nodes.ObjectTypeNd; +import com.redhat.persistence.pdl.nodes.PathNd; +import com.redhat.persistence.pdl.nodes.PropertyNd; +import com.redhat.persistence.pdl.nodes.QualiasNd; +import com.redhat.persistence.pdl.nodes.ReferenceKeyNd; +import com.redhat.persistence.pdl.nodes.SQLBlockNd; +import com.redhat.persistence.pdl.nodes.SuperNd; +import com.redhat.persistence.pdl.nodes.TypeNd; +import com.redhat.persistence.pdl.nodes.UniqueKeyNd; /** * PDLParser Modified: ccm-core/trunk/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,11 +18,14 @@ */ package com.redhat.persistence.profiler.rdbms; -import com.redhat.persistence.engine.rdbms.*; +import com.redhat.persistence.engine.rdbms.RDBMSProfiler; +import com.redhat.persistence.engine.rdbms.RDBMSStatement; +import com.redhat.persistence.engine.rdbms.StatementLifecycle; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; -import java.sql.*; -import java.util.*; - /** * CompoundProfiler * |
