directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 55362 - incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui
Date Sat, 23 Oct 2004 08:27:41 GMT
Author: akarasulu
Date: Sat Oct 23 01:27:40 2004
New Revision: 55362

Added:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/
      - copied from rev 55314, incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/
Modified:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/ASTNode.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AboutDialog.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AddEntryDialog.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AnnotatedFilterTreeDialog.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AttributesTableModel.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/BackendDatabaseViewer.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/BackendFrame.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/EntryDialog.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/EntryNode.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/FilterDialog.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/FilterDialog2.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/IndexDialog.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/SearchResultDialog.java
Log:
moving viewer over from the sandbox

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/ASTNode.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/ASTNode.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/ASTNode.java	Sat Oct 23 01:27:40 2004
@@ -1,193 +1,5 @@
 /*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
+ *   Copyright 2004 The Apache Software Foundation
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -202,117 +14,117 @@
  *   limitations under the License.
  *
  */
-
-/*
- * $Id: ASTNode.java,v 1.1 2003/09/30 03:41:12 akarasulu Exp $
- *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
- *
- */
+package org.apache.eve.db.gui;
 
-package org.apache.ldap.server.backend.db.gui ;
 
-
-import java.util.ArrayList ;
-import java.util.Enumeration ;
-import javax.swing.tree.TreeNode ;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import javax.swing.tree.TreeNode;
 
 import java.util.Collections;
-import org.apache.ldap.common.filter.ExprNode ;
-import org.apache.ldap.common.filter.BranchNode ;
+import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.filter.BranchNode;
 
 
 /**
  * A node representing an entry.
+ *
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
  */
-public class ASTNode
-	implements TreeNode
+public class ASTNode implements TreeNode
 {
-    private final ASTNode m_parent ;
-	private final ExprNode m_exprNode ;
-    private final ArrayList m_children ;
+    private final ASTNode parent;
+	private final ExprNode exprNode;
+    private final ArrayList children;
 
 
-    public ASTNode(ASTNode a_parent, ExprNode a_exprNode)
+    public ASTNode( ASTNode parent, ExprNode exprNode )
     {
-        m_children = new ArrayList(2) ;
-        m_exprNode = a_exprNode ;
+        this.children = new ArrayList(2);
+        this.exprNode = exprNode;
 
-        if(a_parent == null) {
-            m_parent = this ;
-        } else {
-            m_parent = a_parent ;
+        if( parent == null )
+        {
+            this.parent = this;
+        }
+        else
+        {
+            this.parent = parent;
         }
 
-		try {
-            if(m_exprNode.isLeaf()) {
-                return ;
+		try
+        {
+            if( exprNode.isLeaf() )
+            {
+                return;
             }
 
-            BranchNode l_branch = (BranchNode) m_exprNode ;
-            ArrayList l_exprNodes = l_branch.getChildren() ;
-            for(int ii = 0 ; ii < l_exprNodes.size(); ii++) {
-                ExprNode l_child = (ExprNode) l_exprNodes.get(ii) ;
-                m_children.add(new ASTNode(this, l_child)) ;
+            BranchNode branch = ( BranchNode ) exprNode;
+            ArrayList exprNodes = branch.getChildren();
+            for ( int ii = 0; ii < exprNodes.size(); ii++ )
+            {
+                ExprNode child = ( ExprNode ) exprNodes.get(ii);
+                children.add( new ASTNode( this, child ) );
             }
-        } catch(Exception e) {
-            e.printStackTrace() ;
+        }
+        catch( Exception e )
+        {
+            e.printStackTrace();
         }
     }
 
 
     public Enumeration children()
     {
-        return Collections.enumeration(m_children) ;
+        return Collections.enumeration( children );
     }
 
 
     public boolean getAllowsChildren()
     {
-        return !m_exprNode.isLeaf() ;
+        return !exprNode.isLeaf();
     }
 
 
-    public TreeNode getChildAt(int a_childIndex)
+    public TreeNode getChildAt( int childIndex )
     {
-		return (TreeNode) m_children.get(a_childIndex) ;
+		return ( TreeNode ) children.get( childIndex );
     }
 
 
     public int getChildCount()
     {
-        return m_children.size() ;
+        return children.size();
     }
 
 
-    public int getIndex(TreeNode a_child)
+    public int getIndex( TreeNode child )
     {
-        return m_children.indexOf(a_child) ;
+        return children.indexOf( child );
     }
 
 
     public TreeNode getParent()
     {
-        return m_parent ;
+        return parent;
     }
 
 
     public boolean isLeaf()
     {
-        return m_children.size() <= 0 ;
+        return children.size() <= 0;
     }
 
 
     public String toString()
     {
-        return m_exprNode.toString() ;
+        return exprNode.toString();
     }
 
 
     public ExprNode getExprNode()
     {
-        return m_exprNode ;
+        return exprNode;
     }
 }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AboutDialog.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/AboutDialog.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AboutDialog.java	Sat Oct 23 01:27:40 2004
@@ -1,193 +1,5 @@
 /*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
+ *   Copyright 2004 The Apache Software Foundation
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -202,40 +14,32 @@
  *   limitations under the License.
  *
  */
-
-/*
- * $Id: AboutDialog.java,v 1.1 2003/09/30 03:41:12 akarasulu Exp $
- *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
- *
- */
+package org.apache.eve.db.gui;
 
-package org.apache.ldap.server.backend.db.gui ;
 
-import java.awt.GridBagLayout;
-import javax.swing.JPanel;
-import javax.swing.JLabel;
-import javax.swing.JButton;
-import javax.swing.JTextArea;
-import javax.swing.JDialog;
-import java.awt.Frame;
-import java.awt.BorderLayout;
-import java.awt.FlowLayout;
+import java.awt.*;
+import javax.swing.*;
 import java.awt.event.WindowEvent;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-public class AboutDialog extends JDialog {
+
+/**
+ * An about dialog for the introspector GUI.
+ *
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class AboutDialog extends JDialog
+{
     private String title = "About";
-    private String product = "ldapd-modjdbm backend";
-    private String version = "0.7";
+    private String product = "Eve jdbm partition inspector";
+    private String version = "0.1";
     private String copyright = "Copyright (c) 2003";
     private String comments =
-        "This is the jdbm backend database viewer or introspector.\n" +
-        "Irregular behavior can be analyzed by using this tool to inspect\n" +
-        "the state of system indices and entry attributes within the backend." ;
+        "This is the jdbm partition viewer or introspector.\nIrregular behavior "
+      + "can be analyzed by using this tool to inspect\nthe state of system "
+      + "indices and entry attributes within the partition's database.";
     private JPanel contentPane = new JPanel();
     private JLabel prodLabel = new JLabel();
     private JLabel verLabel = new JLabel();
@@ -250,22 +54,28 @@
     private JPanel jPanel1 = new JPanel();
     private JPanel jPanel2 = new JPanel();
 
+
     /** Creates new About Dialog */
-    public AboutDialog(Frame parent, boolean modal) {
+    public AboutDialog(Frame parent, boolean modal)
+    {
         super(parent, modal);
         initGUI();
         pack();
     }
 
-    public AboutDialog() {
+
+    public AboutDialog()
+    {
         super();
         setModal(true);
         initGUI();
         pack();
     }
 
+
     /** This method is called from within the constructor to initialize the dialog. */
-    private void initGUI() {
+    private void initGUI()
+    {
         addWindowListener(
             new java.awt.event.WindowAdapter() {
                 public void windowClosing(WindowEvent evt) {
@@ -341,9 +151,12 @@
         jPanel2.setMaximumSize(new java.awt.Dimension(80,165));
     }
 
+
     /** Closes the dialog */
-    private void closeDialog(WindowEvent evt) {
-        setVisible(false);
+    private void closeDialog(WindowEvent evt)
+    {
+        evt.getWindow();
+        setVisible( false );
         dispose();
     }
 }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AddEntryDialog.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/AddEntryDialog.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AddEntryDialog.java	Sat Oct 23 01:27:40 2004
@@ -1,302 +1,102 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
 /*
- * $Id: AddEntryDialog.java,v 1.1 2003/10/03 03:03:18 akarasulu Exp $
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  *
  */
-package org.apache.ldap.server.backend.db.gui ;
+package org.apache.eve.db.gui;
 
 
-import java.awt.Frame ;
+import java.awt.Frame;
 
-import javax.naming.directory.Attributes ;
+import javax.naming.directory.Attributes;
 
 import javax.swing.DefaultCellEditor;
-import javax.swing.JPanel ;
-import javax.swing.JLabel ;
-import javax.swing.JTable ;
-import javax.swing.JDialog ;
-import javax.swing.JButton ;
-import javax.swing.JMenuItem ;
-import javax.swing.JComboBox ;
-import javax.swing.JPopupMenu ;
-import javax.swing.JTextField ;
-import javax.swing.JOptionPane ;
-import javax.swing.JScrollPane ;
-
-import java.awt.event.MouseEvent ;
-import java.awt.event.ActionEvent ;
-import java.awt.event.MouseAdapter ;
-import java.awt.event.ActionListener ;
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.JTable;
+import javax.swing.JDialog;
+import javax.swing.JButton;
+import javax.swing.JMenuItem;
+import javax.swing.JComboBox;
+import javax.swing.JPopupMenu;
+import javax.swing.JTextField;
+import javax.swing.JOptionPane;
+import javax.swing.JScrollPane;
+
+import java.awt.event.MouseEvent;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.ActionListener;
 
-import org.apache.ldap.common.message.LockableAttributesImpl ;
+import org.apache.ldap.common.message.LockableAttributesImpl;
 
 
 /**
  * Allows for operations on entries.
  * 
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.1 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
  */
 public class AddEntryDialog extends JDialog implements ActionListener
 {
-    private JPanel m_namePnl = new JPanel() ;
-    private JPanel m_attrPnl = new JPanel() ;
-    private JPanel m_buttonPnl = new JPanel() ;
-    private JPanel m_rdnPnl = new JPanel() ;
-    private JPanel m_dnPnl = new JPanel() ;
-    private JLabel m_rdnLbl = new JLabel() ;
-    private JComboBox m_rdnChoice = new JComboBox() ;
-    private JTextField m_dnText = new JTextField() ;
-    private JScrollPane m_attrScrollPnl = new JScrollPane() ;
-    private JTable m_attrTbl = new JTable() ;
-    private JButton m_doneBut = new JButton() ;
-    private JButton m_cancelBut = new JButton() ;
-    private JPopupMenu m_popup ;
-
-    private String m_parentDn ;
-    private String m_childRdn ;
-    private Attributes m_childEntry = new LockableAttributesImpl() ;
+    private JPanel m_namePnl = new JPanel();
+    private JPanel m_attrPnl = new JPanel();
+    private JPanel m_buttonPnl = new JPanel();
+    private JPanel m_rdnPnl = new JPanel();
+    private JPanel m_dnPnl = new JPanel();
+    private JLabel m_rdnLbl = new JLabel();
+    private JComboBox m_rdnChoice = new JComboBox();
+    private JTextField m_dnText = new JTextField();
+    private JScrollPane m_attrScrollPnl = new JScrollPane();
+    private JTable m_attrTbl = new JTable();
+    private JButton m_doneBut = new JButton();
+    private JButton m_cancelBut = new JButton();
+    private JPopupMenu m_popup;
+
+    private Attributes m_childEntry = new LockableAttributesImpl();
 
 
     /**
-     * Creates new form JDialog
+     * Creates new entry addition dialog.
      *  
-     * @param a_parent
-     * @param a_modal
+     * @param parent the parent frame
+     * @param modal whether or not to go modal on the dialog
      */
-    public AddEntryDialog( Frame a_parent, boolean a_modal )
+    public AddEntryDialog( Frame parent, boolean modal )
     {
-        super( a_parent, a_modal ) ;
-        m_childEntry.put( "objectClass", "top" ) ;
-        initGUI() ;
+        super( parent, modal );
+        m_childEntry.put( "objectClass", "top" );
+        initGUI();
     }
 
 
     /** 
      * This method is called from within the constructor to initialize the form.
      */
-    private void initGUI( )
+    private void initGUI()
     {
         addWindowListener( new java.awt.event.WindowAdapter(  )
         {
             public void windowClosing( java.awt.event.WindowEvent evt )
             {
-                closeDialog( ) ;
+                closeDialog( );
             }
-        } ) ;
-        pack(  ) ;
-        setBounds( new java.awt.Rectangle( 0, 0, 447, 364 ) ) ;
-        setTitle( "Add New Entry" ) ;
-        getContentPane(  ).setLayout( new java.awt.GridBagLayout(  ) ) ;
+        } );
+        pack(  );
+        setBounds( new java.awt.Rectangle( 0, 0, 447, 364 ) );
+        setTitle( "Add New Entry" );
+        getContentPane(  ).setLayout( new java.awt.GridBagLayout(  ) );
         getContentPane(  ).add( 
             m_namePnl,
             new java.awt.GridBagConstraints( 
@@ -310,7 +110,7 @@
                 java.awt.GridBagConstraints.HORIZONTAL,
                 new java.awt.Insets( 5, 5, 5, 5 ),
                 0,
-                0 ) ) ;
+                0 ) );
         getContentPane(  ).add( 
             m_attrPnl,
             new java.awt.GridBagConstraints( 
@@ -324,7 +124,7 @@
                 java.awt.GridBagConstraints.BOTH,
                 new java.awt.Insets( 5, 5, 5, 5 ),
                 0,
-                0 ) ) ;
+                0 ) );
         getContentPane(  ).add( 
             m_buttonPnl,
             new java.awt.GridBagConstraints( 
@@ -338,7 +138,7 @@
                 java.awt.GridBagConstraints.HORIZONTAL,
                 new java.awt.Insets( 0, 0, 0, 20 ),
                 0,
-                0 ) ) ;
+                0 ) );
         m_namePnl.setBorder( 
             javax.swing.BorderFactory.createTitledBorder( 
                 javax.swing.BorderFactory.createLineBorder( 
@@ -348,13 +148,13 @@
                 javax.swing.border.TitledBorder.LEADING,
                 javax.swing.border.TitledBorder.TOP,
                 new java.awt.Font( "SansSerif", 0, 14 ),
-                new java.awt.Color( 60, 60, 60 ) ) ) ;
+                new java.awt.Color( 60, 60, 60 ) ) );
         m_namePnl.setLayout( 
-            new javax.swing.BoxLayout( m_namePnl, javax.swing.BoxLayout.Y_AXIS ) ) ;
-        m_namePnl.add( m_rdnPnl ) ;
-        m_namePnl.add( m_dnPnl ) ;
-        m_rdnLbl.setText( "Rdn:" ) ;
-        m_rdnPnl.setLayout( new java.awt.GridBagLayout() ) ;
+            new javax.swing.BoxLayout( m_namePnl, javax.swing.BoxLayout.Y_AXIS ) );
+        m_namePnl.add( m_rdnPnl );
+        m_namePnl.add( m_dnPnl );
+        m_rdnLbl.setText( "Rdn:" );
+        m_rdnPnl.setLayout( new java.awt.GridBagLayout() );
         m_rdnPnl.add( 
             m_rdnChoice,
             new java.awt.GridBagConstraints( 
@@ -368,7 +168,7 @@
                 java.awt.GridBagConstraints.NONE,
                 new java.awt.Insets( 0, 10, 0, 0 ),
                 0,
-                0 ) ) ;
+                0 ) );
         m_rdnPnl.add( 
             m_rdnLbl,
             new java.awt.GridBagConstraints( 
@@ -382,8 +182,8 @@
                 java.awt.GridBagConstraints.NONE,
                 new java.awt.Insets( 0, 10, 0, 0 ),
                 0,
-                0 ) ) ;
-        m_dnPnl.setLayout( new java.awt.GridBagLayout(  ) ) ;
+                0 ) );
+        m_dnPnl.setLayout( new java.awt.GridBagLayout(  ) );
         m_dnPnl.add( 
             m_dnText,
             new java.awt.GridBagConstraints( 
@@ -397,9 +197,9 @@
                 java.awt.GridBagConstraints.HORIZONTAL,
                 new java.awt.Insets( 0, 5, 0, 0 ),
                 0,
-                0 ) ) ;
-        m_dnText.setText( "unknown" ) ;
-        m_dnText.setEditable( false ) ;
+                0 ) );
+        m_dnText.setText( "unknown" );
+        m_dnText.setEditable( false );
         m_dnText.setBorder( 
             javax.swing.BorderFactory.createTitledBorder( 
                 javax.swing.BorderFactory.createLineBorder( 
@@ -409,30 +209,30 @@
                 javax.swing.border.TitledBorder.LEADING,
                 javax.swing.border.TitledBorder.TOP,
                 new java.awt.Font( "SansSerif", 0, 14 ),
-                new java.awt.Color( 60, 60, 60 ) ) ) ;
-        m_rdnChoice.setEditable( true ) ;
-        m_rdnChoice.setMaximumRowCount( 6 ) ;
+                new java.awt.Color( 60, 60, 60 ) ) );
+        m_rdnChoice.setEditable( true );
+        m_rdnChoice.setMaximumRowCount( 6 );
         
