Changeset 1324 for trunk

Timestamp:

04/17/19 15:46:36 (5 years ago)

Author:

bln4

Message:

Fixed bug with frame data that reared its head because of just implemented ability to encrypt frames with custom labels.

Location:

trunk/src/org/expeditee

Files:

• auth/account/Authenticate.java (modified) (1 diff)
• gui/Frame.java (modified) (3 diffs)

trunk/src/org/expeditee/auth/account/Authenticate.java

@@ -73 +73 @@
                         for (int i = 1; i <= FrameIO.getLastNumber(oneFrame.getFramesetName()); i++) {
                                 Frame f = FrameIO.LoadFrame(oneFrame.getFramesetName() + i);
-                                if (f != null && f.getData() != null && f.getData().contains("MultiuserCredentials")) {
-                                        AuthenticatorBrowser.CREDENTIALS_FRAME = f.getNumber();
+                                if (f != null) {
+                                        List<String> data = f.getData();
+                                        if(data != null && data.contains("MultiuserCredentials")) {
+                                                AuthenticatorBrowser.CREDENTIALS_FRAME = f.getNumber();
+                                        }
                                 }
                         }

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

@@ -141 +141 @@
         
         // frame data
-        private Item frameData = new Text("Frame Data");
+        private List<String> _frameData = new ArrayList<String>();
 
         private int _lineCount = 0;
@@ -1866 +1866 @@
          */
         public List<String> getData() {
-                return frameData.getData();
+                return _frameData;
         }
         
@@ -1874 +1874 @@
          */
         public void addToData(String dataItem) {
-                frameData.addToData(dataItem);
+                _frameData.add(dataItem);
         }