You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/02 14:13:13 UTC
svn commit: r600281 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorUtil.java
Author: aadamchik
Date: Sun Dec 2 05:13:13 2007
New Revision: 600281
URL: http://svn.apache.org/viewvc?rev=600281&view=rev
Log:
generics
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorUtil.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorUtil.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorUtil.java?rev=600281&r1=600280&r2=600281&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorUtil.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/tools/CayenneGeneratorUtil.java Sun Dec 2 05:13:13 2007
@@ -32,8 +32,8 @@
import java.util.*;
/**
- * Utility class to perform class generation from data map. This class is used by
- * ant and Maven plugins.
+ * Utility class to perform class generation from data map. This class is used by ant and
+ * Maven plugins.
*
* @author Andrus Adamchik, Kevin Menard
* @since 3.0
@@ -41,19 +41,19 @@
class CayenneGeneratorUtil {
protected ILog logger;
-
+
protected MapLoader mapLoader;
protected File map;
protected File additionalMaps[];
protected DefaultClassGenerator generator;
-
+
protected String includeEntitiesPattern;
protected String excludeEntitiesPattern;
-
+
/** Loads and returns a DataMap by File. */
public DataMap loadDataMap(File mapName) throws Exception {
InputSource in = new InputSource(mapName.toURL().toString());
- if(mapLoader == null) {
+ if (mapLoader == null) {
mapLoader = new MapLoader();
}
return mapLoader.loadDataMap(in);
@@ -63,7 +63,7 @@
public DataMap loadDataMap() throws Exception {
return loadDataMap(map);
}
-
+
/** Loads and returns DataMap based on <code>map</code> attribute. */
protected DataMap[] loadAdditionalDataMaps() throws Exception {
if (null == additionalMaps) {
@@ -76,7 +76,7 @@
}
return dataMaps;
}
-
+
public void processMap() throws Exception {
DataMap dataMap = loadDataMap();
@@ -90,22 +90,21 @@
additionalDataMaps[i].setNamespace(entityResolver);
}
- Collection allEntities = dataMap.getObjEntities();
- List filteredEntities = new ArrayList(allEntities.size());
+ Collection<ObjEntity> allEntities = dataMap.getObjEntities();
+ List<ObjEntity> filteredEntities = new ArrayList<ObjEntity>(allEntities.size());
// filter client entities
if (generator.isClient()) {
if (dataMap.isClientSupported()) {
- Iterator it = allEntities.iterator();
- while (it.hasNext()) {
- ObjEntity entity = (ObjEntity) it.next();
+ for (ObjEntity entity : allEntities) {
if (entity.isClientAllowed()) {
filteredEntities.add(entity);
}
}
}
else {
- throw new CayenneRuntimeException("Cannot generate client classes because the data map is not configured to allow them.");
+ throw new CayenneRuntimeException(
+ "Cannot generate client classes because the data map is not configured to allow them.");
}
}
else {
@@ -125,9 +124,8 @@
generator.validateAttributes();
generator.execute();
}
-
- public void execute() throws Exception
- {
+
+ public void execute() throws Exception {
try {
processMap();
}
@@ -148,23 +146,23 @@
public void setAdditionalMaps(File[] additionalMaps) {
this.additionalMaps = additionalMaps;
}
-
+
public void setExcludeEntitiesPattern(String excludeEntitiesPattern) {
this.excludeEntitiesPattern = excludeEntitiesPattern;
}
-
+
public void setGenerator(DefaultClassGenerator generator) {
this.generator = generator;
}
-
+
public void setIncludeEntitiesPattern(String includeEntitiesPattern) {
this.includeEntitiesPattern = includeEntitiesPattern;
}
-
+
public void setLogger(ILog logger) {
this.logger = logger;
}
-
+
public void setMap(File map) {
this.map = map;
}