Changeset 1326 for trunk

Timestamp:

04/17/19 17:48:37 (5 years ago)

Author:

bln4

Message:

*facepalm* actually fixed bug with frames storing data.

ExpWriter had to be updated to deal with the fact that the header could now have a list in it.

Location:

trunk/src/org/expeditee

Files:

• auth/EncryptedExpWriter.java (modified) (1 diff)
• gui/Frame.java (modified) (2 diffs)
• io/ExpWriter.java (modified) (2 diffs)

trunk/src/org/expeditee/auth/EncryptedExpWriter.java

@@ -85 +85 @@
                         Frame secretsFrame = FrameIO.LoadFrame(linkToSecretsFrame.getParent().getFramesetName() + linkToSecretsFrame.getLink());
                         Collection<Text> labels = secretsFrame.getTextItems();
-                        labels.removeIf(lbl -> lbl.getText().equals(label));
+                        labels.removeIf(lbl -> !lbl.getText().equals(label));
                         labels.removeIf(lbl -> lbl.getData() == null || lbl.getData().size() == 0);
                         if (labels.isEmpty()) {

trunk/src/org/expeditee/gui/Frame.java

@@ -141 +141 @@
         
         // frame data
-        private List<String> _frameData = new ArrayList<String>();
+        private List<String> _frameData = null;
 
         private int _lineCount = 0;
@@ -1874 +1874 @@
          */
         public void addToData(String dataItem) {
-                _frameData.add(dataItem);
+                if (dataItem != null) {
+                        if (_frameData == null)
+                                _frameData = new LinkedList<String>();
+                        _frameData.add(dataItem);
+                }
         }
 

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

@@ -147 +147 @@
                                 o = Conversion.ConvertToExpeditee(_FrameTags.get(tag), o);
                                 if (o != null) {
-                                        writeLine(tag.toString(), o.toString());
+                                        if (o instanceof List) {
+                                                for (Object line: (List) o) {
+                                                        writeLine(tag.toString(), line.toString());
+                                                }
+                                        } else {
+                                                writeLine(tag.toString(), o.toString());
+                                        }
                                 }
                         } catch (Exception e) {
@@ -156 +162 @@
                 writeTerminator();
         }
+        
+//      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();
+//                      }
+//              }
+//      }
 
         private void writeLine(String tag, String line) throws IOException {