You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/04/10 14:13:05 UTC
[1/3] cayenne git commit: CAY-2171 Modeler: Undo db Entity Sync
throws error
Repository: cayenne
Updated Branches:
refs/heads/master af5ae7856 -> c9ec6e78f
CAY-2171 Modeler: Undo db Entity Sync throws error
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c6686098
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c6686098
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c6686098
Branch: refs/heads/master
Commit: c6686098399bfb21be8200fa390ebe764f4f99f5
Parents: 8f3ac8b
Author: Anton Dreka <dr...@gmail.com>
Authored: Mon Apr 10 16:45:49 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Mon Apr 10 16:45:49 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../modeler/dialog/db/merge/MergerOptions.java | 4 +++
.../db/merge/MergerTokenSelectorController.java | 31 ++++++++++----------
3 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c6686098/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 694e754..49cb64b 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -36,6 +36,7 @@ CAY-2021 cdbimport: detect when same FK constraint is defined twice
CAY-2077 Bug in CayenneRuntimeException using wrong specified string in Formatter
CAY-2094 SelectById query doesn't work from ROP client
CAY-2161 'Not for Client Use' option is ignored at Class Generation
+CAY-2171 Modeler: Undo db Entity Sync throws error
CAY-2240 Modeler: issue with cursor rendering for EJBQL query
CAY-2243 ObjectContext.getGraphManager().unregisterObject() inconsistencies
CAY-2250 Remove: Incorrect text in Confirm Remove message when cursor is set on attribute row
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c6686098/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java
index 3bb67f1..e486837 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java
@@ -283,6 +283,10 @@ public class MergerOptions extends CayenneController {
notifyProjectModified(modelChanged);
reportFailures(mergerContext);
+
+ if(tokens.isReverse()) {
+ getApplication().getUndoManager().discardAllEdits();
+ }
}
private ModelMergeDelegate createDelegate(final Collection<ObjEntity> loadedObjEntities) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c6686098/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
index 21d0e82..5d5483c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
@@ -49,12 +49,13 @@ public class MergerTokenSelectorController extends CayenneController {
protected Set<MergerToken> excludedTokens;
protected List<MergerToken> selectableTokensList;
protected MergerTokenFactory mergerTokenFactory;
+ protected boolean isReverse;
public MergerTokenSelectorController(CayenneController parent) {
super(parent);
this.view = new MergerTokenSelectorView();
- this.excludedTokens = new HashSet<MergerToken>();
- this.selectableTokensList = new ArrayList<MergerToken>();
+ this.excludedTokens = new HashSet<>();
+ this.selectableTokensList = new ArrayList<>();
initController();
}
@@ -69,7 +70,7 @@ public class MergerTokenSelectorController extends CayenneController {
}
public List<MergerToken> getSelectedTokens() {
- List<MergerToken> t = new ArrayList<MergerToken>(selectableTokensList);
+ List<MergerToken> t = new ArrayList<>(selectableTokensList);
t.removeAll(excludedTokens);
return Collections.unmodifiableList(t);
}
@@ -121,8 +122,7 @@ public class MergerTokenSelectorController extends CayenneController {
if (b) {
excludedTokens.remove(token);
- }
- else {
+ } else {
excludedTokens.add(token);
}
@@ -137,8 +137,7 @@ public class MergerTokenSelectorController extends CayenneController {
if (unselectedCount == selectableTokensList.size()) {
view.getCheckAll().setSelected(false);
- }
- else if (unselectedCount == 0) {
+ } else if (unselectedCount == 0) {
view.getCheckAll().setSelected(true);
}
}
@@ -183,8 +182,7 @@ public class MergerTokenSelectorController extends CayenneController {
public void select(MergerToken token, boolean select) {
if (select) {
excludedTokens.remove(token);
- }
- else {
+ } else {
excludedTokens.add(token);
}
}
@@ -200,9 +198,7 @@ public class MergerTokenSelectorController extends CayenneController {
excludedTokens.add(reverse);
}
- /**
- * Repaint, so that "Operation" column updates properly
- */
+ // Repaint, so that "Operation" column updates properly
view.getTokens().repaint();
}
@@ -212,8 +208,7 @@ public class MergerTokenSelectorController extends CayenneController {
if (isCheckAllSelected) {
excludedTokens.clear();
- }
- else {
+ } else {
excludedTokens.addAll(selectableTokensList);
}
@@ -221,8 +216,14 @@ public class MergerTokenSelectorController extends CayenneController {
model.fireTableDataChanged();
}
+ public boolean isReverse() {
+ return isReverse;
+ }
+
public void reverseAllAction() {
-
+
+ isReverse = true;
+
for (int i = 0; i < selectableTokensList.size(); i++) {
MergerToken token = selectableTokensList.get(i);
MergerToken reverse = token.createReverse(mergerTokenFactory);
[3/3] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/191' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/191' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c9ec6e78
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c9ec6e78
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c9ec6e78
Branch: refs/heads/master
Commit: c9ec6e78fe112eab559561d84047b8606efd5f7b
Parents: af5ae78 e926e7a
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Apr 10 17:08:36 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Apr 10 17:08:36 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../modeler/dialog/db/merge/MergerOptions.java | 4 +++
.../db/merge/MergerTokenSelectorController.java | 31 ++++++++++----------
3 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c9ec6e78/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
[2/3] cayenne git commit: CAY-2171 Modeler: Undo db Entity Sync
throws error
Posted by nt...@apache.org.
CAY-2171 Modeler: Undo db Entity Sync throws error
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e926e7a5
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e926e7a5
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e926e7a5
Branch: refs/heads/master
Commit: e926e7a5f1da84e9220fe3322361f943686f9cde
Parents: c668609
Author: Anton Dreka <dr...@gmail.com>
Authored: Mon Apr 10 17:02:52 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Mon Apr 10 17:02:52 2017 +0300
----------------------------------------------------------------------
.../modeler/dialog/db/merge/MergerTokenSelectorController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e926e7a5/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
index 5d5483c..66f7cae 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
@@ -222,7 +222,7 @@ public class MergerTokenSelectorController extends CayenneController {
public void reverseAllAction() {
- isReverse = true;
+ isReverse = !isReverse;
for (int i = 0; i < selectableTokensList.size(); i++) {
MergerToken token = selectableTokensList.get(i);