blancoDb 1.2.131.2.14ւ̎ȕύX_͉L̒ʂB
2005.11.05 Ldiffʂ𐸍B


Index: src/main/blanco/db/BlancoDbTableMeta2Xml.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/BlancoDbTableMeta2Xml.java,v
retrieving revision 1.5
diff -u -r1.5 BlancoDbTableMeta2Xml.java
--- src/main/blanco/db/BlancoDbTableMeta2Xml.java	12 Oct 2005 14:01:27 -0000	1.5
+++ src/main/blanco/db/BlancoDbTableMeta2Xml.java	5 Nov 2005 10:30:13 -0000
@@ -143,9 +142,10 @@
             OutputStream outStream = null;
             try {
                 outStream = new BufferedOutputStream(new FileOutputStream(
-                        outputDirectoryName + "/SimpleTable"
-                                + adjuster.toClassName(table.getName())
-                                + ".xml"));
+                        outputDirectoryName
+                                + "/SimpleTable"
+                                + BlancoNameAdjuster.toClassName(table
+                                        .getName()) + ".xml"));
                 TransformerFactory tf = TransformerFactory.newInstance();
                 Transformer transformer = tf.newTransformer();
                 transformer.setOutputProperty("encoding", "UTF-8");
@@ -237,8 +237,7 @@
      * @return
      */
     private final String getBaseClassName(Table table) {
-        NameAdjuster adjuster = new NameAdjuster();
-        return adjuster.toClassName(table.getName());
+        return BlancoNameAdjuster.toClassName(table.getName());
     }
 
     public final void generateSelect(GatewayCollector collector,
@@ -304,10 +301,10 @@
                     sql.append("\n   AND ");
                 }
                 sql.append(field.getName() + " = #"
-                        + adjuster.toValueName(field.getName()));
+                        + BlancoNameAdjuster.toParameterName(field.getName()));
                 Element parameter = document.createElement("parameter");
-                parameter.setAttribute("name", adjuster.toValueName(field
-                        .getName()));
+                parameter.setAttribute("name", BlancoNameAdjuster
+                        .toParameterName(field.getName()));
                 parameter.setAttribute("type", field.getTypeFullName());
                 parameters.appendChild(parameter);
             }
@@ -419,10 +414,10 @@
                     sql.append("\n   AND ");
                 }
                 sql.append(field.getName() + " = #"
-                        + adjuster.toValueName(field.getName()));
+                        + BlancoNameAdjuster.toParameterName(field.getName()));
                 Element parameter = document.createElement("parameter");
-                parameter.setAttribute("name", adjuster.toValueName(field
-                        .getName()));
+                parameter.setAttribute("name", BlancoNameAdjuster
+                        .toParameterName(field.getName()));
                 parameter.setAttribute("type", field.getTypeFullName());
                 parameters.appendChild(parameter);
             }
@@ -480,7 +473,7 @@
             eleRoot.appendChild(eleQuery);
             eleQuery.setAttribute("name", CLASS_PREFIX
                     + getBaseClassName(table) + "Column"
-                    + adjuster.toTitleCase(field.getName()));
+                    + BlancoNameAdjuster.toClassName(field.getName()));
             eleQuery.setAttribute("single", "false");
 
             Element query = document.createElement("query");
@@ -511,12 +504,14 @@
                     sql.append("\n   AND ");
                 }
 
-                sql.append(fieldPrimaryKey.getName() + " = #"
-                        + adjuster.toValueName(fieldPrimaryKey.getName()));
+                sql.append(fieldPrimaryKey.getName()
+                        + " = #"
+                        + BlancoNameAdjuster.toParameterName(fieldPrimaryKey
+                                .getName()));
 
                 Element parameter = document.createElement("parameter");
-                parameter.setAttribute("name", adjuster
-                        .toValueName(fieldPrimaryKey.getName()));
+                parameter.setAttribute("name", BlancoNameAdjuster
+                        .toParameterName(fieldPrimaryKey.getName()));
                 parameter.setAttribute("type", fieldPrimaryKey
                         .getTypeFullName());
                 parameters.appendChild(parameter);
@@ -643,11 +636,12 @@
             } else {
                 sql.append(", ");
             }
-            sql.append("#" + adjuster.toValueName(field.getName()));
+            sql.append("#"
+                    + BlancoNameAdjuster.toParameterName(field.getName()));
 
             Element parameter = document.createElement("parameter");
-            parameter.setAttribute("name", adjuster
-                    .toValueName(field.getName()));
+            parameter.setAttribute("name", BlancoNameAdjuster
+                    .toParameterName(field.getName()));
             parameter.setAttribute("type", field.getTypeFullName());
             parameters.appendChild(parameter);
         }
@@ -698,11 +690,11 @@
                 sql.append(", ");
             }
             sql.append(field.getName() + " = #"
-                    + adjuster.toValueName(field.getName()));
+                    + BlancoNameAdjuster.toParameterName(field.getName()));
 
             Element parameter = document.createElement("parameter");
-            parameter.setAttribute("name", adjuster
-                    .toValueName(field.getName()));
+            parameter.setAttribute("name", BlancoNameAdjuster
+                    .toParameterName(field.getName()));
             parameter.setAttribute("type", field.getTypeFullName());
             parameters.appendChild(parameter);
@@ -777,11 +767,11 @@
                 sql.append("\n   AND ");
             }
             sql.append(field.getName() + " = #"
-                    + adjuster.toValueName(field.getName()));
+                    + BlancoNameAdjuster.toParameterName(field.getName()));
 
             Element parameter = document.createElement("parameter");
-            parameter.setAttribute("name", adjuster
-                    .toValueName(field.getName()));
+            parameter.setAttribute("name", BlancoNameAdjuster
+                    .toParameterName(field.getName()));
             parameter.setAttribute("type", field.getTypeFullName());
             parameters.appendChild(parameter);
         }