-        m_rdnChoice.setSize( new java.awt.Dimension( 130, 24 ) ) ;
-        m_attrPnl.setLayout( new java.awt.BorderLayout(  ) ) ;
-        m_attrPnl.add( m_attrScrollPnl, java.awt.BorderLayout.CENTER ) ;
-        m_attrScrollPnl.getViewport(  ).add( m_attrTbl ) ;
-        m_attrTbl.setBounds( new java.awt.Rectangle( 78, 60, 32, 32 ) ) ;
-        m_attrTbl.setCellSelectionEnabled( true ) ;
+        m_rdnChoice.setSize( new java.awt.Dimension( 130, 24 ) );
+        m_attrPnl.setLayout( new java.awt.BorderLayout(  ) );
+        m_attrPnl.add( m_attrScrollPnl, java.awt.BorderLayout.CENTER );
+        m_attrScrollPnl.getViewport(  ).add( m_attrTbl );
+        m_attrTbl.setBounds( new java.awt.Rectangle( 78, 60, 32, 32 ) );
+        m_attrTbl.setCellSelectionEnabled( true );
         
-        m_doneBut.setText( "Done" ) ;
+        m_doneBut.setText( "Done" );
         m_buttonPnl.setLayout( 
-            new java.awt.FlowLayout( java.awt.FlowLayout.RIGHT, 10, 5 ) ) ;
-        m_buttonPnl.add( m_doneBut ) ;
-        m_buttonPnl.add( m_cancelBut ) ;
-        m_cancelBut.setText( "Cancel" ) ;
+            new java.awt.FlowLayout( java.awt.FlowLayout.RIGHT, 10, 5 ) );
+        m_buttonPnl.add( m_doneBut );
+        m_buttonPnl.add( m_cancelBut );
+        m_cancelBut.setText( "Cancel" );
         m_cancelBut.addActionListener( new ActionListener () 
         {
             public void actionPerformed( ActionEvent a_evt )
             {
-                closeDialog() ;
+                closeDialog();
             }
-        } ) ;
+        } );
         m_attrScrollPnl.setBorder( 
             javax.swing.BorderFactory.createTitledBorder( 
                 javax.swing.BorderFactory.createLineBorder( 
@@ -442,36 +242,36 @@
                 javax.swing.border.TitledBorder.LEADING,
                 javax.swing.border.TitledBorder.TOP,
                 new java.awt.Font( "SansSerif", 0, 14 ),
-                new java.awt.Color( 60, 60, 60 ) ) ) ;
+                new java.awt.Color( 60, 60, 60 ) ) );
 
         m_attrTbl.setModel( new AttributesTableModel( m_childEntry, 
-            null, null, true ) ) ;
+            null, null, true ) );
     
         //
         // Build the table's popup menu
         //
 
-        m_popup = new JPopupMenu() ;
-        JMenuItem l_menuItem = new JMenuItem( "Add" ) ;
-        l_menuItem.setActionCommand( "Add" ) ;
-        l_menuItem.addActionListener( this ) ;
-        m_popup.add( l_menuItem ) ;
-        l_menuItem = new JMenuItem( "Delete" ) ;
-        l_menuItem.setActionCommand( "Delete" ) ;
-        l_menuItem.addActionListener( this ) ;
-        m_popup.add( l_menuItem ) ;
+        m_popup = new JPopupMenu();
+        JMenuItem l_menuItem = new JMenuItem( "Add" );
+        l_menuItem.setActionCommand( "Add" );
+        l_menuItem.addActionListener( this );
+        m_popup.add( l_menuItem );
+        l_menuItem = new JMenuItem( "Delete" );
+        l_menuItem.setActionCommand( "Delete" );
+        l_menuItem.addActionListener( this );
+        m_popup.add( l_menuItem );
     
         // Add listener to components that can bring up popup menus.
-        m_attrTbl.addMouseListener( new PopupListener() ) ;
+        m_attrTbl.addMouseListener( new PopupListener() );
         
-        setUpEditor( m_attrTbl ) ;
+        setUpEditor( m_attrTbl );
     }
 
 
     private void setUpEditor( JTable l_table ) 
     {
         //Set up the editor for the integer cells.
-        final JTextField l_textField = new JTextField() ;
+        final JTextField l_textField = new JTextField();
 
         
         DefaultCellEditor l_textEditor = 
@@ -482,12 +282,12 @@
             public Object getCellEditorValue() 
             {
                 System.out.println( "Editor returning '" + l_textField.getText()
-                    + "'" ) ;
-                return l_textField.getText() ;
+                    + "'" );
+                return l_textField.getText();
             }
         };
         
-        l_table.setDefaultEditor( String.class, l_textEditor ) ;
+        l_table.setDefaultEditor( String.class, l_textEditor );
     }
 
 
@@ -496,13 +296,13 @@
     {
         public void mousePressed( MouseEvent e ) 
         {
-            maybeShowPopup( e ) ;
+            maybeShowPopup( e );
         }
 
         
         public void mouseReleased( MouseEvent e ) 
         {
-            maybeShowPopup( e ) ;
+            maybeShowPopup( e );
         }
 
       
@@ -510,7 +310,7 @@
         {
             if ( e.isPopupTrigger() ) 
             {
-                m_popup.show( e.getComponent(), e.getX(), e.getY() ) ;
+                m_popup.show( e.getComponent(), e.getX(), e.getY() );
             }
         }
     }
@@ -518,30 +318,30 @@
 
     public void actionPerformed( ActionEvent a_event )
     {
-        String l_cmd = a_event.getActionCommand() ;
+        String l_cmd = a_event.getActionCommand();
         AttributesTableModel l_model = ( AttributesTableModel ) 
-            m_attrTbl.getModel() ;
-        int l_row = m_attrTbl.getSelectedRow() ;
-        System.out.println( l_cmd ) ;
+            m_attrTbl.getModel();
+        int l_row = m_attrTbl.getSelectedRow();
+        System.out.println( l_cmd );
         
         if ( l_row >= l_model.getRowCount() || l_row < 0 )
         {
             JOptionPane.showMessageDialog( this, 
-                "Row needs to be selected to apply operation" ) ;
+                "Row needs to be selected to apply operation" );
         }
         
         if ( l_cmd.equals( "Add" ) )
         {
-             l_model.insert( l_row, "xxxx", "xxxx" ) ;
+             l_model.insert( l_row, "xxxx", "xxxx" );
         }
         else if ( l_cmd.equals( "Delete" ) )
         {
-            l_model.delete( l_row ) ;
+            l_model.delete( l_row );
         }
         else 
         {
             JOptionPane.showMessageDialog( this, 
-                "Unrecognized action - abandoning action processing." ) ;
+                "Unrecognized action - abandoning action processing." );
         }
     }
 
@@ -549,34 +349,25 @@
     /** Closes the dialog */
     private void closeDialog()
     {
-        setVisible( false ) ;
-        dispose() ;
+        setVisible( false );
+        dispose();
     }
 
 
-    public void setParentDn( String a_dn )
+    public void setParentDn( String dn )
     {
-        m_parentDn = a_dn ;
-        
-        if ( null == m_childRdn )
-        {
-            m_dnText.setText( a_dn ) ;
-        }
-        else 
-        {
-            m_dnText.setText( a_dn + "," + m_childRdn ) ;
-        }
+        m_dnText.setText( dn );
     }
     
     
     public Attributes getChildEntry()
     {
-        return m_childEntry ;
+        return m_childEntry;
     }
     
     
     public String getChildDn()
     {
-        return m_dnText.getText() ;
+        return m_dnText.getText();
     }
 }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AnnotatedFilterTreeDialog.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/AnnotatedFilterTreeDialog.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AnnotatedFilterTreeDialog.java	Sat Oct 23 01:27:40 2004
@@ -1,193 +1,5 @@
 /*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
+ *   Copyright 2004 The Apache Software Foundation
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -202,17 +14,8 @@
  *   limitations under the License.
  *
  */
-
-/*
- * $Id: AnnotatedFilterTreeDialog.java,v 1.1 2003/09/30 03:41:12 akarasulu Exp $
- *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
- *
- */
+package org.apache.eve.db.gui ;
 
-package org.apache.ldap.server.backend.db.gui ;
 
 import javax.swing.JDialog ;
 import java.awt.Frame ;
@@ -227,6 +30,12 @@
 import java.awt.event.ActionEvent;
 
 
+/**
+ * Dialog for showing annotated filter trees.
+ *
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
 public class AnnotatedFilterTreeDialog
     extends JDialog
 {
@@ -299,6 +108,7 @@
 
     /** Closes the dialog */
     private void closeDialog(WindowEvent evt) {
+        evt.getWindow();
         setVisible(false);
         dispose();
     }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AttributesTableModel.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/AttributesTableModel.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/AttributesTableModel.java	Sat Oct 23 01:27:40 2004
@@ -1,418 +1,278 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
 /*
- * $Id: AttributesTableModel.java,v 1.2 2003/10/03 03:03:18 akarasulu Exp $
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  *
  */
-package org.apache.ldap.server.backend.db.gui ;
+package org.apache.eve.db.gui;
 
 
-import java.util.ArrayList ;
-import java.math.BigInteger ;
+import java.util.ArrayList;
+import java.math.BigInteger;
 
-import javax.naming.NamingException ;
-import javax.naming.NamingEnumeration ;
-import javax.naming.directory.Attribute ;
-import javax.naming.directory.Attributes ;
-import javax.swing.table.AbstractTableModel ;
+import javax.naming.NamingException;
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.swing.table.AbstractTableModel;
 
 
 /**
  * A general purpose table model for entry attributes.
  * 
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.2 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
  */
-public class AttributesTableModel
-    extends AbstractTableModel
+public class AttributesTableModel extends AbstractTableModel
 {
-    public static final String KEY_COL = "Keys" ;
-    public static final String VAL_COL = "Values" ;
-
-    private final ArrayList m_keyList ;
-    private final ArrayList m_valList ;
-    
-    private final Attributes m_entry ;
-    private final BigInteger m_id ;
-    private final String m_dn ;
-    private boolean m_isMutable = true ;
-
-
-    public AttributesTableModel( Attributes a_entry, BigInteger a_id, 
-        String a_dn, boolean a_isMutable )
-    {
-        m_dn = a_dn ;
-        m_id = a_id ;
-        m_entry = a_entry ;
-        m_isMutable = a_isMutable ;
+    /** name for the key column */
+    public static final String KEY_COL = "Keys";
+    /** name for the values column */
+    public static final String VAL_COL = "Values";
+
+    /** list of attribute ids */
+    private final transient ArrayList keyList;
+    /** list of attribute values */
+    private final transient ArrayList valList;
+
+    /** the attributes for the entry */
+    private final Attributes entry;
+    /** the unique id of the entry  */
+    private final BigInteger id;
+    /** the distinguished name of the entry */
+    private final String dn;
+    /** whether or not the model is mutable */
+    private boolean isMutable = true;
+
+
+    /**
+     * Creates a table model for entry attributes.
+     *
+     * @param entry the entry to create a model for
+     * @param id the id for the entry
+     * @param dn the distinguished name of the entry
+     * @param isMutable whether or not the model can be changed
+     */
+    public AttributesTableModel( Attributes entry, BigInteger id, String dn,
+                                 boolean isMutable )
+    {
+        this.dn = dn;
+        this.id = id;
+        this.entry = entry;
+        this.isMutable = isMutable;
         
-        NamingEnumeration l_list = a_entry.getIDs() ;
-        int l_rowCount = 0 ;
+        NamingEnumeration list = entry.getIDs();
+        int rowCount = 0;
         
-        while( l_list.hasMoreElements() )
+        while( list.hasMoreElements() )
         {
-            String l_id = ( String ) l_list.nextElement() ;
-            l_rowCount = l_rowCount + a_entry.get( l_id ).size() ;            
+            String attrId = ( String ) list.nextElement();
+            rowCount = rowCount + entry.get( attrId ).size();
         }
         
-        m_keyList = new ArrayList( l_rowCount ) ;
-        m_valList = new ArrayList( l_rowCount ) ;
+        keyList = new ArrayList( rowCount );
+        valList = new ArrayList( rowCount );
 
-        l_list = m_entry.getIDs() ;
-        while ( l_list.hasMoreElements() ) 
+        list = this.entry.getIDs();
+        while ( list.hasMoreElements() )
         {
-            String l_key = ( String ) l_list.nextElement() ;
-            Attribute l_attr = ( Attribute ) m_entry.get( l_key ) ;
+            String l_key = ( String ) list.nextElement();
+            Attribute l_attr = ( Attribute ) this.entry.get( l_key );
             
             for ( int ii = 0; ii < l_attr.size(); ii++ )
             {
                 try 
                 {
-                    m_keyList.add( l_attr.getID() ) ;
-                    m_valList.add( l_attr.get( ii ) ) ;
+                    keyList.add( l_attr.getID() );
+                    valList.add( l_attr.get( ii ) );
                 }
                 catch ( NamingException e )
                 {
-                    e.printStackTrace() ;
+                    e.printStackTrace();
                 }
             }
         }
     }
 
 
-    public String getColumnName( int a_col )
+    /**
+     * @see AbstractTableModel#getColumnName(int)
+     */
+    public String getColumnName( int col )
     {
-        if ( a_col == 0 ) 
+        if ( col == 0 )
         {
-            return KEY_COL ;
+            return KEY_COL;
         } 
-        else if ( a_col == 1 ) 
+        else if ( col == 1 )
         {
-            return VAL_COL ;
+            return VAL_COL;
         } 
         else 
         {
             throw new RuntimeException("There can only be 2 columns at index "
-                + "0 and at 1") ;
+                + "0 and at 1");
         }
     }
 
 
+    /**
+     * @see javax.swing.table.AbstractTableModel#getRowCount()
+     */
     public int getRowCount()
     {
-        return m_keyList.size() ;
+        return keyList.size();
     }
 
 
+    /**
+     * @see javax.swing.table.AbstractTableModel#getColumnCount()
+     */
     public int getColumnCount()
     {
-        return 2 ;
+        return 2;
     }
 
 
-    public Class getColumnClass( int c ) 
+    /**
+     * @see AbstractTableModel#getColumnClass(int)
+     */
+    public Class getColumnClass( int c )
     {
-        return String.class ;
+        return String.class;
     }
 
 
-    public boolean isCellEditable( int a_row, int a_col ) 
+    /**
+     * @see AbstractTableModel#isCellEditable(int, int)
+     */
+    public boolean isCellEditable( int row, int col )
     {
-        return m_isMutable ;
+        return isMutable;
     }
 
 
-    public Object getValueAt(int a_row, int a_col)
+    /**
+     * @see AbstractTableModel#getValueAt(int, int)
+     */
+    public Object getValueAt( int row, int col )
     {
-		if ( a_row >= m_keyList.size() ) 
+		if ( row >= keyList.size() )
         {
-			return ( "NULL" ) ;
+			return ( "NULL" );
 		}
 
-        if ( getColumnName( a_col ).equals( KEY_COL ) ) 
+        if ( getColumnName( col ).equals( KEY_COL ) )
         {
-            return m_keyList.get( a_row ) ;
+            return keyList.get( row );
         } 
-        else if ( getColumnName( a_col ).equals( VAL_COL ) ) 
+        else if ( getColumnName( col ).equals( VAL_COL ) )
         {
-            return m_valList.get( a_row ) ;
+            return valList.get( row );
         } 
         else 
         {
-            throw new RuntimeException( "You didn't correctly set col names" ) ;
+            throw new RuntimeException( "You didn't correctly set col names" );
         }
     }
-    
-    
-    public void setValue( Object a_val, int a_row, int a_col )
+
+
+    /**
+     * @see AbstractTableModel#setValueAt(Object, int, int)
+     */
+    public void setValue( Object val, int row, int col )
     {
-        ArrayList l_list = null ;
+        ArrayList list = null;
         
-        if ( a_col > 1 || a_col < 0 )
+        if ( col > 1 || col < 0 )
         {
-            return ;
+            return;
         }
-        else if ( a_col == 0 )
+        else if ( col == 0 )
         {
-            l_list = m_keyList ;
+            list = keyList;
         }
         else 
         {
-            l_list = m_valList ;
+            list = valList;
         }
         
-        if ( a_row >= m_keyList.size() ) 
+        if ( row >= keyList.size() )
         {
-            return ;
+            return;
         }
 
-        l_list.set( a_row, a_val ) ;
-        fireTableCellUpdated( a_row, a_col ) ;
-    }    
-    
-    
+        list.set( row, val );
+        fireTableCellUpdated( row, col );
+    }
+
+
+    /**
+     * Gets the distinguished name of the entry.
+     *
+     * @return the distinguished name of the entry
+     */
     public String getEntryDn()
     {
-        return m_dn ;
+        return dn;
     }
     
     
