Index: /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/db2/Db2SequenceKeyGeneratorFactory.java
===================================================================
--- /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/db2/Db2SequenceKeyGeneratorFactory.java	(revision 6731)
+++ /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/db2/Db2SequenceKeyGeneratorFactory.java	(working copy)
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006 Le Duc Bao, Ralf Joachim
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@
 
 /**
  * Factory class for SEQUENCE key generators for DB2.
- * 
+ *
  * @author <a href="mailto:leducbao AT gmail DOT com">Le Duc Bao</a>
  * @author <a href="mailto:ralf DOT joachim AT syscon-world DOT de">Ralf Joachim</a>
  * @version $Revision: 5951 $ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
@@ -40,9 +40,9 @@
         StringBuffer buff = new StringBuffer();
         String tableName = sequenceKey.getTable().getName();
         String pkList = toPrimaryKeyList(key.getTable());
-        String sequenceName = MessageFormat.format(sequenceKey.getSequence(), 
-                new String[]{tableName, pkList});
-        
+        String sequenceName = MessageFormat.format(sequenceKey.getSequence(),
+                new Object[]{tableName, pkList});
+
         String newline = conf.getStringValue(
                 DDLGenConfiguration.NEWLINE_KEY, DDLGenConfiguration.DEFAULT_NEWLINE);
         String indent = conf.getStringValue(
@@ -47,7 +47,7 @@
                 DDLGenConfiguration.NEWLINE_KEY, DDLGenConfiguration.DEFAULT_NEWLINE);
         String indent = conf.getStringValue(
                 DDLGenConfiguration.INDENT_KEY, DDLGenConfiguration.DEFAULT_INDENT);
-        
+
         buff.append(newline).append(newline);
         buff.append("CREATE SEQUENCE AS INTEGER ").append(sequenceName);
         buff.append(newline).append(indent);
@@ -69,12 +69,12 @@
 
             String triggerTemp = conf.getStringValue(
                     DDLGenConfiguration.TRIGGER_TEMPLATE_KEY, "");
-    
+
             triggerTemp = triggerTemp.replaceAll("<trigger_name>", triggerName);
             triggerTemp = triggerTemp.replaceAll("<sequence_name>", sequenceName);
-            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);            
-            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);            
-            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);            
+            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);
+            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);
+            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);
             buff.append(newline);
             buff.append(newline);
             buff.append(triggerTemp);
@@ -79,10 +79,10 @@
             buff.append(newline);
             buff.append(triggerTemp);
         }
-        
+
         return buff.toString();
     }
-    
+
     /**
      * {@inheritDoc}
      */
Index: /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/hsql/HsqlSequenceKeyGeneratorFactory.java
===================================================================
--- /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/hsql/HsqlSequenceKeyGeneratorFactory.java	(revision 6731)
+++ /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/hsql/HsqlSequenceKeyGeneratorFactory.java	(working copy)
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006 Le Duc Bao, Ralf Joachim
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@
 
 /**
  * Factory class for SEQUENCE key generators for HSQL.
- * 
+ *
  * @author <a href="mailto:leducbao AT gmail DOT com">Le Duc Bao</a>
  * @author <a href="mailto:ralf DOT joachim AT syscon-world DOT de">Ralf Joachim</a>
  * @version $Revision: 5951 $ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
@@ -40,9 +40,9 @@
         StringBuffer buff = new StringBuffer();
         String tableName = sequenceKey.getTable().getName();
         String pkList = toPrimaryKeyList(key.getTable());
-        String sequenceName = MessageFormat.format(sequenceKey.getSequence(), 
-                new String[]{tableName, pkList});
-        
+        String sequenceName = MessageFormat.format(sequenceKey.getSequence(),
+                new Object[]{tableName, pkList});
+
         String newline = conf.getStringValue(
                 DDLGenConfiguration.NEWLINE_KEY, DDLGenConfiguration.DEFAULT_NEWLINE);
         String indent = conf.getStringValue(
@@ -65,12 +65,12 @@
 
             String triggerTemp = conf.getStringValue(
                     DDLGenConfiguration.TRIGGER_TEMPLATE_KEY, "");
-    
+
             triggerTemp = triggerTemp.replaceAll("<trigger_name>", triggerName);
             triggerTemp = triggerTemp.replaceAll("<sequence_name>", sequenceName);
-            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);            
-            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);            
-            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);            
+            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);
+            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);
+            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);
             buff.append(newline);
             buff.append(newline);
             buff.append(triggerTemp);
@@ -75,10 +75,10 @@
             buff.append(newline);
             buff.append(triggerTemp);
         }
-        
+
         return buff.toString();
     }
-    
+
     /**
      * {@inheritDoc}
      */
