Changeset 1414 for trunk/src/org/expeditee/encryption/io/EncryptedExpWriter.java

Timestamp:

06/26/19 16:02:00 (5 years ago)

Author:

bln4

Message:

More amendments to the way surrogates are handled. Including renaming classic to primary.

File:

• trunk/src/org/expeditee/encryption/io/EncryptedExpWriter.java (modified) (4 diffs)

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

@@ -44 +44 @@
         private static final String labelProfile = "Profile";
         private static final String labelNone = "None";
-        protected static final String SURROGATE_TERMINATOR = TERMINATOR + "...";
+        protected static final char TERMINATOR = 'Z';
+        protected static final String TERMINATOR_WITH_CONTINUATION = TERMINATOR + "...";
 
         public EncryptedExpWriter(String encryptionLabel) {
@@ -132 +133 @@
                 
                 if (toWrite.isSurrogate()) {
-                        writeLine("SurrogateFor " + toWrite.getClassic().getID());
+                        writeLine("SurrogateFor " + toWrite.getPrimary().getID());
                 }
                 
@@ -177 +178 @@
                 }
                 
+                // write out the surrogates
                 List<Item> surrogates = frame.getSurrogateItemsToSave();
                 if (!surrogates.isEmpty()) {
@@ -242 +244 @@
         
         private void writeSurrogateTerminator() throws IOException {
-                writeLine(SURROGATE_TERMINATOR + nl);
+                writeLine(TERMINATOR_WITH_CONTINUATION + nl);
         }