+    /**
+     * Gets the unique id for the entry.
+     *
+     * @return the unique id for the entry
+     */
     public BigInteger getEntryId()
     {
-        return m_id ;
+        return id;
     }
-    
-    
-    public void delete( int a_row )
+
+
+    /**
+     * Deletes a row within the table model.
+     *
+     * @param row the row index to delete
+     */
+    public void delete( int row )
     {
-        if ( a_row >= m_keyList.size() || a_row < 0 ) 
+        if ( row >= keyList.size() || row < 0 )
         {
-            return ;
+            return;
         }
         
-        m_keyList.remove( a_row ) ;
-        m_valList.remove( a_row ) ;
-        fireTableRowsDeleted( a_row, a_row ) ;
+        keyList.remove( row );
+        valList.remove( row );
+        fireTableRowsDeleted( row, row );
     }
-    
-    
-    public void insert( int a_row, Object a_key, Object a_val )
+
+
+    /**
+     * Inserts an attribute key/value into the table model.
+     *
+     * @param row the row index to insert into
+     * @param key the key of the attr to insert
+     * @param val the value of the attr to insert
+     */
+    public void insert( int row, Object key, Object val )
     {
-        if ( a_row >= m_keyList.size() || a_row < 0 ) 
+        if ( row >= keyList.size() || row < 0 )
         {
-            return ;
+            return;
         }
         
-        m_keyList.add( a_row, a_key ) ;
-        m_valList.add( a_row, a_val ) ;
-        fireTableRowsInserted( a_row, a_row ) ;
+        keyList.add( row, key );
+        valList.add( row, val );
+        fireTableRowsInserted( row, row );
     }
 }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/BackendDatabaseViewer.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/BackendDatabaseViewer.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/BackendDatabaseViewer.java	Sat Oct 23 01:27:40 2004
@@ -1,313 +1,96 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
 /*
- * $Id: BackendDatabaseViewer.java,v 1.4 2003/10/09 22:26:13 akarasulu Exp $
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
  *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  *
  */
-package org.apache.ldap.server.backend.db.gui ;
+package org.apache.eve.db.gui ;
 
 
 import java.awt.Toolkit ;
 import java.awt.Dimension ;
-import javax.swing.UIManager ;
-
-import org.apache.ldap.server.backend.AbstractBackend ;
 
-import org.apache.avalon.framework.service.Serviceable ;
-import org.apache.avalon.framework.activity.Executable ;
-import org.apache.avalon.framework.service.ServiceManager ;
-import org.apache.avalon.framework.service.ServiceException ;
-import org.apache.avalon.framework.logger.AbstractLogEnabled ;
+import org.apache.eve.db.SearchEngine;
+import org.apache.eve.db.Database;
 
 
 /**
- * A backend database viewer.
+ * A partition database viewer.
  * 
- * @avalon.component name="backend-database-viewer" lifestyle="singleton"
- * @avalon.service type="org.apache.ldap.server.backend.db.gui.BackendDatabaseViewer" 
- * version="1.0"
- * 
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.4 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
  */
-public class BackendDatabaseViewer extends AbstractLogEnabled
-    implements Serviceable, Executable
+public class BackendDatabaseViewer
 {
-    /** A handle on the atomic backend */
-    private AbstractBackend m_backend ;    
-    
-    /**
-     * Viewer main is not really used.
-     * 
-     * @param a_argv
-     */
-    public static void main( String [] argv ) 
+    /** A handle on the atomic partition */
+    private Database db;
+    private SearchEngine eng;
+
+
+    public BackendDatabaseViewer( Database db, SearchEngine eng )
     {
-        // set up system Look&Feel
-        try 
-        {
-            UIManager.setLookAndFeel( UIManager
-                .getSystemLookAndFeelClassName() ) ;
-        }
-        catch ( Exception e ) 
-        {
-            System.out.println( "Could not set look and feel to use " +
-                UIManager.getSystemLookAndFeelClassName() + "." ) ;
-            e.printStackTrace() ;
-        }
-        
-        BackendDatabaseViewer l_viewer = new BackendDatabaseViewer () ;
-        
-        try
-        {
-            l_viewer.execute() ;
-        }
-        catch ( Exception e )
-        {
-            e.printStackTrace() ;
-            System.exit( -1 ) ;
-        }
+        this.db = db;
+        this.eng = eng;
     }
+
+
+//    /**
+//     * Viewer main is not really used.
+//     *
+//     * @param argv the var args
+//     */
+//    public static void main( String [] argv )
+//    {
+//        // set up system Look&Feel
+//        try
+//        {
+//            UIManager.setLookAndFeel( UIManager.getSystemLookAndFeelClassName() ) ;
+//        }
+//        catch ( Exception e )
+//        {
+//            System.out.println( "Could not set look and feel to use " +
+//                UIManager.getSystemLookAndFeelClassName() + "." ) ;
+//            e.printStackTrace() ;
+//        }
+//
+//        BackendDatabaseViewer viewer = new BackendDatabaseViewer(  ) ;
+//
+//        try
+//        {
+//            viewer.execute() ;
+//        }
+//        catch ( Exception e )
+//        {
+//            e.printStackTrace() ;
+//            System.exit( -1 ) ;
+//        }
+//    }
     
 
     public void execute() throws Exception
     {
-        BackendFrame l_frame = new BackendFrame( m_backend, getLogger() ) ;
+        BackendFrame frame = new BackendFrame( db, eng ) ;
 
-        Dimension l_screenSize = Toolkit.getDefaultToolkit().getScreenSize() ;
-        Dimension l_frameSize = l_frame.getSize() ;
-        l_frameSize.height = ( ( l_frameSize.height > l_screenSize.height )
-            ? l_screenSize.height : l_frameSize.height) ;
-        l_frameSize.width = ( ( l_frameSize.width > l_screenSize.width )
-            ? l_screenSize.width : l_frameSize.width ) ;
-        l_frame.setLocation( ( l_screenSize.width - l_frameSize.width ) / 2,
-            ( l_screenSize.height - l_frameSize.height ) / 2) ;
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize() ;
+        Dimension frameSize = frame.getSize() ;
+        frameSize.height = ( ( frameSize.height > screenSize.height )
+            ? screenSize.height : frameSize.height) ;
+        frameSize.width = ( ( frameSize.width > screenSize.width )
+            ? screenSize.width : frameSize.width ) ;
+        frame.setLocation( ( screenSize.width - frameSize.width ) / 2,
+            ( screenSize.height - frameSize.height ) / 2) ;
 
-        l_frame.setVisible( true );
-        System.out.println( l_frameSize ) ;
-    }
-
-    
-    /**
-     * @avalon.dependency 
-     *      type="org.apache.ldap.server.backend.AtomicBackend"
-     *      key="system-backend" version="1.0"
-     * 
-     * @see org.apache.avalon.framework.service.Serviceable#service(
-     * org.apache.avalon.framework.service.ServiceManager)
-     */
-    public void service( ServiceManager a_manager )
-        throws ServiceException
-    {
-        m_backend = ( AbstractBackend ) a_manager.lookup( "system-backend" ) ;
-        getLogger().debug( "Got handle on system backend!" ) ;
+        frame.setVisible( true );
+        System.out.println( frameSize ) ;
     }
 }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/BackendFrame.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/BackendFrame.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/BackendFrame.java	Sat Oct 23 01:27:40 2004
@@ -1,342 +1,135 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
 /*
- * $Id: BackendFrame.java,v 1.10 2003/10/13 18:09:18 akarasulu Exp $
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  *
  */
+package org.apache.eve.db.gui;
 
-package org.apache.ldap.server.backend.db.gui ;
 
-
-import java.io.File ;
-import java.io.FileReader ;
-import java.io.IOException ;
-import java.io.FileNotFoundException ;
-
-import java.math.BigInteger ;
-import java.text.ParseException ;
-
-import java.util.Stack ;
-import java.util.HashMap ;
-import java.util.Iterator ;
-import java.util.Hashtable ;
-
-import java.awt.Window ;
-import java.awt.Toolkit ;
-import java.awt.Dimension ;
-import java.awt.BorderLayout ;
-import java.awt.event.ActionEvent ;
-import java.awt.event.ActionListener ;
-
-import javax.naming.NamingException ;
-import javax.naming.NamingEnumeration ; 
-import javax.naming.directory.Attributes ;
-import javax.naming.directory.SearchControls ;
-
-import javax.swing.JTree ;
-import javax.swing.JMenu ;
-import javax.swing.JTable ;
-import javax.swing.JFrame ;
-import javax.swing.JPanel ;
-import javax.swing.JLabel ;
-import javax.swing.JMenuBar ;
-import javax.swing.JMenuItem ;
-import javax.swing.JTextArea ;
-import javax.swing.JSplitPane ;
-import javax.swing.JSeparator ;
-import javax.swing.JScrollPane ;
-import javax.swing.JTabbedPane ;
-import javax.swing.JOptionPane ;
-import javax.swing.JFileChooser ;
-import javax.swing.tree.TreePath ;
-import javax.swing.tree.TreeNode ;
-import javax.swing.tree.TreeModel ;
-import javax.swing.tree.DefaultTreeModel ;
-import javax.swing.tree.TreeSelectionModel ;
-import javax.swing.table.DefaultTableModel ;
-import javax.swing.event.TreeSelectionEvent ;
-import javax.swing.event.TreeSelectionListener ;
-
-import org.apache.ldap.common.name.LdapName ;
-import org.apache.ldap.common.ldif.LdifParser ;
-import org.apache.ldap.common.filter.ExprNode ;
-import org.apache.ldap.common.util.StringTools ;
-import org.apache.ldap.common.ldif.LdifIterator ;
-import org.apache.ldap.common.ldif.LdifParserImpl ;
-import org.apache.ldap.server.backend.db.Database ;
-import org.apache.ldap.common.filter.FilterParser ;
-import org.apache.ldap.server.backend.db.index.Index ;
-import org.apache.ldap.server.backend.AbstractBackend ;
-import org.apache.ldap.common.filter.FilterParserImpl ;
-import org.apache.ldap.common.message.DerefAliasesEnum ;
-import org.apache.ldap.server.backend.db.index.IndexRecord ;
-import org.apache.ldap.common.message.LockableAttributesImpl ;
-
-import org.apache.avalon.framework.logger.Logger ;
-import org.apache.avalon.framework.logger.LogEnabled ;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.FileNotFoundException;
+
+import java.math.BigInteger;
+import java.text.ParseException;
+
+import java.util.Stack;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Hashtable;
+
+import java.awt.Window;
+import java.awt.Toolkit;
+import java.awt.Dimension;
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.naming.NamingException;
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.SearchControls;
+
+import javax.swing.JTree;
+import javax.swing.JMenu;
+import javax.swing.JTable;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JTextArea;
+import javax.swing.JSplitPane;
+import javax.swing.JSeparator;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JOptionPane;
+import javax.swing.JFileChooser;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+
+import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.common.ldif.LdifParser;
+import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.util.StringTools;
+import org.apache.ldap.common.ldif.LdifIterator;
+import org.apache.ldap.common.ldif.LdifParserImpl;
+import org.apache.ldap.common.filter.FilterParser;
+import org.apache.ldap.common.filter.FilterParserImpl;
+import org.apache.ldap.common.message.DerefAliasesEnum;
+import org.apache.ldap.common.message.LockableAttributesImpl;
+
+import org.apache.eve.db.Database;
+import org.apache.eve.db.IndexRecord;
+import org.apache.eve.db.Index;
+import org.apache.eve.db.SearchEngine;
 
 
 /**
- * @todo Document me!
+ * The frame for the database.
  * 
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.10 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
  */
