[SwapDV-commit] CVS: swapdv/ui/Models CategoryTreeModel.java,1.2,1.3 SearchTableModel.java,1.1,1.2 ShowTableModel.java,1.2,1.3

[Gerry D. <gd...@us...>]

Update of /cvsroot/swapdv/swapdv/ui/Models
In directory usw-pr-cvs1:/tmp/cvs-serv29659/ui/Models

Modified Files:
	CategoryTreeModel.java SearchTableModel.java 
	ShowTableModel.java 
Log Message:
Changed all println()'s over the Logger.logs, added --debug switch and initial deleteShowActions


Index: CategoryTreeModel.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ui/Models/CategoryTreeModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CategoryTreeModel.java	4 Jun 2002 23:45:17 -0000	1.2
+++ CategoryTreeModel.java	11 Jun 2002 15:50:04 -0000	1.3
@@ -34,6 +34,7 @@
 import javax.swing.tree.*;
 import java.util.Enumeration;
 import swapdv.ReplayGuide.*;
+import swapdv.Logger.*;
 
 public class CategoryTreeModel extends DefaultTreeModel {
     Guide guide;
@@ -140,7 +141,7 @@
             if (node instanceof ChannelTreeNode) {
                 ChannelTreeNode chanNode = (ChannelTreeNode)node;
                 if (chanNode.getChannel().created == channel.created) {
-                    System.out.println("removing channel from tree");
+                    Logger.log(0, LoggerI.LEVEL_DEBUG, "removing channel from tree");
                     TreeNode parent = chanNode.getParent();
                     int in[] = new int[1];
                     in[0] = parent.getIndex(chanNode);
@@ -188,7 +189,7 @@
             if (node instanceof ChannelTreeNode) {
                 ChannelTreeNode ChanNode = (ChannelTreeNode)node;
                 if (chan.created == ChanNode.getChannel().created) {
-                    System.out.println("Added show to channel in tree");
+                    Logger.log(0, LoggerI.LEVEL_DEBUG, "Added show to channel in tree");
                     addShow(ChanNode, show);
                     return;
                 }

Index: SearchTableModel.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ui/Models/SearchTableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SearchTableModel.java	3 Jun 2002 23:03:04 -0000	1.1
+++ SearchTableModel.java	11 Jun 2002 15:50:04 -0000	1.2
@@ -34,6 +34,7 @@
 import javax.swing.table.*;
 import java.util.*;
 import swapdv.JtellaServer.*;
+import swapdv.Logger.*;
 
 public class SearchTableModel extends SortableTableModel implements SearchCallback {
     static final private int SHOW = 0;
@@ -62,7 +63,7 @@
         while (en.hasMoreElements()) {
             Vector row = (Vector)en.nextElement();
             if (((String)row.get(IP)).equals(remoteIP) && ((Date)row.get(RECORDED)).equals(showID)) {
-                System.out.println("Ignoring duplicate entry");
+                Logger.log(0, LoggerI.LEVEL_DEBUG, "Ignoring duplicate entry");
                 return;
             }
         }

Index: ShowTableModel.java
===================================================================
RCS file: /cvsroot/swapdv/swapdv/ui/Models/ShowTableModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ShowTableModel.java	10 Jun 2002 23:02:03 -0000	1.2
+++ ShowTableModel.java	11 Jun 2002 15:50:04 -0000	1.3
@@ -34,6 +34,7 @@
 import javax.swing.table.*;
 import java.util.*;
 import swapdv.ReplayGuide.*;
+import swapdv.Logger.*;
 
 public class ShowTableModel extends SortableTableModel {
     private Guide guide = null;
@@ -90,7 +91,7 @@
     synchronized public void update() {
         for (int row=getRowCount()-1; row>= 0; row--) {
             if (getShow(row) == null) {
-                System.out.println("Removing show at row "+row);
+                Logger.log(0, LoggerI.LEVEL_DEBUG, "Removing show at row "+row);
                 remove(row);
             }
         }
@@ -120,7 +121,7 @@
     public void remove(Show show) {
         int row = getRow(show);
         remove(row);
-        System.out.println("removing show "+row);
+        Logger.log(0, LoggerI.LEVEL_DEBUG, "removing show "+row);
     }
 
     protected Vector getRowVec(Show show) {