You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by to...@apache.org on 2007/11/17 00:01:05 UTC
svn commit: r595860 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/DbMerger.java
Author: torehalset
Date: Fri Nov 16 15:01:02 2007
New Revision: 595860
URL: http://svn.apache.org/viewvc?rev=595860&view=rev
Log:
java 5
generics return value
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/DbMerger.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/DbMerger.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/DbMerger.java?rev=595860&r1=595859&r2=595860&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/DbMerger.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/DbMerger.java Fri Nov 16 15:01:02 2007
@@ -56,7 +56,7 @@
* Create and return a {@link List} of {@link MergerToken}s to alter the given
* {@link DataNode} to match the given {@link DataMap}
*/
- public List createMergeTokens(DataNode dataNode, DataMap dataMap) {
+ public List<MergerToken> createMergeTokens(DataNode dataNode, DataMap dataMap) {
return createMergeTokens(dataNode.getAdapter(), dataNode.getDataSource(), dataMap);
}
@@ -64,10 +64,10 @@
* Create and return a {@link List} of {@link MergerToken}s to alter the given
* {@link DataNode} to match the given {@link DataMap}
*/
- public List createMergeTokens(DbAdapter adapter, DataSource dataSource, DataMap dataMap) {
+ public List<MergerToken> createMergeTokens(DbAdapter adapter, DataSource dataSource, DataMap dataMap) {
factory = adapter.mergerFactory();
- List tokens = new ArrayList();
+ List<MergerToken> tokens = new ArrayList<MergerToken>();
Connection conn = null;
ResultSet rs = null;
try {
@@ -129,7 +129,7 @@
return tokens;
}
- private void checkRows(List tokens, DbEntity dbEntity, DbEntity detectedEntity) {
+ private void checkRows(List<MergerToken> tokens, DbEntity dbEntity, DbEntity detectedEntity) {
// columns to drop
for (Iterator it = detectedEntity.getAttributes().iterator(); it.hasNext();) {