-public class BackendFrame
-    extends JFrame
-    implements LogEnabled
+public class BackendFrame extends JFrame
 {
     // Swing Stuff
-    private BorderLayout m_layout = new BorderLayout() ;
-    private JLabel m_statusBar = new JLabel( "Ready" ) ;
-    private JPanel m_mainPnl = new JPanel() ;
-    private JSplitPane m_splitPane = new JSplitPane() ;
-    private JTabbedPane m_tabbedPane = new JTabbedPane() ;
-    private JPanel m_entryPnl = new JPanel() ;
-    private JPanel m_idxPnl = new JPanel() ;
-    private JScrollPane m_treePane = new JScrollPane() ;
-    private JTree m_tree = new JTree() ;
-    private JScrollPane m_entryPane = new JScrollPane() ;
-    private JTable m_entryTbl = new JTable() ;
-    private JScrollPane m_idxPane = new JScrollPane() ;
-    private JTable m_idxTbl = new JTable() ;
-    private JMenu m_searchMenu = new JMenu() ;
-    private JMenuItem m_annotate = new JMenuItem() ;
-    private JMenuItem m_run = new JMenuItem() ;
-    private JMenuItem m_debug = new JMenuItem() ;
-    private JMenu m_indices = new JMenu() ;
+    private JLabel statusBar = new JLabel( "Ready" );
+    private JPanel mainPnl = new JPanel();
+    private JSplitPane splitPane = new JSplitPane();
+    private JTabbedPane tabbedPane = new JTabbedPane();
+    private JPanel entryPnl = new JPanel();
+    private JPanel idxPnl = new JPanel();
+    private JScrollPane treePane = new JScrollPane();
+    private JTree tree = new JTree();
+    private JScrollPane entryPane = new JScrollPane();
+    private JTable entryTbl = new JTable();
+    private JScrollPane idxPane = new JScrollPane();
+    private JTable idxTbl = new JTable();
+    private JMenu searchMenu = new JMenu();
+    private JMenuItem annotate = new JMenuItem();
+    private JMenuItem run = new JMenuItem();
+    private JMenuItem debug = new JMenuItem();
+    private JMenu indices = new JMenu();
 
     // Non Swing Stuff
-    private Database m_database = null ;
-    private AbstractBackend m_backend = null ;
-    private boolean m_doCleanUp = false ;
-    private HashMap m_nodes = new HashMap() ;
-    private EntryNode m_root = null ;
-    private Logger m_logger = null ;
+    private Database database = null;
+    private boolean doCleanUp = false;
+    private HashMap nodes = new HashMap();
+    private EntryNode root = null;
+    private SearchEngine eng = null;
 
 
     /**
      * Creates new form JFrame
      */
-    public BackendFrame( AbstractBackend a_backend, Logger a_logger ) 
+    public BackendFrame( Database db, SearchEngine eng )
         throws Exception
     {
-        m_backend = a_backend ;
-        m_database = m_backend.getDb() ;
-        m_logger = a_logger ;
-        
-        initGUI() ;
-        buildIndicesMenu( m_database ) ;
-        pack() ;
-        load() ;
+        database = db;
+        this.eng = eng;
+
+        initGUI();
+        buildIndicesMenu( database );
+        pack();
+        load();
     }
 
 
@@ -345,218 +138,210 @@
      */
     private void initGUI() 
     {
-        m_mainPnl.setBorder( null ) ;
-        m_mainPnl.setLayout( new java.awt.BorderLayout() ) ;
-        m_mainPnl.add( m_splitPane, java.awt.BorderLayout.CENTER ) ;
-        m_splitPane.add( m_tabbedPane, javax.swing.JSplitPane.RIGHT ) ;
-        m_splitPane.add( m_treePane, javax.swing.JSplitPane.LEFT ) ;
-        m_tabbedPane.add( m_entryPnl, "Entry Attributes" ) ;
-        m_tabbedPane.add( m_idxPnl, "Entry Indices" ) ;
-
-        m_entryPnl.setLayout( new java.awt.BorderLayout() ) ;
-        m_entryPnl.add( m_entryPane, java.awt.BorderLayout.CENTER ) ;
-
-        m_idxPnl.setLayout( new java.awt.BorderLayout() ) ;
-        m_idxPnl.add( m_idxPane, java.awt.BorderLayout.CENTER ) ;
-
-        getContentPane().setLayout( new java.awt.BorderLayout() ) ;
-        JPanel l_content = new JPanel() ;
-        l_content.setPreferredSize( new java.awt.Dimension( 798, 461 ) ) ;
-        l_content.setLayout( new java.awt.BorderLayout() ) ;
-        l_content.setBorder( javax.swing.BorderFactory.createEtchedBorder() ) ;
-        l_content.add( m_mainPnl, java.awt.BorderLayout.NORTH ) ;
-        getContentPane().add( l_content, BorderLayout.CENTER ) ;
+        mainPnl.setBorder( null );
+        mainPnl.setLayout( new java.awt.BorderLayout() );
+        mainPnl.add( splitPane, java.awt.BorderLayout.CENTER );
+        splitPane.add( tabbedPane, javax.swing.JSplitPane.RIGHT );
+        splitPane.add( treePane, javax.swing.JSplitPane.LEFT );
+        tabbedPane.add( entryPnl, "Entry Attributes" );
+        tabbedPane.add( idxPnl, "Entry Indices" );
+
+        entryPnl.setLayout( new java.awt.BorderLayout() );
+        entryPnl.add( entryPane, java.awt.BorderLayout.CENTER );
+
+        idxPnl.setLayout( new java.awt.BorderLayout() );
+        idxPnl.add( idxPane, java.awt.BorderLayout.CENTER );
+
+        getContentPane().setLayout( new java.awt.BorderLayout() );
+        JPanel content = new JPanel();
+        content.setPreferredSize( new java.awt.Dimension( 798, 461 ) );
+        content.setLayout( new java.awt.BorderLayout() );
+        content.setBorder( javax.swing.BorderFactory.createEtchedBorder() );
+        content.add( mainPnl, java.awt.BorderLayout.NORTH );
+        getContentPane().add( content, BorderLayout.CENTER );
         // set title
-        setTitle( "Backend DB Viewer" ) ;
+        setTitle( "Backend DB Viewer" );
         // add status bar
-        getContentPane().add( m_statusBar, BorderLayout.SOUTH ) ;
+        getContentPane().add( statusBar, BorderLayout.SOUTH );
         // add menu bar
-        JMenuBar l_menuBar = new JMenuBar() ;
+        JMenuBar menuBar = new JMenuBar();
 
         // --------------------------------------------------------------------
         // 'Backend' Menu
         // --------------------------------------------------------------------
         
-        JMenu l_backendMenu = new JMenu( "Backend" ) ;
-        l_backendMenu.setText( "Backend" ) ;
-        l_backendMenu.setBackground( new java.awt.Color( 205, 205, 205 ) ) ;
-        l_backendMenu.setMnemonic( 'B' ) ;
+        JMenu backendMenu = new JMenu( "Backend" );
+        backendMenu.setText( "Backend" );
+        backendMenu.setBackground( new java.awt.Color( 205, 205, 205 ) );
+        backendMenu.setMnemonic( 'B' );
 
         // create Import menu item
-        JMenuItem l_add = new JMenuItem( "Add" ) ;
-        l_backendMenu.add( l_add ) ;
-        l_add.setMnemonic( 'A' ) ;
-        l_add.setBackground( new java.awt.Color( 205, 205, 205 ) ) ;
-        l_add.addActionListener( new ActionListener() 
+        JMenuItem add = new JMenuItem( "Add" );
+        backendMenu.add( add );
+        add.setMnemonic( 'A' );
+        add.setBackground( new java.awt.Color( 205, 205, 205 ) );
+        add.addActionListener( new ActionListener()
         {
             public void actionPerformed( ActionEvent e ) 
             {
-                doAddDialog() ;
+                doAddDialog();
             }
-        } ) ;
+        } );
 
         // create Import menu item
-        JMenuItem l_import = new JMenuItem( "Import" ) ;
-        l_backendMenu.add( l_import ) ;
-        l_import.setMnemonic( 'I' ) ;
-        l_import.setBackground( new java.awt.Color( 205, 205, 205 ) ) ;
-        l_import.addActionListener( new ActionListener() 
+        JMenuItem importItem = new JMenuItem( "Import" );
+        backendMenu.add( importItem );
+        importItem.setMnemonic( 'I' );
+        importItem.setBackground( new java.awt.Color( 205, 205, 205 ) );
+        importItem.addActionListener( new ActionListener()
         {
             public void actionPerformed( ActionEvent e ) 
             {
-                doImport() ;
+                doImport();
             }
-        } ) ;
+        } );
 
         // create Exit menu item
-        JMenuItem l_exit = new JMenuItem( "Exit" ) ;
-        l_backendMenu.add( l_exit ) ;
-        l_exit.setMnemonic( 'E' ) ;
-        l_exit.setBackground( new java.awt.Color( 205, 205, 205 ) ) ;
-        l_exit.addActionListener( new ActionListener() 
+        JMenuItem exit = new JMenuItem( "Exit" );
+        backendMenu.add( exit );
+        exit.setMnemonic( 'E' );
+        exit.setBackground( new java.awt.Color( 205, 205, 205 ) );
+        exit.addActionListener( new ActionListener()
         {
             public void actionPerformed( ActionEvent e ) 
             {
-                exitForm() ;
+                exitForm();
             }
-        } ) ;
+        } );
 
         // create About menu item
-        JMenu m_helpMenu = new JMenu( "Help" ) ;
-        m_helpMenu.setMnemonic( 'H' ) ;
-        JMenuItem m_about = new JMenuItem( "About" ) ;
-        m_about.setMnemonic( 'A' ) ;
-        m_about.setBackground( new java.awt.Color( 205,205,205 ) ) ;
-        m_about.addActionListener( new ActionListener() 
+        JMenu helpMenu = new JMenu( "Help" );
+        helpMenu.setMnemonic( 'H' );
+        JMenuItem about = new JMenuItem( "About" );
+        about.setMnemonic( 'A' );
+        about.setBackground( new java.awt.Color( 205,205,205 ) );
+        about.addActionListener( new ActionListener()
         {
             public void actionPerformed( ActionEvent e ) 
             {
                 AboutDialog aboutDialog = 
-                    new AboutDialog ( BackendFrame.this, true ) ;
-                BackendFrame.this.centerOnScreen( aboutDialog ) ;
-                aboutDialog.setVisible( true ) ;
-            }
-        } ) ;
-        m_helpMenu.setBackground( new java.awt.Color( 205,205,205 ) ) ;
-        m_helpMenu.add( m_about ) ;
+                    new AboutDialog ( BackendFrame.this, true );
+                BackendFrame.this.centerOnScreen( aboutDialog );
+                aboutDialog.setVisible( true );
+            }
+        } );
+        helpMenu.setBackground( new java.awt.Color( 205,205,205 ) );
+        helpMenu.add( about );
         
         // create Save menu item
         // create Print menu item
-        l_menuBar.setBackground( new java.awt.Color( 196,197,203 ) ) ;
-        l_menuBar.add( l_backendMenu ) ;
-        l_menuBar.add( m_searchMenu ) ;
-        l_menuBar.add( m_indices ) ;
-        l_menuBar.add( m_helpMenu ) ;
+        menuBar.setBackground( new java.awt.Color( 196,197,203 ) );
+        menuBar.add( backendMenu );
+        menuBar.add( searchMenu );
+        menuBar.add( indices );
+        menuBar.add( helpMenu );
         // sets menu bar
-        setJMenuBar( l_menuBar ) ;
-        setBounds( new java.awt.Rectangle( 0, 0, 802, 515 ) ) ;
-        setSize( new java.awt.Dimension( 802,515 ) ) ;
-        setResizable( true ) ;
+        setJMenuBar( menuBar );
+        setBounds( new java.awt.Rectangle( 0, 0, 802, 515 ) );
+        setSize( new java.awt.Dimension( 802,515 ) );
+        setResizable( true );
         
         addWindowListener( new java.awt.event.WindowAdapter() 
         {
             public void windowClosing( java.awt.event.WindowEvent evt ) 
             {
-                exitForm() ;
+                exitForm();
             }
-        } ) ;
+        } );
         
-        m_treePane.getViewport().add( m_tree ) ;
-        m_tree.setBounds( new java.awt.Rectangle( 6,184,82,80 ) ) ;
-        m_tree.setShowsRootHandles( true ) ;
-        m_tree.setToolTipText( "DB DIT" ) ;
-        m_tree.setScrollsOnExpand( true ) ;
-        m_tree.getSelectionModel().addTreeSelectionListener(
+        treePane.getViewport().add( tree );
+        tree.setBounds( new java.awt.Rectangle( 6,184,82,80 ) );
+        tree.setShowsRootHandles( true );
+        tree.setToolTipText( "DB DIT" );
+        tree.setScrollsOnExpand( true );
+        tree.getSelectionModel().addTreeSelectionListener(
             new TreeSelectionListener() 
         {
             public void valueChanged( TreeSelectionEvent e ) 
             {
-                TreePath l_path = e.getNewLeadSelectionPath() ;
-                TreeSelectionModel l_model = 
-                    ( TreeSelectionModel ) e.getSource() ;
+                TreePath path = e.getNewLeadSelectionPath();
 
-                if ( l_path == null ) 
+                if ( path == null )
                 {
-                    return ;
+                    return;
                 }
 
-                Object l_last = l_path.getLastPathComponent() ;
+                Object last = path.getLastPathComponent();
                 try 
                 {
-                    if ( l_last instanceof EntryNode ) 
+                    if ( last instanceof EntryNode )
                     {
-                        displayEntry( ( ( EntryNode ) l_last ).getEntryId(), 
-                        ( ( EntryNode ) l_last).getLdapEntry() ) ;
+                        displayEntry( ( ( EntryNode ) last ).getEntryId(),
+                        ( ( EntryNode ) last).getLdapEntry() );
                     }
                 } 
                 catch( Exception ex ) 
                 {
-                    ex.printStackTrace() ;
+                    ex.printStackTrace();
                 }
             }
-        } ) ;
+        } );
 
-        m_entryPane.getViewport().add( m_entryTbl ) ;
-        m_entryTbl.setBounds( new java.awt.Rectangle( 321,103,32,32 ) ) ;
+        entryPane.getViewport().add( entryTbl );
+        entryTbl.setBounds( new java.awt.Rectangle( 321,103,32,32 ) );
 
-        m_idxPane.getViewport().add( m_idxTbl ) ;
-        m_idxTbl.setBounds( new java.awt.Rectangle( 429,134,32,32 ) ) ;
+        idxPane.getViewport().add( idxTbl );
+        idxTbl.setBounds( new java.awt.Rectangle( 429,134,32,32 ) );
 
-        m_treePane.setSize( new java.awt.Dimension( 285, 435 ) ) ;
-        m_treePane.setPreferredSize( new java.awt.Dimension( 285, 403 ) ) ;
-        m_searchMenu.setText( "Search" ) ;
-        m_searchMenu.setBackground( new java.awt.Color( 205,205,205 ) ) ;
-        m_searchMenu.add( m_run ) ;
-        m_searchMenu.add( m_debug ) ;
-        m_searchMenu.add( m_annotate ) ;
+        treePane.setSize( new java.awt.Dimension( 285, 435 ) );
+        treePane.setPreferredSize( new java.awt.Dimension( 285, 403 ) );
+        searchMenu.setText( "Search" );
+        searchMenu.setBackground( new java.awt.Color( 205,205,205 ) );
+        searchMenu.add( run );
+        searchMenu.add( debug );
+        searchMenu.add( annotate );
 
-        ActionListener l_searchHandler = new ActionListener()
+        ActionListener searchHandler = new ActionListener()
         {
             public void actionPerformed( ActionEvent an_event ) 
             {
                 System.out.println( "action command = " 
-                    + an_event.getActionCommand() ) ;
-				doFilterDialog( an_event.getActionCommand() ) ;
+                    + an_event.getActionCommand() );
+				doFilterDialog( an_event.getActionCommand() );
             }
-        } ;
+        };
 