Index: src/main/blanco/db/definition/TableGateway.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/definition/TableGateway.java,v
retrieving revision 1.6
diff -u -r1.6 TableGateway.java
--- src/main/blanco/db/definition/TableGateway.java	12 Oct 2005 14:01:27 -0000	1.6
+++ src/main/blanco/db/definition/TableGateway.java	5 Nov 2005 10:30:13 -0000
@@ -29,13 +29,7 @@
 
     public TableGateway(String name) {
         _dbName = name;
-        _className = createClassName(name);
-    }
-
-    private String createClassName(String name) {
-        NameAdjuster adjuster = new NameAdjuster();
-        return adjuster.toClassName(name.replaceAll(" ", "")
-                .replaceAll("_", ""));
+        _className = BlancoNameAdjuster.toClassName(name);
     }
 
     public boolean hasDataField() {
Index: src/main/blanco/db/expander/query/Finalize.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/Finalize.java,v
retrieving revision 1.9
diff -u -r1.9 Finalize.java
--- src/main/blanco/db/expander/query/Finalize.java	20 Oct 2005 14:10:35 -0000	1.9
+++ src/main/blanco/db/expander/query/Finalize.java	5 Nov 2005 10:30:13 -0000
@@ -31,14 +31,14 @@
         Implementor implementor = new Implementor(getData());
 
         implementor.addLine("super.finalize();");
-        implementor.addLine("if (_statement != null) {");
+        implementor.addLine("if (fStatement != null) {");
         implementor.addLine("final String message = \"" + className
                 + " : close()\bhɂ郊\[X̊JsĂ܂B\";");
         implementor.addLine("System.out.println(message);");
 
         if (storage.getSetting().isLogging()) {
             implementor.addLine("");
-            implementor.addLine("_log.error(\"" + getName()
+            implementor.addLine("fLog.error(\"" + getName()
                     + ": \" + message);");
         }
 
Index: src/main/blanco/db/expander/query/PrepareStatementCursorMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/PrepareStatementCursorMethod.java,v
retrieving revision 1.10
diff -u -r1.10 PrepareStatementCursorMethod.java
--- src/main/blanco/db/expander/query/PrepareStatementCursorMethod.java	18 Oct 2005 11:18:22 -0000	1.10
+++ src/main/blanco/db/expander/query/PrepareStatementCursorMethod.java	5 Nov 2005 10:30:13 -0000
@@ -57,9 +57,9 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
             implementor
-                    .addLine("_log.debug(\""
+                    .addLine("fLog.debug(\""
                             + getName()
                             + ": query = \" + query + \", resultSetType = \" + resultSetType + \", resultSetConcurrency = \" + resultSetConcurrency);");
             implementor.addLine("}");
@@ -68,7 +68,7 @@
 
         implementor.addStatement("close()");
         implementor
-                .addStatement("_statement = _connection.prepareStatement(getQuery(), resultSetType, resultSetConcurrency)");
+                .addStatement("fStatement = fConnection.prepareStatement(getQuery(), resultSetType, resultSetConcurrency)");
     }
 
 }
\ No newline at end of file
Index: src/main/blanco/db/expander/query/PrepareStatementMethod2.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/PrepareStatementMethod2.java,v
retrieving revision 1.13
diff -u -r1.13 PrepareStatementMethod2.java
--- src/main/blanco/db/expander/query/PrepareStatementMethod2.java	18 Oct 2005 11:18:22 -0000	1.13
+++ src/main/blanco/db/expander/query/PrepareStatementMethod2.java	5 Nov 2005 10:30:13 -0000
@@ -48,8 +48,8 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName()
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName()
                     + ": query = \" + query);");
             implementor.addLine("}");
             implementor.addLine("");
@@ -59,11 +59,11 @@
 
         if (_iterator == null) {
             implementor
-                    .addStatement("_statement = _connection.prepareStatement(query)");
+                    .addStatement("fStatement = fConnection.prepareStatement(query)");
         } else if (_iterator.getScrollInterface().equals("forward_only")
                 && _iterator.isEnableUpdatableInterface() == false) {
             implementor
-                    .addStatement("_statement = _connection.prepareStatement(query)");
+                    .addStatement("fStatement = fConnection.prepareStatement(query)");
         } else {
             String resultSetType = "ResultSet.TYPE_FORWARD_ONLY";
             String resultSetConcurrency = "ResultSet.CONCUR_READ_ONLY";
@@ -76,7 +76,7 @@
                 resultSetConcurrency = "ResultSet.CONCUR_UPDATABLE";
             }
             implementor
-                    .addStatement("_statement = _connection.prepareStatement(query, "
+                    .addStatement("fStatement = fConnection.prepareStatement(query, "
                             + resultSetType + ", " + resultSetConcurrency + ")");
         }
     }
Index: src/main/blanco/db/expander/query/QueryConstructor.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/QueryConstructor.java,v
retrieving revision 1.9
diff -u -r1.9 QueryConstructor.java
--- src/main/blanco/db/expander/query/QueryConstructor.java	18 Oct 2005 11:18:22 -0000	1.9
+++ src/main/blanco/db/expander/query/QueryConstructor.java	5 Nov 2005 10:30:13 -0000
@@ -37,7 +37,7 @@
     public void implement() {
         Implementor implementor = new Implementor(getData());
 
-        Value connectionField = new Value(Connection.class, "_connection");
+        Value connectionField = new Value(Connection.class, "fConnection");
         implementor.assign(connectionField, _connectinonArgument);
     }
 }
\ No newline at end of file
Index: src/main/blanco/db/expander/query/caller/CloseMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/caller/CloseMethod.java,v
retrieving revision 1.2
diff -u -r1.2 CloseMethod.java
--- src/main/blanco/db/expander/query/caller/CloseMethod.java	18 Oct 2005 11:18:22 -0000	1.2
+++ src/main/blanco/db/expander/query/caller/CloseMethod.java	5 Nov 2005 10:30:13 -0000
@@ -30,7 +31,7 @@
         super("close");
         this.storage = storage;
 
