Minor changes

KinkyDesign · May 21, 2010 · 82e5fbe · 82e5fbe
1 parent f74508e
commit 82e5fbe
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/src/org/kinkydesign/decibell/Component.java b/src/org/kinkydesign/decibell/Component.java
@@ -338,22 +338,23 @@ private String toString(String x) {
                         buffer.append(":\n");
                         buffer.append(((Component) f.get(this)).toString(x + spaces(4)));
                     }
-                } else if (f.get(this)!=null && Collection.class.isAssignableFrom(f.get(this).getClass())) {
+                } else if (f.get(this) != null && Collection.class.isAssignableFrom(f.get(this).getClass())) {
                     Collection collection = (Collection) f.get(this);
+                    buffer.append(spaces(3));
+                    buffer.append("L " + f.getName() + " :\n");
                     for (Object o : collection) {
                         if (o instanceof Component) {
+                            if (o.equals(this)) {
+                                continue;
+                            }
                             buffer.append(x);
-                            buffer.append(spaces(3));
-                            buffer.append("L member = \n");
-                            buffer.append(((Component) o).toString(spaces(4)));
+                            buffer.append(((Component) o).toString(spaces(8)));
                             buffer.append("\n");
                         } else {
                             buffer.append(x);
-                            buffer.append(spaces(3));
-                            buffer.append("L member = \n");
                             buffer.append(o);
+                            buffer.append("\n");
                         }
-
                     }
                 } else {
                     buffer.append(x);

diff --git a/src/org/kinkydesign/decibell/db/StatementPool.java b/src/org/kinkydesign/decibell/db/StatementPool.java
@@ -76,7 +76,6 @@ public final class StatementPool {
     private static final Object lock = new Object();
 
     private DbConnector con = null;
-
     private Map<JTable, ArrayBlockingQueue<Pair<PreparedStatement, SQLQuery>>> search =
             new HashMap<JTable, ArrayBlockingQueue<Pair<PreparedStatement, SQLQuery>>>();
     private Map<JTable, ArrayBlockingQueue<Pair<PreparedStatement, SQLQuery>>> searchpk =
@@ -95,7 +94,7 @@ private StatementPool(DbConnector con) {
         }
         for (JRelationalTable rel : ComponentRegistry.getRegistry(con).getRelationTables()) {
             initRelTable(rel);
-        }        
+        }
     }
 
     /**
@@ -105,7 +104,7 @@ private StatementPool(DbConnector con) {
      */
     public static StatementPool getPool(DbConnector con) {
         if (pools.get(con) == null) {
-            synchronized(lock){
+            synchronized (lock) {
                 pools.put(con, new StatementPool(con));
             }
         }

diff --git a/src/org/kinkydesign/decibell/db/util/Pair.java b/src/org/kinkydesign/decibell/db/util/Pair.java
@@ -41,7 +41,7 @@
 import java.util.Map.Entry;
 
 /**
- * A simple pair implementation of the Map.Entry interface.
+ * A simple pair implementation of the <code>java.util.Map.Entry</code> interface.
  * @author Charalampos Chomenides
  * @author Pantelis Sopasakis
  */

diff --git a/test/org/kinkydesign/decibell/alpha/collect/MasterSlaveTest.java b/test/org/kinkydesign/decibell/alpha/collect/MasterSlaveTest.java
@@ -1,11 +1,6 @@
 package org.kinkydesign.decibell.alpha.collect;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
-import java.util.Vector;
-import java.util.concurrent.ArrayBlockingQueue;
+import java.util.*;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -70,6 +65,8 @@ public void testMasterSlave() throws ImproperRegistration {
             m3.attemptRegister(db);
             assertEquals(1, m3.attemptRegister(db));
 
+            System.out.println(m3);
+
             ArrayList<Master> mastersFound = new Master().search(db);
             assertNotNull(mastersFound);
             assertEquals(3, mastersFound.size());

diff --git a/test/org/kinkydesign/decibell/alpha/sr/SRListTest.java b/test/org/kinkydesign/decibell/alpha/sr/SRListTest.java
@@ -28,6 +28,7 @@ public void testSRList() throws Exception {
         for (SRList sr : found) {
             try {
                 System.out.println(sr.getMyList().get(0).getMyList().get(0).getId());
+                System.out.println(sr);
             } catch (IndexOutOfBoundsException ex) {
             }
         }