-        m_annotate.setText( FilterDialog.ANNOTATE_MODE ) ;
-        m_annotate.setActionCommand( FilterDialog.ANNOTATE_MODE ) ;
-        m_annotate.setBackground( new java.awt.Color( 205,205,205 ) ) ;
-        m_annotate.addActionListener( l_searchHandler ) ;
-
-        m_run.setText( FilterDialog.RUN_MODE ) ;
-        m_run.setActionCommand( FilterDialog.RUN_MODE ) ;
-        m_run.setBackground( new java.awt.Color( 205,205,205 ) ) ;
-        m_run.addActionListener( l_searchHandler ) ;
-
-        m_debug.setText( FilterDialog.DEBUG_MODE ) ;
-        m_debug.setActionCommand( FilterDialog.DEBUG_MODE ) ;
-        m_debug.setBackground( new java.awt.Color( 205,205,205 ) ) ;
-        m_debug.addActionListener( l_searchHandler ) ;
+        annotate.setText( FilterDialog.ANNOTATE_MODE );
+        annotate.setActionCommand( FilterDialog.ANNOTATE_MODE );
+        annotate.setBackground( new java.awt.Color( 205,205,205 ) );
+        annotate.addActionListener( searchHandler );
 
-        m_indices.setText( "Indices" ) ;
-        m_indices.setBackground( new java.awt.Color( 205, 205, 205 ) ) ;
-    }
+        run.setText( FilterDialog.RUN_MODE );
+        run.setActionCommand( FilterDialog.RUN_MODE );
+        run.setBackground( new java.awt.Color( 205,205,205 ) );
+        run.addActionListener( searchHandler );
 
+        debug.setText( FilterDialog.DEBUG_MODE );
+        debug.setActionCommand( FilterDialog.DEBUG_MODE );
+        debug.setBackground( new java.awt.Color( 205,205,205 ) );
+        debug.addActionListener( searchHandler );
 
-    public void enableLogging( Logger a_logger )
-    {
-        m_logger = a_logger ;
+        indices.setText( "Indices" );
+        indices.setBackground( new java.awt.Color( 205, 205, 205 ) );
     }
 
 
-    private void centerOnScreen( Window a_window )
+    private void centerOnScreen( Window window )
     {
-        Dimension l_frameSize = a_window.getSize() ;
-        Dimension l_screenSize = Toolkit.getDefaultToolkit().getScreenSize() ;
+        Dimension frameSize = window.getSize();
+        Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
         
-        l_frameSize.height = ( ( l_frameSize.height > l_screenSize.height )
-            ? l_screenSize.height : l_frameSize.height ) ;
-        l_frameSize.width = ( ( l_frameSize.width > l_screenSize.width )
-            ? l_screenSize.width : l_frameSize.width ) ;
-        a_window.setLocation( ( l_screenSize.width - l_frameSize.width ) / 2,
-            ( l_screenSize.height - l_frameSize.height ) / 2 ) ;
+        frameSize.height = ( ( frameSize.height > screenSize.height )
+            ? screenSize.height : frameSize.height );
+        frameSize.width = ( ( frameSize.width > screenSize.width )
+            ? screenSize.width : frameSize.width );
+        window.setLocation( ( screenSize.width - frameSize.width ) / 2,
+            ( screenSize.height - frameSize.height ) / 2 );
     }
 
     
@@ -567,37 +352,36 @@
     {
         try 
         {
-            Attributes l_entry = null ;
-            TreePath l_path = m_tree.getSelectionModel().getSelectionPath() ;
-            String l_parentDn = m_database.getSuffix().toString() ;
+            TreePath path = tree.getSelectionModel().getSelectionPath();
+            String parentDn = database.getSuffix().toString();
 
-            if ( null != l_path ) 
+            if ( null != path )
             {
-                Object l_last = l_path.getLastPathComponent() ;
+                Object last = path.getLastPathComponent();
 
-                if( l_last instanceof EntryNode ) 
+                if( last instanceof EntryNode )
                 {
-                    l_parentDn = ( ( EntryNode ) l_last ).getEntryDn() ;
+                    parentDn = ( ( EntryNode ) last ).getEntryDn();
                 } 
             }
             
-            if ( null == l_parentDn )
+            if ( null == parentDn )
             {
                 JOptionPane.showMessageDialog( this, 
-                    "Must select a parent entry to add a child to!" ) ;
-                return ;
+                    "Must select a parent entry to add a child to!" );
+                return;
             }
         
-            AddEntryDialog l_dialog = new AddEntryDialog( this, false ) ;
-            l_dialog.setParentDn( l_parentDn ) ;
+            AddEntryDialog dialog = new AddEntryDialog( this, false );
+            dialog.setParentDn( parentDn );
             
-            centerOnScreen( l_dialog ) ;
-            l_dialog.setEnabled( true ) ;
-            l_dialog.setVisible( true ) ;
+            centerOnScreen( dialog );
+            dialog.setEnabled( true );
+            dialog.setVisible( true );
         }
         catch ( Exception e )
         {
-            e.printStackTrace() ;
+            e.printStackTrace();
         }
     }
     
@@ -610,109 +394,101 @@
      */
     public String getSelectedDn()
     {
-        TreePath l_path = m_tree.getSelectionModel().getSelectionPath() ;
+        TreePath path = tree.getSelectionModel().getSelectionPath();
         
-        if ( null == l_path )
+        if ( null == path )
         {
-            return m_database.getSuffix().toString() ;
+            return database.getSuffix().toString();
         }        
         
-        Object l_last = l_path.getLastPathComponent() ;
-        String l_base = null ;
+        Object last = path.getLastPathComponent();
+        String base = null;
         
-        if( l_last instanceof EntryNode ) 
+        if( last instanceof EntryNode )
         {
-            Attributes l_entry = ( ( EntryNode ) l_last ).getLdapEntry() ;
-                
             try
             {
-                l_base = ( ( EntryNode ) l_last ).getEntryDn() ;
+                base = ( ( EntryNode ) last ).getEntryDn();
             }
             catch ( NamingException e )
             {
-                e.printStackTrace() ;
+                e.printStackTrace();
             }
         } 
         else 
         {
-            l_base = m_database.getSuffix().toString() ;
+            base = database.getSuffix().toString();
         }
         
-        return l_base ;
+        return base;
     }
     
 
     public void doImport()
     {
-        FileReader l_in = null ;
-        LdifIterator l_list = null ;
-        LdifParser l_parser = new LdifParserImpl() ;
-        JFileChooser l_chooser = new JFileChooser() ;
-        int l_choice = l_chooser.showOpenDialog( this ) ;
-        File l_selected = l_chooser.getSelectedFile() ;
+        FileReader in = null;
+        LdifIterator list = null;
+        LdifParser parser = new LdifParserImpl();
+        JFileChooser chooser = new JFileChooser();
+        int choice = chooser.showOpenDialog( this );
+        File selected = chooser.getSelectedFile();
         
-        if ( JFileChooser.APPROVE_OPTION != l_choice )
+        if ( JFileChooser.APPROVE_OPTION != choice )
         {
-            return ;
+            return;
         }
 
         try 
         {
-            l_in = new FileReader( l_selected ) ;
-            l_list = new LdifIterator( l_in ) ;
+            in = new FileReader( selected );
+            list = new LdifIterator( in );
             
-            while ( l_list.hasNext() )
+            while ( list.hasNext() )
             {
-                String l_dif = ( String ) l_list.next() ;
-                LockableAttributesImpl l_attrs = new LockableAttributesImpl() ;
-                l_parser.parse( l_attrs, l_dif ) ;
-                String l_updn = ( String ) l_attrs.get( "dn" ).get() ;
-                LdapName l_ndn =
-                    new LdapName( StringTools.deepTrimToLower( l_updn ) ) ;
-                l_attrs.remove( "dn" ) ;
+                String dif = ( String ) list.next();
+                LockableAttributesImpl attrs = new LockableAttributesImpl();
+                parser.parse( attrs, dif );
+                String updn = ( String ) attrs.get( "dn" ).get();
+                LdapName ndn =
+                    new LdapName( StringTools.deepTrimToLower( updn ) );
+                attrs.remove( "dn" );
 
-                if ( null == m_database.getEntryId( l_ndn.toString() ) )
+                if ( null == database.getEntryId( ndn.toString() ) )
                 {
-                    m_database.add( l_updn, l_ndn, l_attrs ) ;
-                    m_logger.debug( "Added entry: " + l_updn ) ;
-                    
-                    load() ;
+                    database.add( updn, ndn, attrs );
+                    load();
                 }
-                else
-                {
-                    m_logger.debug( "Passed entry: " + l_updn ) ;
-                }                
             }
         }
         catch( ParseException e )
         {
             // @todo display popup with error here!
-            e.printStackTrace() ;
-            return ;
+            e.printStackTrace();
+            return;
         } 
         catch( NamingException e )
         {
             // @todo display popup with error here!
-            e.printStackTrace() ;
-            return ;
+            e.printStackTrace();
+            return;
         } 
         catch( FileNotFoundException e ) 
         {
             // @todo display popup with error here!
-            e.printStackTrace() ;
-            return ;
+            e.printStackTrace();
+            return;
         }
         catch( IOException e ) 
         {
             // @todo display popup with error here!
-            e.printStackTrace() ;
-            return ;
+            e.printStackTrace();
+            return;
         }
         catch( Exception e ) 
         {
             // @todo display popup with error here!
-            e.printStackTrace() ;
-            return ;
+            e.printStackTrace();
+            return;
         }
     }
 
@@ -722,44 +498,44 @@
      */
     private void exitForm() 
     {
-        setEnabled( false ) ;
-        setVisible( false ) ;
-        dispose() ;
+        setEnabled( false );
+        setVisible( false );
+        dispose();
 
-        if ( m_doCleanUp && m_database != null ) 
+        if ( doCleanUp && database != null )
         {
             try
             {
-                m_database.sync() ;
-                m_database.close() ;
+                database.sync();
+                database.close();
             }
             catch ( NamingException e )
             {
-                e.printStackTrace() ;
+                e.printStackTrace();
             }
 
-	        System.exit( 0 ) ;
+	        System.exit( 0 );
         }
     }
     
     
-    public void doRunDebugAnnotate( FilterDialog a_dialog, String a_mode )
+    public void doRunDebugAnnotate( FilterDialog dialog, String mode )
     {
         try 
         {
-            if ( a_mode == FilterDialog.RUN_MODE ) 
+            if ( mode == FilterDialog.RUN_MODE )
             {
-                doRun( a_dialog.getFilter(), a_dialog.getScope(),
-                    a_dialog.getBase(), a_dialog.getLimit() ) ;
+                doRun( dialog.getFilter(), dialog.getScope(),
+                    dialog.getBase(), dialog.getLimit() );
             } 
-            else if ( a_mode == FilterDialog.DEBUG_MODE ) 
+            else if ( mode == FilterDialog.DEBUG_MODE )
             {
-                doDebug( a_dialog.getFilter(), a_dialog.getScope(),
-                     a_dialog.getBase(), a_dialog.getLimit() ) ;
+                doDebug( dialog.getFilter(), dialog.getScope(),
+                     dialog.getBase(), dialog.getLimit() );
             } 
-            else if ( a_mode == FilterDialog.ANNOTATE_MODE ) 
+            else if ( mode == FilterDialog.ANNOTATE_MODE )
             {
-                if ( doAnnotate( a_dialog.getFilter() ) ) 
+                if ( doAnnotate( dialog.getFilter() ) )
                 {
                     // continue
                 } 
@@ -767,411 +543,409 @@
                 {
                     // We failed don't loose users filter buf
                     // allow user to make edits.
-                    return ;
+                    return;
                 }
             } 
             else 
             {
-                throw new RuntimeException( "Unrecognized mode." ) ;
+                throw new RuntimeException( "Unrecognized mode." );
             }
         }
         catch ( Exception e )
         {
             // @todo show error popup here!
-            e.printStackTrace() ;
+            e.printStackTrace();
         }
     }
 
 
-    public void doFilterDialog( final String a_mode )
+    public void doFilterDialog( final String mode )
     {
-        final FilterDialog l_dialog = new FilterDialog( a_mode, this, true ) ;
+        final FilterDialog dialog = new FilterDialog( mode, this, true );
 
-        if ( m_tree.getSelectionModel().getSelectionPath() != null ) 
+        if ( tree.getSelectionModel().getSelectionPath() != null )
         {
-            l_dialog.setBase( getSelectedDn() ) ;
+            dialog.setBase( getSelectedDn() );
         } 
         else 
         {
-            l_dialog.setBase( m_database.getSuffix().toString() ) ;
+            dialog.setBase( database.getSuffix().toString() );
         }
 
-        l_dialog.addActionListener( new ActionListener() 
+        dialog.addActionListener( new ActionListener()
         {
             public void actionPerformed( ActionEvent an_event ) 
             {
-                String l_cmd = an_event.getActionCommand() ;
+                String cmd = an_event.getActionCommand();
 
-                if ( l_cmd.equals( FilterDialog.SEARCH_CMD ) ) 
+                if ( cmd.equals( FilterDialog.SEARCH_CMD ) )
                 {
-                    doRunDebugAnnotate( l_dialog, a_mode ) ;
+                    doRunDebugAnnotate( dialog, mode );
                 } 
-                else if ( l_cmd.equals(FilterDialog.CANCEL_CMD ) ) 
+                else if ( cmd.equals(FilterDialog.CANCEL_CMD ) )
                 {
                     // Do nothing! Just exit dialog.
                 } 
                 else 
                 {
                     throw new RuntimeException( 
-                        "Unrecognized FilterDialog command: " + l_cmd ) ;
+                        "Unrecognized FilterDialog command: " + cmd );
                 }
 
-				l_dialog.setVisible( false ) ;
-				l_dialog.dispose() ;
+				dialog.setVisible( false );
+				dialog.dispose();
             }
-        } ) ;
+        } );
 
         //Center the frame on screen
-        l_dialog.setSize( 456, 256 ) ;
-        centerOnScreen( l_dialog ) ;
-        l_dialog.setEnabled( true ) ;
-        l_dialog.setVisible( true ) ;
+        dialog.setSize( 456, 256 );
+        centerOnScreen( dialog );
+        dialog.setEnabled( true );
+        dialog.setVisible( true );
     } 
 
 
-    public boolean doRun( String a_filter, String a_scope, String a_base,
-        String a_limit )
+    public boolean doRun( String filter, String scope, String base,
+        String limit )
         throws Exception
     {
-        System.out.println( "Search attempt using filter '" + a_filter + "' "
-            + "with scope '" + a_scope + "' and a return limit of '" + a_limit
-            + "'" ) ;
-        FilterParser l_parser = new FilterParserImpl() ;
-        l_parser.enableLogging( m_logger ) ;
-        ExprNode l_root = null ;
+        System.out.println( "Search attempt using filter '" + filter + "' "
+            + "with scope '" + scope + "' and a return limit of '" + limit
+            + "'" );
+        FilterParser parser = new FilterParserImpl();
+        ExprNode root = null;
 
         try 
         {
-            l_root = l_parser.parse( a_filter ) ;
+            root = parser.parse( filter );
         } 
         catch ( Exception e ) 
         {
-            e.printStackTrace() ;
-            JTextArea l_text = new JTextArea() ;
-            String l_msg = e.getMessage() ;
+            e.printStackTrace();
+            JTextArea text = new JTextArea();
+            String msg = e.getMessage();
 
-            if ( l_msg.length() > 1024 ) 
+            if ( msg.length() > 1024 )
             {
-                l_msg = l_msg.substring( 0, 1024 ) + "\n. . . truncated . . ." ;
+                msg = msg.substring( 0, 1024 ) + "\n. . . truncated . . .";
             }
 
-            l_text.setText( l_msg ) ;
-            l_text.setEnabled( false ) ;
-            JOptionPane.showMessageDialog( null, l_text, "Syntax Error",
-                JOptionPane.ERROR_MESSAGE ) ;
-            return false ;
+            text.setText( msg );
+            text.setEnabled( false );
+            JOptionPane.showMessageDialog( null, text, "Syntax Error",
+                JOptionPane.ERROR_MESSAGE );
+            return false;
         }
 
-        SearchControls l_ctls = new SearchControls() ;
+        SearchControls ctls = new SearchControls();
 
-        if ( a_scope == FilterDialog.BASE_SCOPE ) 
+        if ( scope == FilterDialog.BASE_SCOPE )
         {
-	        l_ctls.setSearchScope( SearchControls.OBJECT_SCOPE ) ;
+	        ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
         } 
-        else if ( a_scope == FilterDialog.SINGLE_SCOPE ) 
+        else if ( scope == FilterDialog.SINGLE_SCOPE )
         {
-            l_ctls.setSearchScope( SearchControls.ONELEVEL_SCOPE ) ;
+            ctls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         } 
-        else if ( a_scope == FilterDialog.SUBTREE_SCOPE ) 
+        else if ( scope == FilterDialog.SUBTREE_SCOPE )
         {
-            l_ctls.setSearchScope( SearchControls.SUBTREE_SCOPE ) ;
+            ctls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         } else {
             throw new RuntimeException( "Unexpected scope parameter: " +
-                a_scope ) ;
+                scope );
         }
 
