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/04/16 23:07:22 UTC
svn commit: r648849 - in
/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db:
MergerOptions.java MergerTokenSelectorController.java
Author: torehalset
Date: Wed Apr 16 14:07:21 2008
New Revision: 648849
URL: http://svn.apache.org/viewvc?rev=648849&view=rev
Log:
CAY-1033: merge: modeler should remove completed tokens
Modified:
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java?rev=648849&r1=648848&r2=648849&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java Wed Apr 16 14:07:21 2008
@@ -269,9 +269,21 @@
boolean modelChanged = false;
for (Iterator<MergerToken> it = tokensToMigrate.iterator(); it.hasNext();) {
MergerToken tok = it.next();
+ int numOfFailuresBefore = mergerContext
+ .getValidationResult()
+ .getFailures()
+ .size();
tok.execute(mergerContext);
if (!modelChanged && tok.getDirection().equals(MergeDirection.TO_MODEL)) {
modelChanged = true;
+ }
+
+ if (numOfFailuresBefore == mergerContext
+ .getValidationResult()
+ .getFailures()
+ .size()) {
+ // looks like the token executed without failures
+ tokens.removeToken(tok);
}
}
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java?rev=648849&r1=648848&r2=648849&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerTokenSelectorController.java Wed Apr 16 14:07:21 2008
@@ -78,6 +78,14 @@
public List<MergerToken> getSelectableTokens() {
return Collections.unmodifiableList(selectableTokensList);
}
+
+ public void removeToken(MergerToken token) {
+ selectableTokensList.remove(token);
+ excludedTokens.remove(token);
+
+ AbstractTableModel model = (AbstractTableModel) view.getTokens().getModel();
+ model.fireTableDataChanged();
+ }
// ----- properties -----