minor cleanup

Author: andrus

cayenne/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java

@@ -498,15 +498,15 @@ public ExtendedTypeMap getExtendedTypes() {
     }
 
     @Override
-    public DbAttribute buildAttribute(String name, String typeName, int type, int size, int scale, boolean allowNulls) {
+    public DbAttribute buildAttribute(String name, String typeName, int type, int maxLength, int scale, boolean allowNulls) {
 
         DbAttribute attr = new DbAttribute();
         attr.setName(name);
         attr.setType(type);
         attr.setMandatory(!allowNulls);
 
-        if (size >= 0) {
-            attr.setMaxLength(size);
+        if (maxLength >= 0) {
+            attr.setMaxLength(maxLength);
         }
 
         if (scale >= 0) {

cayenne/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java

@@ -19,11 +19,6 @@
 
 package org.apache.cayenne.dba.db2;
 
-import java.sql.PreparedStatement;
-import java.sql.Types;
-import java.util.List;
-
-import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor;
 import org.apache.cayenne.access.translator.ParameterBinding;
@@ -40,24 +35,19 @@
 import org.apache.cayenne.configuration.Constants;
 import org.apache.cayenne.configuration.RuntimeProperties;
 import org.apache.cayenne.dba.JdbcAdapter;
-import org.apache.cayenne.dba.PkGenerator;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.SQLAction;
+
+import java.sql.PreparedStatement;
+import java.sql.Types;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
- * DbAdapter implementation for the <a href="http://www.ibm.com/db2/"> DB2 RDBMS </a>.
- * Sample connection settings to use with DB2 are shown below:
- * 
- * <pre>
- *       test-db2.jdbc.username = test
- *       test-db2.jdbc.password = secret
- *       test-db2.jdbc.url = jdbc:db2://servername:50000/databasename
- *       test-db2.jdbc.driver = com.ibm.db2.jcc.DB2Driver
- * </pre>
+ * DbAdapter implementation for the DB2 RDBMS.
  */
 public class DB2Adapter extends JdbcAdapter {
 

cayenne/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java

@@ -19,7 +19,6 @@
 
 package org.apache.cayenne.dba.derby;
 
-import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor;
 import org.apache.cayenne.access.translator.ParameterBinding;
@@ -36,7 +35,6 @@
 import org.apache.cayenne.configuration.Constants;
 import org.apache.cayenne.configuration.RuntimeProperties;
 import org.apache.cayenne.dba.JdbcAdapter;
-import org.apache.cayenne.dba.PkGenerator;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.query.Query;
@@ -50,22 +48,7 @@
 import java.util.Map;
 
 /**
- * DbAdapter implementation for the <a href="http://db.apache.org/derby/"> Derby RDBMS
- * </a>. Sample connection settings to use with Derby are shown below. <h3>Embedded</h3>
- * <p>
- * <pre>
- *  test-derby.jdbc.url = jdbc:derby:testdb;create=true
- *  test-derby.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver
- * </pre>
- * <p>
- * <h3>Network Server</h3>
- * <p>
- * <pre>
- *  derbynet.jdbc.url = jdbc:derby://localhost/cayenne
- *  derbynet.jdbc.driver = org.apache.derby.jdbc.ClientDriver
- *  derbynet.jdbc.username = someuser
- *  derbynet.jdbc.password = secret;
- * </pre>
+ * DbAdapter implementation for the Derby RDBMS
  */
 public class DerbyAdapter extends JdbcAdapter {
 

cayenne/src/main/java/org/apache/cayenne/dba/firebird/FirebirdAdapter.java

@@ -19,7 +19,6 @@
 
 package org.apache.cayenne.dba.firebird;
 
-import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.sqlbuilder.sqltree.SQLTreeProcessor;
 import org.apache.cayenne.access.translator.ejbql.EJBQLTranslator;
@@ -43,17 +42,7 @@
 import java.util.Map;
 
 /**
- * DbAdapter implementation for <a href="http://www.firebirdsql.org">FirebirdSQL
- * RDBMS </a>. Sample connection settings to use with Firebird are shown
- * below:
- * 
- * <pre>
- *      firebird.cayenne.adapter = org.apache.cayenne.dba.firebird.FirebirdAdapter
- *      firebird.jdbc.username = test
- *      firebird.jdbc.password = secret
- *      firebird.jdbc.url = jdbc:firebirdsql:localhost:/home/firebird/test.fdb  
- *      firebird.jdbc.driver = org.firebirdsql.jdbc.FBDriver
- * </pre>
+ * DbAdapter implementation for the FirebirdSQL RDBMS
  */
 public class FirebirdAdapter extends JdbcAdapter {