-        int l_limit = Integer.MAX_VALUE ;
-        if ( ! a_limit.equals( FilterDialog.UNLIMITED ) ) 
+        int limitMax = Integer.MAX_VALUE;
+        if ( ! limit.equals( FilterDialog.UNLIMITED ) )
         {
-            l_limit = Integer.parseInt( a_limit ) ;
+            limitMax = Integer.parseInt( limit );
         }
 
-        Hashtable l_env = new Hashtable() ;
-
-        l_env.put( DerefAliasesEnum.JNDI_PROP, 
-            DerefAliasesEnum.DEREFALWAYS_NAME ) ;
-
-        NamingEnumeration l_cursor = m_backend.getEngine().search( 
-            new LdapName( a_base ), l_env, l_root, null, l_ctls ) ;
-        String [] l_cols = new String [2] ;
-        l_cols[0] = "id" ;
-        l_cols[1] = "dn" ;
-        DefaultTableModel l_tableModel = new DefaultTableModel( l_cols, 0 ) ;
-        Object [] l_row = new Object[2] ;
-        int l_count = 0 ;
-        while ( l_cursor.hasMore() && l_count < l_limit ) 
-        {
-            IndexRecord l_rec = ( IndexRecord ) l_cursor.next() ;
-            l_row[0] = l_rec.getEntryId() ;
-            l_row[1] = m_database.getEntryDn( ( BigInteger ) l_row[0] ) ;
-            l_tableModel.addRow( l_row ) ;
-            l_count++ ;
-        }
-
-        SearchResultDialog l_results = new SearchResultDialog( this, false ) ;
-        StringBuffer l_buf = new StringBuffer() ;
-        l_buf.append( "base: " ).append( a_base ).append( '\n' ) ;
-        l_buf.append( "scope: " ).append( a_scope ).append( '\n' ) ;
-        l_buf.append( "limit: " ).append( a_limit ).append( '\n' ) ;
-        l_buf.append( "total: " ).append( l_count ).append( '\n' ) ;
-        l_buf.append( "filter:\n" ).append( a_filter ).append( '\n' ) ;
-        l_results.setFilter( l_buf.toString() ) ;
-
-	    TreeNode l_astRoot = new ASTNode( null, l_root ) ;
-	    TreeModel l_treeModel = new DefaultTreeModel( l_astRoot, true ) ;
-        l_results.setTreeModel( l_treeModel ) ;
-        l_results.setTableModel( l_tableModel ) ;
-        centerOnScreen( l_results ) ;
-        l_results.setVisible( true ) ;
-        return true ;
+        Hashtable env = new Hashtable();
+
+        env.put( DerefAliasesEnum.JNDI_PROP,
+            DerefAliasesEnum.DEREFALWAYS_NAME );
+
+        NamingEnumeration cursor = eng.search( new LdapName( base ),
+                env, root, ctls );
+        String [] cols = new String [2];
+        cols[0] = "id";
+        cols[1] = "dn";
+        DefaultTableModel tableModel = new DefaultTableModel( cols, 0 );
+        Object [] row = new Object[2];
+        int count = 0;
+        while ( cursor.hasMore() && count < limitMax )
+        {
+            IndexRecord rec = ( IndexRecord ) cursor.next();
+            row[0] = rec.getEntryId();
+            row[1] = database.getEntryDn( ( BigInteger ) row[0] );
+            tableModel.addRow( row );
+            count++;
+        }
+
+        SearchResultDialog results = new SearchResultDialog( this, false );
+        StringBuffer buf = new StringBuffer();
+        buf.append( "base: " ).append( base ).append( '\n' );
+        buf.append( "scope: " ).append( scope ).append( '\n' );
+        buf.append( "limit: " ).append( limit ).append( '\n' );
+        buf.append( "total: " ).append( count ).append( '\n' );
+        buf.append( "filter:\n" ).append( filter ).append( '\n' );
+        results.setFilter( buf.toString() );
+
+	    TreeNode astRoot = new ASTNode( null, root );
+	    TreeModel treeModel = new DefaultTreeModel( astRoot, true );
+        results.setTreeModel( treeModel );
+        results.setTableModel( tableModel );
+        centerOnScreen( results );
+        results.setVisible( true );
+        return true;
     }
 
 
-    public void doDebug( String a_filter, String a_scope, String a_base,
-        String a_limit )
+    public void doDebug( String filter, String scope, String base,
+        String limit )
     {
-        System.out.println( "Search attempt using filter '" + a_filter + "' "
-            + "with scope '" + a_scope + "' and a return limit of '" + a_limit
-            + "'" ) ;
+        System.out.println( "Search attempt using filter '" + filter + "' "
+            + "with scope '" + scope + "' and a return limit of '" + limit
+            + "'" );
     }
 
 
-    public void selectTreeNode( BigInteger a_id )
+    public void selectTreeNode( BigInteger id )
     {
-        Stack l_stack = new Stack() ;
-        Object [] l_comps = null ;
-        TreeNode l_parent = ( EntryNode ) m_nodes.get( a_id ) ;
+        Stack stack = new Stack();
+        Object [] comps = null;
+        TreeNode parent = ( EntryNode ) nodes.get( id );
 
-        while ( l_parent != null && ( l_parent != l_parent.getParent() ) ) 
+        while ( parent != null && ( parent != parent.getParent() ) )
         {
-            l_stack.push( l_parent ) ;
-            l_parent = l_parent.getParent() ;
+            stack.push( parent );
+            parent = parent.getParent();
         }
 
-        if ( l_stack.size() == 0 ) 
+        if ( stack.size() == 0 )
         {
-            l_comps = new Object[1] ;
-            l_comps[0] = m_root ;
+            comps = new Object[1];
+            comps[0] = root;
         } 
         else 
         {
-            l_comps = new Object[l_stack.size()] ;
+            comps = new Object[stack.size()];
         }
 
-        for ( int ii = 0; l_stack.size() > 0 && ii < l_comps.length; ii++ ) 
+        for ( int ii = 0; stack.size() > 0 && ii < comps.length; ii++ )
         {
-            l_comps[ii] = l_stack.pop() ;
+            comps[ii] = stack.pop();
         }
 
-        TreePath l_path = new TreePath( l_comps ) ;
-        m_tree.scrollPathToVisible( l_path ) ;
-        m_tree.getSelectionModel().setSelectionPath( l_path ) ;
-        m_tree.validate() ;
+        TreePath path = new TreePath( comps );
+        tree.scrollPathToVisible( path );
+        tree.getSelectionModel().setSelectionPath( path );
+        tree.validate();
     }
 
 
-    public boolean doAnnotate( String a_filter )
+    public boolean doAnnotate( String filter )
         throws Exception
     {
-		FilterParser l_parser = new FilterParserImpl() ;
-        l_parser.enableLogging( m_logger ) ;
-        ExprNode l_root = null ;
+		FilterParser parser = new FilterParserImpl();
+        ExprNode root = null;
 
         try 
         {
-            l_root = l_parser.parse( a_filter ) ;
+            root = parser.parse( filter );
         } 
         catch( Exception e ) 
         {
-            JTextArea l_text = new JTextArea() ;
-            String l_msg = e.getMessage() ;
+            JTextArea text = new JTextArea();
+            String msg = e.getMessage();
 
-            if ( l_msg.length() > 1024 ) 
+            if ( msg.length() > 1024 )
             {
-                l_msg = l_msg.substring( 0, 1024 ) + "\n. . . truncated . . ." ;
+                msg = msg.substring( 0, 1024 ) + "\n. . . truncated . . .";
             }
 
-            l_text.setText( l_msg ) ;
-            l_text.setEnabled( false ) ;
-            JOptionPane.showMessageDialog( null, l_text, "Syntax Error",
-                JOptionPane.ERROR_MESSAGE ) ;
-            return false ;
-        }
-
-		AnnotatedFilterTreeDialog l_treeDialog = new
-			AnnotatedFilterTreeDialog( BackendFrame.this, false ) ;
-		l_treeDialog.setFilter( a_filter ) ;
-
-        m_backend.getEngine().getOptimizer().annotate( l_root ) ;
-		TreeNode l_astRoot = new ASTNode( null, l_root ) ;
-		TreeModel l_model = new DefaultTreeModel( l_astRoot, true ) ;
-		l_treeDialog.setModel( l_model ) ;
-        l_treeDialog.setVisible( true ) ;
-        return true ;
+            text.setText( msg );
+            text.setEnabled( false );
+            JOptionPane.showMessageDialog( null, text, "Syntax Error",
+                JOptionPane.ERROR_MESSAGE );
+            return false;
+        }
+
+		AnnotatedFilterTreeDialog treeDialog = new
+			AnnotatedFilterTreeDialog( BackendFrame.this, false );
+		treeDialog.setFilter( filter );
+
+        eng.getOptimizer().annotate( root );
+		TreeNode astRoot = new ASTNode( null, root );
+		TreeModel model = new DefaultTreeModel( astRoot, true );
+		treeDialog.setModel( model );
+        treeDialog.setVisible( true );
+        return true;
     }
 
 
     /**
      * Shows a dialog to display and scan indices.
      * 
-     * @param a_idxAttr the name of the index or its attribute
+     * @param idxAttr the name of the index or its attribute
      * @throws Exception if the indices cannot be accessed
      */
-    public void showIndexDialog( String a_idxAttr )
+    public void showIndexDialog( String idxAttr )
         throws Exception
     {
-        Index l_index = null ;
-        boolean l_isSystem = m_database.hasSystemIndexOn( a_idxAttr ) ; 
+        Index index = null;
+        boolean isSystem = database.hasSystemIndexOn( idxAttr );
         
-        if ( l_isSystem )
+        if ( isSystem )
         {
-            l_index = ( Index ) m_database.getSystemIndex( a_idxAttr ) ;
+            index = ( Index ) database.getSystemIndex( idxAttr );
         }
         else 
         {
-            l_index = ( Index ) m_database.getUserIndex( a_idxAttr ) ;
+            index = ( Index ) database.getUserIndex( idxAttr );
         }
 
-        if ( l_index != null ) 
+        if ( index != null )
         {
-            IndexDialog l_dialog = new IndexDialog( this, false, l_index ) ;
-            centerOnScreen( l_dialog ) ;
-            l_dialog.setEnabled( true ) ;
-            l_dialog.setVisible( true ) ;
+            IndexDialog dialog = new IndexDialog( this, false, index );
+            centerOnScreen( dialog );
+            dialog.setEnabled( true );
+            dialog.setVisible( true );
         }
     }
 
 
-    public void buildIndicesMenu( Database a_database )
+    public void buildIndicesMenu( Database database )
     {
-        JMenuItem l_item = null ;
+        JMenuItem item = null;
         
-        ActionListener l_listener = new ActionListener()
+        ActionListener listener = new ActionListener()
         {
-            public void actionPerformed( ActionEvent a_event ) 
+            public void actionPerformed( ActionEvent event )
             {
                 try 
                 {
-                    showIndexDialog( a_event.getActionCommand() ) ;
+                    showIndexDialog( event.getActionCommand() );
                 } 
                 catch ( Exception e ) 
                 {
-                    e.printStackTrace() ;
+                    e.printStackTrace();
                 }
             }
-        } ;
+        };
+
+        Iterator list = database.getSystemIndices();
+        while ( list.hasNext() )
+        {
+            String idx = ( String ) list.next();
+            item = new JMenuItem();
+            item.setBackground( new java.awt.Color( 205, 205, 205 ) );
+            indices.add( item );
+            item.setText( idx );
+            item.setActionCommand( idx );
+            item.addActionListener( listener );
+        }
 
-        Iterator l_list = a_database.getSystemIndices() ;
-        while ( l_list.hasNext() )
+        indices.add( new JSeparator() );
+        list = database.getUserIndices();
+        while ( list.hasNext() )
         {
-            String l_idx = ( String ) l_list.next() ;
-            l_item = new JMenuItem() ;
-            l_item.setBackground( new java.awt.Color( 205, 205, 205 ) ) ;
-            m_indices.add( l_item ) ;
-            l_item.setText( l_idx ) ;
-            l_item.setActionCommand( l_idx ) ;
-            l_item.addActionListener( l_listener ) ;
-        }
-
-        m_indices.add( new JSeparator() ) ;
-        l_list = a_database.getUserIndices() ;
-        while ( l_list.hasNext() ) 
-        {
-            String l_idx = ( String ) l_list.next() ;
-			l_item = new JMenuItem() ;
-            l_item.setBackground( new java.awt.Color( 205, 205, 205 ) ) ;
-            m_indices.add( l_item ) ;
-            l_item.setText( l_idx ) ;
-            l_item.setActionCommand( l_idx ) ;
-            l_item.addActionListener( l_listener ) ;
+            String idx = ( String ) list.next();
+			item = new JMenuItem();
+            item.setBackground( new java.awt.Color( 205, 205, 205 ) );
+            indices.add( item );
+            item.setText( idx );
+            item.setActionCommand( idx );
+            item.addActionListener( listener );
         }
     }
 
 
