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/29 23:07:08 UTC
svn commit: r616535 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/
cayenne-jdk1.5-unpublished/src/test/java/org/apa...
Author: kmenard
Date: Tue Jan 29 14:07:06 2008
New Revision: 616535
URL: http://svn.apache.org/viewvc?rev=616535&view=rev
Log:
Generics.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationProject.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapProject.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/FlatProjectView.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/PartialProject.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfigurator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectTraversal.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureValidator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/Validator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/PartialProjectTest.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationProject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationProject.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationProject.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ApplicationProject.java Tue Jan 29 14:07:06 2008
@@ -157,7 +157,7 @@
*/
@Override
public List getChildren() {
- return new ArrayList(this.getConfiguration().getDomains());
+ return new ArrayList<DataDomain>(this.getConfiguration().getDomains());
}
/**
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapProject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapProject.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapProject.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/DataMapProject.java Tue Jan 29 14:07:06 2008
@@ -102,7 +102,7 @@
*/
@Override
public List getChildren() {
- List entities = new ArrayList();
+ List<DataMap> entities = new ArrayList<DataMap>();
entities.add(map);
return entities;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/FlatProjectView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/FlatProjectView.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/FlatProjectView.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/FlatProjectView.java Tue Jan 29 14:07:06 2008
@@ -44,8 +44,8 @@
/**
* Returns flat tree view.
*/
- public List flattenProjectTree(Object rootNode) {
- List nodes = new ArrayList();
+ public List<ProjectPath> flattenProjectTree(Object rootNode) {
+ List<ProjectPath> nodes = new ArrayList<ProjectPath>();
TraversalHelper helper = new TraversalHelper(nodes);
new ProjectTraversal(helper).traverse(rootNode);
return nodes;
@@ -55,9 +55,9 @@
* Helper class that serves as project traversal helper.
*/
class TraversalHelper implements ProjectTraversalHandler {
- protected List nodes;
+ protected List<ProjectPath> nodes;
- public TraversalHelper(List nodes) {
+ public TraversalHelper(List<ProjectPath> nodes) {
this.nodes = nodes;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/NamedObjectFactory.java Tue Jan 29 14:07:06 2008
@@ -20,7 +20,6 @@
package org.apache.cayenne.project;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.cayenne.access.DataDomain;
@@ -69,7 +68,7 @@
* @author Andrus Adamchik
*/
public abstract class NamedObjectFactory {
- private static final Map factories = new HashMap();
+ private static final Map<Class, NamedObjectFactory> factories = new HashMap<Class, NamedObjectFactory>();
static {
factories.put(DataMap.class, new DataMapFactory());
@@ -87,14 +86,14 @@
}
public static String createName(Class objectClass, Object namingContext) {
- return ((NamedObjectFactory) factories.get(objectClass)).makeName(namingContext);
+ return (factories.get(objectClass)).makeName(namingContext);
}
/**
* @since 1.0.5
*/
public static String createName(Class objectClass, Object namingContext, String nameBase) {
- return ((NamedObjectFactory) factories.get(objectClass)).makeName(namingContext, nameBase);
+ return (factories.get(objectClass)).makeName(namingContext, nameBase);
}
/**
@@ -106,7 +105,7 @@
* This behavior can be changed later.</i></p>
*/
public static Object createObject(Class objectClass, Object namingContext) {
- return ((NamedObjectFactory) factories.get(objectClass)).makeObject(
+ return (factories.get(objectClass)).makeObject(
namingContext);
}
@@ -114,10 +113,10 @@
* @since 1.0.5
*/
public static Object createObject(
- Class objectClass,
+ Class<? extends DataMap> objectClass,
Object namingContext,
String nameBase) {
- return ((NamedObjectFactory) factories.get(objectClass)).makeObject(
+ return (factories.get(objectClass)).makeObject(
namingContext,
nameBase);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/PartialProject.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/PartialProject.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/PartialProject.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/PartialProject.java Tue Jan 29 14:07:06 2008
@@ -45,9 +45,9 @@
*/
public class PartialProject extends Project {
protected String projectVersion;
- protected Map domains;
+ protected Map<String, DomainMetaData> domains;
protected ConfigLoaderDelegate loadDelegate;
- protected Map dataViewLocations;
+ protected Map<String, String> dataViewLocations;
/**
* Constructor PartialProjectHandler.
@@ -71,10 +71,10 @@
* DataNodeConfigInfo objects. Only main project file gets updated, the rest
* are assumed to be in place.
*/
- public void updateNodes(List list) throws ProjectException {
- Iterator it = list.iterator();
+ public void updateNodes(List<? extends DataNodeConfigInfo> list) throws ProjectException {
+ Iterator<? extends DataNodeConfigInfo> it = list.iterator();
while (it.hasNext()) {
- DataNodeConfigInfo nodeConfig = (DataNodeConfigInfo) it.next();
+ DataNodeConfigInfo nodeConfig = it.next();
String domainName = nodeConfig.getDomain();
if (domainName == null && domains.size() != 1) {
throw new IllegalArgumentException("Node must have domain set explicitly if there is no default domain.");
@@ -113,7 +113,7 @@
@Override
protected void postInitialize(File projectFile) {
loadDelegate = new LoadDelegate();
- domains = new HashMap();
+ domains = new HashMap<String, DomainMetaData>();
try {
FileInputStream in = new FileInputStream(projectFile);
@@ -136,7 +136,7 @@
@Override
public List getChildren() {
- return new ArrayList(domains.values());
+ return new ArrayList<DomainMetaData>(domains.values());
}
@Override
@@ -149,7 +149,7 @@
*/
@Override
public List buildFileList() {
- List list = new ArrayList();
+ List<ProjectFile> list = new ArrayList<ProjectFile>();
list.add(projectFileForObject(this));
return list;
}
@@ -174,7 +174,7 @@
}
private DomainMetaData findDomain(String domainName) {
- DomainMetaData domain = (DomainMetaData) domains.get(domainName);
+ DomainMetaData domain = domains.get(domainName);
if (domain == null) {
throw new IllegalArgumentException("Can't find domain: " + domainName);
}
@@ -187,7 +187,7 @@
String nodeName,
boolean failIfNotFound) {
DomainMetaData domain = findDomain(domainName);
- NodeMetaData node = (NodeMetaData) domain.nodes.get(nodeName);
+ NodeMetaData node = domain.nodes.get(nodeName);
if (node == null && failIfNotFound) {
throw new IllegalArgumentException(
"Can't find node: " + domainName + "." + nodeName);
@@ -198,8 +198,8 @@
protected class DomainMetaData {
protected String name;
- protected Map nodes = new HashMap();
- protected Map maps = new HashMap();
+ protected Map<String, NodeMetaData> nodes = new HashMap<String, NodeMetaData>();
+ protected Map<String, MapMetaData> maps = new HashMap<String, MapMetaData>();
protected Map mapDependencies = new HashMap();
protected Map properties = new HashMap();
@@ -213,7 +213,7 @@
protected String dataSource;
protected String adapter;
protected String factory;
- protected List maps = new ArrayList();
+ protected List<String> maps = new ArrayList<String>();
public NodeMetaData(String name) {
this.name = name;
@@ -237,7 +237,7 @@
}
protected DomainMetaData findDomain(String name) {
- DomainMetaData domain = (DomainMetaData) domains.get(name);
+ DomainMetaData domain = domains.get(name);
if (domain == null) {
throw new ProjectException("Can't find domain: " + name);
}
@@ -247,7 +247,7 @@
protected MapMetaData findMap(String domainName, String mapName) {
DomainMetaData domain = findDomain(domainName);
- MapMetaData map = (MapMetaData) domain.maps.get(mapName);
+ MapMetaData map = domain.maps.get(mapName);
if (map == null) {
throw new ProjectException("Can't find map: " + mapName);
}
@@ -257,7 +257,7 @@
protected NodeMetaData findNode(String domainName, String nodeName) {
DomainMetaData domain = findDomain(domainName);
- NodeMetaData node = (NodeMetaData) domain.nodes.get(nodeName);
+ NodeMetaData node = domain.nodes.get(nodeName);
if (node == null) {
throw new ProjectException("Can't find node: " + nodeName);
}
@@ -339,7 +339,7 @@
Validate.notNull(dataViewName);
Validate.notNull(dataViewLocation);
if (dataViewLocations == null) {
- dataViewLocations = new HashMap();
+ dataViewLocations = new HashMap<String, String>();
}
dataViewLocations.put(dataViewName, dataViewLocation);
}
@@ -359,16 +359,16 @@
public Iterator viewNames() {
if (dataViewLocations == null) {
- dataViewLocations = new HashMap();
+ dataViewLocations = new HashMap<String, String>();
}
return dataViewLocations.keySet().iterator();
}
public String viewLocation(String dataViewName) {
if (dataViewLocations == null) {
- dataViewLocations = new HashMap();
+ dataViewLocations = new HashMap<String, String>();
}
- return (String) dataViewLocations.get(dataViewName);
+ return dataViewLocations.get(dataViewName);
}
public Iterator propertyNames(String domainName) {
@@ -380,13 +380,13 @@
}
public Iterator linkedMapNames(String domainName, String nodeName) {
- return ((NodeMetaData) findDomain(domainName).nodes.get(nodeName))
+ return (findDomain(domainName).nodes.get(nodeName))
.maps
.iterator();
}
public String mapLocation(String domainName, String mapName) {
- return ((MapMetaData) findDomain(domainName).maps.get(mapName)).location;
+ return (findDomain(domainName).maps.get(mapName)).location;
}
public Iterator mapNames(String domainName) {
@@ -394,15 +394,15 @@
}
public String nodeAdapterName(String domainName, String nodeName) {
- return ((NodeMetaData) findDomain(domainName).nodes.get(nodeName)).adapter;
+ return (findDomain(domainName).nodes.get(nodeName)).adapter;
}
public String nodeDataSourceName(String domainName, String nodeName) {
- return ((NodeMetaData) findDomain(domainName).nodes.get(nodeName)).dataSource;
+ return (findDomain(domainName).nodes.get(nodeName)).dataSource;
}
public String nodeFactoryName(String domainName, String nodeName) {
- return ((NodeMetaData) findDomain(domainName).nodes.get(nodeName)).factory;
+ return (findDomain(domainName).nodes.get(nodeName)).factory;
}
public Iterator nodeNames(String domainName) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/Project.java Tue Jan 29 14:07:06 2008
@@ -50,7 +50,7 @@
protected File projectDir;
protected List<ProjectFile> files = new ArrayList<ProjectFile>();
protected int upgradeStatus;
- protected List upgradeMessages;
+ protected List<String> upgradeMessages;
protected boolean modified;
/**
@@ -119,7 +119,7 @@
protected void postInitialize(File projectFile) {
// take a snapshot of files used by the project
files = Collections.synchronizedList(buildFileList());
- upgradeMessages = Collections.synchronizedList(new ArrayList());
+ upgradeMessages = Collections.synchronizedList(new ArrayList<String>());
checkForUpgrades();
}
@@ -145,7 +145,7 @@
/**
* Returns a list of upgrade messages.
*/
- public List getUpgradeMessages() {
+ public List<String> getUpgradeMessages() {
return upgradeMessages;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfigurator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfigurator.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfigurator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectConfigurator.java Tue Jan 29 14:07:06 2008
@@ -107,10 +107,10 @@
}
// copy driver files, delete unused
- Iterator it = info.getNodes().iterator();
+ Iterator<DataNodeConfigInfo> it = info.getNodes().iterator();
boolean needFix = it.hasNext();
while (it.hasNext()) {
- DataNodeConfigInfo nodeInfo = (DataNodeConfigInfo) it.next();
+ DataNodeConfigInfo nodeInfo = it.next();
String name = nodeInfo.getName();
File targetDriverFile =
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectTraversal.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectTraversal.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectTraversal.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/ProjectTraversal.java Tue Jan 29 14:07:06 2008
@@ -30,6 +30,7 @@
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.Relationship;
+import org.apache.cayenne.map.ProcedureParameter;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.util.CayenneMapEntry;
import org.apache.cayenne.util.Util;
@@ -260,7 +261,7 @@
}
}
- public void traverseProcedureParameters(Iterator parameters, ProjectPath path) {
+ public void traverseProcedureParameters(Iterator<? extends ProcedureParameter> parameters, ProjectPath path) {
// Note: !! do not try to sort parameters - they are positional by definition
while (parameters.hasNext()) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/MappingNamesHelper.java Tue Jan 29 14:07:06 2008
@@ -32,7 +32,7 @@
public class MappingNamesHelper {
// TODO: used by StringUtils and ClassGenerationInfo... need to refactor..
- static final Collection RESERVED_JAVA_KEYWORDS = Arrays.asList(
+ static final Collection<String> RESERVED_JAVA_KEYWORDS = Arrays.asList(
"abstract", "assert", "default", "if", "private", "this", "boolean", "do",
"implements", "protected", "throw", "break", "double", "import", "public",
"throws", "byte", "else", "instanceof", "return", "transient", "case",
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ObjRelationshipValidator.java Tue Jan 29 14:07:06 2008
@@ -86,7 +86,7 @@
}
else {
// check for missing DbRelationship mappings
- List dbRels = rel.getDbRelationships();
+ List<DbRelationship> dbRels = rel.getDbRelationships();
if (dbRels.size() == 0) {
validator.registerWarning("ObjRelationship "
+ objRelationshipIdentifier(rel)
@@ -97,8 +97,8 @@
DbEntity expectedTarget = ((ObjEntity) rel.getTargetEntity())
.getDbEntity();
- if (((DbRelationship) dbRels.get(0)).getSourceEntity() != expectedSrc
- || ((DbRelationship) dbRels.get(dbRels.size() - 1))
+ if ((dbRels.get(0)).getSourceEntity() != expectedSrc
+ || (dbRels.get(dbRels.size() - 1))
.getTargetEntity() != expectedTarget) {
validator.registerWarning("ObjRelationship "
+ objRelationshipIdentifier(rel)
@@ -117,11 +117,11 @@
DbRelationship firstRel = inverse
.getDbRelationships()
.get(0);
- Iterator attributePairIterator = firstRel.getJoins().iterator();
+ Iterator<DbJoin> attributePairIterator = firstRel.getJoins().iterator();
// by default, the relation will be check for mandatory.
boolean check = true;
while (attributePairIterator.hasNext()) {
- DbJoin pair = (DbJoin) attributePairIterator.next();
+ DbJoin pair = attributePairIterator.next();
if (!pair.getSource().isMandatory()) {
// a field of the fk can be nullable, cancel the check.
check = false;
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureValidator.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/ProcedureValidator.java Tue Jan 29 14:07:06 2008
@@ -19,11 +19,11 @@
package org.apache.cayenne.project.validator;
-import java.util.Iterator;
import java.util.List;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Procedure;
+import org.apache.cayenne.map.ProcedureParameter;
import org.apache.cayenne.project.ProjectPath;
import org.apache.cayenne.util.Util;
@@ -41,7 +41,7 @@
// check that return value is present
if (procedure.isReturningValue()) {
- List parameters = procedure.getCallParameters();
+ List<ProcedureParameter> parameters = procedure.getCallParameters();
if (parameters.size() == 0) {
validator.registerWarning(
"Procedure returns a value, but has no parameters.",
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/SelectQueryValidator.java Tue Jan 29 14:07:06 2008
@@ -64,12 +64,12 @@
}
if (query.getPrefetchTree() != null) {
- Iterator prefetches = query
+ Iterator<PrefetchTreeNode> prefetches = query
.getPrefetchTree()
.nonPhantomNodes()
.iterator();
while (prefetches.hasNext()) {
- validatePrefetch(root, ((PrefetchTreeNode) prefetches.next())
+ validatePrefetch(root, (prefetches.next())
.getPath(), treeNodePath, validator);
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/Validator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/Validator.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/Validator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/project/validator/Validator.java Tue Jan 29 14:07:06 2008
@@ -35,7 +35,7 @@
*/
public class Validator {
protected Project project;
- protected List validationResults = new ArrayList();
+ protected List<ValidationInfo> validationResults = new ArrayList<ValidationInfo>();
protected int maxSeverity;
/**
@@ -59,9 +59,9 @@
if (status.hasFailures()) {
ProjectPath path = new ProjectPath(project);
- Iterator it = status.getOtherFailures().iterator();
+ Iterator<String> it = status.getOtherFailures().iterator();
while (it.hasNext()) {
- registerError((String) it.next(), path);
+ registerError(it.next(), path);
}
it = status.getFailedMaps().keySet().iterator();
@@ -100,7 +100,7 @@
*/
protected void reset() {
if (validationResults != null) {
- validationResults = new ArrayList();
+ validationResults = new ArrayList<ValidationInfo>();
}
maxSeverity = ValidationInfo.VALID;
}
@@ -139,7 +139,7 @@
}
/** Return collection of ValidationInfo objects from last validation. */
- public List validationResults() {
+ public List<ValidationInfo> validationResults() {
return validationResults;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/PartialProjectTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/PartialProjectTest.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/PartialProjectTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/project/PartialProjectTest.java Tue Jan 29 14:07:06 2008
@@ -86,7 +86,7 @@
}
public void testNodes() throws Exception {
- PartialProject.DomainMetaData d2 = (PartialProject.DomainMetaData) project.domains
+ PartialProject.DomainMetaData d2 = project.domains
.get("d2");
assertNotNull(d2);
assertEquals(2, d2.nodes.size());
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java?rev=616535&r1=616534&r2=616535&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java Tue Jan 29 14:07:06 2008
@@ -146,7 +146,7 @@
protected boolean processUpgrades(Project project) throws ProjectException {
// must really concat all messages, this is a temp hack...
- String msg = (String) project.getUpgradeMessages().get(0);
+ String msg = project.getUpgradeMessages().get(0);
// need an upgrade
int returnCode = JOptionPane.showConfirmDialog(
Application.getFrame(),