Changeset 205

Timestamp:

11/05/02 15:22:13 (21 years ago)

Author:

piso

Message:

_submit(): offer to save modified buffers.

File:

• trunk/j/src/org/armedbear/j/P4.java (modified) (5 diffs)

trunk/j/src/org/armedbear/j/P4.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: P4.java,v 1.2 2002-10-14 16:29:33 piso Exp $
+ * $Id: P4.java,v 1.3 2002-11-05 15:22:13 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -25 +25 @@
 import gnu.regexp.REMatch;
 import gnu.regexp.UncheckedRE;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -464 +465 @@
         final String title = sb.toString();
         boolean save = false;
-        if (parentBuffer.isModified()) {
+        List list = getModifiedBuffers();
+        if (list != null && list.size() > 0) {
             int response =
                 ConfirmDialog.showConfirmDialogWithCancelButton(editor,
-                    VC_CHECK_SAVE_PROMPT, title);
+                    "Save modified buffers first?", title);
             switch (response) {
                 case RESPONSE_YES:
@@ -479 +481 @@
             editor.repaintNow();
         }
-        if (!save || parentBuffer.save()) {
+        if (!save || saveModifiedBuffers(editor, list)) {
             // Look for existing checkin buffer before making a new one.
             CheckinBuffer checkinBuffer = null;
@@ -519 +521 @@
         }
     }
-
+    
+    private static List getModifiedBuffers()
+    {
+        ArrayList list = null;
+        for (BufferIterator it = new BufferIterator(); it.hasNext();) {
+            Buffer buf = it.nextBuffer();
+            if (!buf.isModified())
+                continue;
+            if (buf.isUntitled())
+                continue;
+            final int modeId = buf.getModeId();
+            if (modeId == SEND_MAIL_MODE)
+                continue;
+            if (modeId == CHECKIN_MODE)
+                continue;
+            if (buf.getFile() != null && buf.getFile().isLocal()) {
+                if (list == null)
+                    list = new ArrayList();
+                list.add(buf);
+            }
+        }
+        return list;
+    }
+
+    private static boolean saveModifiedBuffers(Editor editor, List list)
+    {
+        editor.setWaitCursor();
+        int numErrors = 0;
+        for (Iterator it = list.iterator(); it.hasNext();) {
+            Buffer buf = (Buffer) it.next();
+            if (buf.getFile() != null && buf.getFile().isLocal()) {
+                editor.status("Saving modified buffers...");
+                if (buf.getBooleanProperty(Property.REMOVE_TRAILING_WHITESPACE))
+                    buf.removeTrailingWhitespace();
+                if (!buf.save())
+                    ++numErrors;
+            }
+        }
+        editor.setDefaultCursor();
+        if (numErrors == 0) {
+            editor.status("Saving modified buffers...done");
+            return true;
+        }
+        // User will already have seen detailed error information from Buffer.save().
+        editor.status("");
+        return false;
+    }
+    
     public static void replaceComment(final Editor editor, final String comment)
     {