Changeset 1420 for trunk

Timestamp:

07/25/19 11:44:16 (5 years ago)

Author:

bln4

Message:

Injecting an encryption label into an XRayable Item now injects that encryption label into the source item as well.

Location:

trunk/src/org/expeditee

Files:

• encryption/io/EncryptedExpWriter.java (modified) (1 diff)
• items/Picture.java (modified) (1 diff)
• items/XRayable.java (modified) (1 diff)

trunk/src/org/expeditee/encryption/io/EncryptedExpWriter.java

@@ -135 +135 @@
         
         protected void writeClass(Item toWrite) throws IOException {
-                if (toWrite instanceof Text && toWrite.getText().equals("Content for Label Two")) {
-                        System.err.println("EncryptedExpWriter::writeClass::breakpoint");
-                } else if (toWrite instanceof Text && toWrite.getText().equals("Encrypted") && toWrite.getPrimary().getText().equals("Content for Label One")) {
-                        System.err.println("EncryptedExpWriter::writeClass::breakpoint");
-                }
-                
                 LinkedHashMap<Character,Method> itemTags = new LinkedHashMap<Character, Method>(getItemCharTags());
                 LinkedHashMap<String,Method> itemTagsExt = new LinkedHashMap<String, Method>(getItemStrTags());

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

@@ -36 +36 @@
 import org.expeditee.core.Stroke;
 import org.expeditee.core.bounds.AxisAlignedBoxBounds;
-import org.expeditee.core.bounds.CombinationBoxBounds;
 import org.expeditee.core.bounds.PolygonBounds;
 import org.expeditee.gio.EcosystemManager;
 import org.expeditee.gio.GraphicsManager;
 import org.expeditee.gui.DisplayController;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;

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

@@ -39 +39 @@
         }
         
+        @Override
+        public void setEncryptionLabel(String label) {
+                // When the encryption label is set on a XRayable is sets it on its source as well.
+                super.setEncryptionLabel(label);
+                _source.setEncryptionLabel(label);
+        }
+        
         public Collection<Item> getItemsToSave() {
                 Collection<Item> toSave = new LinkedList<Item>();