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/06/30 14:48:32 UTC
[1/2] cayenne git commit: CAY-2323 Graph. No warning while saving the
image with existing name
Repository: cayenne
Updated Branches:
refs/heads/master bb70d83a0 -> 3eb9affcb
CAY-2323 Graph. No warning while saving the image with existing name
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/19b909a6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/19b909a6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/19b909a6
Branch: refs/heads/master
Commit: 19b909a628cfb9b973b63bff2f36f3f356ab33ee
Parents: d8ffcdf
Author: Anton Dreka <dr...@gmail.com>
Authored: Tue Jun 20 09:49:27 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Tue Jun 20 09:49:27 2017 +0300
----------------------------------------------------------------------
.../modeler/graph/action/SaveAsImageAction.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/19b909a6/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java
index d9e85dc..73f56ac 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java
@@ -20,6 +20,7 @@ package org.apache.cayenne.modeler.graph.action;
import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -80,12 +81,23 @@ public class SaveAsImageAction extends CayenneAction {
path += "." + ext;
}
- try {
+ File file = new File(path);
+ try {
JGraph graph = dataDomainGraphTab.getGraph();
BufferedImage img = graph.getImage(null, 0);
- try (OutputStream out = new FileOutputStream(path);) {
+ if (file.exists()) {
+ int response = JOptionPane.showConfirmDialog(null,
+ "Do you want to replace the existing file?",
+ "Confirm", JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE);
+ if (response != JOptionPane.YES_OPTION) {
+ return;
+ }
+ }
+
+ try (OutputStream out = new FileOutputStream(file)) {
ImageIO.write(img, ext, out);
out.flush();
}
[2/2] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/233' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/233' 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/3eb9affc
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3eb9affc
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3eb9affc
Branch: refs/heads/master
Commit: 3eb9affcb03655391a7c613160f77da58eb13a8a
Parents: bb70d83 19b909a
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Jun 30 17:45:55 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Jun 30 17:45:55 2017 +0300
----------------------------------------------------------------------
.../modeler/graph/action/SaveAsImageAction.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------