Changeset 1200 for trunk/src/org/expeditee/io/ExpReader.java

Timestamp:

11/28/18 16:16:29 (6 years ago)

Author:

bln4

Message:

org.expeditee.auth.gio.EncryptedExpReader ->
org.expeditee.auth.gio.EncryptedExpWriter ->
org.expeditee.io.DefaultFrameReader ->
org.expeditee.io.DefaultFrameWriter ->
org.expeditee.io.ExpReader ->
org.expeditee.io.ExpWriter ->

The beginnings of a authentication system for Expeditee. Frame files (.exp) can now be encrypted with a password. A login system is being developed to accompany this.

org.expeditee.gui.AttributeUtils ->
org.expeditee.gui.Frame ->
org.expeditee.gui.FrameUtils ->
org.expeditee.items.Item ->
org.expeditee.items.PermissionPair ->
org.expeditee.items.Text ->

As part of the development the login screen. Modifications to Text Items have been made. New properties are 'Mask' and 'MinWidth'. Mask allows you to set a character to use as...a mask...for example, a password field using '*'. MinWidth allows you to specify a minimum width for text boxes. A text box with a minimum width never shrinks below this width; even when it has no content.

File:

• trunk/src/org/expeditee/io/ExpReader.java (modified) (5 diffs)

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

@@ -68 +68 @@
          */
         protected static boolean isValidLine(String s) {
-                return s.length() >= 2 && s.charAt(1) == ' '
-                                && (Character.isLetter(s.charAt(0)) || s.charAt(0) == '[' || s.charAt(0) == ']' || s.charAt(0) == '^' || s.charAt(0) == '_');
+                // Previously lines in a .exp file had to start with a letter (A-Z, a-z).  This allowed for an efficient check for valid lines.
+                // As we started to run out of spare letters to use for properties, we wished to use the full range of characters.  But we did not
+                // wish to loose the efficiency of the Character.isLetter check.  In order to maintain as much of this efficiency as possible, but
+                // allow for all characters, we take advantage of how || is evaluated:
+                //              if the check for Character.isLetter passes, then the more complex map lookup operation does not take place.
+                return s.length() >= 2 && (Character.isLetter(s.charAt(0)) || _ItemTags.keySet().contains(s.charAt(0)));
         }
 
@@ -117 +121 @@
                                                         break;
                                                 }
-                                                _linePoints.put(currentItem.getID(), currentItem);
+                                                _linePoints.put(currentItem.getID(), currentItem);                                              
                                                 newFrame.addItem(currentItem);
                                         } else if (currentItem != null && actionShouldBeDelayed(getTag(next))) { 
@@ -123 +127 @@
                                         } else if (currentItem != null) {
                                                 processBodyLine(currentItem, next);
+//                                              final boolean hasSpecifiedPermission = currentItem.getPermission() != null;
+//                                              final boolean hasSpecifiedOwner = currentItem.getOwner() != null;
+//                                              if (hasSpecifiedPermission && hasSpecifiedOwner && currentItem.getPermission().getPermission(currentItem.getOwner()) == UserAppliedPermission.denied) {
+//                                                      newFrame.removeItem(currentItem);
+//                                                      newFrame.addItemHidden(currentItem);
+//                                                      continue;
+//                                              }
                                         } else {
                                                 System.err.println("Error while reading in frame (ExpReader): Found body line but no current item to apply it to.");
@@ -236 +247 @@
                 Character tag = getTag(line);
                 String value = getValue(line);
-
+                
                 Method toRun = _ItemTags.get(tag);
+                                
                 if (toRun == null) {
                         System.out.println("Error accessing tag method: " + tag);
                 }
+                                
                 Object[] vals = Conversion.Convert(toRun, value);
-
                 try {
                         if (vals != null) {
@@ -322 +334 @@
                                         String value = getValue(next);
                                         if (tag.equals('V')) {
+                                                reader.close();
                                                 return Integer.parseInt(value);
                                         }
                                 }
                         }
+                        reader.close();
                 } catch (Exception e) {
                 }