Index: /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/oracle/OracleSequenceKeyGeneratorFactory.java
===================================================================
--- /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/oracle/OracleSequenceKeyGeneratorFactory.java	(revision 6731)
+++ /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/oracle/OracleSequenceKeyGeneratorFactory.java	(working copy)
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006 Le Duc Bao, Ralf Joachim
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@
 
 /**
  * Factory class for SEQUENCE key generators for Oracle.
- * 
+ *
  * @author <a href="mailto:leducbao AT gmail DOT com">Le Duc Bao</a>
  * @author <a href="mailto:ralf DOT joachim AT syscon-world DOT de">Ralf Joachim</a>
  * @version $Revision: 5951 $ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
@@ -38,13 +38,13 @@
         SequenceKeyGenerator sequenceKey = (SequenceKeyGenerator) key;
         StringBuffer buff = new StringBuffer();
         DDLGenConfiguration conf = sequenceKey.getConfiguration();
-        
+
         String tableName = sequenceKey.getTable().getName();
         String pkList = toPrimaryKeyList(key.getTable());
         String pkTypeList = toPrimaryKeyTypeList(key.getTable());
-        String sequenceName = MessageFormat.format(sequenceKey.getSequence(), 
-                new String[]{tableName, pkList});
-        
+        String sequenceName = MessageFormat.format(sequenceKey.getSequence(),
+                new Object[]{tableName, pkList});
+
         String newline = conf.getStringValue(
                 DDLGenConfiguration.NEWLINE_KEY, DDLGenConfiguration.DEFAULT_NEWLINE);
         String indent = conf.getStringValue(
@@ -67,12 +67,12 @@
             }
             String triggerTemp = conf.getStringValue(
                     DDLGenConfiguration.TRIGGER_TEMPLATE_KEY, "");
-    
+
             triggerTemp = triggerTemp.replaceAll("<trigger_name>", triggerName);
             triggerTemp = triggerTemp.replaceAll("<sequence_name>", sequenceName);
-            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);            
-            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);            
-            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);            
+            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);
+            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);
+            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);
             buff.append(newline);
             buff.append(newline);
             buff.append(triggerTemp);
@@ -77,10 +77,10 @@
             buff.append(newline);
             buff.append(triggerTemp);
         }
-        
+
         return buff.toString();
     }
-    
+
     /**
      * {@inheritDoc}
      */
