Changeset 1607

Timestamp:

06/08/07 20:15:22 (18 months ago)

Author:

david

Message:

code cleanup ticket #383

Location:

branches/3.0-Beta2/components

Files:

• client/test/ome/adapters/pojos/itests/PojosServiceTest.java (modified) (2 diffs)
• client/test/ome/adapters/pojos/utests/PojosTest.java (modified) (5 diffs)
• common/test/ome/model/utests/PermissionsTest.java (modified) (3 diffs)
• dsl/src/ome/dsl/SaxReader.java (modified) (1 diff)
• policy/.project (modified) (1 diff)
• resurrect/src/ome/resurrect/Resurrect.java (modified) (3 diffs)
• server/src/ome/rules/drools/AllObjects.java (modified) (3 diffs)
• server/src/ome/tools/FileSystem.java (modified) (3 diffs)
• server/test/ome/server/itests/EventStateChangeTest.java (modified) (3 diffs)
• server/test/ome/server/itests/query/pojos/QueryTest.java (modified) (2 diffs)
• tools/WebAdmin/test/TestArray2List.java (modified) (3 diffs)
• tools/WebAdmin/test/TestChangeGroups.java (modified) (5 diffs)
• tools/WebAdmin/test/TestDelete.java (modified) (3 diffs)
• tools/WebAdmin/test/TestGroups.java (modified) (5 diffs)
• tools/WebAdmin/test/TestTheLink.java (modified) (3 diffs)

branches/3.0-Beta2/components/client/test/ome/adapters/pojos/itests/PojosServiceTest.java

@@ -866 +866 @@
                 Dataset.ANNOTATIONS)).intValue() > 0);
 
-        System.out.println(original.getDetails().getCounts());
-
+        if (log.isDebugEnabled()) {
+            log.debug(original.getDetails().getCounts());
+        }
+ 
     }
 
@@ -977 +979 @@
         Set updt_ids = new HashSet(updated.collectProjectLinks(new IdBlock()));
 
-        System.out.println(orig_ids);
-        System.out.println(updt_ids);
+        if (log.isDebugEnabled()) {
+            log.debug(orig_ids);
+            log.debug(updt_ids);
+        }
 
         assertTrue(updt_ids.containsAll(orig_ids));

branches/3.0-Beta2/components/client/test/ome/adapters/pojos/utests/PojosTest.java

@@ -7 +7 @@
 package ome.adapters.pojos.utests;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.testng.annotations.*;
 
@@ -42 +44 @@
 
 public class PojosTest extends TestCase {
+
+    private static Log log = LogFactory.getLog(PojosTest.class);
+    
     IObject[] all;
 
@@ -114 +119 @@
         assertFalse(pd.getDatasets().size() == 0);
         assertFalse(pd.getDatasets().iterator().next().getClass() == Dataset.class);
-        System.out.println(pd);
+        if (log.isDebugEnabled()) {
+            log.debug(pd);
+        }
     }
 
@@ -162 +169 @@
         Set d_links = new HashSet(test.collectProjectLinks(null));
 
-        System.out.println(p_links);
-        System.out.println(d_links);
+        if (log.isDebugEnabled()) {
+            log.debug(p_links);
+            log.debug(d_links);
+        }
 
         assertTrue(p_links.containsAll(d_links));
@@ -174 +183 @@
         Set i2_links = new HashSet(test2.collectDatasetLinks(null));
 
-        System.out.println(d2_links);
-        System.out.println(i2_links);
+        if (log.isDebugEnabled()) {
+            log.debug(d2_links);
+            log.debug(i2_links);
+        }
+
 
         assertTrue(d2_links.containsAll(i2_links));

branches/3.0-Beta2/components/common/test/ome/model/utests/PermissionsTest.java

@@ -12 +12 @@
 import java.io.ObjectOutputStream;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.testng.annotations.*;
 
