Ticket #2314: scriptClosing.patch

src/main/java/org/sophie2/extra/func/scripting/logic/ScriptingLogic.java

@@ -7 +7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.sophie2.base.dialogs.DialogManager;
+import org.sophie2.base.layout.model.DocView;
 import org.sophie2.base.menus.MenuItem;
 import org.sophie2.base.model.resources.r4.ResourceRefR4;
 import org.sophie2.base.model.resources.r4.access.ResourceAccess;
@@ -25 +28 @@
 import org.sophie2.extra.func.scripting.view.ScriptResourcePreviewProvider.ScriptResourcePreview;
 import org.sophie2.extra.func.scripting.view.ScriptResourcePreviewProvider.ScriptResourcePreview.OpenScriptButton;
 import org.sophie2.main.app.commons.app.AppMainWindow;
+import org.sophie2.main.app.commons.app.DocumentsLogic;
 import org.sophie2.main.app.commons.book.BookDocView;
 import org.sophie2.main.app.commons.util.AppViewUtil;
 import org.sophie2.main.dialogs.input.DialogUtils;
@@ -228 +232 @@
 
                         return true;
                 }               
+        },
+        
+        /**
+         * When a book is closed by the DocumentsLogic checks if there are any 
+         * opened script doc views to be closed also.
+         */
+        @SortKey("mmm-close-script-documents")
+        ON_CLOSE_BOOK {
+
+                public void defineFilter(EventFilterBuilder filter) {
+                        filter.setSourceClass(DocumentsLogic.class);
+                        filter.setEventId(DocumentsLogic.EventIds.BOOK_CLOSED);
+                        filter.setTipClass(AppMainWindow.class);
+                }
+
+                public boolean handle(EventR3 event) {
+                        ResourceRefR4 bookRef = event.getEventParam(0, ResourceRefR4.class);
+                        AppMainWindow mainWindow = event.getTip(AppMainWindow.class);
+                        
+                        List<DocView> closedDocs = new ArrayList<DocView>();
+                        DocView current = mainWindow.currentDocument().get();
+                        for (DocView docView : mainWindow.documents().get()) {
+                                if (docView instanceof ScriptDocView) {
+                                        ScriptDocView scriptView = (ScriptDocView) docView;
+                                        ResourceAccess scriptAccess = scriptView.getAccess();
+                                        ResourceRefR4 scriptRef = scriptAccess.getRef();
+                                        if (scriptRef.getLocation().startsWith(bookRef.getLocation())) {
+                                                closedDocs.add(scriptView);
+                                        }
+                                }
+                        }
+                        for (DocView toRemove : closedDocs) {
+                                mainWindow.documents().get().remove(toRemove);
+                        }
+                        if (closedDocs.contains(current)) {
+                                mainWindow.currentDocument().set(null);
+                        }
+                        
+                        return true;
+                }
         };
 }

src/main/java/org/sophie2/main/app/commons/app/DocumentsLogic.java

@@ -2 +2 @@
 
 import org.sophie2.base.dialogs.DialogManager;
 import org.sophie2.base.layout.impl.DefaultDocView;
+import org.sophie2.base.model.resources.r4.ResourceRefR4;
+import org.sophie2.base.model.resources.r4.access.ResourceAccess;
 import org.sophie2.core.logging.SophieLog;
 import org.sophie2.core.mvc.EventFilterBuilder;
+import org.sophie2.core.mvc.EventParams;
+import org.sophie2.core.mvc.LogicR3;
 import org.sophie2.core.mvc.OperationDef;
 import org.sophie2.core.mvc.SortKey;
 import org.sophie2.core.mvc.events.EventR3;
@@ -112 +116 @@
                                         assert mainWindow.documents().get().contains(docView) : "Document not in list?";
                                         mainWindow.documents().get().remove(docView);
                                         mainWindow.currentDocument().set(null);
-                                        
                                 }
-                                docView.getAccess().close();
+                                if (docView instanceof BookDocView) {
+                                        //We should close only the book accesses
+                                        ResourceAccess access = docView.getAccess();
+                                        access.close();
+                                        ResourceRefR4 bookRef = access.getRef();
+                                        LogicR3.fire(this, null, mainWindow, event, EventIds.BOOK_CLOSED, bookRef);
+                                }
                         }       
                         
                         return true;
                 }
+                
         },
 
         
@@ -141 +151 @@
                 }
 
         };
+        
+        /**
+         * Notification of event triggered by action in this logic.
+         * 
+         * @author mira
+         */
+        public enum EventIds {
+                
+                /**
+                 * A book view has been closed. 
+                 */
+                @EventParams({ResourceRefR4.class})
+                BOOK_CLOSED;
+                
+        }
 }