[Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/jdbcproxy ProxyConnection.java, 1.2, 1.3 ProxyDriver.java, 1.2, 1.3 ProxyMethodManager.java, 1.2, 1.3

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/jdbcproxy
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15944/test/src/net/sourceforge/squirrel_sql/jdbcproxy

Modified Files:
	ProxyConnection.java ProxyDriver.java ProxyMethodManager.java 
Log Message:
1761706 (Miscellaneous Java 5 Generics) from patch submitted by Bron Eubanks

Index: ProxyDriver.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/jdbcproxy/ProxyDriver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProxyDriver.java	27 Mar 2006 11:01:51 -0000	1.2
--- ProxyDriver.java	31 Jul 2007 01:06:19 -0000	1.3
***************
*** 101,105 ****
          throws SQLException 
      {
!         ArrayList list = new ArrayList();
  
          DriverPropertyInfo classInfo = new SortableDriverProperty(DRIVER_CLASS_PROP_KEY, null);
--- 101,105 ----
          throws SQLException 
      {
!         List<DriverPropertyInfo> list = new ArrayList<DriverPropertyInfo>();
  
          DriverPropertyInfo classInfo = new SortableDriverProperty(DRIVER_CLASS_PROP_KEY, null);
***************
*** 118,141 ****
          trackCalls.required = false;
          list.add(trackCalls);
!         List connMethods = getMethods("java.sql.Connection", "ProxyConnection");
          Collections.sort(connMethods);
          list.addAll(connMethods);
!         List mdMethods = getMethods("java.sql.DatabaseMetaData", "ProxyDatabaseMetaData");
          Collections.sort(mdMethods);
          list.addAll(mdMethods);
!         List psMethods = getMethods("java.sql.PreparedStatement", "ProxyPreparedStatement");
          Collections.sort(psMethods);
          list.addAll(psMethods);        
!         List rsMethods = getMethods("java.sql.ResultSet", "ProxyResultSet");
          Collections.sort(rsMethods);
          list.addAll(rsMethods);        
!         List rsmdMethods = getMethods("java.sql.ResultSetMetaData", "ProxyResultSetMetaData");
          Collections.sort(rsmdMethods);
          list.addAll(rsmdMethods);        
!         List stmtMethods = getMethods("java.sql.Statement", "ProxyStatement");
          Collections.sort(stmtMethods);
          list.addAll(stmtMethods);        
          DriverPropertyInfo[] ar = new DriverPropertyInfo[list.size()];
!         return (DriverPropertyInfo[])list.toArray(ar);
      }
      
--- 118,144 ----
          trackCalls.required = false;
          list.add(trackCalls);
!         List<SortableDriverProperty> connMethods = 
!             getMethods("java.sql.Connection", "ProxyConnection");
          Collections.sort(connMethods);
          list.addAll(connMethods);
!         List<SortableDriverProperty> mdMethods = 
!             getMethods("java.sql.DatabaseMetaData", "ProxyDatabaseMetaData");
          Collections.sort(mdMethods);
          list.addAll(mdMethods);
!         List<SortableDriverProperty> psMethods = 
!             getMethods("java.sql.PreparedStatement", "ProxyPreparedStatement");
          Collections.sort(psMethods);
          list.addAll(psMethods);        
!         List<SortableDriverProperty> rsMethods = getMethods("java.sql.ResultSet", "ProxyResultSet");
          Collections.sort(rsMethods);
          list.addAll(rsMethods);        
!         List<SortableDriverProperty> rsmdMethods = getMethods("java.sql.ResultSetMetaData", "ProxyResultSetMetaData");
          Collections.sort(rsmdMethods);
          list.addAll(rsmdMethods);        
!         List<SortableDriverProperty> stmtMethods = getMethods("java.sql.Statement", "ProxyStatement");
          Collections.sort(stmtMethods);
          list.addAll(stmtMethods);        
          DriverPropertyInfo[] ar = new DriverPropertyInfo[list.size()];
!         return list.toArray(ar);
      }
      
***************
*** 159,166 ****
      }
      