-        String name = getNameAdjuster().toFieldName("Statement");
+        String name = BlancoNameAdjuster.toParameterName("fStatement");
         _statement = new Value(java.sql.PreparedStatement.class, name);
     }
 
@@ -42,13 +43,13 @@
     }
 
     public void implement() {
-        _statement = getField("Statement");
+        _statement = getField("fStatement");
 
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
Index: src/main/blanco/db/expander/query/caller/ExecuteMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/caller/ExecuteMethod.java,v
retrieving revision 1.2
diff -u -r1.2 ExecuteMethod.java
--- src/main/blanco/db/expander/query/caller/ExecuteMethod.java	18 Oct 2005 11:18:22 -0000	1.2
+++ src/main/blanco/db/expander/query/caller/ExecuteMethod.java	5 Nov 2005 10:30:13 -0000
@@ -33,8 +33,8 @@
 
     public void implement() {
         if (storage.getSetting().isLogging()) {
-            getData().addLine("if (_log.isDebugEnabled()) {");
-            getData().addLine("_log.debug(\"" + getName() + "\");");
+            getData().addLine("if (fLog.isDebugEnabled()) {");
+            getData().addLine("fLog.debug(\"" + getName() + "\");");
             getData().addLine("}");
             getData().addLine("");
         }
Index: src/main/blanco/db/expander/query/caller/GetCallerOutputParameterMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/caller/GetCallerOutputParameterMethod.java,v
retrieving revision 1.2
diff -u -r1.2 GetCallerOutputParameterMethod.java
--- src/main/blanco/db/expander/query/caller/GetCallerOutputParameterMethod.java	18 Oct 2005 11:18:22 -0000	1.2
+++ src/main/blanco/db/expander/query/caller/GetCallerOutputParameterMethod.java	5 Nov 2005 10:30:14 -0000
@@ -54,8 +54,8 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            getData().addLine("if (_log.isDebugEnabled()) {");
-            getData().addLine("_log.debug(\"" + getName() + "\");");
+            getData().addLine("if (fLog.isDebugEnabled()) {");
+            getData().addLine("fLog.debug(\"" + getName() + "\");");
             getData().addLine("}");
             getData().addLine("");
         }
@@ -92,17 +92,17 @@
                                     + " wrk = "
                                     + BlancoDbMappingUtil
                                             .mapWrapperClassForPrimitive(
-                                                    "_statement." + type + "("
+                                                    "fStatement." + type + "("
                                                             + index + ")", val
                                                             .getType()
                                                             .getName()) + ";");
-                    getData().addLine("if (_statement.wasNull()) {");
+                    getData().addLine("if (fStatement.wasNull()) {");
                     getData().addLine("return null;");
                     getData().addLine("}");
                     getData().addLine("return wrk;");
                 } else {
                     getData().addLine(
-                            "return _statement." + type + "(" + index + ");");
+                            "return fStatement." + type + "(" + index + ");");
                 }
             }
         }
Index: src/main/blanco/db/expander/query/caller/PrepareCallMethod2.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/caller/PrepareCallMethod2.java,v
retrieving revision 1.2
diff -u -r1.2 PrepareCallMethod2.java
--- src/main/blanco/db/expander/query/caller/PrepareCallMethod2.java	18 Oct 2005 11:18:22 -0000	1.2
+++ src/main/blanco/db/expander/query/caller/PrepareCallMethod2.java	5 Nov 2005 10:30:14 -0000
@@ -52,15 +52,16 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + ": query = \" + query);");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName()
+                    + ": query = \" + query);");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
         implementor.addStatement("close()");
 
-        implementor.addStatement("_statement = _connection.prepareCall(query)");
+        implementor.addStatement("fStatement = fConnection.prepareCall(query)");
 
         BlancoDbQueryParserUtil query = new BlancoDbQueryParserUtil(_caller
                 .getQuery());
@@ -83,7 +84,7 @@
                     implementor.addUsingType(new Type(Timestamp.class));
                 }
 
-                String stmtLine = "_statement.registerOutParameter("
+                String stmtLine = "fStatement.registerOutParameter("
                         + index
                         + ", "
                         + BlancoDbMappingUtil.convertJavaTypeToJdbcType(val
Index: src/main/blanco/db/expander/query/caller/QueryCallerClass.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/caller/QueryCallerClass.java,v
retrieving revision 1.3
diff -u -r1.3 QueryCallerClass.java
--- src/main/blanco/db/expander/query/caller/QueryCallerClass.java	18 Oct 2005 11:18:22 -0000	1.3
+++ src/main/blanco/db/expander/query/caller/QueryCallerClass.java	5 Nov 2005 10:30:14 -0000
@@ -42,13 +42,13 @@
     }
 
     protected void expandClassStruct() {
-        addField(new PrivateField(Connection.class, "Connection"));
-        addField(new PrivateField(CallableStatement.class, "Statement"));
+        addField(new PrivateField(Connection.class, "fConnection"));
+        addField(new PrivateField(CallableStatement.class, "fStatement"));
 
         if (storage.getSetting().isLogging()) {
             addImport(new Type("org.apache.commons.logging.LogFactory"));
             PrivateField field1 = new PrivateField(new Type(
-                    "org.apache.commons.logging.Log"), "log");
+                    "org.apache.commons.logging.Log"), "fLog");
             field1.getJavaDoc().addLine("MÔ߂̃IuWFNg<br>");
             field1.getJavaDoc().addLine(
                     " static final ɂȂׂBblancoIg̎dloOɂ");