@@ -27 +29 @@
 public class PermissionsTest extends TestCase {
 
+    private static Log log = LogFactory.getLog(PermissionsTest.class);
+    
     Permissions p;
 
@@ -401 +405 @@
         Perms pp = new Perms().revoke(role, right);
         long l = pp.toLong();
-        System.out.println(l + ":" + Long.toBinaryString(l));
+        if (log.isDebugEnabled()) {
+            log.debug(l + ":" + Long.toBinaryString(l));
+        }
         long bit = Perms.bit(role, right);
-        System.out.println(bit + ":" + Long.toBinaryString(bit));
+        if (log.isDebugEnabled()) {
+            log.debug(bit + ":" + Long.toBinaryString(bit));
+        }
         assertTrue((l ^ bit) == -1L);
 

branches/3.0-Beta2/components/dsl/src/ome/dsl/SaxReader.java

@@ -253 +253 @@
     /** simple outputting routine with indention */
     private void outputStart(String element, Attributes attrs) {
-        System.out.print(depth + element);
-        System.out.print("(");
+        if (log.isDebugEnabled()) {
+            log.debug(depth + element + "(");
+        }
         for (int i = 0; i < attrs.getLength(); i++) {
             String attr = attrs.getQName(i);
             String value = attrs.getValue(i);
-            System.out.print(" " + attr + "=\"" + value + "\" ");
-        }
-        System.out.print("):");
-        System.out.println("");
+            if (log.isDebugEnabled()) {
+                log.debug(" " + attr + "=\"" + value + "\" ");
+            }
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("): ");
+        }
         depth += "  ";
     }

branches/3.0-Beta2/components/policy/.project

@@ -78 +78 @@
                 </link>
                 <link>
+                        <name>server_src</name>
+                        <type>2</type>
+                        <locationURI>OMERO_COMPONENTS/server/src</locationURI>
+                </link>
+                <link>
                         <name>resurrect_src</name>
                         <type>2</type>
                         <locationURI>OMERO_COMPONENTS/resurrect/src</locationURI>
                 </link>
-                <link>
-                        <name>server_src</name>
-                        <type>2</type>
-                        <locationURI>OMERO_COMPONENTS/server/src</locationURI>
-                </link>
         </linkedResources>
 </projectDescription>

branches/3.0-Beta2/components/resurrect/src/ome/resurrect/Resurrect.java

@@ -9 +9 @@
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.eclipse.swt.*;
 import org.eclipse.swt.widgets.*;
