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 2018/08/27 12:25:39 UTC
[1/3] cayenne git commit: CAY-2459 Paste function is not working
Repository: cayenne
Updated Branches:
refs/heads/master 69b731bf4 -> b3b600bf9
CAY-2459 Paste function is not working
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2a6dde2b
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2a6dde2b
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2a6dde2b
Branch: refs/heads/master
Commit: 2a6dde2b115db8943a91f8f857daee640378f443
Parents: 36faff5
Author: Arseni Bulatski <an...@gmail.com>
Authored: Wed Aug 22 11:14:38 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Wed Aug 22 11:33:52 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../src/main/java/org/apache/cayenne/modeler/Main.java | 2 +-
.../org/apache/cayenne/modeler/action/PasteAction.java | 11 +++++++++--
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a6dde2b/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d2e5421..c368134 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,6 +20,7 @@ Bug Fixes:
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
+CAY-2459 Paste function is not working
----------------------------------
Release: 4.1.M2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a6dde2b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
index 5b2e5d2..e0e3c04 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.project.ProjectModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.swing.*;
+import javax.swing.SwingUtilities;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/2a6dde2b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
index 94162ee..5774847 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
@@ -49,9 +49,9 @@ import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.CayenneTransferable;
import org.apache.cayenne.query.Query;
-import javax.swing.*;
+import javax.swing.KeyStroke;
import javax.swing.undo.UndoableEdit;
-import java.awt.*;
+import java.awt.Toolkit;
import java.awt.datatransfer.FlavorEvent;
import java.awt.datatransfer.FlavorListener;
import java.awt.datatransfer.UnsupportedFlavorException;
@@ -106,6 +106,10 @@ public class PasteAction extends CayenneAction implements FlavorListener {
Object currentObject = getProjectController().getCurrentObject();
+ if(content instanceof DataMap) {
+ currentObject = getProjectController().getProject().getRootNode();
+ }
+
if (content != null && currentObject != null) {
DataChannelDescriptor domain = (DataChannelDescriptor) getProjectController()
.getProject()
@@ -516,6 +520,9 @@ public class PasteAction extends CayenneAction implements FlavorListener {
(currentObject instanceof DataMap && isTreeLeaf(content))
||
+ (currentObject instanceof DataMap && content instanceof DataMap)
+ ||
+
(currentObject instanceof DbEntity && (content instanceof DbAttribute
|| content instanceof DbRelationship || isTreeLeaf(content)))
||
[2/3] cayenne git commit: Merge PR #304
Posted by nt...@apache.org.
Merge PR #304
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/798663d6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/798663d6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/798663d6
Branch: refs/heads/master
Commit: 798663d6b07789ee847773ffe5395dcc34ded54f
Parents: 69b731b 2a6dde2
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Aug 27 15:24:06 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Aug 27 15:24:06 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../src/main/java/org/apache/cayenne/modeler/Main.java | 2 +-
.../org/apache/cayenne/modeler/action/PasteAction.java | 11 +++++++++--
3 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/798663d6/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
----------------------------------------------------------------------
[3/3] cayenne git commit: CAY-2459 Modeler: DataMap paste function is
not working
Posted by nt...@apache.org.
CAY-2459 Modeler: DataMap paste function is not working
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b3b600bf
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b3b600bf
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b3b600bf
Branch: refs/heads/master
Commit: b3b600bf9fd02ea54d6cca68346b138d5042e5eb
Parents: 798663d
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Aug 27 15:25:02 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Aug 27 15:25:02 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/b3b600bf/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index c368134..c81594e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -20,7 +20,7 @@ Bug Fixes:
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation
CAY-2445 Oracle: Problem with ExpressionFactory.notInExp()
-CAY-2459 Paste function is not working
+CAY-2459 Modeler: DataMap paste function is not working
----------------------------------
Release: 4.1.M2