Index: src/main/blanco/db/expander/query/caller/SetCallerInputParameterMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/caller/SetCallerInputParameterMethod.java,v
retrieving revision 1.2
diff -u -r1.2 SetCallerInputParameterMethod.java
--- src/main/blanco/db/expander/query/caller/SetCallerInputParameterMethod.java	18 Oct 2005 11:18:22 -0000	1.2
+++ src/main/blanco/db/expander/query/caller/SetCallerInputParameterMethod.java	5 Nov 2005 10:30:14 -0000
@@ -70,9 +70,9 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
 
-            String strLine = "_log.debug(\"" + getName() + ": ";
+            String strLine = "fLog.debug(\"" + getName() + ": ";
             Iterator ite = _caller.getInParameterIterator();
             boolean isFirst = true;
             while (ite.hasNext()) {
@@ -93,11 +93,11 @@
         }
 
         // statementmۂł΂AIprepareCallĂяo܂B
-        implementor.addLine("if (_statement == null) {");
+        implementor.addLine("if (fStatement == null) {");
         implementor.addStatement("prepareCall()");
         implementor.addLine("}");
 
-        getField("Statement");
+        getField("fStatement");
 
         BlancoDbQueryParserUtil query = new BlancoDbQueryParserUtil(_caller
                 .getQuery());
@@ -119,7 +119,7 @@
                 if (BlancoDbMappingUtil.isMapWrapperClassNecessity(val
                         .getType().getName())) {
                     implementor.openIf(val.getName() + " == null");
-                    implementor.addStatement("_statement.setNull("
+                    implementor.addStatement("fStatement.setNull("
                             + index
                             + ", "
                             + BlancoDbMappingUtil.convertJavaTypeToJdbcType(val
@@ -134,7 +134,7 @@
                     implementor.addUsingType(new Type(Timestamp.class));
                 }
 
-                String stmtLine = "_statement."
+                String stmtLine = "fStatement."
                         + type
                         + "("
                         + index
Index: src/main/blanco/db/expander/query/invoker/CloseMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/invoker/CloseMethod.java,v
retrieving revision 1.8
diff -u -r1.8 CloseMethod.java
--- src/main/blanco/db/expander/query/invoker/CloseMethod.java	18 Oct 2005 11:18:22 -0000	1.8
+++ src/main/blanco/db/expander/query/invoker/CloseMethod.java	5 Nov 2005 10:30:14 -0000
@@ -30,7 +31,7 @@
         super("close");
         this.storage = storage;
 
-        String name = getNameAdjuster().toFieldName("Statement");
+        String name = BlancoNameAdjuster.toParameterName("fStatement");
         _statement = new Value(java.sql.PreparedStatement.class, name);
     }
 
@@ -42,13 +43,13 @@
     }
 
     public void implement() {
-        _statement = getField("Statement");
+        _statement = getField("fStatement");
 
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
Index: src/main/blanco/db/expander/query/invoker/ExecuteSingleUpdateMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/invoker/ExecuteSingleUpdateMethod.java,v
retrieving revision 1.10
diff -u -r1.10 ExecuteSingleUpdateMethod.java
--- src/main/blanco/db/expander/query/invoker/ExecuteSingleUpdateMethod.java	18 Oct 2005 11:18:22 -0000	1.10
+++ src/main/blanco/db/expander/query/invoker/ExecuteSingleUpdateMethod.java	5 Nov 2005 10:30:14 -0000
@@ -74,14 +74,14 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
         Value result = new Value(int.class, "result");
-        getField("Statement");
+        getField("fStatement");
 
         implementor.declare(result, new Statement(int.class, "0"));
 
Index: src/main/blanco/db/expander/query/invoker/ExecuteUpdateMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/invoker/ExecuteUpdateMethod.java,v
retrieving revision 1.12
diff -u -r1.12 ExecuteUpdateMethod.java
--- src/main/blanco/db/expander/query/invoker/ExecuteUpdateMethod.java	18 Oct 2005 11:18:22 -0000	1.12
+++ src/main/blanco/db/expander/query/invoker/ExecuteUpdateMethod.java	5 Nov 2005 10:30:14 -0000
@@ -54,21 +54,21 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
         // statementmۂł΂AIprepareStatementĂяo܂B
-        implementor.addLine("if (_statement == null) {");
+        implementor.addLine("if (fStatement == null) {");
         implementor.addStatement("prepareStatement()");
         implementor.addLine("}");
 
         implementor.emptyLine();
 
         implementor.openTry();
-        implementor.addStatement("return _statement.executeUpdate()");
+        implementor.addStatement("return fStatement.executeUpdate()");
 
         Value sqlException = new Value(SQLException.class, "e");
         implementor.addCatch(sqlException);
Index: src/main/blanco/db/expander/query/invoker/QueryInvokerClass.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/invoker/QueryInvokerClass.java,v
retrieving revision 1.17
diff -u -r1.17 QueryInvokerClass.java
--- src/main/blanco/db/expander/query/invoker/QueryInvokerClass.java	18 Oct 2005 11:18:22 -0000	1.17
+++ src/main/blanco/db/expander/query/invoker/QueryInvokerClass.java	5 Nov 2005 10:30:14 -0000
@@ -51,14 +51,14 @@
         addImport(new Type(storage.getSetting().getRootNameSpace()
                 + ".util.BlancoDbUtil"));
 
-        addField(new PrivateField(new Value(Connection.class, "connection")));
+        addField(new PrivateField(new Value(Connection.class, "fConnection")));
         addField(new PrivateField(new Value(PreparedStatement.class,
-                "Statement")));
+                "fStatement")));
 
         if (storage.getSetting().isLogging()) {
             addImport(new Type("org.apache.commons.logging.LogFactory"));
             PrivateField field1 = new PrivateField(new Type(
-                    "org.apache.commons.logging.Log"), "log");
+                    "org.apache.commons.logging.Log"), "fLog");
             field1.getJavaDoc().addLine("MÔ߂̃IuWFNg<br>");
             field1.getJavaDoc().addLine(
                     " static final ɂȂׂBblancoIg̎dloOɂ");
