Changeset 1441 for trunk/src/org/expeditee/items/Picture.java

Timestamp:

11/07/19 12:22:50 (5 years ago)

Author:

bnemhaus

Message:

Copying images in Expeditee now duplicates the associated file on the filesystem.
Also changed USER_NAME back to USER.NAME on David's direction.

File:

• trunk/src/org/expeditee/items/Picture.java (modified) (4 diffs)

trunk/src/org/expeditee/items/Picture.java

@@ -21 +21 @@
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.text.DecimalFormat;
 
@@ -47 +51 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.management.ResourceUtil;
 
 /**
@@ -626 +631 @@
                 p._image = _image;
                 p._highlightMode = _highlightMode;
+                
+                String copyFileName = _fileName;
+                try {
+                        String name = getName();
+                        Path imageFilePath = ResourceUtil.resolveImagePath(Paths.get(name), this.getSource().getParent());
+                        Path imageDirectoryPath = imageFilePath.getParent();
+                        String fileName = name.substring(0, name.indexOf('.'));
+                        String suffix = name.substring(name.indexOf('.'));
+                        File copiedFile = File.createTempFile(fileName, suffix, imageDirectoryPath.toFile());
+                        Path newFilePath = Files.copy(imageFilePath, Paths.get(copiedFile.getAbsolutePath()), StandardCopyOption.REPLACE_EXISTING);
+                        Path newFilePathResolved = ResourceUtil.resolveImagePath(newFilePath.getFileName(), this.getSource().getParent());
+                        Path newFilePathRelativeToExpediteeHome = ResourceUtil.relativiseImagePath(newFilePathResolved);
+                        copyFileName = newFilePathRelativeToExpediteeHome.toString();
+                } catch (IOException e) {
+                        MessageBay.displayMessage("Unable to duplicate image file, new copy refers to existing image file.");
+                        MessageBay.displayMessage("Caused by IOException with message: " + e.getMessage());
+                }
+                
                 // Doing Duplicate item duplicates link mark which we dont want to do
                 // when in audience mode because the linkMark will be copied incorrectly
@@ -668 +691 @@
                 p._scaleType = _scaleType;
                 p._path = _path;
-                p._fileName = _fileName;
+                p._fileName = copyFileName;
 
                 p.updateSource();