Index: /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/postgresql/PostgresqlSequenceKeyGeneratorFactory.java
===================================================================
--- /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/postgresql/PostgresqlSequenceKeyGeneratorFactory.java	(revision 6731)
+++ /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/postgresql/PostgresqlSequenceKeyGeneratorFactory.java	(working copy)
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006 Le Duc Bao, Ralf Joachim
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@
 
 /**
  * Factory class for SEQUENCE key generators for PostgreSQL.
- * 
+ *
  * @author <a href="mailto:leducbao AT gmail DOT com">Le Duc Bao</a>
  * @author <a href="mailto:ralf DOT joachim AT syscon-world DOT de">Ralf Joachim</a>
  * @version $Revision: 5951 $ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
@@ -41,9 +41,9 @@
         String tableName = sequenceKey.getTable().getName();
         String pkList = toPrimaryKeyList(key.getTable());
         String pkTypeList = toPrimaryKeyTypeList(key.getTable());
-        String sequenceName = MessageFormat.format(sequenceKey.getSequence(), 
-                new String[]{tableName, pkList});
-        
+        String sequenceName = MessageFormat.format(sequenceKey.getSequence(),
+                new Object[]{tableName, pkList});
+
         String newline = conf.getStringValue(
                 DDLGenConfiguration.NEWLINE_KEY, DDLGenConfiguration.DEFAULT_NEWLINE);
         String indent = conf.getStringValue(
@@ -66,12 +66,12 @@
 
             String triggerTemp = conf.getStringValue(
                     DDLGenConfiguration.TRIGGER_TEMPLATE_KEY, "");
-    
+
             triggerTemp = triggerTemp.replaceAll("<trigger_name>", triggerName);
             triggerTemp = triggerTemp.replaceAll("<sequence_name>", sequenceName);
-            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);            
-            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);            
-            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);            
+            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);
+            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);
+            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);
             buff.append(newline);
             buff.append(newline);
             buff.append(triggerTemp);
@@ -76,10 +76,10 @@
             buff.append(newline);
             buff.append(triggerTemp);
         }
-        
+
         return buff.toString();
     }
-    
+
     /**
      * {@inheritDoc}
      */
Index: /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/sapdb/SapdbSequenceKeyGeneratorFactory.java
===================================================================
--- /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/sapdb/SapdbSequenceKeyGeneratorFactory.java	(revision 6731)
+++ /home/ekuns/workspace/castor-4/ddlgen/src/main/java/org/castor/ddlgen/engine/sapdb/SapdbSequenceKeyGeneratorFactory.java	(working copy)
@@ -1,12 +1,12 @@
 /*
  * Copyright 2006 Le Duc Bao, Ralf Joachim
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
  * the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
@@ -24,7 +24,7 @@
 
 /**
  * Factory class for SEQUENCE key generators for SapDB.
- * 
+ *
  * @author <a href="mailto:leducbao AT gmail DOT com">Le Duc Bao</a>
  * @author <a href="mailto:ralf DOT joachim AT syscon-world DOT de">Ralf Joachim</a>
  * @version $Revision: 5951 $ $Date: 2006-04-25 16:09:10 -0600 (Tue, 25 Apr 2006) $
@@ -40,9 +40,9 @@
         StringBuffer buff = new StringBuffer();
         String tableName = sequenceKey.getTable().getName();
         String pkList = toPrimaryKeyList(key.getTable());
-        String sequenceName = MessageFormat.format(sequenceKey.getSequence(), 
-                new String[]{tableName, pkList});
-        
+        String sequenceName = MessageFormat.format(sequenceKey.getSequence(),
+                new Object[]{tableName, pkList});
+
         String newline = conf.getStringValue(
                 DDLGenConfiguration.NEWLINE_KEY, DDLGenConfiguration.DEFAULT_NEWLINE);
         String indent = conf.getStringValue(
@@ -67,12 +67,12 @@
 
             String triggerTemp = conf.getStringValue(
                     DDLGenConfiguration.TRIGGER_TEMPLATE_KEY, "");
-    
+
             triggerTemp = triggerTemp.replaceAll("<trigger_name>", triggerName);
             triggerTemp = triggerTemp.replaceAll("<sequence_name>", sequenceName);
-            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);            
-            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);            
-            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);            
+            triggerTemp = triggerTemp.replaceAll("<table_name>", tableName);
+            triggerTemp = triggerTemp.replaceAll("<pk_name>", pkList);
+            triggerTemp = triggerTemp.replaceAll("<pk_type>", pkTypeList);
             buff.append(newline);
             buff.append(newline);
             buff.append(triggerTemp);
@@ -77,10 +77,10 @@
             buff.append(newline);
             buff.append(triggerTemp);
         }
-        
+
         return buff.toString();
     }
-    
+
     /**
      * {@inheritDoc}
      */