Changeset 1408 for trunk/src/org/expeditee/io/ExpWriter.java

Timestamp:

06/21/19 12:12:55 (5 years ago)

Author:

bln4

Message:

Implementation of the surrogate system.
When you set an item to have a encryption label, a surrogate for that item is generated.
The newly updated EncryptedExpReader/Writer has been updated to maintain the connection between the item and its surrogate.

Coming up next:
Surrogate mode. The ability to simulate viewing and editing an encrypted frame with a limited set of labels.

File:

• trunk/src/org/expeditee/io/ExpWriter.java (modified) (8 diffs)

trunk/src/org/expeditee/io/ExpWriter.java

@@ -28 +28 @@
 import java.lang.reflect.Method;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -53 +54 @@
         protected String _framename;
 
-        private static final char TERMINATOR = 'Z';
+        protected static final char TERMINATOR = 'Z';
 
         public ExpWriter() {
@@ -87 +88 @@
                 try {
                         _FrameTags.remove('A');
-                        _ItemTags.put('S', Item.class.getMethod("getTypeAndID",
+                        getItemTags().put('S', Item.class.getMethod("getTypeAndID",
                                         new Class[] {}));
                 } catch (Exception e) {
@@ -130 +131 @@
                 writeTerminator();
                 writeLine(SessionStats.getFrameEventList(frame));
-
-                return;
         }
 
@@ -137 +136 @@
         }
 
-        private void writeHeader(Frame toWrite) throws IOException {
+        protected void writeHeader(Frame toWrite) throws IOException {
                 Iterator<Character> it = _FrameTags.keySet().iterator();
                 Object[] param = {};
@@ -185 +184 @@
 //      }
 
-        private void writeLine(String tag, String line) throws IOException {
+        protected void writeLine(String tag, String line) throws IOException {
                 writeLine(tag + " " + line);
         }
@@ -227 +226 @@
         }
 
-        private List<Item> _lineEnds = new LinkedList<Item>();
+        protected List<Item> _lineEnds = new LinkedList<Item>();
 
         // Writes out a LineEnd to the file
@@ -306 +305 @@
         }
 
-        private void writeClass(Object toWrite) throws IOException {
-                Iterator<Character> it = _ItemTags.keySet().iterator();
-                Iterator<String> itExt = _ItemTagsExt.keySet().iterator();
-                Object[] param = {};
-
+        protected void writeClass(Item toWrite) throws IOException {
+                writeTags(toWrite, new Object[] {}, getItemTags());
+                writeTags(toWrite, new Object[] {}, getItemTagsExt());
+        }
+
+        protected <T> void writeTags(Item toWrite, Object[] param, LinkedHashMap<T, Method> tags) {
+                Iterator<T> it = tags.keySet().iterator();
                 while (it.hasNext()) {
-                        Character tag = it.next();
-                        Method toRun = _ItemTags.get(tag);
-                        Class<?> declarer = toRun.getDeclaringClass();
-                        if (declarer.isAssignableFrom(toWrite.getClass())) {
-                                try {
-                                        Object o = toRun.invoke(toWrite, param);
-                                        o = Conversion.ConvertToExpeditee(toRun, o);
-                                        if (o != null) {
-                                                if (o instanceof List) {
-                                                        for (Object line : (List) o) {
-                                                                writeLine(tag.toString(), line.toString());
-                                                        }
-                                                } else
-                                                        writeLine(tag.toString(), o.toString());
-                                        }
-                                } catch (Exception e) {
-                                        e.printStackTrace();
+                        T tag = it.next();
+                        writeTag(toWrite, param, tags, tag);
+                }
+        }
+
+        protected <T> void writeTag(Item toWrite, Object[] param, LinkedHashMap<T, Method> tags, T tag) {
+                Method toRun = tags.get(tag);
+                Class<?> declarer = toRun.getDeclaringClass();
+                if (declarer.isAssignableFrom(toWrite.getClass())) {
+                        try {
+                                Object o = toRun.invoke(toWrite, param);
+                                o = Conversion.ConvertToExpeditee(toRun, o);
+                                if (o != null) {
+                                        if (o instanceof List) {
+                                                for (Object line : (List) o) {
+                                                        writeLine(tag.toString(), line.toString());
+                                                }
+                                        } else
+                                                writeLine(tag.toString(), o.toString());
                                 }
-                        }
-                }
-                
-                while (itExt.hasNext()) {
-                        String tag = itExt.next();
-                        Method toRun = _ItemTagsExt.get(tag);
-                        Class<?> declarer = toRun.getDeclaringClass();
-                        if (declarer.isAssignableFrom(toWrite.getClass())) {
-                                try {
-                                        Object o = toRun.invoke(toWrite, param);
-                                        o = Conversion.ConvertToExpeditee(toRun, o);
-                                        if (o != null) {
-                                                if (o instanceof List) {
-                                                        for (Object line : (List) o) {
-                                                                writeLine(tag.toString(), line.toString());
-                                                        }
-                                                } else
-                                                        writeLine(tag.toString(), o.toString());
-                                        }
-                                } catch (Exception e) {
-                                        e.printStackTrace();
-                                }
+                        } catch (Exception e) {
+                                e.printStackTrace();
                         }
                 }