Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.java?rev=648483&r1=648482&r2=648483&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/dao/BaseDAOGenerator.java Tue Apr 15 19:24:59 2008 @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; @@ -246,28 +245,24 @@ answer.addSuperInterface(getDAOInterfaceType(table)); answer.addImportedType(getDAOInterfaceType(table)); - Iterator<FullyQualifiedJavaType> fqjtIter = daoTemplate.getImplementationImports().iterator(); - while (fqjtIter.hasNext()) { - answer.addImportedType(fqjtIter.next()); + for (FullyQualifiedJavaType fqjt : daoTemplate.getImplementationImports()) { + answer.addImportedType(fqjt); } commentGenerator.addJavaFileComment(answer); // add constructor - Method method = daoTemplate.getConstructorClone(commentGenerator, - getDAOImplementationType(table), table); - answer.addMethod(method); + answer.addMethod(daoTemplate.getConstructorClone(commentGenerator, + getDAOImplementationType(table), table)); // add any fields from the template - Iterator<Field> fldIter = daoTemplate.getFieldClones(commentGenerator, table); - while (fldIter.hasNext()) { - answer.addField(fldIter.next()); + for (Field field : daoTemplate.getFieldClones(commentGenerator, table)) { + answer.addField(field); } // add any methods from the template - Iterator<Method> mtdIter = daoTemplate.getMethodClones(commentGenerator, table); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : daoTemplate.getMethodClones(commentGenerator, table)) { + answer.addMethod(method); } IbatorRules rules = introspectedTable.getRules(); @@ -276,9 +271,8 @@ if (rules.generateInsert()) { methods = getInsertMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -286,9 +280,8 @@ if (rules.generateUpdateByPrimaryKeyWithoutBLOBs()) { methods = getUpdateByPrimaryKeyWithoutBLOBsMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -297,9 +290,8 @@ methods = getUpdateByPrimaryKeyWithBLOBsMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -308,9 +300,8 @@ methods = getUpdateByPrimaryKeySelectiveMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -318,9 +309,8 @@ if (rules.generateSelectByExampleWithoutBLOBs()) { methods = getSelectByExampleWithoutBLOBsMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -329,9 +319,8 @@ methods = getSelectByExampleWithBLOBsMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -339,9 +328,8 @@ if (rules.generateSelectByPrimaryKey()) { methods = getSelectByPrimaryKeyMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -349,9 +337,8 @@ if (rules.generateDeleteByExample()) { methods = getDeleteByExampleMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -359,9 +346,8 @@ if (rules.generateDeleteByPrimaryKey()) { methods = getDeleteByPrimaryKeyMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -369,9 +355,8 @@ if (rules.generateCountByExample()) { methods = getCountByExampleMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -379,9 +364,8 @@ if (rules.generateUpdateByExampleSelective()) { methods = getUpdateByExampleSelectiveMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -389,9 +373,8 @@ if (rules.generateUpdateByExampleWithBLOBs()) { methods = getUpdateByExampleWithBLOBsMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -399,9 +382,8 @@ if (rules.generateUpdateByExampleWithoutBLOBs()) { methods = getUpdateByExampleWithoutBLOBsMethods(introspectedTable, false, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -460,23 +442,20 @@ answer.addImportedType(fqjt); } - Iterator<FullyQualifiedJavaType> fqjtIter = daoTemplate.getInterfaceImports().iterator(); - while (fqjtIter.hasNext()) { - answer.addImportedType(fqjtIter.next()); + for (FullyQualifiedJavaType fqjt : daoTemplate.getInterfaceImports()) { + answer.addImportedType(fqjt); } ibatorContext.getCommentGenerator().addJavaFileComment(answer); IbatorRules rules = introspectedTable.getRules(); List<Method> methods; - Iterator<Method> mtdIter; if (rules.generateInsert()) { methods = getInsertMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -484,9 +463,8 @@ if (rules.generateUpdateByPrimaryKeyWithoutBLOBs()) { methods = getUpdateByPrimaryKeyWithoutBLOBsMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -495,9 +473,8 @@ methods = getUpdateByPrimaryKeyWithBLOBsMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -506,9 +483,8 @@ methods = getUpdateByPrimaryKeySelectiveMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -516,9 +492,8 @@ if (rules.generateSelectByExampleWithoutBLOBs()) { methods = getSelectByExampleWithoutBLOBsMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -527,9 +502,8 @@ methods = getSelectByExampleWithBLOBsMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -537,9 +511,8 @@ if (rules.generateSelectByPrimaryKey()) { methods = getSelectByPrimaryKeyMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -547,9 +520,8 @@ if (rules.generateDeleteByExample()) { methods = getDeleteByExampleMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -557,9 +529,8 @@ if (rules.generateDeleteByPrimaryKey()) { methods = getDeleteByPrimaryKeyMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -567,9 +538,8 @@ if (rules.generateCountByExample()) { methods = getCountByExampleMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -577,9 +547,8 @@ if (rules.generateUpdateByExampleSelective()) { methods = getUpdateByExampleSelectiveMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -587,9 +556,8 @@ if (rules.generateUpdateByExampleWithBLOBs()) { methods = getUpdateByExampleWithBLOBsMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -597,9 +565,8 @@ if (rules.generateUpdateByExampleWithoutBLOBs()) { methods = getUpdateByExampleWithoutBLOBsMethods(introspectedTable, true, answer); if (methods != null) { - mtdIter = methods.iterator(); - while (mtdIter.hasNext()) { - answer.addMethod(mtdIter.next()); + for (Method method : methods) { + answer.addMethod(method); } } } @@ -662,9 +629,7 @@ compilationUnit.addImportedType(parameterType); method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -732,9 +697,7 @@ method.setName(methodNameCalculator.getUpdateByPrimaryKeyWithoutBLOBsMethodName(introspectedTable)); method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -781,9 +744,7 @@ method.setName(methodNameCalculator.getUpdateByPrimaryKeyWithBLOBsMethodName(introspectedTable)); method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -830,9 +791,7 @@ method.setName(methodNameCalculator.getUpdateByPrimaryKeySelectiveMethodName(introspectedTable)); method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -898,9 +857,7 @@ method.setName(methodNameCalculator.getSelectByExampleWithoutBLOBsMethodName(introspectedTable)); method.addParameter(new Parameter(type, "example")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -972,9 +929,7 @@ method.setName(methodNameCalculator.getSelectByExampleWithBLOBsMethodName(introspectedTable)); method.addParameter(new Parameter(type, "example")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -1030,18 +985,14 @@ compilationUnit.addImportedType(type); method.addParameter(new Parameter(type, "key")); //$NON-NLS-1$ } else { - Iterator<ColumnDefinition> iter = introspectedTable.getPrimaryKeyColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); + for (ColumnDefinition cd : introspectedTable.getPrimaryKeyColumns()) { FullyQualifiedJavaType type = cd.getResolvedJavaType().getFullyQualifiedJavaType(); compilationUnit.addImportedType(type); method.addParameter(new Parameter(type, cd.getJavaProperty())); } } - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -1065,9 +1016,7 @@ sb.append("();"); //$NON-NLS-1$ method.addBodyLine(sb.toString()); - Iterator<ColumnDefinition> cdIter = introspectedTable.getPrimaryKeyColumns(); - while (cdIter.hasNext()) { - ColumnDefinition cd = cdIter.next(); + for (ColumnDefinition cd : introspectedTable.getPrimaryKeyColumns()) { sb.setLength(0); sb.append("key."); //$NON-NLS-1$ sb.append(JavaBeansUtil.getSetterMethodName(cd.getJavaProperty())); @@ -1114,9 +1063,7 @@ method.setName(methodNameCalculator.getDeleteByExampleMethodName(introspectedTable)); method.addParameter(new Parameter(type, "example")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -1157,18 +1104,14 @@ compilationUnit.addImportedType(type); method.addParameter(new Parameter(type, "key")); //$NON-NLS-1$ } else { - Iterator<ColumnDefinition> cdIter = introspectedTable.getPrimaryKeyColumns(); - while (cdIter.hasNext()) { - ColumnDefinition cd = cdIter.next(); + for (ColumnDefinition cd : introspectedTable.getPrimaryKeyColumns()) { FullyQualifiedJavaType type = cd.getResolvedJavaType().getFullyQualifiedJavaType(); compilationUnit.addImportedType(type); method.addParameter(new Parameter(type, cd.getJavaProperty())); } } - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -1192,9 +1135,7 @@ sb.append("();"); //$NON-NLS-1$ method.addBodyLine(sb.toString()); - Iterator<ColumnDefinition> cdIter = introspectedTable.getPrimaryKeyColumns(); - while (cdIter.hasNext()) { - ColumnDefinition cd = cdIter.next(); + for (ColumnDefinition cd : introspectedTable.getPrimaryKeyColumns()) { sb.setLength(0); sb.append("key."); //$NON-NLS-1$ sb.append(JavaBeansUtil.getSetterMethodName(cd.getJavaProperty())); @@ -1238,9 +1179,7 @@ method.setName(methodNameCalculator.getCountByExampleMethodName(introspectedTable)); method.addParameter(new Parameter(type, "example")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -1347,9 +1286,7 @@ method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$ method.addParameter(new Parameter(javaModelGenerator.getExampleType(table), "example")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -1386,7 +1323,7 @@ InnerClass answer = new InnerClass( new FullyQualifiedJavaType("UpdateByExampleParms")); //$NON-NLS-1$ answer.setVisibility(JavaVisibility.PRIVATE); - answer.setModifierStatic(true); + answer.setStatic(true); answer.setSuperClass(javaModelGenerator.getExampleType(table)); ibatorContext.getCommentGenerator().addClassComment(answer, table); @@ -1440,9 +1377,7 @@ method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$ method.addParameter(new Parameter(javaModelGenerator.getExampleType(table), "example")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); } @@ -1491,9 +1426,7 @@ method.addParameter(new Parameter(parameterType, "record")); //$NON-NLS-1$ method.addParameter(new Parameter(javaModelGenerator.getExampleType(table), "example")); //$NON-NLS-1$ - Iterator<FullyQualifiedJavaType> iter = daoTemplate.getCheckedExceptions().iterator(); - while (iter.hasNext()) { - FullyQualifiedJavaType fqjt = iter.next(); + for (FullyQualifiedJavaType fqjt : daoTemplate.getCheckedExceptions()) { method.addException(fqjt); compilationUnit.addImportedType(fqjt); }
Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java?rev=648483&r1=648482&r2=648483&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava2Impl.java Tue Apr 15 19:24:59 2008 @@ -145,7 +145,7 @@ * the generated fields and methods will be added to this object */ protected void generateClassParts(FullyQualifiedTable table, - Iterator<ColumnDefinition> columnDefinitions, TopLevelClass topLevelClass, + List<ColumnDefinition> columnDefinitions, TopLevelClass topLevelClass, String rootClass) { boolean trimStrings = "true".equalsIgnoreCase(properties //$NON-NLS-1$ @@ -156,9 +156,8 @@ Method method; CommentGenerator commentGenerator = ibatorContext.getCommentGenerator(); - - while (columnDefinitions.hasNext()) { - ColumnDefinition cd = columnDefinitions.next(); + + for (ColumnDefinition cd : columnDefinitions) { if (propertyExistsInRootClass(cd, rootClass)) { continue; } @@ -870,7 +869,7 @@ InnerClass answer = new InnerClass(FullyQualifiedJavaType.getCriteriaInstance()); answer.setVisibility(JavaVisibility.PUBLIC); - answer.setModifierStatic(true); + answer.setStatic(true); ibatorContext.getCommentGenerator().addClassComment(answer, introspectedTable.getTable()); method = new Method(); @@ -893,10 +892,7 @@ criteriaLists.add("criteriaWithListValue"); //$NON-NLS-1$ criteriaLists.add("criteriaWithBetweenValue"); //$NON-NLS-1$ - Iterator<ColumnDefinition> cdIter = introspectedTable.getNonBLOBColumns(); - while (cdIter.hasNext()) { - ColumnDefinition cd = cdIter.next(); - + for (ColumnDefinition cd : introspectedTable.getNonBLOBColumns()) { if (StringUtility.stringHasValue(cd.getTypeHandler())) { criteriaLists.addAll( addtypeHandledObjectsAndMethods(cd, method, answer)); @@ -908,8 +904,8 @@ method.setVisibility(JavaVisibility.PUBLIC); method.setName("isValid"); //$NON-NLS-1$ method.setReturnType(FullyQualifiedJavaType.getBooleanPrimitiveInstance()); - Iterator<String> strIter = criteriaLists.iterator(); StringBuffer sb = new StringBuffer(); + Iterator<String> strIter = criteriaLists.iterator(); sb.append("return "); //$NON-NLS-1$ sb.append(strIter.next()); sb.append(".size() > 0"); //$NON-NLS-1$ @@ -1218,10 +1214,7 @@ answer.addMethod(method); } - cdIter = introspectedTable.getNonBLOBColumns(); - while (cdIter.hasNext()) { - ColumnDefinition cd = cdIter.next(); - + for (ColumnDefinition cd : introspectedTable.getNonBLOBColumns()) { topLevelClass.addImportedType(cd.getResolvedJavaType() .getFullyQualifiedJavaType()); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava5Impl.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava5Impl.java?rev=648483&r1=648482&r2=648483&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava5Impl.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/java/model/JavaModelGeneratorJava5Impl.java Tue Apr 15 19:24:59 2008 @@ -188,7 +188,7 @@ InnerClass answer = new InnerClass(FullyQualifiedJavaType.getCriteriaInstance()); answer.setVisibility(JavaVisibility.PUBLIC); - answer.setModifierStatic(true); + answer.setStatic(true); ibatorContext.getCommentGenerator().addClassComment(answer, introspectedTable.getTable()); method = new Method(); @@ -211,10 +211,7 @@ criteriaLists.add("criteriaWithListValue"); //$NON-NLS-1$ criteriaLists.add("criteriaWithBetweenValue"); //$NON-NLS-1$ - Iterator<ColumnDefinition> cdIter = introspectedTable.getNonBLOBColumns(); - while (cdIter.hasNext()) { - ColumnDefinition cd = cdIter.next(); - + for (ColumnDefinition cd : introspectedTable.getNonBLOBColumns()) { if (StringUtility.stringHasValue(cd.getTypeHandler())) { criteriaLists.addAll( addtypeHandledObjectsAndMethods(cd, method, answer)); @@ -531,10 +528,7 @@ answer.addMethod(method); } - cdIter = introspectedTable.getNonBLOBColumns(); - while (cdIter.hasNext()) { - ColumnDefinition cd = cdIter.next(); - + for (ColumnDefinition cd : introspectedTable.getNonBLOBColumns()) { topLevelClass.addImportedType(cd.getResolvedJavaType() .getFullyQualifiedJavaType()); Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java?rev=648483&r1=648482&r2=648483&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/sqlmap/SqlMapGeneratorIterateImpl.java Tue Apr 15 19:24:59 2008 @@ -36,6 +36,7 @@ import org.apache.ibatis.ibator.api.dom.xml.XmlElement; import org.apache.ibatis.ibator.config.IbatorContext; import org.apache.ibatis.ibator.config.GeneratedKey; +import org.apache.ibatis.ibator.config.MergeConstants; import org.apache.ibatis.ibator.config.PropertyRegistry; import org.apache.ibatis.ibator.internal.db.ColumnDefinition; import org.apache.ibatis.ibator.internal.rules.IbatorRules; @@ -334,10 +335,7 @@ i++; } - Iterator<ColumnDefinition> iter = introspectedTable.getNonBLOBColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getNonBLOBColumns()) { XmlElement resultElement = new XmlElement("result"); //$NON-NLS-1$ if (useColumnIndex) { @@ -410,10 +408,8 @@ || StringUtility.stringHasValue(introspectedTable.getSelectByExampleQueryId())) { i++; } - Iterator<ColumnDefinition> iter = introspectedTable.getBLOBColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); + for (ColumnDefinition cd : introspectedTable.getBLOBColumns()) { XmlElement resultElement = new XmlElement("result"); //$NON-NLS-1$ if (useColumnIndex) { @@ -482,10 +478,7 @@ valuesClause.append("values ("); //$NON-NLS-1$ boolean comma = false; - Iterator<ColumnDefinition> iter = introspectedTable.getAllColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getAllColumns()) { if (cd.isIdentity()) { // cannot set values on identity fields continue; @@ -558,7 +551,7 @@ sb.setLength(0); sb.append("set "); //$NON-NLS-1$ - Iterator<ColumnDefinition> iter = introspectedTable.getNonPrimaryKeyColumns(); + Iterator<ColumnDefinition> iter = introspectedTable.getNonPrimaryKeyColumns().iterator(); while (iter.hasNext()) { ColumnDefinition cd = iter.next(); @@ -580,10 +573,7 @@ } boolean and = false; - iter = introspectedTable.getPrimaryKeyColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getPrimaryKeyColumns()) { sb.setLength(0); if (and) { sb.append(" and "); //$NON-NLS-1$ @@ -629,7 +619,7 @@ sb.setLength(0); sb.append("set "); //$NON-NLS-1$ - Iterator<ColumnDefinition> iter = introspectedTable.getBaseColumns(); + Iterator<ColumnDefinition> iter = introspectedTable.getBaseColumns().iterator(); while (iter.hasNext()) { ColumnDefinition cd = iter.next(); @@ -651,10 +641,7 @@ } boolean and = false; - iter = introspectedTable.getPrimaryKeyColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getPrimaryKeyColumns()) { sb.setLength(0); if (and) { sb.append(" and "); //$NON-NLS-1$ @@ -703,10 +690,7 @@ answer.addElement(new TextElement(sb.toString())); boolean and = false; - Iterator<ColumnDefinition> iter = introspectedTable.getPrimaryKeyColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getPrimaryKeyColumns()) { sb.setLength(0); if (and) { sb.append(" and "); //$NON-NLS-1$ @@ -854,9 +838,7 @@ comma = true; } - Iterator<ColumnDefinition> iter = introspectedTable.getAllColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); + for (ColumnDefinition cd : introspectedTable.getAllColumns()) { if (comma) { sb.append(", "); //$NON-NLS-1$ } else { @@ -874,10 +856,7 @@ answer.addElement(new TextElement(sb.toString())); boolean and = false; - iter = introspectedTable.getPrimaryKeyColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getPrimaryKeyColumns()) { sb.setLength(0); if (and) { sb.append(" and "); //$NON-NLS-1$ @@ -943,8 +922,8 @@ /** * Calculates the name of the result map. Typically this is the String - * "ibatorgenerated_XXXXResult" where XXXX is the name of the domain object - * related to this table. The prefix "ibatorgenerated_" is important because + * "prefix_XXXXResult" where XXXX is the name of the domain object + * related to this table. The prefix is important because * it allows iBATOR to regenerate this element on subsequent runs. * * @param table @@ -960,7 +939,7 @@ if (s == null) { StringBuffer sb = new StringBuffer(); - sb.append("ibatorgenerated_"); //$NON-NLS-1$ + sb.append(MergeConstants.NEW_XML_ELEMENT_PREFIX); sb.append(table.getDomainObjectName()); sb.append("Result"); //$NON-NLS-1$ @@ -1005,7 +984,10 @@ * @see org.apache.ibatis.ibator.api.SqlMapGenerator#getDeleteByPrimaryKeyStatementId() */ public String getDeleteByPrimaryKeyStatementId() { - return "ibatorgenerated_deleteByPrimaryKey"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("deleteByPrimaryKey"); //$NON-NLS-1$ + + return sb.toString(); } /* @@ -1014,7 +996,10 @@ * @see org.apache.ibatis.ibator.api.SqlMapGenerator#getDeleteByExampleStatementId() */ public String getDeleteByExampleStatementId() { - return "ibatorgenerated_deleteByExample"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("deleteByExample"); //$NON-NLS-1$ + + return sb.toString(); } /* @@ -1022,7 +1007,10 @@ * @see org.apache.ibatis.ibator.api.SqlMapGenerator#getCountByExampleStatementId() */ public String getCountByExampleStatementId() { - return "ibatorgenerated_countByExample"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("countByExample"); //$NON-NLS-1$ + + return sb.toString(); } /* @@ -1031,7 +1019,10 @@ * @see org.apache.ibatis.ibator.api.SqlMapGenerator#getInsertStatementId() */ public String getInsertStatementId() { - return "ibatorgenerated_insert"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("insert"); //$NON-NLS-1$ + + return sb.toString(); } /* @@ -1040,7 +1031,10 @@ * @see org.apache.ibatis.ibator.api.SqlMapGenerator#getSelectByPrimaryKeyStatementId() */ public String getSelectByPrimaryKeyStatementId() { - return "ibatorgenerated_selectByPrimaryKey"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("selectByPrimaryKey"); //$NON-NLS-1$ + + return sb.toString(); } /* @@ -1049,7 +1043,10 @@ * @see org.apache.ibatis.ibator.api.SqlMapGenerator#getSelectByExampleStatementId() */ public String getSelectByExampleStatementId() { - return "ibatorgenerated_selectByExample"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("selectByExample"); //$NON-NLS-1$ + + return sb.toString(); } /* @@ -1058,7 +1055,10 @@ * @see org.apache.ibatis.ibator.api.SqlMapGenerator#getSelectByExampleWithBLOBsStatementId() */ public String getSelectByExampleWithBLOBsStatementId() { - return "ibatorgenerated_selectByExampleWithBLOBs"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("selectByExampleWithBLOBs"); //$NON-NLS-1$ + + return sb.toString(); } /* @@ -1067,7 +1067,10 @@ * @see org.apache.ibatis.ibator.api.SqlMapGenerator#getUpdateByPrimaryKeyWithBLOBsStatementId() */ public String getUpdateByPrimaryKeyWithBLOBsStatementId() { - return "ibatorgenerated_updateByPrimaryKeyWithBLOBs"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("updateByPrimaryKeyWithBLOBs"); //$NON-NLS-1$ + + return sb.toString(); } /* @@ -1076,15 +1079,24 @@ * @see org.apache.ibatis.ibator.api.SqlMapGenerator#getUpdateByPrimaryKeyStatementId() */ public String getUpdateByPrimaryKeyStatementId() { - return "ibatorgenerated_updateByPrimaryKey"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("updateByPrimaryKey"); //$NON-NLS-1$ + + return sb.toString(); } public String getUpdateByPrimaryKeySelectiveStatementId() { - return "ibatorgenerated_updateByPrimaryKeySelective"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("updateByPrimaryKeySelective"); //$NON-NLS-1$ + + return sb.toString(); } public String getUpdateByExampleSelectiveStatementId() { - return "ibatorgenerated_updateByExampleSelective"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("updateByExampleSelective"); //$NON-NLS-1$ + + return sb.toString(); } /** @@ -1119,7 +1131,10 @@ * @return the name of the example where clause element */ protected String getExampleWhereClauseId() { - return "ibatorgenerated_Example_Where_Clause"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("Example_Where_Clause"); //$NON-NLS-1$ + + return sb.toString(); } /** @@ -1206,10 +1221,7 @@ // if any of the columns have a user defined type handler, then we need // to add additional inner iterate elements that specify the type handler - Iterator<ColumnDefinition> iter = introspectedTable.getNonBLOBColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getNonBLOBColumns()) { if (StringUtility.stringHasValue(cd.getTypeHandler())) { // name the property based on the column name, then // add the type handler to the parameter declaration @@ -1359,10 +1371,7 @@ comma = true; } - Iterator<ColumnDefinition> iter = introspectedTable.getNonBLOBColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getNonBLOBColumns()) { if (comma) { sb.append(", "); //$NON-NLS-1$ } else { @@ -1431,10 +1440,7 @@ comma = true; } - Iterator<ColumnDefinition> iter = introspectedTable.getAllColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getAllColumns()) { if (comma) { sb.append(", "); //$NON-NLS-1$ } else { @@ -1526,10 +1532,7 @@ dynamicElement.addAttribute(new Attribute("prepend", "set")); //$NON-NLS-1$ //$NON-NLS-2$ answer.addElement(dynamicElement); - Iterator<ColumnDefinition> iter = introspectedTable.getNonPrimaryKeyColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getNonPrimaryKeyColumns()) { XmlElement isNotNullElement = new XmlElement("isNotNull"); //$NON-NLS-1$ isNotNullElement.addAttribute(new Attribute("prepend", ",")); //$NON-NLS-1$ //$NON-NLS-2$ isNotNullElement.addAttribute(new Attribute("property", cd.getJavaProperty())); //$NON-NLS-1$ @@ -1544,10 +1547,7 @@ } boolean and = false; - iter = introspectedTable.getPrimaryKeyColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getPrimaryKeyColumns()) { sb.setLength(0); if (and) { sb.append(" and "); //$NON-NLS-1$ @@ -1597,10 +1597,7 @@ dynamicElement.addAttribute(new Attribute("prepend", "set")); //$NON-NLS-1$ //$NON-NLS-2$ answer.addElement(dynamicElement); - Iterator<ColumnDefinition> iter = introspectedTable.getAllColumns(); - while (iter.hasNext()) { - ColumnDefinition cd = iter.next(); - + for (ColumnDefinition cd : introspectedTable.getAllColumns()) { XmlElement isNotNullElement = new XmlElement("isNotNull"); //$NON-NLS-1$ isNotNullElement.addAttribute(new Attribute("prepend", ",")); //$NON-NLS-1$ //$NON-NLS-2$ isNotNullElement.addAttribute(new Attribute("property", cd.getJavaProperty("record."))); //$NON-NLS-1$ //$NON-NLS-2$ @@ -1644,7 +1641,7 @@ sb.setLength(0); sb.append("set "); //$NON-NLS-1$ - Iterator<ColumnDefinition> iter = introspectedTable.getAllColumns(); + Iterator<ColumnDefinition> iter = introspectedTable.getAllColumns().iterator(); while (iter.hasNext()) { ColumnDefinition cd = iter.next(); @@ -1695,7 +1692,7 @@ sb.setLength(0); sb.append("set "); //$NON-NLS-1$ - Iterator<ColumnDefinition> iter = introspectedTable.getNonBLOBColumns(); + Iterator<ColumnDefinition> iter = introspectedTable.getNonBLOBColumns().iterator(); while (iter.hasNext()) { ColumnDefinition cd = iter.next(); @@ -1729,10 +1726,16 @@ } public String getUpdateByExampleStatementId() { - return "ibatorgenerated_updateByExample"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("updateByExample"); //$NON-NLS-1$ + + return sb.toString(); } public String getUpdateByExampleWithBLOBsStatementId() { - return "ibatorgenerated_updateByExampleWithBLOBs"; //$NON-NLS-1$ + StringBuffer sb = new StringBuffer(MergeConstants.NEW_XML_ELEMENT_PREFIX); + sb.append("updateByExampleWithBLOBs"); //$NON-NLS-1$ + + return sb.toString(); } } Modified: ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java URL: http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java?rev=648483&r1=648482&r2=648483&view=diff ============================================================================== --- ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java (original) +++ ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/util/ClassloaderUtility.java Tue Apr 15 19:24:59 2008 @@ -21,7 +21,6 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.apache.ibatis.ibator.internal.util.messages.Messages; @@ -46,9 +45,7 @@ File file; if (entries != null) { - Iterator<String> iter = entries.iterator(); - while (iter.hasNext()) { - String classPathEntry = iter.next(); + for (String classPathEntry : entries) { file = new File(classPathEntry); if (!file.exists()) { throw new RuntimeException(
