You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by km...@apache.org on 2008/01/21 05:20:46 UTC
svn commit: r613753 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/ main/java/org/apache/cayenne/access/
main/java/org/apache/cayenne/access/jdbc/
main/java/org/apache/cayenne/access/trans/ main/java/org...
Author: kmenard
Date: Sun Jan 20 20:20:44 2008
New Revision: 613753
URL: http://svn.apache.org/viewvc?rev=613753&view=rev
Log:
Replaced traditional for loops with foreach loops where it enhanced clarity.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptor.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/enhancer/PojoVisitor.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ImportUtils.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectPath.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/NamedQuery.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnEntity.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnListener.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMapLoaderAction.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Base64Codec.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EventUtil.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectUpgradeTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/CayenneContextQueryAction.java Sun Jan 20 20:20:44 2008
@@ -124,8 +124,8 @@
&& refreshQuery.getGroupKeys().length > 0) {
String[] groups = refreshQuery.getGroupKeys();
- for (int i = 0; i < groups.length; i++) {
- context.getQueryCache().removeGroup(groups[i]);
+ for (String group : groups) {
+ context.getQueryCache().removeGroup(group);
}
// cascade group invalidation
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ObjectId.java Sun Jan 20 20:20:44 2008
@@ -363,8 +363,8 @@
if (isTemporary()) {
buffer.append(", TEMP:");
- for (int i = 0; i < key.length; i++) {
- IDUtil.appendFormattedByte(buffer, key[i]);
+ for (byte aKey : key) {
+ IDUtil.appendFormattedByte(buffer, aKey);
}
}
else if (singleKey != null) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContextQueryAction.java Sun Jan 20 20:20:44 2008
@@ -156,8 +156,8 @@
String[] groups = refreshQuery.getGroupKeys();
if (groups != null && groups.length > 0) {
- for (int i = 0; i < groups.length; i++) {
- context.getQueryCache().removeGroup(groups[i]);
+ for (String group : groups) {
+ context.getQueryCache().removeGroup(group);
}
// cascade group invalidation
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java Sun Jan 20 20:20:44 2008
@@ -325,8 +325,8 @@
&& refreshQuery.getGroupKeys().length > 0) {
String[] groups = refreshQuery.getGroupKeys();
- for (int i = 0; i < groups.length; i++) {
- domain.getQueryCache().removeGroup(groups[i]);
+ for (String group : groups) {
+ domain.getQueryCache().removeGroup(group);
}
GenericResponse response = new GenericResponse();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java Sun Jan 20 20:20:44 2008
@@ -256,8 +256,8 @@
+ tableNamePattern);
if (types != null && types.length > 0) {
- for (int i = 0; i < types.length; i++) {
- logObj.debug("Read tables: table type=" + types[i]);
+ for (String type : types) {
+ logObj.debug("Read tables: table type=" + type);
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorJointNode.java Sun Jan 20 20:20:44 2008
@@ -98,9 +98,9 @@
// this is reasonable to expect...
Map id = new TreeMap();
- for (int i = 0; i < idIndices.length; i++) {
- Object value = flatRow.get(columns[idIndices[i]].getLabel());
- id.put(columns[idIndices[i]].getName(), value);
+ for (int idIndex : idIndices) {
+ Object value = flatRow.get(columns[idIndex].getLabel());
+ id.put(columns[idIndex].getName(), value);
}
return id;
@@ -129,8 +129,8 @@
DataRow row = new DataRow(rowCapacity);
// extract subset of flat row columns, recasting to the target keys
- for (int i = 0; i < columns.length; i++) {
- row.put(columns[i].getName(), flatRow.get(columns[i].getLabel()));
+ for (ColumnDescriptor column : columns) {
+ row.put(column.getName(), flatRow.get(column.getLabel()));
}
return row;
@@ -279,9 +279,9 @@
*/
private String sourceForTarget(String targetColumn) {
if (targetColumn != null && columns != null) {
- for (int i = 0; i < columns.length; i++) {
- if (targetColumn.equals(columns[i].getName())) {
- return columns[i].getLabel();
+ for (ColumnDescriptor column : columns) {
+ if (targetColumn.equals(column.getName())) {
+ return column.getLabel();
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/QueryResult.java Sun Jan 20 20:20:44 2008
@@ -190,8 +190,8 @@
}
else if (object instanceof int[]) {
int[] ints = (int[]) object;
- for (int i = 0; i < ints.length; i++) {
- list.add(Integer.valueOf(ints[i]));
+ for (int anInt : ints) {
+ list.add(Integer.valueOf(anInt));
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java Sun Jan 20 20:20:44 2008
@@ -136,15 +136,15 @@
if (isLoggable) {
int totalUpdateCount = 0;
- for (int i = 0; i < results.length; i++) {
+ for (int result : results) {
// this means Statement.SUCCESS_NO_INFO or Statement.EXECUTE_FAILED
- if (results[i] < 0) {
+ if (result < 0) {
totalUpdateCount = Statement.SUCCESS_NO_INFO;
break;
}
- totalUpdateCount += results[i];
+ totalUpdateCount += result;
}
QueryLogger.logUpdateCount(totalUpdateCount);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptor.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptor.java Sun Jan 20 20:20:44 2008
@@ -84,8 +84,8 @@
* @since 3.0
*/
public void forceUpperCaseColumnNames() {
- for(int i = 0; i < columns.length; i++) {
- columns[i].setLabel(columns[i].getLabel().toUpperCase());
+ for (ColumnDescriptor column : columns) {
+ column.setLabel(column.getLabel().toUpperCase());
}
}
@@ -95,8 +95,8 @@
* @since 3.0
*/
public void forceLowerCaseColumnNames() {
- for(int i = 0; i < columns.length; i++) {
- columns[i].setLabel(columns[i].getLabel().toLowerCase());
+ for (ColumnDescriptor column : columns) {
+ column.setLabel(column.getLabel().toLowerCase());
}
}
@@ -138,11 +138,11 @@
*/
protected void overrideJavaTypes(Map overrides) {
- for (int i = 0; i < columns.length; i++) {
- String type = (String) overrides.get(columns[i].getName());
+ for (ColumnDescriptor column : columns) {
+ String type = (String) overrides.get(column.getName());
if (type != null) {
- columns[i].setJavaClass(type);
+ column.setJavaClass(type);
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/trans/SelectTranslator.java Sun Jan 20 20:20:44 2008
@@ -576,8 +576,7 @@
else if (objAttribute != null) {
// record ObjAttribute override
- for (int i = 0; i < columns.size(); i++) {
- ColumnDescriptor column = columns.get(i);
+ for (ColumnDescriptor column : columns) {
if (attribute.getName().equals(column.getName())) {
// kick out the original attribute
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java Sun Jan 20 20:20:44 2008
@@ -95,12 +95,9 @@
public static void main(String[] args)
{
Rot13PasswordEncoder encoder = new Rot13PasswordEncoder();
-
- for (int i = 0; i < args.length; i++)
- {
- String string = args[i];
- System.out.println(encoder.rotate(string));
- }
+ for (String string : args) {
+ System.out.println(encoder.rotate(string));
+ }
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java Sun Jan 20 20:20:44 2008
@@ -104,12 +104,9 @@
public static void main(String[] args)
{
Rot47PasswordEncoder encoder = new Rot47PasswordEncoder();
-
- for (int i = 0; i < args.length; i++)
- {
- String string = args[i];
- System.out.println(encoder.rotate(string));
- }
+ for (String string : args) {
+ System.out.println(encoder.rotate(string));
+ }
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java Sun Jan 20 20:20:44 2008
@@ -218,8 +218,8 @@
// "bytea" type does not support length
String[] externalTypes = externalTypesForJdbcType(type);
if (externalTypes != null && externalTypes.length > 0) {
- for (int i = 0; i < externalTypes.length; i++) {
- if ("bytea".equalsIgnoreCase(externalTypes[i])) {
+ for (String externalType : externalTypes) {
+ if ("bytea".equalsIgnoreCase(externalType)) {
return false;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ejbql/parser/SimpleNode.java Sun Jan 20 20:20:44 2008
@@ -153,8 +153,7 @@
+ getName()
+ (text && this.text != null ? " [" + this.text + "]" : ""));
if (children != null) {
- for (int i = 0; i < children.length; ++i) {
- SimpleNode n = children[i];
+ for (SimpleNode n : children) {
if (n != null) {
n.dump(out, prefix + " ", text);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/enhancer/PojoVisitor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/enhancer/PojoVisitor.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/enhancer/PojoVisitor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/enhancer/PojoVisitor.java Sun Jan 20 20:20:44 2008
@@ -57,8 +57,8 @@
String superName,
String[] interfaces) {
- for (int i = 0; i < interfaces.length; i++) {
- if (ENHANCED_INTERFACE_SIG.equals(interfaces[i])) {
+ for (String anInterface : interfaces) {
+ if (ENHANCED_INTERFACE_SIG.equals(anInterface)) {
throw new DoubleEnhanceException(name
+ " already implements "
+ ENHANCED_INTERFACE_SIG);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/parser/SimpleNode.java Sun Jan 20 20:20:44 2008
@@ -138,10 +138,10 @@
boolean shouldFlatten = false;
int newSize = 0;
- for (int i = 0; i < children.length; i++) {
- if (children[i].getClass() == getClass()) {
+ for (Node child : children) {
+ if (child.getClass() == getClass()) {
shouldFlatten = true;
- newSize += children[i].jjtGetNumChildren();
+ newSize += child.jjtGetNumChildren();
}
else {
newSize++;
@@ -152,11 +152,11 @@
Node[] newChildren = new Node[newSize];
int j = 0;
- for (int i = 0; i < children.length; ++i) {
- Node c = children[i];
+ for (Node c : children) {
if (c.getClass() == getClass()) {
- for (int k = 0; k < c.jjtGetNumChildren(); ++k)
+ for (int k = 0; k < c.jjtGetNumChildren(); ++k) {
newChildren[j++] = c.jjtGetChild(k);
+ }
}
else {
newChildren[j++] = c;
@@ -286,11 +286,11 @@
*/
protected void connectChildren() {
if (children != null) {
- for (int i = 0; i < children.length; i++) {
+ for (Node child : children) {
// although nulls are expected to be wrapped in scalar, still doing a
// check here to make it more robust
- if (children[i] != null) {
- children[i].jjtSetParent(this);
+ if (child != null) {
+ child.jjtSetParent(this);
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ImportUtils.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ImportUtils.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ImportUtils.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/gen/ImportUtils.java Sun Jan 20 20:20:44 2008
@@ -224,13 +224,13 @@
public int compare(String s1, String s2) {
- for (int index = 0; index < importOrdering.length; index++) {
- String ordering = importOrdering[index];
-
- if ((s1.startsWith(ordering)) && (!s2.startsWith(ordering)))
+ for (String ordering : importOrdering) {
+ if ((s1.startsWith(ordering)) && (!s2.startsWith(ordering))) {
return -1;
- if ((!s1.startsWith(ordering)) && (s2.startsWith(ordering)))
+ }
+ if ((!s1.startsWith(ordering)) && (s2.startsWith(ordering))) {
return 1;
+ }
}
return s1.compareTo(s2);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/EntityResolver.java Sun Jan 20 20:20:44 2008
@@ -212,12 +212,12 @@
CallbackDescriptor[] callbacks = listener
.getCallbackMap()
.getCallbacks();
- for (int i = 0; i < callbacks.length; i++) {
+ for (CallbackDescriptor callback : callbacks) {
- for (String method : callbacks[i].getCallbackMethods()) {
+ for (String method : callback.getCallbackMethods()) {
// note that callbacks[i].getCallbackType() == i
- callbackRegistry.addDefaultListener(callbacks[i]
+ callbackRegistry.addDefaultListener(callback
.getCallbackType(), listenerInstance, method);
}
}
@@ -238,11 +238,11 @@
CallbackDescriptor[] callbacks = listener
.getCallbackMap()
.getCallbacks();
- for (int i = 0; i < callbacks.length; i++) {
+ for (CallbackDescriptor callback : callbacks) {
- for (String method : callbacks[i].getCallbackMethods()) {
+ for (String method : callback.getCallbackMethods()) {
callbackRegistry.addListener(
- callbacks[i].getCallbackType(),
+ callback.getCallbackType(),
entityClass,
listenerInstance,
method);
@@ -251,10 +251,10 @@
}
CallbackDescriptor[] callbacks = entity.getCallbackMap().getCallbacks();
- for (int i = 0; i < callbacks.length; i++) {
- for (String method : callbacks[i].getCallbackMethods()) {
+ for (CallbackDescriptor callback : callbacks) {
+ for (String method : callback.getCallbackMethods()) {
callbackRegistry.addListener(
- callbacks[i].getCallbackType(),
+ callback.getCallbackType(),
entityClass,
method);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectPath.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectPath.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectPath.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectPath.java Sun Jan 20 20:20:44 2008
@@ -69,9 +69,9 @@
* Scans path, looking for the first element that is an instanceof <code>aClass</code>.
*/
public <T> T firstInstanceOf(Class<T> aClass) {
- for (int i = 0; i < path.length; i++) {
- if (path[i] != null && aClass.isAssignableFrom(path[i].getClass())) {
- return (T) path[i];
+ for (Object aPath : path) {
+ if (aPath != null && aClass.isAssignableFrom(aPath.getClass())) {
+ return (T) aPath;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/NamedQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/NamedQuery.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/NamedQuery.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/NamedQuery.java Sun Jan 20 20:20:44 2008
@@ -273,10 +273,10 @@
Object[] keys = parameters.keySet().toArray();
Arrays.sort(keys);
- for (int i = 0; i < keys.length; i++) {
+ for (Object key : keys) {
// HashCodeBuilder will take care of processing object if it
// happens to be a primitive array such as byte[]
- builder.append(keys[i]).append(parameters.get(keys[i]));
+ builder.append(key).append(parameters.get(key));
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/SQLTemplate.java Sun Jan 20 20:20:44 2008
@@ -334,9 +334,9 @@
StringBuilder buffer = new StringBuilder(name);
if (parameters != null) {
- for (int i = 0; i < parameters.length; i++) {
- if (!parameters[i].isEmpty()) {
- buffer.append(parameters[i].hashCode());
+ for (Map<String, ?> parameter : parameters) {
+ if (!parameter.isEmpty()) {
+ buffer.append(parameter.hashCode());
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnEntity.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnEntity.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnEntity.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnEntity.java Sun Jan 20 20:20:44 2008
@@ -63,21 +63,21 @@
private Method findMethod(Class<?> objectClass, String methodName)
throws IllegalArgumentException {
Method[] methods = objectClass.getDeclaredMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methodName.equals(methods[i].getName())) {
+ for (Method method : methods) {
+ if (methodName.equals(method.getName())) {
// must be non-static, void, with no args
// JPA spec also requires it to be non-final, but we don't care
- int modifiers = methods[i].getModifiers();
+ int modifiers = method.getModifiers();
if (!Modifier.isStatic(modifiers)
- && Void.TYPE.isAssignableFrom(methods[i].getReturnType())
- && methods[i].getParameterTypes().length == 0) {
+ && Void.TYPE.isAssignableFrom(method.getReturnType())
+ && method.getParameterTypes().length == 0) {
- if (!Util.isAccessible(methods[i])) {
- methods[i].setAccessible(true);
+ if (!Util.isAccessible(method)) {
+ method.setAccessible(true);
}
- return methods[i];
+ return method;
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnListener.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnListener.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnListener.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/CallbackOnListener.java Sun Jan 20 20:20:44 2008
@@ -78,23 +78,23 @@
throws IllegalArgumentException {
Method[] methods = objectClass.getDeclaredMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methodName.equals(methods[i].getName())) {
+ for (Method method : methods) {
+ if (methodName.equals(method.getName())) {
// must be non-static, void, with a single arg assignable to entity type
// JPA spec also requires it to be non-final, but we don't care
- int modifiers = methods[i].getModifiers();
- Class<?>[] parameters = methods[i].getParameterTypes();
+ int modifiers = method.getModifiers();
+ Class<?>[] parameters = method.getParameterTypes();
if (!Modifier.isStatic(modifiers)
- && Void.TYPE.isAssignableFrom(methods[i].getReturnType())
+ && Void.TYPE.isAssignableFrom(method.getReturnType())
&& parameters.length == 1
&& parameters[0].isAssignableFrom(entityType)) {
- if (!Util.isAccessible(methods[i])) {
- methods[i].setAccessible(true);
+ if (!Util.isAccessible(method)) {
+ method.setAccessible(true);
}
- return methods[i];
+ return method;
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry.java Sun Jan 20 20:20:44 2008
@@ -50,8 +50,8 @@
* Removes all listeners for all event types.
*/
public void clear() {
- for (int i = 0; i < eventCallbacks.length; i++) {
- eventCallbacks[i].clear();
+ for (LifecycleCallbackEventHandler eventCallback : eventCallbacks) {
+ eventCallback.clear();
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java Sun Jan 20 20:20:44 2008
@@ -255,9 +255,9 @@
BeanInfo info = Introspector.getBeanInfo(beanClass);
PropertyDescriptor[] descriptors = info.getPropertyDescriptors();
- for (int i = 0; i < descriptors.length; i++) {
- if (propertyName.equals(descriptors[i].getName())) {
- return descriptors[i];
+ for (PropertyDescriptor descriptor : descriptors) {
+ if (propertyName.equals(descriptor.getName())) {
+ return descriptor;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/RemoteIncrementalFaultList.java Sun Jan 20 20:20:44 2008
@@ -161,8 +161,8 @@
byte[] bytes = IDUtil.pseudoUniqueByteSequence8();
StringBuffer buffer = new StringBuffer(17);
buffer.append("I");
- for (int i = 0; i < bytes.length; i++) {
- IDUtil.appendFormattedByte(buffer, bytes[i]);
+ for (byte aByte : bytes) {
+ IDUtil.appendFormattedByte(buffer, aByte);
}
return buffer.toString();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/hessian/HessianConfig.java Sun Jan 20 20:20:44 2008
@@ -57,14 +57,14 @@
if (factoryNames != null && factoryNames.length > 0) {
- for (int i = 0; i < factoryNames.length; i++) {
+ for (String factoryName : factoryNames) {
try {
- factory.addFactory(loadFactory(factoryNames[i], resolver));
+ factory.addFactory(loadFactory(factoryName, resolver));
}
catch (Exception e) {
throw new CayenneRuntimeException("Error configuring factory class "
- + factoryNames[i], e);
+ + factoryName, e);
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMapLoaderAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMapLoaderAction.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMapLoaderAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMapLoaderAction.java Sun Jan 20 20:20:44 2008
@@ -50,9 +50,9 @@
entityResolver.addDataMap(mainDataMap);
mainDataMap.setNamespace(entityResolver);
- for (int i = 0; i < additionalDataMapFiles.length; i++) {
+ for (File additionalDataMapFile : additionalDataMapFiles) {
- DataMap dataMap = loadDataMap(mapLoader, additionalDataMapFiles[i]);
+ DataMap dataMap = loadDataMap(mapLoader, additionalDataMapFile);
entityResolver.addDataMap(dataMap);
dataMap.setNamespace(entityResolver);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java Sun Jan 20 20:20:44 2008
@@ -213,8 +213,8 @@
return true;
}
- for (int i = 0; i < itemExcludeFilters.length; i++) {
- if (itemExcludeFilters[i].matcher(item).find()) {
+ for (Pattern itemExcludeFilter : itemExcludeFilters) {
+ if (itemExcludeFilter.matcher(item).find()) {
return false;
}
}
@@ -234,8 +234,8 @@
}
String itemName = item.getName();
- for (int i = 0; i < itemIncludeFilters.length; i++) {
- if (itemIncludeFilters[i].matcher(itemName).find()) {
+ for (Pattern itemIncludeFilter : itemIncludeFilters) {
+ if (itemIncludeFilter.matcher(itemName).find()) {
return true;
}
}
@@ -255,8 +255,8 @@
}
String itemName = item.getName();
- for (int i = 0; i < itemExcludeFilters.length; i++) {
- if (itemExcludeFilters[i].matcher(itemName).find()) {
+ for (Pattern itemExcludeFilter : itemExcludeFilters) {
+ if (itemExcludeFilter.matcher(itemName).find()) {
return false;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Base64Codec.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Base64Codec.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Base64Codec.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Base64Codec.java Sun Jan 20 20:20:44 2008
@@ -396,15 +396,15 @@
byte groomedData[] = new byte[data.length];
int bytesCopied = 0;
- for (int i = 0; i < data.length; i++) {
- switch (data[i]) {
+ for (byte datum : data) {
+ switch (datum) {
case (byte) ' ':
case (byte) '\n':
case (byte) '\r':
case (byte) '\t':
break;
default:
- groomedData[bytesCopied++] = data[i];
+ groomedData[bytesCopied++] = datum;
}
}
@@ -427,9 +427,9 @@
byte groomedData[] = new byte[data.length];
int bytesCopied = 0;
- for (int i = 0; i < data.length; i++) {
- if (isBase64(data[i])) {
- groomedData[bytesCopied++] = data[i];
+ for (byte datum : data) {
+ if (isBase64(datum)) {
+ groomedData[bytesCopied++] = datum;
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EventUtil.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EventUtil.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EventUtil.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/EventUtil.java Sun Jan 20 20:20:44 2008
@@ -83,12 +83,12 @@
Object sender,
EventSubject[] subjects) {
- for (int i = 0; i < subjects.length; i++) {
+ for (EventSubject subject : subjects) {
// assume that subject name and listener method name match
- String fqSubject = subjects[i].getSubjectName();
+ String fqSubject = subject.getSubjectName();
String method = fqSubject.substring(fqSubject.lastIndexOf('/') + 1);
- manager.addListener(listener, method, GraphEvent.class, subjects[i], sender);
+ manager.addListener(listener, method, GraphEvent.class, subject, sender);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/Util.java Sun Jan 20 20:20:44 2008
@@ -200,13 +200,14 @@
if (!recursive || !file.isDirectory())
return file.delete();
- String[] list = file.list();
+ String[] contents = file.list();
// list can be null if directory doesn't have an 'x' permission bit set for the user
- if (list != null) {
- for (int i = 0; i < list.length; i++) {
- if (!delete(filePath + File.separator + list[i], true))
+ if (contents != null) {
+ for (String item : contents) {
+ if (!delete(filePath + File.separator + item, true)) {
return false;
+ }
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/util/ZipUtil.java Sun Jan 20 20:20:44 2008
@@ -133,16 +133,17 @@
try {
// something like an Ant directory scanner wouldn't hurt here
- for (int i = 0; i < sources.length; i++) {
- if (!sources[i].exists()) {
+ for (File source : sources) {
+ if (!source.exists()) {
throw new IllegalArgumentException(
- "File or directory does not exist: " + sources[i]);
+ "File or directory does not exist: " + source);
}
- if (sources[i].isDirectory()) {
- zipDirectory(out, stripPath, sources[i], pathSeparator);
- } else {
- zipFile(out, stripPath, sources[i], pathSeparator);
+ if (source.isDirectory()) {
+ zipDirectory(out, stripPath, source, pathSeparator);
+ }
+ else {
+ zipFile(out, stripPath, source, pathSeparator);
}
}
} finally {
@@ -168,11 +169,12 @@
}
// recurse via entries
- for (int i = 0; i < entries.length; i++) {
- File file = new File(dir, entries[i]);
+ for (String entry : entries) {
+ File file = new File(dir, entry);
if (file.isDirectory()) {
zipDirectory(out, stripPath, file, pathSeparator);
- } else {
+ }
+ else {
zipFile(out, stripPath, file, pathSeparator);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectUpgradeTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectUpgradeTest.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectUpgradeTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/ApplicationProjectUpgradeTest.java Sun Jan 20 20:20:44 2008
@@ -52,8 +52,8 @@
URL upgradeSrcUrl = CayenneResources.getResourceURL("upgrade/1.1");
File upgradeSrcDir = new File(new URI(upgradeSrcUrl.toExternalForm()));
File[] files = upgradeSrcDir.listFiles();
- for (int i = 0; i < files.length; i++) {
- Util.copy(files[i], new File(upgradeScratchDir, files[i].getName()));
+ for (File file : files) {
+ Util.copy(file, new File(upgradeScratchDir, file.getName()));
}
File cayenneXml = new File(upgradeScratchDir, "cayenne.xml");
@@ -97,8 +97,8 @@
URL upgradeSrcUrl = CayenneResources.getResourceURL("upgrade/1.2");
File upgradeSrcDir = new File(new URI(upgradeSrcUrl.toExternalForm()));
File[] files = upgradeSrcDir.listFiles();
- for (int i = 0; i < files.length; i++) {
- Util.copy(files[i], new File(upgradeScratchDir, files[i].getName()));
+ for (File file : files) {
+ Util.copy(file, new File(upgradeScratchDir, file.getName()));
}
File cayenneXml = new File(upgradeScratchDir, "cayenne.xml");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SimpleAccessStack.java Sun Jan 20 20:20:44 2008
@@ -47,8 +47,8 @@
this.resources = resources;
this.domain = new UnitTestDomain("domain");
domain.setEventManager(new EventManager(2));
- for (int i = 0; i < maps.length; i++) {
- initNode(maps[i]);
+ for (DataMap map : maps) {
+ initNode(map);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java?rev=613753&r1=613752&r2=613753&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/SybaseStackAdapter.java Sun Jan 20 20:20:44 2008
@@ -119,11 +119,11 @@
select.close();
}
- for (int i = 0; i < names.size(); i++) {
+ for (Object name : names) {
executeDDL(con, "alter table "
+ tableName
+ " drop constraint "
- + names.get(i));
+ + name);
}
}