!     private List getMethods(String className, String proxyClassName) {
!         ArrayList result = new ArrayList();
          try {
!             Class c = Class.forName(className);
              Method[] methods = c.getDeclaredMethods();
              
--- 162,169 ----
      }
      
!     private List<SortableDriverProperty> getMethods(String className, String proxyClassName) {
!         ArrayList<SortableDriverProperty> result = new ArrayList<SortableDriverProperty>();
          try {
!             Class<?> c = Class.forName(className);
              Method[] methods = c.getDeclaredMethods();
              
***************
*** 168,172 ****
                  for (int i = 0; i < methods.length; i++) {
                      Method method = methods[i];
!                     DriverPropertyInfo info = 
                          new SortableDriverProperty(proxyClassName + "." + method.getName(), null);
                      info.required = false;
--- 171,175 ----
                  for (int i = 0; i < methods.length; i++) {
                      Method method = methods[i];
!                     SortableDriverProperty info = 
                          new SortableDriverProperty(proxyClassName + "." + method.getName(), null);
                      info.required = false;
***************
*** 181,185 ****
      
      private class SortableDriverProperty extends DriverPropertyInfo
!                                          implements Comparable {        
          public SortableDriverProperty(String name, String value) {
              super(name, value);
--- 184,188 ----
      
      private class SortableDriverProperty extends DriverPropertyInfo
!                                          implements Comparable<SortableDriverProperty> {        
          public SortableDriverProperty(String name, String value) {
              super(name, value);
***************
*** 189,198 ****
           * @see java.lang.Comparable#compareTo(java.lang.Object)
           */
!         public int compareTo(Object o) {
!             if (o instanceof DriverPropertyInfo) {
!                 DriverPropertyInfo dpi = (DriverPropertyInfo)o;
!                 return name.compareTo(dpi.name); 
!             }
!             return 0;
          }
      }
--- 192,197 ----
           * @see java.lang.Comparable#compareTo(java.lang.Object)
           */
!         public int compareTo(SortableDriverProperty o) {
!             return name.compareTo(o.name); 
          }
      }

Index: ProxyMethodManager.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/jdbcproxy/ProxyMethodManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProxyMethodManager.java	25 Mar 2006 21:03:35 -0000	1.2
--- ProxyMethodManager.java	31 Jul 2007 01:06:19 -0000	1.3
***************
*** 1,5 ****
  package net.sourceforge.squirrel_sql.jdbcproxy;
  
- import java.sql.DriverPropertyInfo;
  import java.sql.SQLException;
  import java.util.HashMap;
--- 1,4 ----
***************
*** 30,34 ****
      private static Properties _props = null; 
      
!     private static HashMap methodsCalled = new HashMap();
      
      public static void setDriverProperties(Properties props) {
--- 29,33 ----
      private static Properties _props = null; 
      
!     private static HashMap<String, Long> methodsCalled = new HashMap<String, Long>();
      
      public static void setDriverProperties(Properties props) {
***************
*** 41,45 ****
          String key = className + "." + methodName;
          if (methodsCalled.containsKey(key)) {
!             Long count = (Long)methodsCalled.get(key);
              methodsCalled.put(key, new Long(count.longValue() + 1));
          } else {
--- 40,44 ----
          String key = className + "." + methodName;
          if (methodsCalled.containsKey(key)) {
!             Long count = methodsCalled.get(key);
              methodsCalled.put(key, new Long(count.longValue() + 1));
          } else {
***************
*** 56,62 ****
      public static void printMethodsCalled() {
          if (trackMethods()) {
!             for (Iterator iter = methodsCalled.keySet().iterator(); iter.hasNext();) {
!                 String key = (String) iter.next();
!                 Long count = (Long)methodsCalled.get(key);
                  System.out.println(key + " -> "+count.longValue());
              }
--- 55,61 ----
      public static void printMethodsCalled() {
          if (trackMethods()) {
!             for (Iterator<String> iter = methodsCalled.keySet().iterator(); iter.hasNext();) {
!                 String key = iter.next();
!                 Long count = methodsCalled.get(key);
                  System.out.println(key + " -> "+count.longValue());
              }

Index: ProxyConnection.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/jdbcproxy/ProxyConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProxyConnection.java	26 Mar 2006 11:42:06 -0000	1.2
--- ProxyConnection.java	31 Jul 2007 01:06:19 -0000	1.3
***************
*** 160,169 ****
          return new ProxyStatement(this, _con.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability));
      }
! 
      public Map getTypeMap() throws SQLException {
          ProxyMethodManager.check("ProxyConnection", "getTypeMap");
          return _con.getTypeMap();
      }
! 
      public void setTypeMap(Map map) throws SQLException {
          ProxyMethodManager.check("ProxyConnection", "setTypeMap");
--- 160,169 ----
          return new ProxyStatement(this, _con.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability));
      }
!     @SuppressWarnings("unchecked")
      public Map getTypeMap() throws SQLException {
          ProxyMethodManager.check("ProxyConnection", "getTypeMap");
          return _con.getTypeMap();
      }
!     @SuppressWarnings("unchecked")
      public void setTypeMap(Map map) throws SQLException {
          ProxyMethodManager.check("ProxyConnection", "setTypeMap");