Ticket #2355: resource-delete-exceptions.patch

src/main/java/org/sophie2/main/dnd/dnddata/FileListData.java

@@ -9 +9 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.StringTokenizer;
 
 import org.sophie2.base.dnd.AwtTransferable;
 import org.sophie2.base.dnd.DndData;
@@ -75 +74 @@
                 
                 private static List<File> textURIListToFileList(String data) {
                         List<File> list = new ArrayList<File>(1);
-                        for (StringTokenizer st = new StringTokenizer(data, "\r\n"); st.hasMoreTokens();) {
-                                String str = st.nextToken();
+                        for (String str : data.split("\r\n")) {
                                 if (str.startsWith("#")) {
                                         // the line is a comment (as per the RFC 2483)
                                         continue;

src/main/java/org/sophie2/main/func/resources/logic/ResourceDeleteLogic.java

@@ -19 +19 @@
 import org.sophie2.main.app.commons.book.BookView;
 import org.sophie2.main.app.commons.element.ElementView;
 import org.sophie2.main.app.commons.page.RootPageView;
+import org.sophie2.main.app.commons.util.AppViewUtil;
 import org.sophie2.main.dialogs.input.ConfirmDialogInput;
 import org.sophie2.main.dialogs.input.DialogUtils;
 import org.sophie2.main.func.resources.view.ResourceDetailsPalette;
+import org.sophie2.main.func.resources.view.ResourceDetailsPalette.DeleteResourceButton;
 import org.sophie2.main.func.resources.view.ResourcesPalette.ResourceItem;
-import org.sophie2.main.func.resources.view.ResourceDetailsPalette.DeleteResourceButton;
 
 /**
  * Represents the logic for handling the deleting resources event.
@@ -49 +50 @@
 
                         assert palette != null : "The source must not be null!";
 
-                        BookDocView bookDocView = palette.findNearestElement(null, BookDocView.class);
+                        BookDocView bookDocView = AppViewUtil.getCurrentBookDocView(palette);
                         ListPaletteItem selectedItem = 
                                 palette.resourcePalette().get().firstSelectedItem().get();
 
@@ -76 +77 @@
                                 return deleteResource(resource, book);
                         }
 
-                                DialogUtils.showErrorDialog(null, "The selected resource is currently in use.",
-                                  "Could not delete resource");
+                        DialogUtils.showErrorDialog(null, "The selected resource is currently in use.",
+                                "Could not delete resource");
                         return true;
                 }
         };

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

@@ -234 +234 @@
                         for (String childName : children) {
                                 RootKey key = RootKey.fromRef(ResourceRefR4.makeChild(childName));
                                 ResourceModel childModel = model.getSubModel(key);
-                                decapsulate(bookModel, childModel, ResourceRefR4.makeChild(childName), 
+                                decapsulate(bookModel, childModel,
+                                                bookToModel.append(ResourceRefR4.makeChild(childName)), 
                                                 bookChanger, false);
                         }
                 }

src/main/java/org/sophie2/main/app/halos/grouping/GroupHalosLogic.java

@@ -236 +236 @@
                         ElementH parentH = ((ElementView) groupView.parent().get()).model().get();
                         
                         final ResourceRefR4 relativeGroupRef = 
-                                ResourceRefR4.getRelativeRef(groupRef, parentH.getRef());
+                                ResourceRefR4.getRelativeRef(parentH.getRef(), groupRef);
                         ResourceAccess parentAccess = parentH.getAccess();
                         ImmList<ActivationChannel> channels = 
                                 CompositeElement.KEY_SUB_ELEMENTS.get(parentAccess);