Index: src/main/blanco/db/expander/query/invoker/SetInvokerInputParameterMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/invoker/SetInvokerInputParameterMethod.java,v
retrieving revision 1.25
diff -u -r1.25 SetInvokerInputParameterMethod.java
--- src/main/blanco/db/expander/query/invoker/SetInvokerInputParameterMethod.java	18 Oct 2005 11:18:22 -0000	1.25
+++ src/main/blanco/db/expander/query/invoker/SetInvokerInputParameterMethod.java	5 Nov 2005 10:30:14 -0000
@@ -70,9 +70,9 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
 
-            String strLine = "_log.debug(\"" + getName() + ": ";
+            String strLine = "fLog.debug(\"" + getName() + ": ";
             Iterator ite = _invoker.getInParameterIterator();
             boolean isFirst = true;
             while (ite.hasNext()) {
@@ -93,11 +93,11 @@
         }
 
         // statementmۂł΂AIprepareStatementĂяo܂B
-        implementor.addLine("if (_statement == null) {");
+        implementor.addLine("if (fStatement == null) {");
         implementor.addStatement("prepareStatement()");
         implementor.addLine("}");
 
-        getField("Statement");
+        getField("fStatement");
 
         BlancoDbQueryParserUtil query = new BlancoDbQueryParserUtil(_invoker
                 .getQuery());
@@ -119,7 +119,7 @@
                 if (BlancoDbMappingUtil.isMapWrapperClassNecessity(val
                         .getType().getName())) {
                     implementor.openIf(val.getName() + " == null");
-                    implementor.addStatement("_statement.setNull("
+                    implementor.addStatement("fStatement.setNull("
                             + index
                             + ", "
                             + BlancoDbMappingUtil.convertJavaTypeToJdbcType(val
@@ -134,7 +134,7 @@
                     implementor.addUsingType(new Type(Timestamp.class));
                 }
 
-                String stmtLine = "_statement."
+                String stmtLine = "fStatement."
                         + type
                         + "("
                         + index
@@ -152,7 +152,6 @@
                         .getType().getName())) {
                     implementor.closeIf();
                 }
-
             }
         }
     }
Index: src/main/blanco/db/expander/query/iterator/AbsoluteMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/AbsoluteMethod.java,v
retrieving revision 1.7
diff -u -r1.7 AbsoluteMethod.java
--- src/main/blanco/db/expander/query/iterator/AbsoluteMethod.java	18 Oct 2005 11:18:21 -0000	1.7
+++ src/main/blanco/db/expander/query/iterator/AbsoluteMethod.java	5 Nov 2005 10:30:14 -0000
@@ -47,18 +47,18 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName()
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName()
                     + ": rows = \" + rows);");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
         // resultSetmۂł΂AIexecuteQueryĂяo܂B
-        implementor.addLine("if (_resultSet == null) {");
+        implementor.addLine("if (fResultSet == null) {");
         implementor.addStatement("executeQuery()");
         implementor.addLine("}");
 
-        implementor.addStatement("return _resultSet.absolute(rows)");
+        implementor.addStatement("return fResultSet.absolute(rows)");
     }
 }
\ No newline at end of file
Index: src/main/blanco/db/expander/query/iterator/CloseMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/CloseMethod.java,v
retrieving revision 1.8
diff -u -r1.8 CloseMethod.java
--- src/main/blanco/db/expander/query/iterator/CloseMethod.java	18 Oct 2005 11:18:21 -0000	1.8
+++ src/main/blanco/db/expander/query/iterator/CloseMethod.java	5 Nov 2005 10:30:14 -0000
@@ -45,15 +46,15 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
-        String name = getNameAdjuster().toFieldName("ResultSet");
+        String name = BlancoNameAdjuster.toParameterName("fResultSet");
         _resultSet = new Value(ResultSet.class, name);
-        _statement = getField("Statement");
+        _statement = getField("fStatement");
 
         Statement expression = new Statement(_resultSet);
         expression.join("!=", new Statement(Value.NULL));
Index: src/main/blanco/db/expander/query/iterator/ExecuteQueryMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/ExecuteQueryMethod.java,v
retrieving revision 1.9
diff -u -r1.9 ExecuteQueryMethod.java
--- src/main/blanco/db/expander/query/iterator/ExecuteQueryMethod.java	18 Oct 2005 11:18:21 -0000	1.9
+++ src/main/blanco/db/expander/query/iterator/ExecuteQueryMethod.java	5 Nov 2005 10:30:14 -0000
@@ -45,19 +45,19 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
-        _statement = getField("Statement");
-        _resultSet = getField("ResultSet");
+        _statement = getField("fStatement");
+        _resultSet = getField("fResultSet");
 
         Receiver r = null;
 
         // statementmۂł΂AIprepareStatementĂяo܂B
-        implementor.addLine("if (_statement == null) {");
+        implementor.addLine("if (fStatement == null) {");
         implementor.addStatement("prepareStatement()");
         implementor.addLine("}");
 
Index: src/main/blanco/db/expander/query/iterator/FirstMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/FirstMethod.java,v
retrieving revision 1.8
diff -u -r1.8 FirstMethod.java
--- src/main/blanco/db/expander/query/iterator/FirstMethod.java	18 Oct 2005 11:18:21 -0000	1.8
+++ src/main/blanco/db/expander/query/iterator/FirstMethod.java	5 Nov 2005 10:30:14 -0000
@@ -45,18 +45,18 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
         // resultSetmۂł΂AIexecuteQueryĂяo܂B
-        implementor.addLine("if (_resultSet == null) {");
+        implementor.addLine("if (fResultSet == null) {");
         implementor.addStatement("executeQuery()");
         implementor.addLine("}");
 
