[Firebug-cvs] firebug/project/java/src/org/firebug/database MysqlDBHandler.java,1.5,1.6

[<do...@us...>]

Update of /cvsroot/firebug/firebug/project/java/src/org/firebug/database
In directory sc8-pr-cvs1:/tmp/cvs-serv4362/src/org/firebug/database

Modified Files:
	MysqlDBHandler.java 
Log Message:
More cleanup in the database handler.

Index: MysqlDBHandler.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/database/MysqlDBHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MysqlDBHandler.java	21 May 2003 23:06:38 -0000	1.5
--- MysqlDBHandler.java	21 May 2003 23:30:40 -0000	1.6
***************
*** 40,50 ****
  
  	setDebug();
! 	setDBHost("localhost");
! 	setDBPort("3306");
! 	setDBUser("root");
! 	setDBPass("");
! 
! 	connectionqueue = new LinkedList();
! 	initializeCQueue(number_of_connections);
      }
  
--- 40,45 ----
  
  	setDebug();
! 	setDBProperties("localhost","","3306","root",""); 
! 	set_c_pool(use_c_pool);
      }
  
***************
*** 53,63 ****
  
  	setDebug();
! 	setDBHost(host);
! 	setDBPort(port);
! 	setDBUser(user);
! 	setDBPass(passwd);
! 
! 	connectionqueue = new LinkedList();
! 	initializeCQueue(number_of_connections);
      }
  
--- 48,53 ----
  
  	setDebug();
! 	setDBProperties(host,"",port,user,passwd); 
! 	set_c_pool(use_c_pool);
      }
  
***************
*** 66,80 ****
  
  	setDebug();
! 	setDBHost(host);
! 	setDBPort(port);
! 	setDBUser(user);
! 	setDBPass(passwd);
! 
! 	connectionqueue = new LinkedList();
! 	initializeCQueue(number_of_connections);
! 	use_c_pool = true;
      }
  
  
  
  
--- 56,74 ----
  
  	setDebug();
! 	setDBProperties(host,"",port,user,passwd); 
! 	set_c_pool(use_c_pool);
      }
  
  
+     private void set_c_pool(boolean use_c_pool) {
+ 
+ 	if (use_c_pool) {
+  	   this.use_c_pool = true;
+ 	   connectionqueue = new LinkedList();
+ 	   initializeCQueue(number_of_connections);
+ 	} else {
+ 	    this.use_c_pool = false;
+ 	}
+     }
  
  
***************
*** 131,137 ****
       *  instead of throwing.  This should make it a bit easier
       *  to write cleaner code in the classes that invoke it.
!      *  Since everything is basically going to the same oracle 
!      *  server,  and is called by one class at a time (multipass
!      *  algorithm and the Categorizer runs by itself), 
       *  this should not present a big problem.
       */
--- 125,130 ----
       *  instead of throwing.  This should make it a bit easier
       *  to write cleaner code in the classes that invoke it.
!      *  Since everything is going to the same database 
!      *  server,  and is called by one class at a time,
       *  this should not present a big problem.
       */