Ticket #2115: 2115.patch

modules/org.sophie2.main.func.text/src/main/java/org/sophie2/main/func/text/chaining/TextChainingLogic.java

@@ -5 +5 @@
 import org.sophie2.base.bound.BoundControl;
 import org.sophie2.base.bound.ComboInput;
 import org.sophie2.base.commons.util.ImmMap;
+import org.sophie2.base.commons.util.NaiveImmList;
 import org.sophie2.base.commons.util.ImmMap.ImmEntry;
 import org.sophie2.base.halos.HaloButton;
 import org.sophie2.base.model.book.BookH;
+import org.sophie2.base.model.book.FrameH;
 import org.sophie2.base.model.book.PageH;
 import org.sophie2.base.model.book.frame.FrameR4;
 import org.sophie2.base.model.book.interfaces.ResourceFrame;
@@ -19 +21 @@
 import org.sophie2.base.model.resources.r4.access.ResourceAccess;
 import org.sophie2.base.model.resources.r4.changes.AutoAction;
 import org.sophie2.base.model.resources.r4.changes.ResourceChanger;
+import org.sophie2.base.model.resources.r4.keys.TemplatedKey;
 import org.sophie2.base.model.resources.r4.resources.ResourceH;
 import org.sophie2.base.model.resources.r4.resources.ResourceR4;
 import org.sophie2.base.model.text.mvc.TextViewFlow;
 import org.sophie2.base.model.text.smart.ImmHotText;
 import org.sophie2.base.model.text.smart.position.HotInterval;
+import org.sophie2.core.logging.SophieLog;
 import org.sophie2.core.mvc.EventFilterBuilder;
 import org.sophie2.core.mvc.OperationDef;
 import org.sophie2.core.mvc.SortKey;
@@ -34 +38 @@
 import org.sophie2.main.app.halos.frame.FrameRemoveHaloButton;
 import org.sophie2.main.app.layout.left.pages.PagePreviewPalette;
 import org.sophie2.main.app.layout.left.pages.PagePreviewPalette.PageItem;
+import org.sophie2.main.app.layout.right.library.LibraryTabLogic;
 import org.sophie2.main.func.text.chaining.TextChainHud.AutoChainButton;
 import org.sophie2.main.func.text.chaining.TextChainHud.TextChainComboBox;
 import org.sophie2.main.func.text.model.HeadTextFrameH;
@@ -111 +116 @@
 
                         int curIndex = book.getIndexOf(curPage);                        
                         int chainIndex = 1;
+                        
+                        
+                        
 
                         // ----- start templating stuff -------
                         final ResourceRefR4 frameRef = selFrameView.model().get().getRef();
@@ -160 +168 @@
                                 ResourceRefR4 toChainRef = HeadTextFrameH.createTextFrameAction(
                                                 book, page, ImmHotText.empty(), ResourceRefR4.NONE_REF.toUri(),
                                                 null, "Insert text frame", false);
+                                
+                                
 
                                 chainTextFrame(selFrameView, toChainRef, chainIndex, false, templateRef);
 
@@ -392 +402 @@
          *            Whether the action for chaining the frame is significant.
          *            Should be false when this is used in auto chaining, for
          *            example.
-         * @param template 
+         * @param templateRef 
          *                              The template to use for the newly created frame.
          * @return 
          *                              True if the chaining operation was successful, false otherwise.
          */
         static final boolean chainTextFrame(TextFrameView prevView, final ResourceRefR4 toChainRef,
-                        int offset, boolean significant, final ResourceRefR4 template) {
+                        int offset, boolean significant, final ResourceRefR4 templateRef) {
 
                 BookView bookView = prevView.getBookView();
                 ResourceAccess bookAccess = bookView.getAccess();
@@ -461 +471 @@
                                         }}
                         }.register(bookView.getAccess());
                 }
+                
+                if (!ResourceRefR4.NONE_REF.equals(templateRef)) {
+                        FrameH template = ResourceH.getHelper(toChainAccess.open(templateRef, null), FrameH.class);
+
+                        final String templateKind = template.getAccess().getRaw(ResourceR4.KEY_KIND);
+
+                        SophieLog.debug("Applying frame template from " + templateRef);
+
+                        final NaiveImmList<TemplatedKey<?>> immKeys = template.getApplicableTemplatedKeys();
+
+                        new AutoAction("Apply frame template", false) {
+
+                                @Override
+                                public void performAuto() {
+                                        LibraryTabLogic.applyFrameTemplate(getChanger(), immKeys, templateRef, false, templateKind);
+                                }
+
+                        }.register(toChainAccess);
+                }
 
                 new AutoAction("Chain text frame", significant) {
 
@@ -471 +500 @@
                                 frameCh.setRaw(ResourceR4.KEY_KIND, TailTextFrameR4.KIND);
                                 frameCh.setRaw(TailTextFrameR4.KEY_HEAD_REFERENCE, headFrameRef);
                                 frameCh.setRaw(TailTextFrameR4.KEY_CHAIN_ORDER, chainOrder);
-                                frameCh.setRaw(ResourceR4.KEY_TEMPLATE, template);
                         }
 
                 }.register(bookAccess);

modules/org.sophie2.main.app.layout/src/main/java/org/sophie2/main/app/layout/right/library/LibraryTabLogic.java

@@ -543 +543 @@
          * @param templateKind
          *            The kind of the frame template.
          */
-        static void applyFrameTemplate(ResourceChanger changer, final NaiveImmList<TemplatedKey<?>> immValues, final ResourceRefR4 templateRef, boolean skipLocationKey, String templateKind) {
+        public static void applyFrameTemplate(ResourceChanger changer, final NaiveImmList<TemplatedKey<?>> immValues, final ResourceRefR4 templateRef, boolean skipLocationKey, String templateKind) {
                 changer.setRaw(ResourceR4.KEY_TEMPLATE, templateRef);
                 for(TemplatedKey<?> key : immValues) {
                         if (!key.equals(MemberElement.KEY_LOCATION) || !skipLocationKey) {