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 2008/08/26 22:49:57 UTC
svn commit: r689217 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge:
AddColumnToDb.java AddColumnToModel.java DbMerger.java MergerFactory.java
Author: torehalset
Date: Tue Aug 26 13:49:57 2008
New Revision: 689217
URL: http://svn.apache.org/viewvc?rev=689217&view=rev
Log:
fixed type: colum -> column
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToDb.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToModel.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/DbMerger.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerFactory.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToDb.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToDb.java?rev=689217&r1=689216&r2=689217&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToDb.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToDb.java Tue Aug 26 13:49:57 2008
@@ -98,7 +98,7 @@
}
public MergerToken createReverse(MergerFactory factory) {
- return factory.createDropColumToModel(getEntity(), getColumn());
+ return factory.createDropColumnToModel(getEntity(), getColumn());
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToModel.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToModel.java?rev=689217&r1=689216&r2=689217&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToModel.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/AddColumnToModel.java Tue Aug 26 13:49:57 2008
@@ -36,7 +36,7 @@
}
public MergerToken createReverse(MergerFactory factory) {
- return factory.createDropColumToDb(getEntity(), getColumn());
+ return factory.createDropColumnToDb(getEntity(), getColumn());
}
public void execute(MergerContext mergerContext) {
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=689217&r1=689216&r2=689217&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 Tue Aug 26 13:49:57 2008
@@ -170,7 +170,7 @@
// columns to drop
for (DbAttribute detected : detectedEntity.getAttributes()) {
if (findDbAttribute(dbEntity, detected.getName()) == null) {
- tokens.add(factory.createDropColumToDb(dbEntity, detected));
+ tokens.add(factory.createDropColumnToDb(dbEntity, detected));
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerFactory.java?rev=689217&r1=689216&r2=689217&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerFactory.java Tue Aug 26 13:49:57 2008
@@ -56,11 +56,11 @@
return new AddColumnToDb(entity, column);
}
- public MergerToken createDropColumToModel(DbEntity entity, DbAttribute column) {
+ public MergerToken createDropColumnToModel(DbEntity entity, DbAttribute column) {
return new DropColumnToModel(entity, column);
}
- public MergerToken createDropColumToDb(DbEntity entity, DbAttribute column) {
+ public MergerToken createDropColumnToDb(DbEntity entity, DbAttribute column) {
return new DropColumnToDb(entity, column);
}