-        Value resultSet = new Value(ResultSet.class, "_resultSet");
+        Value resultSet = new Value(ResultSet.class, "fResultSet");
         Receiver r = new Receiver(resultSet);
         r.call("first");
         implementor.addReturn(r);
Index: src/main/blanco/db/expander/query/iterator/GetResultSetMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/GetResultSetMethod.java,v
retrieving revision 1.6
diff -u -r1.6 GetResultSetMethod.java
--- src/main/blanco/db/expander/query/iterator/GetResultSetMethod.java	12 Oct 2005 14:01:26 -0000	1.6
+++ src/main/blanco/db/expander/query/iterator/GetResultSetMethod.java	5 Nov 2005 10:30:14 -0000
@@ -24,7 +24,7 @@
 
     public GetResultSetMethod(BlancoDbObjectStorage storage) {
         super("getResultSet");
-        _resultSet = new Value(ResultSet.class, "_resultSet");
+        _resultSet = new Value(ResultSet.class, "fResultSet");
     }
 
     public void setupSignature() {
Index: src/main/blanco/db/expander/query/iterator/GetRowMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/GetRowMethod.java,v
retrieving revision 1.14
diff -u -r1.14 GetRowMethod.java
--- src/main/blanco/db/expander/query/iterator/GetRowMethod.java	20 Oct 2005 14:10:36 -0000	1.14
+++ src/main/blanco/db/expander/query/iterator/GetRowMethod.java	5 Nov 2005 10:30:14 -0000
@@ -53,8 +54,8 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
@@ -77,7 +78,7 @@
                     + MethodExpander.createName("set", field.getName())
                     + "("
                     + BlancoDbMappingUtil.mapWrapperClassForPrimitive(
-                            "_resultSet."
+                            "fResultSet."
                                     + BlancoDbMappingUtil
                                             .getResultSetGetterMethodName(field
                                                     .getTypeName()) + "("
@@ -85,10 +86,10 @@
                     + ")");
 
             if (field.getObjectMappingForPrimitiveNullSupport()) {
-                implementor.openIf("_resultSet.wasNull()");
-                implementor.addStatement("result."
-                        + getNameAdjuster().getMethodName("set",
-                                field.getName()) + "(null)");
+                implementor.openIf("fResultSet.wasNull()");
+                implementor.addStatement("result.set"
+                        + BlancoNameAdjuster.toClassName(field.getName())
+                        + "(null)");
                 implementor.closeIf();
             }
             indexCol++;
Index: src/main/blanco/db/expander/query/iterator/GetSingleRowMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/GetSingleRowMethod.java,v
retrieving revision 1.11
diff -u -r1.11 GetSingleRowMethod.java
--- src/main/blanco/db/expander/query/iterator/GetSingleRowMethod.java	18 Oct 2005 11:18:21 -0000	1.11
+++ src/main/blanco/db/expander/query/iterator/GetSingleRowMethod.java	5 Nov 2005 10:30:14 -0000
@@ -68,8 +68,8 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
Index: src/main/blanco/db/expander/query/iterator/LastMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/LastMethod.java,v
retrieving revision 1.8
diff -u -r1.8 LastMethod.java
--- src/main/blanco/db/expander/query/iterator/LastMethod.java	18 Oct 2005 11:18:21 -0000	1.8
+++ src/main/blanco/db/expander/query/iterator/LastMethod.java	5 Nov 2005 10:30:14 -0000
@@ -45,18 +45,18 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
         // resultSetmۂł΂AIexecuteQueryĂяo܂B
-        implementor.addLine("if (_resultSet == null) {");
+        implementor.addLine("if (fResultSet == null) {");
         implementor.addStatement("executeQuery()");
         implementor.addLine("}");
 
-        Value resultSet = new Value(ResultSet.class, "_resultSet");
+        Value resultSet = new Value(ResultSet.class, "fResultSet");
         Receiver r = new Receiver(resultSet);
         r.call("last");
         implementor.addReturn(r);
Index: src/main/blanco/db/expander/query/iterator/NextMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/NextMethod.java,v
retrieving revision 1.14
diff -u -r1.14 NextMethod.java
--- src/main/blanco/db/expander/query/iterator/NextMethod.java	18 Oct 2005 11:18:21 -0000	1.14
+++ src/main/blanco/db/expander/query/iterator/NextMethod.java	5 Nov 2005 10:30:14 -0000
@@ -45,18 +45,18 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
         // resultSetmۂł΂AIexecuteQueryĂяo܂B
-        implementor.addLine("if (_resultSet == null) {");
+        implementor.addLine("if (fResultSet == null) {");
         implementor.addStatement("executeQuery()");
         implementor.addLine("}");
 
-        Value resultSet = new Value(ResultSet.class, "_resultSet");
+        Value resultSet = new Value(ResultSet.class, "fResultSet");
         Receiver r = new Receiver(resultSet);
         r.call("next");
         implementor.addReturn(r);
Index: src/main/blanco/db/expander/query/iterator/PreviousMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/PreviousMethod.java,v
retrieving revision 1.8
diff -u -r1.8 PreviousMethod.java
--- src/main/blanco/db/expander/query/iterator/PreviousMethod.java	18 Oct 2005 11:18:21 -0000	1.8
+++ src/main/blanco/db/expander/query/iterator/PreviousMethod.java	5 Nov 2005 10:30:14 -0000
@@ -45,18 +45,18 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
         // resultSetmۂł΂AIexecuteQueryĂяo܂B
-        implementor.addLine("if (_resultSet == null) {");
+        implementor.addLine("if (fResultSet == null) {");
         implementor.addStatement("executeQuery()");
         implementor.addLine("}");
 
-        Value resultSet = new Value(ResultSet.class, "_resultSet");
+        Value resultSet = new Value(ResultSet.class, "fResultSet");
         Receiver r = new Receiver(resultSet);
         r.call("previous");
         implementor.addReturn(r);
Index: src/main/blanco/db/expander/query/iterator/QueryIteratorClass.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/QueryIteratorClass.java,v
retrieving revision 1.29
diff -u -r1.29 QueryIteratorClass.java
--- src/main/blanco/db/expander/query/iterator/QueryIteratorClass.java	18 Oct 2005 11:18:21 -0000	1.29
+++ src/main/blanco/db/expander/query/iterator/QueryIteratorClass.java	5 Nov 2005 10:30:14 -0000
@@ -60,14 +60,14 @@
 
     protected void expandClassStruct() {
 
-        addField(new PrivateField(Connection.class, "Connection"));
-        addField(new PrivateField(PreparedStatement.class, "Statement"));
-        addField(new PrivateField(ResultSet.class, "ResultSet"));
+        addField(new PrivateField(Connection.class, "fConnection"));
+        addField(new PrivateField(PreparedStatement.class, "fStatement"));
+        addField(new PrivateField(ResultSet.class, "fResultSet"));
 
         if (storage.getSetting().isLogging()) {
             addImport(new Type("org.apache.commons.logging.LogFactory"));
             PrivateField field1 = new PrivateField(new Type(
-                    "org.apache.commons.logging.Log"), "log");
+                    "org.apache.commons.logging.Log"), "fLog");
             field1.getJavaDoc().addLine("MÔ߂̃IuWFNg<br>");
             field1.getJavaDoc().addLine(
                     " static final ɂȂׂBblancoIg̎dloOɂ");
@@ -112,7 +112,7 @@
         }
 
         Type rowObjectType = new Type(storage.getSetting().getRootNameSpace()
-                + ".row", new NameAdjuster().toClassName(_iterator.getName()
+                + ".row", BlancoNameAdjuster.toClassName(_iterator.getName()
                 + "Row"));
 
         addMethod(new GetRowMethod(storage, rowObjectType, _iterator));
Index: src/main/blanco/db/expander/query/iterator/RelativeMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/RelativeMethod.java,v
retrieving revision 1.7
diff -u -r1.7 RelativeMethod.java
--- src/main/blanco/db/expander/query/iterator/RelativeMethod.java	18 Oct 2005 11:18:21 -0000	1.7
+++ src/main/blanco/db/expander/query/iterator/RelativeMethod.java	5 Nov 2005 10:30:14 -0000
@@ -47,18 +47,18 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName()
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName()
                     + ": rows = \" + rows);");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
         // resultSetmۂł΂AIexecuteQueryĂяo܂B
