Changeset 1427 for trunk/src/org/expeditee/core/Image.java

Timestamp:

08/07/19 14:14:42 (5 years ago)

Author:

bln4

Message:

New piping and functionality implementation to support the encrypting of images.

File:

• trunk/src/org/expeditee/core/Image.java (modified) (6 diffs)

trunk/src/org/expeditee/core/Image.java

@@ -8 +8 @@
 
 import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.encryption.core.EncryptedImage;
 import org.expeditee.gio.ImageManager;
 
@@ -26 +27 @@
 
         /** The ImageManager used to perform platform-specific image interactions. */
-        private static ImageManager _manager = null;
+        protected static ImageManager _manager = null;
         
         /** Sets the platform-specific ImageManager for all images. Can only be set once. */
@@ -72 +73 @@
         
         /** Private constructor as instantiation handled through Image.get(boolean). */
-        private Image(boolean fromDisk)
-        {
+        protected Image(boolean fromDisk) {
                 // Assign the next available handle ID number
                 _handle = nextHandle;
@@ -147 +147 @@
         }
         
-        public static Image getNoise() {
-                return _manager.getNoise();
-        }
-        
         /** Convenience access to ImageManager.getImage(URL). */
         public static Image getImage(URL url)
@@ -158 +154 @@
 
         /** Convenience access to ImageManager.getImage(String). */
-        public static Image getImage(String filename)
-        {
-                return _manager.getImage(filename);
+        public static Image getImage(String filename) {
+                if (filename.endsWith(EncryptedImage.EXPEDITEE_ENCRYPTED_IMAGE_EXTENSION)) {
+                        return EncryptedImage.getImage(filename);
+                } else {
+                        return _manager.getImage(filename);
+                }
         }
 
@@ -168 +167 @@
                 return _manager.getImage(connection);
         }
-
+        
         /** Convenience access to ImageManager.releaseImage(Image). */
         public void releaseImage()