-    void displayEntry( BigInteger a_id, Attributes a_entry )
+    void displayEntry( BigInteger id, Attributes entry )
         throws Exception
     {
-        String l_dn = m_database.getEntryUpdn( a_id ) ;
-        AttributesTableModel l_model = 
-            new AttributesTableModel( a_entry, a_id, l_dn, false ) ;
-        m_entryTbl.setModel( l_model ) ;
-
-        l_model = new AttributesTableModel( 
-            m_database.getIndices( a_id ), a_id, l_dn, false ) ;
-        m_idxTbl.setModel( l_model ) ;
+        String dn = database.getEntryUpdn( id );
+        AttributesTableModel model =
+            new AttributesTableModel( entry, id, dn, false );
+        entryTbl.setModel( model );
+
+        model = new AttributesTableModel(
+            database.getIndices( id ), id, dn, false );
+        idxTbl.setModel( model );
 
-        validate() ;
+        validate();
     }
 
 
     private void load() throws Exception
     {
-        boolean doFiltered = false ;
-        m_nodes = new HashMap() ;
+        // boolean doFiltered = false;
+        nodes = new HashMap();
 
-        Attributes l_suffix = m_database.getSuffixEntry() ;
-        BigInteger l_id = m_database.getEntryId( 
-            m_database.getSuffix().toString() ) ;
-        m_root = new EntryNode( l_id, null, m_database, l_suffix, m_nodes ) ;
+        Attributes suffix = database.getSuffixEntry();
+        BigInteger id = database.getEntryId(
+            database.getSuffix().toString() );
+        root = new EntryNode( id, null, database, suffix, nodes );
 
         /*
-        int l_option = JOptionPane.showConfirmDialog( null, 
+        int option = JOptionPane.showConfirmDialog( null,
             "Would you like to filter leaf nodes on load?", "Use Filter?",
-            JOptionPane.OK_CANCEL_OPTION ) ;
-        doFiltered = l_option == JOptionPane.OK_OPTION ;
+            JOptionPane.OK_CANCEL_OPTION );
+        doFiltered = option == JOptionPane.OK_OPTION;
 
         if(doFiltered) {
-            SearchEngine l_engine = new SearchEngine() ;
-            final FilterDialog l_dialog =
-                new FilterDialog(FilterDialog.LOAD_MODE, this, true) ;
-            l_dialog.addActionListener(new ActionListener() {
+            SearchEngine engine = new SearchEngine();
+            final FilterDialog dialog =
+                new FilterDialog(FilterDialog.LOAD_MODE, this, true);
+            dialog.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
-                    l_dialog.setVisible(false) ;
-                    l_dialog.dispose() ;
+                    dialog.setVisible(false);
+                    dialog.dispose();
                 }
-            }) ;
+            });
 
-            l_dialog.setBase(m_database.getSuffix().toString()) ;
-            l_dialog.setScope(FilterDialog.SUBTREE_SCOPE) ;
+            dialog.setBase(database.getSuffix().toString());
+            dialog.setScope(FilterDialog.SUBTREE_SCOPE);
 
             //Center the frame on screen
-            l_dialog.setSize(456, 256) ;
-            this.centerOnScreen( l_dialog ) ;
-            l_dialog.setEnabled(true) ;
-            l_dialog.setVisible(true) ;
-
-            FilterParser l_parser = new FilterParserImpl() ;
-            l_parser.enableLogging(m_logger) ;
-            ExprNode l_exprNode = l_parser.parse(l_dialog.getFilter()) ;
-
-            int l_scope = -1 ;
-            String l_scopeStr = l_dialog.getScope() ;
-            if(l_scopeStr == FilterDialog.BASE_SCOPE) {
-                l_scope = Backend.BASE_SCOPE ;
-            } else if(l_scopeStr == FilterDialog.SINGLE_SCOPE) {
-                l_scope = Backend.SINGLE_SCOPE ;
-            } else if(l_scopeStr == FilterDialog.SUBTREE_SCOPE) {
-                l_scope = Backend.SUBTREE_SCOPE ;
+            dialog.setSize(456, 256);
+            this.centerOnScreen( dialog );
+            dialog.setEnabled(true);
+            dialog.setVisible(true);
+
+            FilterParser parser = new FilterParserImpl();
+            parser.enableLogging(logger);
+            ExprNode exprNode = parser.parse(dialog.getFilter());
+
+            int scope = -1;
+            String scopeStr = dialog.getScope();
+            if(scopeStr == FilterDialog.BASE_SCOPE) {
+                scope = Backend.BASE_SCOPE;
+            } else if(scopeStr == FilterDialog.SINGLE_SCOPE) {
+                scope = Backend.SINGLE_SCOPE;
+            } else if(scopeStr == FilterDialog.SUBTREE_SCOPE) {
+                scope = Backend.SUBTREE_SCOPE;
             } else {
-                throw new RuntimeException("Unrecognized scope") ;
+                throw new RuntimeException("Unrecognized scope");
             }
 
-            l_exprNode =
-                l_engine.addScopeNode(l_exprNode, l_dialog.getBase(), l_scope) ;
-            m_root = new EntryNode(null, m_database,
-                m_database.getSuffixEntry(), m_nodes, l_exprNode, l_engine) ;
+            exprNode =
+                engine.addScopeNode(exprNode, dialog.getBase(), scope);
+            root = new EntryNode(null, database,
+                database.getSuffixEntry(), nodes, exprNode, engine);
         } else {
-            m_root = new EntryNode(null, m_database,
-                m_database.getSuffixEntry(), m_nodes) ;
+            root = new EntryNode(null, database,
+                database.getSuffixEntry(), nodes);
         }
         */
 
-        DefaultTreeModel l_model = new DefaultTreeModel( m_root ) ;
-        m_tree.setModel( l_model ) ;
+        DefaultTreeModel model = new DefaultTreeModel( root );
+        tree.setModel( model );
 
         if ( isVisible() ) 
         {
-            m_tree.validate() ;
+            tree.validate();
         }
     }
 }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/EntryDialog.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/EntryDialog.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/EntryDialog.java	Sat Oct 23 01:27:40 2004
@@ -1,217 +1,20 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
 /*
- * $Id: EntryDialog.java,v 1.1 2003/10/03 03:03:17 akarasulu Exp $
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
  *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  *
  */
-package org.apache.ldap.server.backend.db.gui ;
+package org.apache.eve.db.gui ;
 
 
 import java.awt.Frame ;