@@ -20 +22 @@
  */
 public class Resurrect {
+
+    private static Log log = LogFactory.getLog(Resurrect.class);
+
     /** Connector to the OME 2.5 (OMERO2) database * */
     Omero2Connector c2;
@@ -70 +75 @@
                     public void handleEvent(org.eclipse.swt.widgets.Event ev) {
                         if (ev.detail == SWT.CHECK) {
-                            System.out.println(ev.item + " checked");
+                            if (log.isDebugEnabled()) {
+                                log.debug(ev.item + " checked");
+                            }
                         }
                     }

branches/3.0-Beta2/components/server/src/ome/rules/drools/AllObjects.java

@@ -15 +15 @@
 package ome.rules.drools;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.drools.spi.KnowledgeHelper;
 import org.drools.spring.metadata.annotation.java.Condition;
@@ -24 +26 @@
 public class AllObjects {
 
+    private static Log log = LogFactory.getLog(AllObjects.class);
+    
     @Condition
     public boolean objectAsserted(@Fact("object")
@@ -33 +37 @@
     public void consequence(@Fact("object")
     Object obj, KnowledgeHelper kh) {
-        System.out.println("here i am" + obj);// TODO walk the graph!
+        if (log.isDebugEnabled()) {
+            log.debug("here i am" + obj); // TODO walk the graph!
+        }
     }
 }

branches/3.0-Beta2/components/server/src/ome/tools/FileSystem.java

@@ -6 +6 @@
 
 import org.apache.commons.io.FileSystemUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
@@ -26 +28 @@
  */
 public class FileSystem extends File {
+
+    private static Log log = LogFactory.getLog(FileSystem.class);
 
         /**
@@ -172 +176 @@
         
         public static void main(String[] args) {
-                FileSystem file = new FileSystem("/usr/local");
+                
+        FileSystem file = new FileSystem("/usr/local");
                 long free = file.free("/");
-                System.out.println("Free kilobytes: " + free);
                 
-                //ServiceFactory sf = new ServiceFactory("ome.client.test");
-                //RawFileStore rfs = sf.createRawFileStore();
-                //byte[] bytes = null;
+        if (log.isDebugEnabled()) {
+            log.debug("Free kilobytes: " + free);
+        }
                 
-                //System.out.println("Time prior to write only: " + System.currentTimeMillis());
-                //rfs.write(bytes, 0L, 0);
-                //System.out.println("Time after to write only: " + System.currentTimeMillis());
+        if (log.isDebugEnabled()) {
+            log.debug("Time prior to check: " + System.currentTimeMillis());
+        }
+                
+        long kb = file.free("/");
 
-                System.out.println("Time prior to check: " + System.currentTimeMillis());
-                long kb = file.free("/");
-                //rfs.write(bytes, 0L, 0);
-                System.out.println("Time after check: " + System.currentTimeMillis());
-                System.out.println("kb free was " + kb);
+        if (log.isDebugEnabled()) {
+            log.debug("Time after check: " + System.currentTimeMillis());
+            log.debug("kb free was " + kb);
+        }
         }
 }

branches/3.0-Beta2/components/server/test/ome/server/itests/EventStateChangeTest.java

@@ -8 +8 @@
 
 import java.util.Date;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.testng.annotations.Test;
 
@@ -15 +18 @@
 
 public class EventStateChangeTest extends AbstractManagedContextTest {
+
+    private static Log log = LogFactory.getLog(EventStateChangeTest.class);
 
     Long id;
@@ -33 +38 @@
         Experimenter e = getExperimenter("root");
         iUpdate.saveObject(e);
-        System.out
-                .println("XXXXXXXXXXXXXXXEventStateChangeTest.test_just_experimenter()");
+        if (log.isDebugEnabled()) {
+            log.debug("XXXXXXXXXXXXXXXEventStateChangeTest.test_just_experimenter()");
+        }
 
     }

branches/3.0-Beta2/components/server/test/ome/server/itests/query/pojos/QueryTest.java

@@ -126 +126 @@
         // "group by ds.id having ds.id in (1L)");
         List result = (List) iQuery.execute(q);
-        System.out.println(result);
+        
+        if (log.isDebugEnabled()) {
+            log.debug(result);
+        }
     }
 
@@ -157 +160 @@
         RdfPrinter rdf = new RdfPrinter();
         rdf.filter("results are", result);
-        System.out.println(rdf.getRdf());
+        if (log.isDebugEnabled()) {
+            log.debug(rdf.getRdf());
+        }
     }
 

branches/3.0-Beta2/components/tools/WebAdmin/test/TestArray2List.java

@@ -2 +2 @@
 import java.util.Arrays;
 import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import ome.api.IAdmin;
@@ -15 +18 @@
 
 public class TestArray2List {
+
+    private static Log log = LogFactory.getLog(TestArray2List.class);
 
         /**
@@ -32 +37 @@
         ExperimenterGroup group = as.getGroup(4L);
         Experimenter [] exps = as.containedExperimenters(group.getId());
-       
-        System.out.println("group "+group.getName());
+        
+        if (log.isDebugEnabled()) {
+            log.debug("group "+group.getName());
+        }
+        
         for (int i=0; i<exps.length; i++) {
                 Experimenter tExp = exps[i];
-                System.out.println("ex "+tExp.getOmeName()+" id: "+tExp.getId());
+                if (log.isDebugEnabled()) {
+                log.debug("ex "+tExp.getOmeName()+" id: "+tExp.getId());
+            }
         }
         
         List<Experimenter> newExp = Arrays.asList(exps);
-
-        System.out.println(newExp);
-        }
+        if (log.isDebugEnabled()) {
+            log.debug(newExp);
+        }
+    }
 }

branches/3.0-Beta2/components/tools/WebAdmin/test/TestChangeGroups.java

@@ -1 +1 @@
 import java.util.ArrayList;
 import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import ome.api.IAdmin;
@@ -14 +17 @@
 
 public class TestChangeGroups {
+    
+    private static Log log = LogFactory.getLog(TestChangeGroups.class);
 
         /**
@@ -19 +24 @@
          */
         public static void main(String[] args) {
-                // TODO Auto-generated method stub
               
         Login l = new Login("root", "ome", "system", "User");
@@ -32 +36 @@
         Experimenter [] exps = as.containedExperimenters(group.getId());
        
-        System.out.println("group "+group.getName());
+        if (log.isDebugEnabled()) {
+            log.debug("group "+group.getName());
+        }
         for (int i=0; i<exps.length; i++) {
                 Experimenter tExp = exps[i];
-                System.out.println("ex "+tExp.getOmeName()+" id: "+tExp.getId());
+            if (log.isDebugEnabled()) {
+                log.debug("ex "+tExp.getOmeName()+" id: "+tExp.getId());
+            }
         }
-        
-        System.out.println("add new user to this group... ");
+        if (log.isDebugEnabled()) {
+            log.debug("add new user to this group... ");
+        }
         
         List<String> formExps = new ArrayList<String>();
@@ -49 +58 @@
                 List<String> exGrL = new ArrayList<String>();
                 for(int j=0; j<exGr.length; j++) {
-                        System.out.println("existing gr '"+exGr[j].getName()+"' id:"+exGr[j].getId());
+                if (log.isDebugEnabled()) {
+                    log.debug("existing gr '"+exGr[j].getName()+"' id:"+exGr[j].getId());
+                }
                         exGrL.add(exGr[j].getId().toString());
                 }
-                
-                System.out.println("if contains... " + formExps.get(i));
+            if (log.isDebugEnabled()) {
+                log.debug("if contains... " + formExps.get(i));
+            }
                 if(!exGrL.contains(group.getId().toString())) {
                         Experimenter tExp = as.getExperimenter(Long.parseLong(formExps.get(i)));
-                        System.out.println("exp can be add... '"+ tExp.getOmeName()+"' id:"+tExp.getId());
+                if (log.isDebugEnabled()) {
+                    log.debug("exp can be add... '"+ tExp.getOmeName()+"' id:"+tExp.getId());
+                }
                         
                         //as.addGroups(tExp, group);
                 } else {
-                        System.out.println("user exist on this group...");
+                if (log.isDebugEnabled()) {
+                    log.debug("user exist on this group...");
+                }
                 }
                 

branches/3.0-Beta2/components/tools/WebAdmin/test/TestDelete.java

@@ -1 +1 @@
 
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import ome.api.IAdmin;
@@ -12 +15 @@
 
 public class TestDelete {
+
+    private static Log log = LogFactory.getLog(TestDelete.class);
 
     public static void main(String args[]) {
@@ -31 +36 @@
         
         for (int i=0; i<exg.length; i++) {
-                System.out.println(exg[i].getName());
+                if (log.isDebugEnabled()) {
+                    log.debug(exg[i].getName());
+            }
         }
         

branches/3.0-Beta2/components/tools/WebAdmin/test/TestGroups.java

@@ +1 @@
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import ome.api.IAdmin;
 import ome.api.IQuery;
@@ -11 +14 @@
 public class TestGroups {
 
+    private static Log log = LogFactory.getLog(TestGroups.class);
+    
     public static void main(String args[]) {
         
@@ -32 +37 @@
         
         ExperimenterGroup df = as.getGroup(2L);
-        System.out.println("df id 2:"+df.getName());
+        if (log.isDebugEnabled()) {
+            log.debug("df id 2:"+df.getName());
+        }
         
         ExperimenterGroup [] exg_t = new ExperimenterGroup[2];
@@ -39 +46 @@
         
         Long id = as.createExperimenter(exp_t, df, exg_t);
-        System.out.println("id "+id);
+        if (log.isDebugEnabled()) {
+            log.debug("id "+id);
+        }
         
         Experimenter exp = as.getExperimenter(id);
@@ -47 +56 @@
         
         for (int i=0; i<exg.length; i++) {
-                System.out.println(exg[i].getName());
+                if (log.isDebugEnabled()) {
+                    log.debug(exg[i].getName());
+            }
         }
         

branches/3.0-Beta2/components/tools/WebAdmin/test/TestTheLink.java

@@ -2 +2 @@
 
 import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import ome.api.IAdmin;
@@ -15 +18 @@
 
 public class TestTheLink {
+
+    private static Log log = LogFactory.getLog(TestTheLink.class);
 
     public static void main(String args[]) {
@@ -35 +40 @@
         
         for(GroupExperimenterMap map : maps) {
-                System.out.println("m "+map.getParent().getId());
+                if (log.isDebugEnabled()) {
+                    log.debug("m "+map.getParent().getId());
+            }
                 //us.deleteObject(map);
         }