Ticket #2249: undoRedoAfterSave.patch

src/main/java/org/sophie2/main/app/commons/util/SaveDocUtil.java

@@ -6 +6 @@
 import org.sophie2.base.dialogs.DialogManager;
 import org.sophie2.base.model.resources.r4.LocationPrefix;
 import org.sophie2.base.model.resources.r4.ResourceRefR4;
-import org.sophie2.base.model.resources.r4.access.AccessOptions;
 import org.sophie2.base.model.resources.r4.access.BaseResourceAccess;
 import org.sophie2.base.model.resources.r4.access.ResourceAccess;
 import org.sophie2.base.model.resources.r4.access.ResourceLocator;
@@ -98 +97 @@
                                 ((StoredResourceAccess) access).save(null);
                         } else {
                                 StoredResourceAccess fileAccess = (StoredResourceAccess) locator.create(
-                                        fileRef, AccessOptions.DEFAULT_ACCESS_OPTIONS.modifyViewId(),
-                                                ((BaseResourceAccess) bookDocView.getAccess()).cloneHeadRevision());
+                                        fileRef, access.getAccessOptions(), 
+                                        ((BaseResourceAccess) bookDocView.getAccess()).getTopRevision());
                                 if (fileAccess == null) {
                                         DialogUtils.showErrorDialog(bookDocView.swingComponent().get(),
                                                         "The resource at "+ fileRef + " is currently in use.", 
                                                         "Could not save book");
                                         return false;
                                 }
-                                access.close();
                                 fileAccess.save(null);
                                 bookDocView.reopen(fileAccess);
+                                access.close();
                         }
                         
                 } catch (IOException e) {

src/main/java/org/sophie2/main/app/menus/file/FileMenuLogic.java

@@ -12 +12 @@
 import org.sophie2.base.model.book.BookH;
 import org.sophie2.base.model.book.resource.r4.BookR4;
 import org.sophie2.base.model.resources.r4.ResourceRefR4;
-import org.sophie2.base.model.resources.r4.access.AccessOptions;
+import org.sophie2.base.model.resources.r4.access.BaseResourceAccess;
+import org.sophie2.base.model.resources.r4.access.ResourceAccess;
 import org.sophie2.base.model.resources.r4.access.StoredResourceAccess;
 import org.sophie2.base.model.resources.r4.changes.AutoAction;
 import org.sophie2.base.model.resources.r4.changes.ResourceChanger;
@@ -191 +192 @@
                         fileName = FileDialogInput.appendFileExtension(
                                         new File(fileName), FileDialogInput.BOOK_FILTER).getName();
                         File file = FileEntryManager.get().getWritableFileEntry(fileName);
-
+                        ResourceAccess access = bookDocView.getAccess();
                         AppMainWindow mainWindow = AppViewUtil.findMainWindow(bookDocView);
-                        StoredResourceAccess fileAccess = (StoredResourceAccess) mainWindow.locator().get().create(
-                                        ResourceRefR4.make(file), AccessOptions.DEFAULT_ACCESS_OPTIONS.modifyViewId(),
-                                        bookDocView.getAccess().getHead());
-
+                        StoredResourceAccess fileAccess = 
+                                (StoredResourceAccess) mainWindow.locator().get().create(
+                                ResourceRefR4.make(file), access.getAccessOptions(), 
+                                ((BaseResourceAccess)access).getTopRevision());
                         try {
                                 fileAccess.save(null);
                                 bookDocView.reopen(fileAccess);
+                                access.close();
                                 BookTemplateHelper.get().bookTemplates().add(new BookTemplate(fileAccess));
                         } catch (IOException e) {
                                 DialogUtils.showExceptionDialog(bookDocView.swingComponent().get(),

src/main/java/org/sophie2/base/model/resources/r4/access/BaseResourceAccess.java

@@ -6 +6 @@
 import org.sophie2.base.model.resources.r4.model.LocalResourceRevision;
 import org.sophie2.base.model.resources.r4.model.ResourceModel;
 import org.sophie2.base.model.resources.r4.model.ResourceRevision;
+import org.sophie2.base.model.resources.r4.model.RevisionId;
+import org.sophie2.base.model.resources.r4.resources.ResourceR4;
 
 
 /**
@@ -77 +79 @@
                 }
                 return LocalResourceRevision.getInitialRevision(copyModel);
         }
+        
+        /**
+         * Method that gets head revision for this access. It checks if the 
+         * access location is "." and if it is not makes  initial 
+         * revision of the accessed resource as top one. For example 
+         * when saving a server book to the 
+         * 
+         * @return Top head revision for the resource of this access.
+         */
+        public ResourceRevision getTopRevision() {
+                if (ResourceRefR4.CURRENT_REF.equals(this.location)) {
+                        return getHead();
+                }
+                ResourceRevision head = getHead();
+                RootKey key = ResourceR4.KEY_CHILDREN.sub(this.location);
+                ResourceModel model = head.getModel().getSubModel(key);
+                RevisionId id = head.getId();
+                return new LocalResourceRevision(null, null, null, model, id);
+        }
 
         /**
          * Closes this access.