Add clone to javaSE SdlFile

2 files changed, 22 insertions, 9 deletions

diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
index affa4ec36..60d2f396f 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
@@ -159,16 +159,10 @@ public class SdlArtwork extends SdlFile implements Cloneable {
      */
     @Override
     public SdlArtwork clone() {
-        try {
-            SdlArtwork artwork = (SdlArtwork) super.clone();
-            if (artwork != null) {
-                artwork.imageRPC = artwork.createImageRPC();
-            }
+        SdlArtwork artwork = (SdlArtwork) super.clone();
+        if (artwork != null) {
+            artwork.imageRPC = artwork.createImageRPC();
             return artwork;
-        } catch (CloneNotSupportedException e) {
-            if (DebugTool.isDebugEnabled()) {
-                throw new RuntimeException("Clone not supported by super class");
-            }
         }
         return null;
     }
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
index 6fd91b8a0..5e8a2cf94 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
@@ -35,6 +35,7 @@ import androidx.annotation.NonNull;
 
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.StaticIconName;
+import com.smartdevicelink.util.DebugTool;
 
 import java.net.URI;
 import java.security.MessageDigest;
@@ -366,4 +367,22 @@ public class SdlFile {
         // return comparison
         return hashCode() == o.hashCode();
     }
+
+    /**
+     * Creates a deep copy of the object
+     *
+     * @return deep copy of the object, null if an exception occurred
+     */
+    @Override
+    public SdlFile clone() {
+        try {
+            SdlFile fileClone = (SdlFile) super.clone();
+            return fileClone;
+        } catch (CloneNotSupportedException e) {
+            if (DebugTool.isDebugEnabled()) {
+                throw new RuntimeException("Clone not supported by super class");
+            }
+        }
+        return null;
+    }
 }