Changeset 1427 for trunk/src/org/expeditee/items

Timestamp:

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

Author:

bln4

Message:

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

Location:

trunk/src/org/expeditee/items

Files:

• Item.java (modified) (3 diffs)
• Picture.java (modified) (4 diffs)
• XRayable.java (modified) (1 diff)

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

@@ -47 +47 @@
 import org.expeditee.core.bounds.EllipticalBounds;
 import org.expeditee.core.bounds.PolygonBounds;
+import org.expeditee.encryption.core.EncryptedImage;
 import org.expeditee.encryption.items.surrogates.EncryptionDetail;
 import org.expeditee.encryption.items.surrogates.EncryptionDetail.Type;
@@ -4049 +4050 @@
                 }
                 
+                //Setup surrogate items.
                 Item copy = this.copy();
                 if (copy.isAnnotation()) {
@@ -4075 +4077 @@
                         copy.setText("Encrypted"); 
                 }
+                
+                // Encrypt XRayables representative files and update pointer.
+                Collection<? extends XRayable> xrayables = this.getEnclosures();
+                for (XRayable xray: xrayables) {
+                        if (xray instanceof Picture) {
+                                EncryptedImage.encryptImage((Picture) xray, labelResult.key);
+                                Text source = xray._source;
+                                String oldName = xray.getName();
+                                String newName = oldName.substring(0, oldName.lastIndexOf('.')) + EncryptedImage.EXPEDITEE_ENCRYPTED_IMAGE_EXTENSION;
+                                source.setText(source.getText().replace(oldName, newName));
+                        }
+                }
+                
                 this.addToSurrogates(copy);
         }

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

@@ -37 +37 @@
 import org.expeditee.core.bounds.AxisAlignedBoxBounds;
 import org.expeditee.core.bounds.PolygonBounds;
+import org.expeditee.encryption.core.EncryptedImage;
+import org.expeditee.encryption.items.surrogates.Label;
+import org.expeditee.encryption.items.surrogates.Label.LabelResult;
 import org.expeditee.gio.EcosystemManager;
 import org.expeditee.gio.GraphicsManager;
@@ -42 +45 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.MessageBay;
 
 /**
@@ -62 +66 @@
 public class Picture extends XRayable {
         
-        public static final String REDACTED_IMAGE_NAME = "redacted.png";
+        public static final String REDACTED_IMAGE_NAME = "expeditee_noise.encrypted";
         
         private static final float CROPPING_COMPOSITE_ALPHA = 0.5f;
@@ -775 +779 @@
         @Override
         public boolean refresh() {
-                // ImageIcon is faster, but cannot handle some formats
-                // (notably.bmp) hence, we try this first, then if it fails we try
-                // ImageIO
-                /*
-                try {
-                        _image = new ImageIcon(_path).getImage();
-                } catch (Exception e) {
-                }
-
-                // if ImageIcon failed to read the image
-                if (_image == null || _image.getWidth() <= 0) {
-                        try {
-                                _image = ImageIO.read(new File(_path));
-                        } catch (IOException e) {
-                                // e.printStackTrace();
-                                Logger.Log(e);
-                                _image = null;
-                                return false;
-                        }
-                }
-*/
-                
                 if (isNoise()) {
-                        _image = Image.getNoise();
+                        _image = EncryptedImage.getNoise();
                 } else {
-                        _image = Image.getImage(_path);
+                        String encryptionLabel = _source.getEncryptionLabel();
+                        if (encryptionLabel == null || encryptionLabel.isEmpty()) {
+                                _image = Image.getImage(_path);
+                        } else {
+                                LabelResult result = Label.getLabel(encryptionLabel);
+                                if (result == LabelResult.SuccessResolveLabelToKey) {
+                                        _image = EncryptedImage.getImage(_path, result.key);
+                                } else {
+                                        MessageBay.displayMessage(result.toString());
+                                        _image = EncryptedImage.getNoise();
+                                }
+                        }
                 }
                 

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

@@ -25 +25 @@
 import org.expeditee.core.Colour;
 import org.expeditee.core.Point;
+import org.expeditee.encryption.core.EncryptedImage;
 import org.expeditee.encryption.items.surrogates.Label;
 import org.expeditee.gui.DisplayController;
 
 public abstract class XRayable extends Item {
-        
         
         protected Text _source = null;