Ticket #2446: 2446.patch

modules/org.sophie2.dev/src/test/java/org/sophie2/dev/author/TestDeleteAutoChainedFrame.java

@@ +1 @@
+package org.sophie2.dev.author;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.swing.SwingUtilities;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.sophie2.base.bound.BoundModule;
+import org.sophie2.base.commons.BaseCommonsModule;
+import org.sophie2.base.dialogs.BaseDialogsModule;
+import org.sophie2.base.dialogs.TestingDialogManager;
+import org.sophie2.base.halos.HaloButton;
+import org.sophie2.base.model.resources.r4.ResourceRefR4;
+import org.sophie2.base.model.resources.r4.changes.AutoAction;
+import org.sophie2.base.model.text.BaseModelTextModule;
+import org.sophie2.base.model.text.model.ImmHotText;
+import org.sophie2.base.model.text.model.ImmText;
+import org.sophie2.base.skins.Message;
+import org.sophie2.core.modularity.SophieModule;
+import org.sophie2.core.mvc.LogicR3;
+import org.sophie2.core.mvc.events.EventR3;
+import org.sophie2.dev.testing.SystemTestBase;
+import org.sophie2.main.app.commons.book.BaseBookView;
+import org.sophie2.main.app.commons.page.RootPageView;
+import org.sophie2.main.app.halos.MainAppHalosModule;
+import org.sophie2.main.app.halos.frame.FrameRemoveHaloButton;
+import org.sophie2.main.app.halos.shared.MainHaloMenu;
+import org.sophie2.main.app.layout.MainAppLayoutModule;
+import org.sophie2.main.app.menus.MainAppMenusModule;
+import org.sophie2.main.app.model.MainAppModelModule;
+import org.sophie2.main.dialogs.input.ConfirmDialogInput;
+import org.sophie2.main.func.resources.MainFuncResourcesModule;
+import org.sophie2.main.func.text.TextFuncModule;
+import org.sophie2.main.func.text.chaining.ChainingMode;
+import org.sophie2.main.func.text.model.HeadTextFrameH;
+import org.sophie2.main.func.text.utils.TextChainUtils;
+import org.sophie2.main.func.text.view.HeadTextFrameView;
+import org.sophie2.main.func.text.view.TextFrameView;
+
+/**
+ * Tests the deleting of auto chained frames. 
+ * 
+ * @author diana
+ *
+ */
+public class TestDeleteAutoChainedFrame extends SystemTestBase {
+
+        /**
+         * Constant created for insertion of a full text frame.
+         * Constant created to be a parameter of a message of an {@link AutoAction}. 
+         * Used for skinning. Used in the test.
+         */
+        public static final String INSERT_FULL_TEXT_FRAME = "Insert a full text frame";
+
+        @SuppressWarnings("unchecked")
+        @Override
+        protected List<Class<? extends SophieModule>> fillDependencies() {
+
+                List<Class<? extends SophieModule>> res = super.fillDependencies();
+                List<Class<? extends SophieModule>> toAppend = 
+                        Arrays.asList(
+                                        BoundModule.class,
+                                        MainAppMenusModule.class,
+                                        BaseModelTextModule.class,
+                                        MainAppHalosModule.class,
+                                        TextFuncModule.class,
+                                        MainAppLayoutModule.class,
+                                        MainAppModelModule.class,
+                                        MainFuncResourcesModule.class,
+                                        BaseDialogsModule.class,
+                                        BaseCommonsModule.class
+                        );
+
+                merge(res, toAppend);
+
+                return res;
+        }
+
+        @Override
+        @Before
+        protected void setUp() throws Exception {
+                super.setUp();
+                SwingUtilities.invokeAndWait(new Runnable() {
+
+                        @SuppressWarnings("synthetic-access")
+                        public void run() {
+                                createNewBook();
+                        }
+                });
+
+                try {
+                        Thread.sleep(10000);
+                } catch (InterruptedException e) {
+                        //nothing
+                }
+                ImmText text = new ImmHotText(
+                                "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean dui" +
+                                " ligula, rhoncus id interdum nec, vestibulum non dolor. Suspendisse nec" +
+                                " ante vitae purus pellentesque porttitor. Duis orci elit, blandit blandit" +
+                                " vestibulum sed, dictum ac dolor. Donec sed blandit ante. In pretium arcu" +
+                                " eleifend ligula imperdiet eget tempor nunc viverra. Maecenas interdum " +
+                                "sapien id nisl dignissim pulvinar. Morbi congue, magna a tincidunt" +
+                                " tincidunt, nibh tortor varius ligula, at feugiat ante neque eu nisl." +
+                                " Proin at odio a elit pharetra egestas vel ac nibh. Integer nunc ipsum," +
+                                " ornare quis lobortis vulputate, accumsan eu purus. Phasellus tristique" +
+                                " interdum odio, id vulputate lorem pretium eu. Aenean at nulla libero," +
+                                " sit amet egestas nisl. Sed metus arcu, cursus eu facilisis quis," +
+                                " dignissim eget neque. Nulla facilisi. Sed quam nisl, ornare vitae blandit" +
+                                " at, tristique sagittis quam."
+                                + "Maecenas vel vestibulum lectus. Ut gravida pellentesque turpis at" +
+                                " pharetra. Mauris luctus est nisl. Aenean egestas lectus vitae" +
+                                " dolor luctus in vestibulum purus faucibus. Vivamus eros dolor," +
+                                " tristique vitae tincidunt nec, ullamcorper id erat. Nunc id lorem" +
+                                " lectus, sed tristique neque. Nullam imperdiet ligula ut velit" +
+                                " facilisis gravida. Lorem ipsum dolor sit amet, consectetur" +
+                                " adipiscing elit. Integer eget dolor ipsum. Nullam elementum" +
+                                " lectus a est tincidunt ultricies tempus nisl interdum. Integer" +
+                                " posuere felis eget lectus pellentesque ac vestibulum neque" +
+                                " vulputate. Donec ut lectus quis eros tincidunt sagittis.", null);
+
+                HeadTextFrameH.createTextFrameAction(curBook(),
+                                curPageWorkArea().getRootPageView().model().get(),
+                                text, ResourceRefR4.NONE_REF.toUri(), null,
+                                Message.create(INSERT_FULL_TEXT_FRAME), true, true);
+
+                TextFrameView frameViewToSelect =
+                        curPageWorkArea().getAll(TextFrameView.class).get(0);
+                curPageWorkArea().getSel().select(frameViewToSelect, false);
+
+                final HeadTextFrameView selectedFrameView =
+                        curPageWorkArea().getSel().getSingleSelected(HeadTextFrameView.class);
+                assertNotNull(selectedFrameView);
+
+                try {
+                        Thread.sleep(5000);
+                } catch (InterruptedException e) {
+                        //nothing
+                }
+                SwingUtilities.invokeAndWait(new Runnable() {
+
+                        @SuppressWarnings("synthetic-access")
+                        public void run() {
+                                assertEquals(ChainingMode.AUTO_CHAINING, selectedFrameView.model().get().getChainMode());
+                                assertTrue(curBook().getPageCount() >= 2);
+
+                                assertTrue(TextChainUtils.getChainedFrameViews(
+                                                selectedFrameView.getBookView(), selectedFrameView).size() >= 2);
+
+                        }
+                });
+
+        }
+
+
+
+        /**
+         * Tests the deleting of chained frames.
+         */
+        @Test
+        public void testChainingNavigationDown() {
+
+                HeadTextFrameView selectedFrameView =
+                        curPageWorkArea().getSel().getSingleSelected(HeadTextFrameView.class);
+                TextFrameView viewToSelect = TextChainUtils.getChainedFrameViews(
+                                selectedFrameView.getBookView(), selectedFrameView).get(1);
+                assertNotNull(viewToSelect);
+
+                BaseBookView bookView = curPageWorkArea().bookView().get();
+                RootPageView page = viewToSelect.findParentElement(RootPageView.class);
+                bookView.goToPage(ResourceRefR4.getRelativeRef(bookView.getAccess().getRef(),
+                                page.getAccess().getRef()));
+                curPageWorkArea().getSel().select(viewToSelect, false);         
+
+
+                MainHaloMenu mainHaloMenu = viewToSelect.findNearestElement(null, MainHaloMenu.class);
+                FrameRemoveHaloButton removeButton = null;
+                for (HaloButton button : mainHaloMenu.buttons().get()) {
+                        if (button instanceof FrameRemoveHaloButton) {
+                                removeButton = (FrameRemoveHaloButton) button;
+                                break;
+                        }
+                }
+                assert removeButton != null;
+
+
+                try {
+                        TestingDialogManager.get().expect(ConfirmDialogInput.class, 
+                                        ConfirmDialogInput.Response.YES);
+
+                        LogicR3.fire(new EventR3(removeButton, null, null, null, HaloButton.EventIds.HALO_CLICK));
+
+                } catch (Exception e) {
+                        fail();
+                }
+
+        }
+
+}

modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/view/TextFrameView.java

@@ -150 +150 @@
         
         @Override
         public boolean isEditable() {
-                return super.isEditable() && textFlow().get().isEditable();
+                boolean isEditable = super.isEditable();
+                if (textFlow().get() != null) {
+                        isEditable = isEditable && textFlow().get().isEditable();
+                }
+                return isEditable;
         }
 }