@@ -233,9 +36,8 @@
 /**
  * Allows for operations on entries.
  * 
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.1 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
  */
 public class EntryDialog extends JDialog
 {
@@ -256,6 +58,7 @@
     private String m_dn ;
     private String m_rdn ;
     private Attributes m_entry ;
+
 
     /**
      * Creates new form JDialog

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/EntryNode.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/EntryNode.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/EntryNode.java	Sat Oct 23 01:27:40 2004
@@ -1,419 +1,226 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
 /*
- * $Id: EntryNode.java,v 1.5 2003/10/15 01:59:50 akarasulu Exp $
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  *
  */
+package org.apache.eve.db.gui;
 
-package org.apache.ldap.server.backend.db.gui ;
 
+import java.math.BigInteger;
 
-import java.math.BigInteger ;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Collections;
 
-import java.util.HashMap ;
-import java.util.Iterator ;
-import java.util.ArrayList ;
-import java.util.Enumeration ;
-import java.util.Collections ;
+import javax.naming.NamingException;
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.Attributes;
 
-import javax.naming.NamingException ;
-import javax.naming.NamingEnumeration ;
-import javax.naming.directory.Attributes ;
+import javax.swing.tree.TreeNode;
 
-import javax.swing.tree.TreeNode ;
-
-import org.apache.ldap.common.filter.ExprNode ;
+import org.apache.ldap.common.filter.ExprNode;
 import org.apache.ldap.common.name.LdapName;
-import org.apache.ldap.server.backend.db.Database ;
-import org.apache.ldap.server.backend.db.index.IndexRecord ;
-import org.apache.ldap.server.backend.db.search.SearchEngine ;
+import org.apache.eve.db.Database;
+import org.apache.eve.db.SearchEngine;
+import org.apache.eve.db.IndexRecord;
 
 
 /**
  * A node representing an entry.
+ * 
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
  */
 public class EntryNode
 	implements TreeNode
 {
-    private final Database m_db ;
-    private final EntryNode m_parent ;
-	private final Attributes m_entry ;
-    private final ArrayList m_children ;
-    private final BigInteger m_id ;
+    private final Database db;
+    private final EntryNode parent;
+	private final Attributes entry;
+    private final ArrayList children;
+    private final BigInteger id;
 
 
-    public EntryNode( BigInteger a_id, EntryNode a_parent, Database a_db, 
-        Attributes a_entry, HashMap a_map )
+    public EntryNode( BigInteger id, EntryNode parent, Database db,
+        Attributes entry, HashMap map )
     {
-        this( a_id, a_parent, a_db, a_entry, a_map, null, null ) ;
+        this( id, parent, db, entry, map, null, null );
     }
 
 
-    public EntryNode( BigInteger a_id, EntryNode a_parent, Database a_db, 
-        Attributes a_entry, HashMap a_map, ExprNode a_exprNode, 
-        SearchEngine a_engine )
+    public EntryNode( BigInteger id, EntryNode parent, Database db,
+        Attributes entry, HashMap map, ExprNode exprNode,
+        SearchEngine engine )
     {
-        m_db = a_db ;
-        m_id = a_id ;
-		m_entry = a_entry ;
-        m_children = new ArrayList() ;
+        this.db = db;
+        this.id = id;
+		this.entry = entry;
+        this.children = new ArrayList();
 
-        if ( a_parent == null ) 
+        if ( parent == null )
         {
-            m_parent = this ;
+            this.parent = this;
         } 
         else 
         {
-            m_parent = a_parent ;
+            this.parent = parent;
         }
 
 		try {
-            ArrayList l_records = new ArrayList() ;
-            NamingEnumeration l_childList = m_db.list( a_id ) ;
-            while( l_childList.hasMore() ) 
+            ArrayList records = new ArrayList();
+            NamingEnumeration childList = db.list( id );
+            while( childList.hasMore() )
             {
-                IndexRecord l_old = ( IndexRecord ) l_childList.next() ;
-                IndexRecord l_new = new IndexRecord() ;
-                l_new.copy( l_old ) ;
-                l_records.add( l_new ) ;
+                IndexRecord old = ( IndexRecord ) childList.next();
+                IndexRecord newRec = new IndexRecord();
+                newRec.copy( old );
+                records.add( newRec );
             }
-            l_childList.close() ;
+            childList.close();
 
-            Iterator l_list = l_records.iterator() ;
+            Iterator list = records.iterator();
             
-            while( l_list.hasNext() ) 
+            while( list.hasNext() )
             {
-                IndexRecord l_rec = ( IndexRecord ) l_list.next() ;
+                IndexRecord rec = ( IndexRecord ) list.next();
 
-                if ( a_engine != null && a_exprNode != null ) 
+                if ( engine != null && exprNode != null )
                 {
-                    if ( m_db.getChildCount( l_rec.getEntryId() ) == 0 ) 
+                    if ( db.getChildCount( rec.getEntryId() ) == 0 )
                     {
-                        if( a_engine.evaluate( a_exprNode, 
-                                        l_rec.getEntryId() ) )
+                        if( engine.evaluate( exprNode, rec.getEntryId() ) )
                         {
-                            Attributes l_entry = m_db.lookup( 
-                                l_rec.getEntryId() ) ;
-                            EntryNode l_child =
-                                new EntryNode( l_rec.getEntryId(), this, m_db, 
-                                    l_entry, a_map, a_exprNode, a_engine) ;
-                            m_children.add(l_child) ;
-                        } else {
-                            continue ;
+                            Attributes newEntry = db.lookup( rec.getEntryId() );
+                            EntryNode child = new EntryNode( rec.getEntryId(),
+                                    this, db, newEntry, map, exprNode, engine);
+                            children.add(child);
                         }
-                    } else {
-                        Attributes l_entry = m_db.lookup( l_rec.getEntryId() ) ;
-                        EntryNode l_child = new EntryNode( l_rec.getEntryId(), 
-                            this, m_db, l_entry, a_map, a_exprNode, a_engine ) ;
-                        m_children.add( l_child ) ;
+                        else
+                        {
+                            continue;
+                        }
+                    }
+                    else
+                    {
+                        Attributes newEntry = db.lookup( rec.getEntryId() );
+                        EntryNode child = new EntryNode( rec.getEntryId(),
+                            this, db, newEntry, map, exprNode, engine );
+                        children.add( child );
                     }
                 } 
-                else {
-                    Attributes l_entry = m_db.lookup( l_rec.getEntryId() ) ;
-                    EntryNode l_child = new EntryNode( l_rec.getEntryId(), this,
-                        m_db, l_entry, a_map ) ;
-                    m_children.add( l_child ) ;
+                else
+                {
+                    Attributes newEntry = db.lookup( rec.getEntryId() );
+                    EntryNode child = new EntryNode( rec.getEntryId(), this,
+                        db, newEntry, map );
+                    children.add( child );
                 }
             }
         } 
         catch ( Exception e ) 
         {
-            e.printStackTrace() ;
+            e.printStackTrace();
         }
 
-        a_map.put( m_id, this ) ;
+        map.put( id, this );
     }
 
 
     public Enumeration children()
     {
-        return Collections.enumeration(m_children) ;
+        return Collections.enumeration( children );
     }
 
 
     public boolean getAllowsChildren()
     {
-        return true ;
+        return true;
     }
 
 
-    public TreeNode getChildAt(int a_childIndex)
+    public TreeNode getChildAt( int childIndex )
     {
-		return (TreeNode) m_children.get(a_childIndex) ;
+		return ( TreeNode ) children.get( childIndex );
     }
 
 
     public int getChildCount()
     {
-        return m_children.size() ;
+        return children.size();
     }
 
 
-    public int getIndex(TreeNode a_child)
+    public int getIndex( TreeNode child )
     {
-        return m_children.indexOf(a_child) ;
+        return children.indexOf( child );
     }
 
 
     public TreeNode getParent()
     {
-        return m_parent ;
+        return parent;
     }
 
 
     public boolean isLeaf()
     {
-        return m_children.size() <= 0 ;
+        return children.size() <= 0;
     }
 
 
     public String getEntryDn()
         throws NamingException
     {
-        return m_db.getEntryDn( m_id ) ;
+        return db.getEntryDn( id );
     }
     
 
     public String toString()
     {
-        StringBuffer l_buf = new StringBuffer() ;
+        StringBuffer buf = new StringBuffer();
         
         try
         {
-            LdapName l_dn = new LdapName( m_db.getEntryDn( m_id ) ) ;
-            l_buf.append( '(' ).append( m_id ).append( ") " ) ;
-            l_buf.append( l_dn.getRdn() ) ;
+            LdapName dn = new LdapName( db.getEntryDn( id ) );
+            buf.append( '(' ).append( id ).append( ") " );
+            buf.append( dn.getRdn() );
         }
         catch( NamingException e )
         {
-            e.printStackTrace() ;
-            l_buf.append( "ERROR: " + e.getMessage() ) ;
+            e.printStackTrace();
+            buf.append( "ERROR: " + e.getMessage() );
         }
         
-        if ( m_children.size() > 0 ) 
+        if ( children.size() > 0 )
         {
-            l_buf.append( " [" ).append( m_children.size() ).append( ']' ) ;
+            buf.append( " [" ).append( children.size() ).append( ']' );
         }
         
-        return l_buf.toString() ;
+        return buf.toString();
     }
 
 
     public Attributes getLdapEntry()
     {
-        return m_entry ;
+        return entry;
     }
     
     
     public BigInteger getEntryId()
     {
-        return m_id ;
+        return id;
     }
 }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/FilterDialog.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/FilterDialog.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/FilterDialog.java	Sat Oct 23 01:27:40 2004
@@ -1,217 +1,20 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
 /*
- * $Id: FilterDialog.java,v 1.2 2003/10/07 22:29:55 akarasulu Exp $
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  *
  */
-package org.apache.ldap.server.backend.db.gui ;
+package org.apache.eve.db.gui ;
 
 
 import javax.swing.JLabel ;
@@ -240,8 +43,13 @@
 import javax.swing.JScrollPane;
 
 
-public class FilterDialog
-    extends JDialog
+/**
+ * A dialog for the filter.
+ *
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class FilterDialog extends JDialog
 {
 	public static final String RUN_MODE = "Run" ;
     public static final String LOAD_MODE = "Load" ;

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/FilterDialog2.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/FilterDialog2.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/FilterDialog2.java	Sat Oct 23 01:27:40 2004
@@ -1,217 +1,20 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
 /*
- * $Id: FilterDialog2.java,v 1.1 2003/10/07 22:21:25 akarasulu Exp $
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  *
  */
-package org.apache.ldap.server.backend.db.gui ;
+package org.apache.eve.db.gui ;
  
  
 import java.awt.Dialog;
@@ -225,6 +28,12 @@
 import javax.swing.JButton;
 
 
+/**
+ * Another dialog.
+ *
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
 public class FilterDialog2 extends Dialog
 {
     private JPanel jPanel1 = new JPanel();

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/IndexDialog.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/IndexDialog.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/IndexDialog.java	Sat Oct 23 01:27:40 2004
@@ -1,217 +1,20 @@
-/*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
 /*
- * $Id: IndexDialog.java,v 1.3 2003/10/02 01:47:59 akarasulu Exp $
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  *
  */
-package org.apache.ldap.server.backend.db.gui ;
+package org.apache.eve.db.gui ;
 
 
 import java.awt.Frame ;  
@@ -235,13 +38,19 @@
 import javax.swing.table.DefaultTableModel ;
 
 import org.apache.ldap.common.util.StringTools ;
-import org.apache.ldap.server.backend.db.index.Index ;
-import org.apache.ldap.server.backend.db.index.IndexRecord ;
+import org.apache.ldap.common.util.ExceptionUtils;
 
 import org.apache.regexp.RE ;
-import org.apache.avalon.framework.ExceptionUtil ;
+import org.apache.eve.db.Index;
+import org.apache.eve.db.IndexRecord;
 
 
+/**
+ * A dialog showing index values.
+ *
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
 public class IndexDialog extends JDialog
 {
     public static final String DEFAULT_CURSOR = "Default" ;
@@ -253,7 +62,6 @@
     private Panel m_mainPnl = new Panel();
     private JTabbedPane m_tabbedPane = new JTabbedPane();
     private JPanel m_listPnl = new JPanel();
-    private JScrollPane jScrollPane1 = new JScrollPane();
     private JPanel m_cursorPnl = new JPanel();
     private JPanel m_resultsPnl = new JPanel();
     private JScrollPane jScrollPane2 = new JScrollPane();
@@ -265,9 +73,6 @@
     private JLabel jLabel2 = new JLabel();
     private JComboBox m_cursorType = new JComboBox();
     private JButton m_scanBut = new JButton();
-    private JPanel jPanel1 = new JPanel();
-    private JPanel jPanel2 = new JPanel();
-    private JButton m_quitBut = new JButton();
     private Index m_index = null ;
 
     /** Creates new form JDialog */
@@ -563,7 +368,7 @@
         } 
         catch ( Exception e ) 
         {
-            String l_msg = ExceptionUtil.printStackTrace(e) ;
+            String l_msg = ExceptionUtils.getStackTrace( e );
 
             if ( l_msg.length() > 1024 ) 
             {
@@ -579,7 +384,7 @@
             JTextArea l_area = new JTextArea() ;
             l_area.setText( l_msg ) ;
             JOptionPane.showMessageDialog( null, l_area, "Index Scan Error",
-                JOptionPane.ERROR_MESSAGE ) ;
+                    JOptionPane.ERROR_MESSAGE ) ;
             return false ;
         }
 

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/SearchResultDialog.java
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/backend-database-viewer/src/java/org/apache/ldap/server/backend/db/gui/SearchResultDialog.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/gui/SearchResultDialog.java	Sat Oct 23 01:27:40 2004
@@ -1,193 +1,5 @@
 /*
- *                                 Apache License
- *                           Version 2.0, January 2004
- *                        http://www.apache.org/licenses/
- *
- *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- *   1. Definitions.
- *
- *      "License" shall mean the terms and conditions for use, reproduction,
- *      and distribution as defined by Sections 1 through 9 of this document.
- *
- *      "Licensor" shall mean the copyright owner or entity authorized by
- *      the copyright owner that is granting the License.
- *
- *      "Legal Entity" shall mean the union of the acting entity and all
- *      other entities that control, are controlled by, or are under common
- *      control with that entity. For the purposes of this definition,
- *      "control" means (i) the power, direct or indirect, to cause the
- *      direction or management of such entity, whether by contract or
- *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
- *      outstanding shares, or (iii) beneficial ownership of such entity.
- *
- *      "You" (or "Your") shall mean an individual or Legal Entity
- *      exercising permissions granted by this License.
- *
- *      "Source" form shall mean the preferred form for making modifications,
- *      including but not limited to software source code, documentation
- *      source, and configuration files.
- *
- *      "Object" form shall mean any form resulting from mechanical
- *      transformation or translation of a Source form, including but
- *      not limited to compiled object code, generated documentation,
- *      and conversions to other media types.
- *
- *      "Work" shall mean the work of authorship, whether in Source or
- *      Object form, made available under the License, as indicated by a
- *      copyright notice that is included in or attached to the work
- *      (an example is provided in the Appendix below).
- *
- *      "Derivative Works" shall mean any work, whether in Source or Object
- *      form, that is based on (or derived from) the Work and for which the
- *      editorial revisions, annotations, elaborations, or other modifications
- *      represent, as a whole, an original work of authorship. For the purposes
- *      of this License, Derivative Works shall not include works that remain
- *      separable from, or merely link (or bind by name) to the interfaces of,
- *      the Work and Derivative Works thereof.
- *
- *      "Contribution" shall mean any work of authorship, including
- *      the original version of the Work and any modifications or additions
- *      to that Work or Derivative Works thereof, that is intentionally
- *      submitted to Licensor for inclusion in the Work by the copyright owner
- *      or by an individual or Legal Entity authorized to submit on behalf of
- *      the copyright owner. For the purposes of this definition, "submitted"
- *      means any form of electronic, verbal, or written communication sent
- *      to the Licensor or its representatives, including but not limited to
- *      communication on electronic mailing lists, source code control systems,
- *      and issue tracking systems that are managed by, or on behalf of, the
- *      Licensor for the purpose of discussing and improving the Work, but
- *      excluding communication that is conspicuously marked or otherwise
- *      designated in writing by the copyright owner as "Not a Contribution."
- *
- *      "Contributor" shall mean Licensor and any individual or Legal Entity
- *      on behalf of whom a Contribution has been received by Licensor and
- *      subsequently incorporated within the Work.
- *
- *   2. Grant of Copyright License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      copyright license to reproduce, prepare Derivative Works of,
- *      publicly display, publicly perform, sublicense, and distribute the
- *      Work and such Derivative Works in Source or Object form.
- *
- *   3. Grant of Patent License. Subject to the terms and conditions of
- *      this License, each Contributor hereby grants to You a perpetual,
- *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- *      (except as stated in this section) patent license to make, have made,
- *      use, offer to sell, sell, import, and otherwise transfer the Work,
- *      where such license applies only to those patent claims licensable
- *      by such Contributor that are necessarily infringed by their
- *      Contribution(s) alone or by combination of their Contribution(s)
- *      with the Work to which such Contribution(s) was submitted. If You
- *      institute patent litigation against any entity (including a
- *      cross-claim or counterclaim in a lawsuit) alleging that the Work
- *      or a Contribution incorporated within the Work constitutes direct
- *      or contributory patent infringement, then any patent licenses
- *      granted to You under this License for that Work shall terminate
- *      as of the date such litigation is filed.
- *
- *   4. Redistribution. You may reproduce and distribute copies of the
- *      Work or Derivative Works thereof in any medium, with or without
- *      modifications, and in Source or Object form, provided that You
- *      meet the following conditions:
- *
- *      (a) You must give any other recipients of the Work or
- *          Derivative Works a copy of this License; and
- *
- *      (b) You must cause any modified files to carry prominent notices
- *          stating that You changed the files; and
- *
- *      (c) You must retain, in the Source form of any Derivative Works
- *          that You distribute, all copyright, patent, trademark, and
- *          attribution notices from the Source form of the Work,
- *          excluding those notices that do not pertain to any part of
- *          the Derivative Works; and
- *
- *      (d) If the Work includes a "NOTICE" text file as part of its
- *          distribution, then any Derivative Works that You distribute must
- *          include a readable copy of the attribution notices contained
- *          within such NOTICE file, excluding those notices that do not
- *          pertain to any part of the Derivative Works, in at least one
- *          of the following places: within a NOTICE text file distributed
- *          as part of the Derivative Works; within the Source form or
- *          documentation, if provided along with the Derivative Works; or,
- *          within a display generated by the Derivative Works, if and
- *          wherever such third-party notices normally appear. The contents
- *          of the NOTICE file are for informational purposes only and
- *          do not modify the License. You may add Your own attribution
- *          notices within Derivative Works that You distribute, alongside
- *          or as an addendum to the NOTICE text from the Work, provided
- *          that such additional attribution notices cannot be construed
- *          as modifying the License.
- *
- *      You may add Your own copyright statement to Your modifications and
- *      may provide additional or different license terms and conditions
- *      for use, reproduction, or distribution of Your modifications, or
- *      for any such Derivative Works as a whole, provided Your use,
- *      reproduction, and distribution of the Work otherwise complies with
- *      the conditions stated in this License.
- *
- *   5. Submission of Contributions. Unless You explicitly state otherwise,
- *      any Contribution intentionally submitted for inclusion in the Work
- *      by You to the Licensor shall be under the terms and conditions of
- *      this License, without any additional terms or conditions.
- *      Notwithstanding the above, nothing herein shall supersede or modify
- *      the terms of any separate license agreement you may have executed
- *      with Licensor regarding such Contributions.
- *
- *   6. Trademarks. This License does not grant permission to use the trade
- *      names, trademarks, service marks, or product names of the Licensor,
- *      except as required for reasonable and customary use in describing the
- *      origin of the Work and reproducing the content of the NOTICE file.
- *
- *   7. Disclaimer of Warranty. Unless required by applicable law or
- *      agreed to in writing, Licensor provides the Work (and each
- *      Contributor provides its Contributions) on an "AS IS" BASIS,
- *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- *      implied, including, without limitation, any warranties or conditions
- *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- *      PARTICULAR PURPOSE. You are solely responsible for determining the
- *      appropriateness of using or redistributing the Work and assume any
- *      risks associated with Your exercise of permissions under this License.
- *
- *   8. Limitation of Liability. In no event and under no legal theory,
- *      whether in tort (including negligence), contract, or otherwise,
- *      unless required by applicable law (such as deliberate and grossly
- *      negligent acts) or agreed to in writing, shall any Contributor be
- *      liable to You for damages, including any direct, indirect, special,
- *      incidental, or consequential damages of any character arising as a
- *      result of this License or out of the use or inability to use the
- *      Work (including but not limited to damages for loss of goodwill,
- *      work stoppage, computer failure or malfunction, or any and all
- *      other commercial damages or losses), even if such Contributor
- *      has been advised of the possibility of such damages.
- *
- *   9. Accepting Warranty or Additional Liability. While redistributing
- *      the Work or Derivative Works thereof, You may choose to offer,
- *      and charge a fee for, acceptance of support, warranty, indemnity,
- *      or other liability obligations and/or rights consistent with this
- *      License. However, in accepting such obligations, You may act only
- *      on Your own behalf and on Your sole responsibility, not on behalf
- *      of any other Contributor, and only if You agree to indemnify,
- *      defend, and hold each Contributor harmless for any liability
- *      incurred by, or claims asserted against, such Contributor by reason
- *      of your accepting any such warranty or additional liability.
- *
- *   END OF TERMS AND CONDITIONS
- *
- *   APPENDIX: How to apply the Apache License to your work.
- *
- *      To apply the Apache License to your work, attach the following
- *      boilerplate notice, with the fields enclosed by brackets "[]"
- *      replaced with your own identifying information. (Don't include
- *      the brackets!)  The text should be enclosed in the appropriate
- *      comment syntax for the file format. We also recommend that a
- *      file or class name and description of purpose be included on the
- *      same "printed page" as the copyright notice for easier
- *      identification within third-party archives.
- *
- *   Copyright [yyyy] [name of copyright owner]
+ *   Copyright 2004 The Apache Software Foundation
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -202,17 +14,8 @@
  *   limitations under the License.
  *
  */
-
-/*
- * $Id: SearchResultDialog.java,v 1.1 2003/09/30 03:41:12 akarasulu Exp $
- *
- * -- (c) LDAPd Group                                                    --
- * -- Please refer to the LICENSE.txt file in the root directory of      --
- * -- any LDAPd project for copyright and distribution information.      --
- *
- */
+package org.apache.eve.db.gui ;
 
-package org.apache.ldap.server.backend.db.gui ;
 
 import javax.swing.JDialog ;
 import java.awt.Frame ;
@@ -233,8 +36,13 @@
 import java.math.BigInteger;
 
 
-public class SearchResultDialog
-    extends JDialog implements ListSelectionListener
+/**
+ * Dialog showing the search results.
+ *
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class SearchResultDialog extends JDialog implements ListSelectionListener
 {
     private JPanel jPanel1 = new JPanel();
     private JTree jTree1 = new JTree();
@@ -297,7 +105,7 @@
         jButton1.setText("Done");
         jButton1.setActionCommand("Done");
 		jButton1.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent a_event) {
+            public void actionPerformed(ActionEvent event) {
                 SearchResultDialog.this.setVisible(false) ;
 				SearchResultDialog.this.dispose() ;
             }
@@ -323,15 +131,15 @@
 
     public void valueChanged(ListSelectionEvent an_event)
     {
-        ListSelectionModel l_selectionModel = (ListSelectionModel) an_event.getSource() ;
-        int l_minIndex = l_selectionModel.getMinSelectionIndex() ;
-        int l_maxIndex = l_selectionModel.getMaxSelectionIndex() ;
-
-        for(int ii = l_minIndex ; ii <= l_maxIndex; ii++) {
-            if(l_selectionModel.isSelectedIndex(ii) && !an_event.getValueIsAdjusting()) {
-                BigInteger l_id = (BigInteger)
+        ListSelectionModel selectionModel = (ListSelectionModel) an_event.getSource() ;
+        int minIndex = selectionModel.getMinSelectionIndex() ;
+        int maxIndex = selectionModel.getMaxSelectionIndex() ;
+
+        for(int ii = minIndex ; ii <= maxIndex; ii++) {
+            if(selectionModel.isSelectedIndex(ii) && !an_event.getValueIsAdjusting()) {
+                BigInteger id = (BigInteger)
                     m_resultsTbl.getModel().getValueAt(ii, 0) ;
-                ((BackendFrame) getParent()).selectTreeNode(l_id) ;
+                ((BackendFrame) getParent()).selectTreeNode(id) ;
             }
         }
     }
@@ -339,25 +147,26 @@
 
     /** Closes the dialog */
     private void closeDialog(WindowEvent evt) {
+        evt.getWindow();
         setVisible(false);
         dispose();
     }
 
 
-    public void setTreeModel(TreeModel a_model)
+    public void setTreeModel(TreeModel model)
     {
-        this.jTree1.setModel(a_model) ;
+        this.jTree1.setModel(model) ;
     }
 
 
-    public void setFilter(String a_filter)
+    public void setFilter(String filter)
     {
-        this.jTextArea1.setText(a_filter) ;
+        this.jTextArea1.setText(filter) ;
     }
 
 
-    public void setTableModel(TableModel a_model)
+    public void setTableModel(TableModel model)
     {
-        m_resultsTbl.setModel(a_model) ;
+        m_resultsTbl.setModel(model) ;
     }
 }

Mime
View raw message