Ticket #2487: 2487.patch

modules/org.sophie2.main.func.resources/src/main/java/org/sophie2/main/func/resources/logic/ResourceImportLogic.java

@@ -47 +47 @@
 import org.sophie2.main.app.commons.frame.FrameView;
 import org.sophie2.main.app.commons.page.MainPageView;
 import org.sophie2.main.app.commons.page.PageWorkArea;
+import org.sophie2.main.app.commons.page.PwaSelector;
 import org.sophie2.main.app.commons.util.AppViewUtil;
 import org.sophie2.main.app.menus.insert.InsertResourceMenuItem;
 import org.sophie2.main.dialogs.input.file.FileDialogInput;
@@ -491 +492 @@
                 }
 
                 public boolean handle(EventR3 event) {
-                        FrameView view = event.getSource(FrameView.class);
+                        FrameView view = event.getSource(FrameView.class);                      
+                        if (view.getViewOptions().isPreviewMode()) {
+                                return false;
+                        }
                         
-                        if (view.getViewOptions().isPreviewMode()
-                                        || !view.getPwa().getSel().isEditable(view)) {
+                        PwaSelector selector = view.getPwa().getSel();
+                        if (!selector.getSelected().contains(view)) {
                                 return false;
                         }
                         

modules/org.sophie2.main.func.resources/src/main/java/org/sophie2/main/func/resources/logic/DndChangeBackgroundLogic.java

@@ -14 +14 @@
 import org.sophie2.core.mvc.events.EventR3;
 import org.sophie2.main.app.commons.element.ElementView;
 import org.sophie2.main.app.commons.frame.FrameView;
+import org.sophie2.main.app.commons.page.PwaSelector;
 import org.sophie2.main.app.commons.page.RootPageView;
 
 /**
@@ -43 +44 @@
                                 return false;
                         }
                         
+                        PwaSelector selector = view.getPwa().getSel();
+                        if (!selector.getSelected().contains(view)) {
+                                return false;
+                        }
+                        
                         // check whether the resource was dropped over the background zone or not
                         ImmPoint point = event.getEventParam(
                                         SophieDragDropHandler.TransferEventIds.POINT_PARAM_INDEX,

modules/org.sophie2.main.func.templates/src/main/java/org/sophie2/main/func/templates/frame/FrameTemplateLogic.java

@@ -27 +27 @@
 import org.sophie2.main.app.commons.frame.FrameView;
 import org.sophie2.main.app.commons.page.MainPageView;
 import org.sophie2.main.app.commons.page.PageWorkArea;
+import org.sophie2.main.app.commons.page.PwaSelector;
 import org.sophie2.main.app.commons.util.AppViewUtil;
 import org.sophie2.main.app.commons.util.TemplateUtil;
 import org.sophie2.main.dnd.TemplateRefData;
@@ -62 +63 @@
                                 return false;
                         }
                         
+                        PwaSelector selector = frameView.getPwa().getSel();
+                        if (!selector.getSelected().contains(frameView)) {
+                                return false;
+                        }
+                        
                         TemplateRefData data = preImport.getTransferable().getDndData(TemplateRefData.class);
                         if (data == null) {
                                 return false;

modules/org.sophie2.main.func.templates/src/main/java/org/sophie2/main/func/templates/book/CreateBookByTemplateHandler.java

@@ -9 +9 @@
 import org.sophie2.main.app.commons.element.ResourceDropHandler;
 import org.sophie2.main.app.commons.util.AppViewUtil;
 import org.sophie2.main.dnd.TemplateRefData;
-import org.sophie2.main.func.templates.frame.ApplyFrameTemplateHandler;
 
 /**
  * Creates a new book from a template. This handler is called when a book
@@ -26 +25 @@
         }
         
         /**
-         * Gets the {@link ApplyFrameTemplateHandler}.
+         * Gets the {@link CreateBookByTemplateHandler}.
          * 
          * @return
-         *              The {@link ApplyFrameTemplateHandler} instance.
+         *              The {@link CreateBookByTemplateHandler} instance.
          */
         public static CreateBookByTemplateHandler get() {
                 if (instance == null) {