-        implementor.addLine("if (_resultSet == null) {");
+        implementor.addLine("if (fResultSet == null) {");
         implementor.addStatement("executeQuery()");
         implementor.addLine("}");
 
-        implementor.addStatement("return _resultSet.relative(rows)");
+        implementor.addStatement("return fResultSet.relative(rows)");
     }
 }
\ No newline at end of file
Index: src/main/blanco/db/expander/query/iterator/SetInputParameterMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/SetInputParameterMethod.java,v
retrieving revision 1.21
diff -u -r1.21 SetInputParameterMethod.java
--- src/main/blanco/db/expander/query/iterator/SetInputParameterMethod.java	18 Oct 2005 11:18:21 -0000	1.21
+++ src/main/blanco/db/expander/query/iterator/SetInputParameterMethod.java	5 Nov 2005 10:30:14 -0000
@@ -70,9 +70,9 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
 
-            String strLine = "_log.debug(\"" + getName() + ": ";
+            String strLine = "fLog.debug(\"" + getName() + ": ";
             Iterator ite = _iterator.getInParameterIterator();
             boolean isFirst = true;
             while (ite.hasNext()) {
@@ -93,11 +93,11 @@
         }
 
         // statementmۂł΂AIprepareStatementĂяo܂B
-        implementor.addLine("if (_statement == null) {");
+        implementor.addLine("if (fStatement == null) {");
         implementor.addStatement("prepareStatement()");
         implementor.addLine("}");
 
-        getField("Statement");
+        getField("fStatement");
 
         BlancoDbQueryParserUtil query = new BlancoDbQueryParserUtil(_iterator
                 .getQuery());
@@ -119,7 +119,7 @@
                 if (BlancoDbMappingUtil.isMapWrapperClassNecessity(val
                         .getType().getName())) {
                     implementor.openIf(val.getName() + " == null");
-                    implementor.addStatement("_statement.setNull("
+                    implementor.addStatement("fStatement.setNull("
                             + index
                             + ", "
                             + BlancoDbMappingUtil.convertJavaTypeToJdbcType(val
@@ -134,7 +134,7 @@
                     implementor.addUsingType(new Type(Timestamp.class));
                 }
 
-                String stmtLine = "_statement."
+                String stmtLine = "fStatement."
                         + type
                         + "("
                         + index
Index: src/main/blanco/db/expander/query/iterator/UpdateObjectMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/UpdateObjectMethod.java,v
retrieving revision 1.14
diff -u -r1.14 UpdateObjectMethod.java
--- src/main/blanco/db/expander/query/iterator/UpdateObjectMethod.java	18 Oct 2005 11:18:21 -0000	1.14
+++ src/main/blanco/db/expander/query/iterator/UpdateObjectMethod.java	5 Nov 2005 10:30:14 -0000
@@ -11,6 +11,7 @@
 
 import java.sql.SQLException;
 
+import blanco.commons.util.BlancoNameAdjuster;
 import blanco.db.definition.QueryField;
 import blanco.db.definition.QueryIterator;
 import blanco.db.mapping.BlancoDbMappingUtil;
@@ -35,9 +36,7 @@
 
     public UpdateObjectMethod(BlancoDbObjectStorage storage,
             QueryIterator iterator, QueryField field) {
-        super("update"
-                + getNameAdjuster().toTitleCase(
-                        getNameAdjuster().toValueName(field.getName())));
+        super("update" + BlancoNameAdjuster.toClassName(field.getName()));
         _field = field;
         this.storage = storage;
     }
@@ -45,8 +44,8 @@
     public void setupSignature() {
         addException(SQLException.class);
 
-        Value value = new Value(_field.getJavaType(), getNameAdjuster()
-                .toValueName(_field.getName()));
+        Value value = new Value(_field.getJavaType(), BlancoNameAdjuster
+                .toParameterName(_field.getName()));
         addArgument(value);
 
         if (_field.getTypeName().equals("InputStream")
@@ -56,7 +55,7 @@
 
         getJavaDoc().addLine("'" + _field.getName() + "'XV܂B<br>");
         getJavaDoc().addParameter(
-                getNameAdjuster().toValueName(_field.getName()),
+                BlancoNameAdjuster.toParameterName(_field.getName()),
                 _field.getName() + "ɃZbgl");
     }
 
@@ -64,11 +63,12 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + ": "
-                    + getNameAdjuster().toValueName(_field.getName())
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + ": "
+                    + BlancoNameAdjuster.toParameterName(_field.getName())
                     + " = \" + "
-                    + getNameAdjuster().toValueName(_field.getName()) + ");");
+                    + BlancoNameAdjuster.toParameterName(_field.getName())
+                    + ");");
             implementor.addLine("}");
             implementor.addLine("");
         }
@@ -77,16 +77,17 @@
                 .getRootNameSpace()
                 + ".util.BlancoDbUtil"));
 
