Changeset 1413 for trunk/src/org/expeditee/encryption/io/EncryptedExpReader.java

Timestamp:

06/25/19 13:57:37 (5 years ago)

Author:

bln4

Message:

Changed surrogates to work the way discussed with David. EncryptedExpReader/Writer updated to work with this.

File:

• trunk/src/org/expeditee/encryption/io/EncryptedExpReader.java (modified) (10 diffs)

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

@@ -26 +26 @@
 import org.expeditee.encryption.items.surrogates.EncryptionDetail;
 import org.expeditee.encryption.items.surrogates.Label;
-import org.expeditee.encryption.items.surrogates.Surrogate;
 import org.expeditee.encryption.items.surrogates.Label.LabelResult;
 import org.expeditee.gui.Frame;
@@ -37 +36 @@
 
 public class EncryptedExpReader extends ExpReader implements CryptographyConstants {
+        
         private static final String ENCRYPTED_EXP_FLAG = "EncryptedExp";
         private static final String labelProfile = "Profile";
@@ -43 +43 @@
         private boolean accessDenied = false;
 
-        public EncryptedExpReader(String frameName) {
-                super(frameName);
-        }
-
         public static boolean isEncryptedExpediteeFile(final String path) throws IOException {
                 final BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(path), "UTF-8"));
@@ -52 +48 @@
                 in.close();
                 return firstLine.startsWith(ENCRYPTED_EXP_FLAG);
+        }
+        
+        public EncryptedExpReader(String frameName) {
+                super(frameName);
         }
         
@@ -132 +132 @@
                                 continue;
                         }
+                        
                         String tag = getTagEnc(next);
-                        if (tag.equals("S")) {
+                        if (next.startsWith("S ")) {
                                 currentItem = newItem(next);
                                 _linePoints.put(currentItem.getID(), currentItem);
                                 newFrame.addItem(currentItem);
                                 currentItem.setEncryptionDetailForTag(tag + "", EncryptionDetail.UnencryptedOnSave);
+                        } else if (next.startsWith("SurrogateFor")) {
+                                int parentID = Integer.parseInt(next.split(" ")[1]);
+                                newFrame.getItemWithID(parentID).addToSurrogates(currentItem);
                         } else if (currentItem != null && actionShouldBeDelayed(tag.charAt(0))) { 
                                 delayedActions.add(new DelayedAction(currentItem, next));
@@ -147 +151 @@
                 }
                 
-                if (next.equals("Z...")) {
-                        next = readTheSurrogateItems(newFrame, delayedActions);
+                if (next.equals(EncryptedExpWriter.SURROGATE_TERMINATOR)) {
+                        next = readTheItems(newFrame, delayedActions);
                 }
                 
@@ -159 +163 @@
                 String tag = getTagEnc(line);
                 String value = getValue(line);
+                
+                if (item.isSurrogate() && item.isTagInherited(tag)) {
+                        return;
+                }
                 
                 // Attempt to decrypt the line if necessary.
@@ -192 +200 @@
                 }
         }
-                
-        private String readTheSurrogateItems(Frame newFrame, List<DelayedAction> delayedActions) throws IOException {
-                String next = null;
-                Item currentItem = null;
-                
-                Predicate<String> endOfSection = s -> s.equals("Z") || s.equals("Z...");
-                while (_reader.ready() && !endOfSection.test(next = _reader.readLine())) {
-                        if (!isValidLine(next)) {
-                                continue;
-                        }
-                        
-                        String tag = getTagEnc(next);
-                        if (tag.equals("S") && !next.startsWith("SurrogateFor")) {
-                                currentItem = newItem(next);
-                                currentItem.setEncryptionDetailForTag(tag + "", EncryptionDetail.UnencryptedOnSave);
-                        } else if (next.startsWith("SurrogateFor")) {
-                                String id = next.split(" ")[1];
-                                Item classic = newFrame.getItemWithID(Integer.parseInt(id));
-                                if (id == null) {
-                                        System.err.println("WARNING: Attempted to create surrogate for classic ID " + 
-                                                        id + " but was no item on frame " + newFrame.getName() + " exists.");
-                                        continue;
-                                }
-                                currentItem.setAsSurrogateFor(classic);
-                                classic.addToSurrogates(new Surrogate(currentItem));
-                        } else if (currentItem != null && actionShouldBeDelayed(getTag(next))) { 
-                                delayedActions.add(new DelayedAction(currentItem, next));
-                        } else if (currentItem != null) {
-                                processBodyLine(currentItem, next);
-                        } else {
-                                System.err.println("Error while reading in frame (ExpReader): Found body line but no current item to apply it to.");
-                        }
-                }
-
-                return next;
-        }
-        
-        protected static String getTagEnc(String line) {
-                char charAtZero = line.charAt(0);
-                if (charAtZero == '_') {
-                        return line.split(" ")[0];
-                } else {
-                        return charAtZero + "";
-                }
-        }
         
         protected static String getValue(String line) {
@@ -247 +210 @@
         }
         
-        protected static boolean isEncryptedLine(String line) {
+        private static String getTagEnc(String line) {
+                char charAtZero = line.charAt(0);
+                if (charAtZero == '_') {
+                        return line.split(" ")[0];
+                } else {
+                        return charAtZero + "";
+                }
+        }
+                
+        private static boolean isEncryptedLine(String line) {
                 if (line.startsWith("S") || line.startsWith("_el")) {
                         return false;
@@ -278 +250 @@
                 }
         }
-        
+
         private class EncryptedLineReader extends BufferedReader {
                 private boolean noneMode = false;