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/30 22:11:04 UTC
svn commit: r616906 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne:
access/trans/ access/types/ map/ tools/
Author: kmenard
Date: Wed Jan 30 13:11:03 2008
New Revision: 616906
URL: http://svn.apache.org/viewvc?rev=616906&view=rev
Log:
Tighten up code using enhanced for loop.
Modified:
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/access/types/ByteOrCharArrayFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/NamePatternMatcher.java
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=616906&r1=616905&r2=616906&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 Wed Jan 30 13:11:03 2008
@@ -147,9 +147,8 @@
// uses the DISTINCT modifier
if (forcingDistinct || getSelectQuery().isDistinct()) {
List<String> orderByColumnList = orderingTranslator.getOrderByColumnList();
- for (int i = 0; i < orderByColumnList.size(); i++) {
+ for (String orderByColumnExp : orderByColumnList) {
// Convert to ColumnDescriptors??
- String orderByColumnExp = orderByColumnList.get(i);
if (!selectColumnExpList.contains(orderByColumnExp)) {
selectColumnExpList.add(orderByColumnExp);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteOrCharArrayFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteOrCharArrayFactory.java?rev=616906&r1=616905&r2=616906&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteOrCharArrayFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/types/ByteOrCharArrayFactory.java Wed Jan 30 13:11:03 2008
@@ -140,8 +140,8 @@
Character[] chars = (Character[]) object;
StringBuffer buffer = new StringBuffer(chars.length);
- for (int i = 0; i < chars.length; i++) {
- buffer.append(chars[i] != null ? chars[i].charValue() : 0);
+ for (Character aChar : chars) {
+ buffer.append(aChar != null ? aChar.charValue() : 0);
}
return buffer.toString();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java?rev=616906&r1=616905&r2=616906&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/AshwoodEntitySorter.java Wed Jan 30 13:11:03 2008
@@ -215,8 +215,8 @@
}
Object masterCandidate = objects.get(j);
- for (int k = 0; k < masters.length; k++) {
- if (masterCandidate.equals(masters[k])) {
+ for (Object master : masters) {
+ if (masterCandidate.equals(master)) {
objectDependencyGraph.putArc(
masterCandidate,
current,
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java?rev=616906&r1=616905&r2=616906&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/AntDataPortDelegate.java Wed Jan 30 13:11:03 2008
@@ -104,8 +104,8 @@
}
String mapName = map.getName();
- for (int i = 0; i < mapFilters.length; i++) {
- if (mapFilters[i].matcher(mapName).find()) {
+ for (Pattern mapFilter : mapFilters) {
+ if (mapFilter.matcher(mapName).find()) {
return true;
}
}
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=616906&r1=616905&r2=616906&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 Wed Jan 30 13:11:03 2008
@@ -193,8 +193,8 @@
return true;
}
- for (int i = 0; i < itemIncludeFilters.length; i++) {
- if (itemIncludeFilters[i].matcher(item).find()) {
+ for (Pattern itemIncludeFilter : itemIncludeFilters) {
+ if (itemIncludeFilter.matcher(item).find()) {
return true;
}
}