You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2011/09/06 21:36:27 UTC
svn commit: r1165799 - in
/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd:
MainFrame.java control/FileSaveAsEventHandler.java
control/XCASSaveHandler.java control/XCASSaveTSHandler.java
control/XmiCasSaveHandler.java
Author: schor
Date: Tue Sep 6 19:36:27 2011
New Revision: 1165799
URL: http://svn.apache.org/viewvc?rev=1165799&view=rev
Log:
[UIMA-1866] change CVD to give overwrite confirmation dialog when writing out files.
Modified:
uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveAsEventHandler.java
uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveHandler.java
uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveTSHandler.java
uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasSaveHandler.java
Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java?rev=1165799&r1=1165798&r2=1165799&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/MainFrame.java Tue Sep 6 19:36:27 2011
@@ -730,6 +730,26 @@ public class MainFrame extends JFrame {
}
return true;
}
+
+ public boolean confirmOverwrite(File f) {
+ if (f.exists()) {
+ Object[] options = {"Yes, Overwrite.",
+ "No"};
+ int n = JOptionPane.showOptionDialog(this,
+ "File " + f.getAbsolutePath() + " exists.\nWould you like to overwrite it?",
+
+ "Confirm Overwrite",
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE,
+ null,
+ options,
+ options[1]);
+ if (n == 1) {
+ return false;
+ }
+ }
+ return true;
+ }
private void createTextArea() {
try {
Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveAsEventHandler.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveAsEventHandler.java?rev=1165799&r1=1165798&r2=1165799&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveAsEventHandler.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/FileSaveAsEventHandler.java Tue Sep 6 19:36:27 2011
@@ -50,7 +50,11 @@ public class FileSaveAsEventHandler impl
int rc = fileChooser.showSaveDialog(this.main);
if (rc == JFileChooser.APPROVE_OPTION) {
File tmp = this.main.getTextFile();
- this.main.setTextFile(fileChooser.getSelectedFile());
+ File fileToSaveTo = fileChooser.getSelectedFile();
+ if (!this.main.confirmOverwrite(fileToSaveTo)) {
+ return;
+ }
+ this.main.setTextFile(fileToSaveTo);
boolean fileSaved = this.main.saveFile();
if (fileSaved) {
this.main.setDirty(false);
Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveHandler.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveHandler.java?rev=1165799&r1=1165798&r2=1165799&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveHandler.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveHandler.java Tue Sep 6 19:36:27 2011
@@ -55,6 +55,9 @@ public class XCASSaveHandler implements
int rc = fileChooser.showSaveDialog(this.main);
if (rc == JFileChooser.APPROVE_OPTION) {
File xcasFile = fileChooser.getSelectedFile();
+ if (!this.main.confirmOverwrite(xcasFile)) {
+ return;
+ }
this.main.setXcasFileOpenDir(xcasFile.getParentFile());
try {
OutputStream outStream = new BufferedOutputStream(new FileOutputStream(xcasFile));
Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveTSHandler.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveTSHandler.java?rev=1165799&r1=1165798&r2=1165799&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveTSHandler.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XCASSaveTSHandler.java Tue Sep 6 19:36:27 2011
@@ -54,6 +54,9 @@ public class XCASSaveTSHandler implement
int rc = fileChooser.showSaveDialog(this.main);
if (rc == JFileChooser.APPROVE_OPTION) {
File tsFile = fileChooser.getSelectedFile();
+ if (!this.main.confirmOverwrite(tsFile)) {
+ return;
+ }
this.main.setXcasFileOpenDir(tsFile.getParentFile());
try {
OutputStream outStream = new BufferedOutputStream(new FileOutputStream(tsFile));
Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasSaveHandler.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasSaveHandler.java?rev=1165799&r1=1165798&r2=1165799&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasSaveHandler.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/control/XmiCasSaveHandler.java Tue Sep 6 19:36:27 2011
@@ -28,6 +28,7 @@ import java.io.IOException;
import java.io.OutputStream;
import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
import org.apache.uima.cas.impl.XmiCasSerializer;
import org.apache.uima.tools.cvd.MainFrame;
@@ -65,6 +66,9 @@ public class XmiCasSaveHandler implement
int rc = fileChooser.showSaveDialog(this.main);
if (rc == JFileChooser.APPROVE_OPTION) {
File xmiCasFile = fileChooser.getSelectedFile();
+ if (!this.main.confirmOverwrite(xmiCasFile)) {
+ return;
+ }
this.main.setXcasFileOpenDir(xmiCasFile.getParentFile());
try {
OutputStream outStream = new BufferedOutputStream(new FileOutputStream(xmiCasFile));