Ticket #2263: copy-paste-image-background.patch

modules/org.sophie2.main.app.commons/src/main/java/org/sophie2/main/app/commons/element/CopyUtil.java

@@ -73 +73 @@
                         if (ResourceRefR4.class.equals(key.getValueClass())) {
                                 ResourceRefR4 valueRef = (ResourceRefR4)resource.get(key);
                                 
+                                if (ResourceRefR4.NONE_REF.equals(valueRef)) {
+                                        continue;
+                                }
+                                
                                 // copy the resource referenced by valueRef
                                 ResourceAccess access = resource.getAccess().open(valueRef, null);
                                 ResourceModel childModel = capsulate(ResourceH.getHelper(access));
@@ -206 +210 @@
                 Map<String, Key<?>> deeplyCopiedKeys = ResourceR4.getDeeplyCopiedKeys(clazz);
                 for (Key key : deeplyCopiedKeys.values()) {
                         ResourceRefR4 valueRef = (ResourceRefR4) model.getRaw(key);
-
-                        RootKey valueRefChildKey = RootKey.fromRef(valueRef);
-                        ResourceModel valueRefModel = model.getSubModel(valueRefChildKey);
                         
-                        ResourceRefR4 realValueRef = decapsulate(bookModel, valueRefModel, 
-                                        valueRef.getThisChildRef(), bookChanger, true);
-                        bookChanger.removeResource(realBookToModel.append(valueRef));
+                        if (valueRef != null && !ResourceRefR4.NONE_REF.equals(valueRef)) {
+                                RootKey valueRefChildKey = RootKey.fromRef(valueRef);
+                                ResourceModel valueRefModel = model.getSubModel(valueRefChildKey);
+                                
+                                ResourceRefR4 realValueRef = decapsulate(bookModel, valueRefModel, 
+                                                valueRef.getThisChildRef(), bookChanger, true);
+                                bookChanger.removeResource(realBookToModel.append(valueRef));                           
+                                ResourceRefR4 newValue = ResourceRefR4.getRelativeRef(realBookToModel, realValueRef);
                         
-                        ResourceRefR4 newValue = ResourceRefR4.getRelativeRef(realBookToModel, realValueRef);
-                        ResourceChanger subChanger = bookChanger.getSub(realBookToModel);
-                        subChanger.setRaw(key, newValue);
+                                ResourceChanger subChanger = bookChanger.getSub(realBookToModel);
+                                subChanger.setRaw(key, newValue);
+                        }
                 }
                 
                 // decapsulate the children of the given resource

modules/org.sophie2.base.model.book/src/main/java/org/sophie2/base/model/book/interfaces/StyledElement.java

@@ -8 +8 @@
 import org.sophie2.base.model.book.frame.ImmInsets;
 import org.sophie2.base.model.resources.r4.ResourceRefR4;
 import org.sophie2.base.model.resources.r4.keys.CompositeKey;
+import org.sophie2.base.model.resources.r4.keys.DeeplyCopied;
 import org.sophie2.base.model.resources.r4.keys.TemplatedKey;
 import org.sophie2.base.model.resources.r4.keys.TemplatedResourceRefKey;
 import org.sophie2.base.persistence.commons.PersistenceOptions;
@@ -82 +83 @@
          * The image used as a background. Used when the background type is
          * <code>image</code>.
          */
+        @DeeplyCopied
         public static final TemplatedResourceRefKey KEY_BACKGROUND__IMAGE =
                 new TemplatedResourceRefKey("background:image", ResourceRefR4.class, ResourceRefR4.NONE_REF) {
                         @Override