Changeset 1200 for trunk/src/org/expeditee/gui

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.

Location:

trunk/src/org/expeditee/gui

Files:

• AttributeUtils.java (modified) (3 diffs)
• Frame.java (modified) (3 diffs)
• FrameIO.java (modified) (6 diffs)
• FrameUtils.java (modified) (2 diffs)

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

@@ -283 +283 @@
                         _Attrib.put("Width",                Item.class.getMethod("getWidthToSave"),
                                                             Item.class.getMethod("setWidth", pIntO));
+                        _Attrib.put("MinWidth",                         Item.class.getMethod("getMinWidthToSave"), 
+                                                                                                Item.class.getMethod("setMinWidth", pIntO));
                         _Attrib.put("X",                    null,
                                                             Item.class.getMethod("setX", pFloat));
@@ -307 +309 @@
                         _Attrib.put("LetterSpacing",            Text.class.getMethod("getLetterSpacing"), 
                                                                                                 Text.class.getMethod("setLetterSpacing", pFloat));
+                        _Attrib.put("Mask",                             Text.class.getMethod("getMask"), 
+                                                                                                Text.class.getMethod("setMask", pIntO));
                         
                         // Aliases for attribute setting
@@ -340 +344 @@
                         _Attrib.alias("j",                  "justification");
                         _Attrib.alias("w",                  "width");
+                        _Attrib.alias("mw",                             "minwidth");    
                         _Attrib.alias("as",                 "autostamp");
-                        
-
                 } catch (SecurityException e) {
                         // TODO Auto-generated catch block

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

@@ -126 +126 @@
         private Stack<History> _redo = new Stack<History>();
 
-        // basically just a list of smaller objects?
-        // maybe a hashtable (id -> item?)
-        // Note: Needs to be able to be iterated through (for painting)
         private List<Item> _body = new ArrayList<Item>();
+        private List<Item> _bodyHiddenDueToPermissions = new ArrayList<Item>();
 
         // for drawing purposes
@@ -964 +962 @@
         }
 
-        public void removeItem(Item item)
-        {
+        public void removeItem(Item item) {
                 removeItem(item, true);
         }
@@ -2607 +2604 @@
                 return _observers != null && _observers.size() > 0;
         }
+        
+        public List<Item> getBodyItemsWithInsufficientPermissions() {
+                return _bodyHiddenDueToPermissions;
+        }
+        
+        public void moveItemToBodyHiddenDueToPermission(final Item i) {
+                _body.remove(i);
+                _bodyHiddenDueToPermissions.add(i);
+        }
 
         public Collection<? extends Item> getInteractableItems()

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

@@ -40 +40 @@
 import org.expeditee.actions.Actions;
 import org.expeditee.agents.ExistingFramesetException;
+import org.expeditee.auth.io.EncryptedExpReader;
+import org.expeditee.auth.io.EncryptedExpWriter;
 import org.expeditee.io.Conversion;
 import org.expeditee.io.ExpReader;
@@ -465 +467 @@
 
                         if (fullPath.endsWith(ExpReader.EXTENTION)) {
-                                reader = new ExpReader(frameName);
+                                if (EncryptedExpReader.isEncryptedExpediteeFile(fullPath)) {
+                                        reader = new EncryptedExpReader(frameName);
+                                } else {
+                                        reader = new ExpReader(frameName);
+                                }
                         } else {
                                 reader = new KMSReader();
@@ -952 +958 @@
                 /* Dont save the frame if it has the noSave tag */
                 if (toSave.hasAnnotation("nosave")) {
-                        Actions.PerformActionCatchErrors(toSave, null, "Restore");
+                        Actions.LegacyPerformActionCatchErrors(toSave, null, "Restore");
                         return "";
                 }
@@ -964 +970 @@
                 /* Format the frame if it has the autoFormat tag */
                 if (toSave.hasAnnotation("autoformat")) {
-                        Actions.PerformActionCatchErrors(toSave, null, "Format");
+                        Actions.LegacyPerformActionCatchErrors(toSave, null, "Format");
                 }
 
@@ -988 +994 @@
                         // if its a new frame or an existing Exp frame...
                         if (fullPath == null || fullPath.endsWith(ExpReader.EXTENTION)) {
-                                writer = new ExpWriter();
+                                //writer = new ExpWriter();
+                                writer = new ExpWriter();//new EncryptedExpWriter();
                                 savedVersion = ExpReader.getVersion(fullPath);
                         } else {
@@ -1198 +1205 @@
         public static Frame LoadProfile(String userName)
         {
-                return LoadFrame(userName + "1");
+                final String profilesLoc = System.getProperty("profiles.loc");
+                if (profilesLoc != null) {
+                        return LoadFrame(userName + "1", profilesLoc);
+                } else {
+                        return LoadFrame(userName + "1");
+                }
         }
 

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

@@ -1288 +1288 @@
                                                 }
                                         }
+                                        
+                                        if (i.getData() != null && !i.getData().isEmpty() && i.getText().isEmpty()) {
+                                                System.err.println();
+                                        }
 
                                         if (i.contains(new Point(x, y))){
@@ -1867 +1871 @@
                                 }
                         }
-                        if (lastEdited != LastEdited && LastEdited.getText().length() == 0) {
+                        if (lastEdited != LastEdited && LastEdited.getText().length() == 0 && LastEdited.getMinWidth() == null) {
                                 parent.removeItem(LastEdited);
                         }