-        _resultSet = getField("ResultSet");
+        _resultSet = getField("fResultSet");
 
         Receiver r = null;
         Call c = null;
         r = new Receiver(_resultSet);
 
         if (_field.getObjectMappingForPrimitiveNullSupport()) {
-            implementor.openIf(getNameAdjuster().toValueName(_field.getName())
+            implementor.openIf(BlancoNameAdjuster.toParameterName(_field
+                    .getName())
                     + " == null");
-            implementor.addStatement("_resultSet.updateNull("
+            implementor.addStatement("fResultSet.updateNull("
                     + new StringLiteral(_field.getName()) + ")");
             implementor.addElse();
         }
@@ -97,7 +98,7 @@
         c.addArgument(new StringLiteral(_field.getJdbcName()));
 
         c.addArgument(BlancoDbMappingUtil.mapWrapperClassIntoPrimitive(
-                getNameAdjuster().toValueName(_field.getName()), _field
+                BlancoNameAdjuster.toParameterName(_field.getName()), _field
                         .getTypeName()));
 
         if (_field.getTypeName().equals("Date")) {
Index: src/main/blanco/db/expander/query/iterator/UpdateRowMethod.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/expander/query/iterator/UpdateRowMethod.java,v
retrieving revision 1.13
diff -u -r1.13 UpdateRowMethod.java
--- src/main/blanco/db/expander/query/iterator/UpdateRowMethod.java	18 Oct 2005 11:18:21 -0000	1.13
+++ src/main/blanco/db/expander/query/iterator/UpdateRowMethod.java	5 Nov 2005 10:30:14 -0000
@@ -60,13 +60,13 @@
         Implementor implementor = new Implementor(getData());
 
         if (storage.getSetting().isLogging()) {
-            implementor.addLine("if (_log.isDebugEnabled()) {");
-            implementor.addLine("_log.debug(\"" + getName() + "\");");
+            implementor.addLine("if (fLog.isDebugEnabled()) {");
+            implementor.addLine("fLog.debug(\"" + getName() + "\");");
             implementor.addLine("}");
             implementor.addLine("");
         }
 
-        _resultSet = getField("ResultSet");
+        _resultSet = getField("fResultSet");
 
         Receiver r = null;
         r = new Receiver(_resultSet);
Index: src/main/blanco/db/generator/BlancoDbGenerator.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/generator/BlancoDbGenerator.java,v
retrieving revision 1.28
diff -u -r1.28 BlancoDbGenerator.java
--- src/main/blanco/db/generator/BlancoDbGenerator.java	20 Oct 2005 14:10:35 -0000	1.28
+++ src/main/blanco/db/generator/BlancoDbGenerator.java	5 Nov 2005 10:30:14 -0000
@@ -154,7 +154,7 @@
             throws SAXException, IOException, TransformerException {
         final String typeName = queryIterator.getName() + "Row";
         // Query̏ꍇɂ́ANXւ̕ό`{ĂKv܂B
-        createRowObjectClass(new NameAdjuster().toClassName(typeName),
+        createRowObjectClass(BlancoNameAdjuster.toClassName(typeName),
                 rootPackage + ".row", queryIterator.getFieldIterator(),
                 outputDirectory);
     }
Index: src/main/blanco/db/helper/seed/BlancoDbHelperViewXmlGen.java
===================================================================
RCS file: /cvsroot/blancofw/blancoDbEE/src/main/blanco/db/helper/seed/BlancoDbHelperViewXmlGen.java,v
retrieving revision 1.4
diff -u -r1.4 BlancoDbHelperViewXmlGen.java
--- src/main/blanco/db/helper/seed/BlancoDbHelperViewXmlGen.java	18 May 2005 06:15:41 -0000	1.4
+++ src/main/blanco/db/helper/seed/BlancoDbHelperViewXmlGen.java	5 Nov 2005 10:30:14 -0000
@@ -104,9 +104,8 @@
                     Element eleQuery = document
                             .createElement(BlancoDbConstants.QUERY_ITERATOR);
                     eleRoot.appendChild(eleQuery);
-                    NameAdjuster adjuster = new NameAdjuster();
                     eleQuery.setAttribute("name", "Simple"
-                            + adjuster.toClassName(tableName));
+                            + BlancoNameAdjuster.toClassName(tableName));
 
                     // p[^VIEW̏ꍇɂ͊{Iɑ݂Ȃ
 
