Changeset 1200 for trunk

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

Files:

• auth (added)
• auth/io (added)
• auth/io/EncryptedExpReader.java (added)
• auth/io/EncryptedExpWriter.java (added)
• gui/AttributeUtils.java (modified) (3 diffs)
• gui/Frame.java (modified) (3 diffs)
• gui/FrameIO.java (modified) (6 diffs)
• gui/FrameUtils.java (modified) (2 diffs)
• io/DefaultFrameReader.java (modified) (3 diffs)
• io/DefaultFrameWriter.java (modified) (4 diffs)
• io/ExpReader.java (modified) (5 diffs)
• io/ExpWriter.java (modified) (4 diffs)
• items/Item.java (modified) (10 diffs)
• items/PermissionPair.java (modified) (2 diffs)
• items/Text.java (modified) (22 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);
                         }

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

@@ -96 +96 @@
                                         pColor));
 
+                        // Note: As of 26/11/18 there are no unused letter item tags.  Use other characters.
                         _ItemTags.put('S', Item.class.getMethod("setID", pInt));
                         _ItemTags.put('s', Item.class.getMethod("setDateCreated", pString));
@@ -150 +151 @@
                         _ItemTags.put('m', Text.class.getMethod("setInitialSpacing", pFloat));
                         _ItemTags.put('w', Text.class.getMethod("setWidth", pIntO));
+                        _ItemTags.put('M', Text.class.getMethod("setMinWidth", pIntO));
                         _ItemTags.put('k', Text.class.getMethod("setJustification", pJustification));
                         _ItemTags.put('r', Text.class.getMethod("setAutoWrap", pBool));
@@ -161 +163 @@
                         
                         _ItemTags.put('p', Item.class.getMethod("setPermission", pPermission));
+                        
+                        _ItemTags.put('O', Text.class.getMethod("setMask", pIntO));
                         
                         // Lines and constraints are created differently

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

@@ -33 +33 @@
 import org.expeditee.agents.WriteTree;
 import org.expeditee.gio.EcosystemManager;
-import org.expeditee.gui.Browser;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -80 +79 @@
                         _FrameTags.put('B', Frame.class.getMethod("getBackgroundColor"));
                         
+                        // Note: As of 26/11/18 there are no unused letter item tags.  Use other characters.
                         _ItemTags.put('S', Item.class.getMethod("getTypeAndID"));
                         _ItemTags.put('s', Item.class.getMethod("getDateCreated"));
@@ -120 +120 @@
                         _ItemTags.put('f', Text.class.getMethod("getFont"));
                         _ItemTags.put('t', Text.class.getMethod("getSpacing"));
+                        
+                        _ItemTags.put('O', Text.class.getMethod("getMask"));
 
                         // TODO set a boolean flag to indicate that the text is a formula
@@ -129 +131 @@
                         _ItemTags.put('m', Text.class.getMethod("getInitialSpacing"));
                         _ItemTags.put('w', Text.class.getMethod("getWidthToSave"));
+                        _ItemTags.put('M', Text.class.getMethod("getMinWidthToSave"));
                         _ItemTags.put('k', Text.class.getMethod("getJustification"));
                         _ItemTags.put('r', Text.class.getMethod("getAutoWrapToSave"));

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) {
                 }

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

@@ -47 +47 @@
 public class ExpWriter extends DefaultFrameWriter {
 
-        private ProxyWriter _writer = null;
+        protected ProxyWriter _writer = null;
 
         protected StringBuilder _stringWriter = null;
@@ -104 +104 @@
                 if (_writer == null)
                         return;
+                
+                preOutputFrame();
 
                 writeHeader(frame);
@@ -109 +111 @@
                 // write each item in the frame
                 for (Item i : frame.getItemsToSave()) {
+                        assert (!(i instanceof Line));
+                        writeItem(i);
+                }
+                
+                for (final Item i: frame.getBodyItemsWithInsufficientPermissions()) {
                         assert (!(i instanceof Line));
                         writeItem(i);
@@ -122 +129 @@
 
                 return;
+        }
+
+        protected void preOutputFrame() {
         }
 

trunk/src/org/expeditee/items/Item.java

@@ -50 +50 @@
 import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
@@ -59 +58 @@
 import org.expeditee.io.Conversion;
 import org.expeditee.settings.UserSettings;
+import org.expeditee.settings.legacy.LegacyFeatures;
 import org.expeditee.simple.Context;
 import org.expeditee.stats.AgentStats;
@@ -275 +275 @@
 
         private List<String> _data = null;
-
+         
         private String _formula = null;
 
@@ -309 +309 @@
 
         protected boolean _filled = true;
+        
+        // NGIKM Attributes
+        private List<String> _ngikmLabels = new ArrayList<String>();
+        private List<String> _ngikmKeys = new ArrayList<String>();
 
         /** Just calls source.duplicateOnto(dest). */
@@ -380 +384 @@
 
                 dest._visible = this._visible;
+                
+                dest._ngikmKeys = new ArrayList<String>(this._ngikmKeys);
+                dest._ngikmLabels = new ArrayList<String>(this._ngikmLabels);
 
                 Frame parent = DisplayController.getCurrentFrame();
@@ -494 +501 @@
         {
                 _permissionPair = permissionPair;
+                if (_permissionPair.getPermission(_owner) == UserAppliedPermission.denied) {
+                        this.getParent().moveItemToBodyHiddenDueToPermission(this);
+                }
         }
         
@@ -1155 +1165 @@
                 return getWidth();
         }
+        
+        public Integer getMinWidthToSave() {
+                return getMinWidth();
+        }
 
         public Integer getWidth()
         {
+                return null;
+        }
+        
+        public Integer getMinWidth() {
                 return null;
         }
@@ -1458 +1476 @@
 
                 for (String s : getAction()) {
-                        Object returnValue = Actions.PerformActionCatchErrors(sourceFrame,
-                                        sourceItem, s);
+                        Object returnValue;
+                        if (LegacyFeatures.UseLegacyActionArgumentMapping.get()) { 
+                                returnValue = Actions.LegacyPerformActionCatchErrors(sourceFrame, sourceItem, s);
+                        } else {
+                                returnValue = Actions.PerformActionCatchErrors(sourceFrame, sourceItem, s, this);
+                        }
+                        
                         if (returnValue != null) {
                                 FreeItems.getInstance().clear();
@@ -2254 +2277 @@
                 throw new UnsupportedOperationException("Item type does not support width attribute!");
         }
+        
+        public void setMinWidth(final Integer width) throws UnsupportedOperationException {
+                throw new UnsupportedOperationException("Item type does not support minwidth attribute.");
+        }
 
         public void setRightMargin(int i, boolean fixWidth)
@@ -2283 +2310 @@
          */
         public void setY(float newY) {
+                if (newY == 265) {
+                        System.err.println("Item::setY::setting y to 265");
+                }
                 setPosition(getX(), newY);
         }

trunk/src/org/expeditee/items/PermissionPair.java

@@ -35 +35 @@
                         if (permissionCode.length() != 0) {
 
-                                if (permissionCode.length() == 1) {
+                                if (permissionCode.length() == 1 || (permissionCode.length() == 2 && permissionCode.startsWith("-"))) {
                                         // replicate it to cover ifOwner/ifNotOwner
                                         permissionCode += permissionCode;
@@ -50 +50 @@
                                 ownerPermission = UserAppliedPermission.getPermission(ownerPermissionCode, defaultPermission);
                                 notOwnerPermission = UserAppliedPermission.getPermission(notOwnerPermissionCode, defaultPermission);
-                                //ownerPermission = UserAppliedPermission.getPermission(permissionCode.substring(0, 1),
-                                //              defaultPermission);
-                                //notOwnerPermission = UserAppliedPermission.getPermission(permissionCode.substring(1, 2),
-                                //              defaultPermission);
                         }
                 }

trunk/src/org/expeditee/items/Text.java

@@ -136 +136 @@
          */
         private Integer _maxWidth = -Integer.MAX_VALUE;
+        
+        private Integer _minWidth = -Integer.MAX_VALUE;
 
         private Justification _justification = Justification.left;
@@ -172 +174 @@
 
         // text is broken up into lines
-        private StringBuffer _text = new StringBuffer();
-
-        private List<TextLayout> _textLayouts = new LinkedList<TextLayout>();
+        protected StringBuffer _text = new StringBuffer();
+
+        protected List<TextLayout> _textLayouts = new LinkedList<TextLayout>();
 
         // The font to display this text in
         private Font _font;
+        
+        // The optional mask character to us in place of the text's content.
+        private Integer _mask = null;
 
         protected static void InitFontFamily(File fontFamilyDir)
@@ -373 +378 @@
 
         /**
-<<<<<<< .mine
-         * Sets the maximum width of this Text item when justification is used.
-         * passing in 0 or -1 means there is no maximum width
-||||||| .r1094
-         * Sets the maximum width of this Text item when justifcation is used.
-         * passing in 0 or -1 means there is no maximum width
-=======
-         * Sets the maximum width of this Text item when justifcation is used. passing
-         * in 0 or -1 means there is no maximum width
->>>>>>> .r1100
-         * 
          * @param width
          *            The maximum width of this item when justification is applied to
@@ -399 +393 @@
 
                 _maxWidth = width;
+                rebuild(true);
+                invalidateAll();
+        }
+        
+        @Override
+        public void setMinWidth(final Integer width) {
+                invalidateAll();
+                
+                if (width == null) {
+                        setJustification(Justification.left);
+                        setRightMargin(DisplayController.getFramePaintArea().getWidth(), false);
+                        return;
+                }
+                
+                _minWidth = width;
                 rebuild(true);
                 invalidateAll();
@@ -433 +442 @@
 
                 return Math.abs(_maxWidth);
+        }
+        
+        public Integer getMinWidth() {
+                if (_minWidth == null || _minWidth <= 0) {
+                        return null;
+                }
+                return _minWidth;
+        }
+        
+        public Integer getAbsoluteMinWidth() {
+                if (_minWidth == null) {
+                        return Integer.MAX_VALUE;
+                }
+                return Math.abs(_minWidth);
         }
 
@@ -1035 +1058 @@
                         lineIndex = newLine;
                 }
-
-                // move the cursor to the new location
-                float[] caret = current.getCaretInfo(hit);
-                float y = getLineDrop(current) * lineIndex;
-                y = getY() + y + caret[1];
-
-                float x = getX() + caret[0] + getJustOffset(current);
-                x = Math.min(x, (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-
-                invalidateAll();
                 
-//              System.err.println("Mouse location: " + mouseX + "," + mouseY);
-//              System.err.println("Caret location: " + caret[0] + "," + caret[1]);
-
-//              System.err.println(text);
-//              System.err.println("X delta: " + (x - getX()));
-                final Point newCursor = new Point(Math.round(x), Math.round(y));
-//              System.err.println("Moving cursor to: " + newCursor);
-                return newCursor;
+                if (this.getMask() != null) {
+                        // If we are working with a mask than the positioning of the mouse is simplified. (as character length is constant)
+                        String content = "";
+                        for (int i = 0; i < this._text.length(); i++) {
+                                content += (char) this.getMask().intValue();
+                        }
+                        final TextLayout fakeLayout = TextLayout.getManager().layoutStringSimple(content, this.getFont());
+                        //final TextHitInfo fakeHitInfo = fakeLayout.getNextRightHit(hit.getCharIndex());
+                        final float[] fakeCaretInfo = fakeLayout.getCaretInfo(hit);
+                        
+                        float y = getLineDrop(current) * lineIndex;
+                        y = getY() + y + fakeCaretInfo[1];
+                        float x = getX() + fakeCaretInfo[0] + getJustOffset(current);
+                        x = Math.min(x, (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
+                        
+                        return new Point(Math.round(x), Math.round(y));
+                } else {
+                        // If we have no mask then....
+                        // move the cursor to the new location
+                        float[] caret = current.getCaretInfo(hit);
+                        float y = getLineDrop(current) * lineIndex;
+                        y = getY() + y + caret[1];
+
+                        float x = getX() + caret[0] + getJustOffset(current);
+                        x = Math.min(x, (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
+
+                        invalidateAll();
+                        
+                        final Point newCursor = new Point(Math.round(x), Math.round(y));
+                        return newCursor;
+                }
         }
 
@@ -1503 +1539 @@
          *              The distance to advance in the y-direction before the next line.
          */
-        private float getLineDrop(TextLayout layout)
+        protected float getLineDrop(TextLayout layout)
         {
                 if (getSpacing() < 0) {
@@ -1620 +1656 @@
                         return false;
                 }
+                
+                if (this.getMinWidth() != null && outline.contains(mouseX,  mouseY)) {
+                        return true;
+                }
 
                 for (TextLayout text : _textLayouts) {
@@ -1628 +1668 @@
                         // gravity of right
                         int justOffset = getJustOffset(text);
-
+                        
                         if (mouseY - textY > textOutline.getMinY() &&
                                         mouseY - textY < textOutline.getMinY() + textOutline.getHeight() &&
@@ -1653 +1693 @@
                 }
 
-                if (_textLayouts == null || _textLayouts.size() < 1) {
+                // if there is no text layouts and the text has no min width, do nothing
+                if (_textLayouts == null || (_textLayouts.size() < 1 && this.getMinWidth() == null)) {
                         return null;
-                }
+                } 
 
                 int preChangeWidth = 0;
@@ -1669 +1710 @@
 
                 float y = -1;
+                
+                if (this.getMinWidth() != null && _textLayouts.size() == 0 && this.getFont() != null) {
+                        final TextLayout fakeLayout = TextLayout.getManager().layoutStringSimple("p", this.getFont());
+                        final int xPos = getX() - getGravity();
+                        final int yPos = getY() - getGravity() - (int) fakeLayout.getAscent();
+                        final int width = 2 * getGravity() + this.getMinWidth();
+                        final int height = 2 * getGravity() + EcosystemManager.getGraphicsManager().getFontHeight(getFont());
+                        TextLayout.getManager().releaseLayout(fakeLayout);
+                        return new AxisAlignedBoxBounds(xPos, yPos, width, height);
+                }
 
                 // Fix concurrency error in ScaleFrameset
@@ -1676 +1727 @@
                 }
 
-                for (TextLayout layout : tmpTextLayouts) {
+                for (int index = 0; index < tmpTextLayouts.size(); index++) {
+                        final TextLayout layout = tmpTextLayouts.get(index);
                         AxisAlignedBoxBounds bounds = layout.getLogicalHighlightShape(0, layout.getCharacterCount());
 
                         if (y < 0) {
                                 y = 0;
-                        } else {
+                        } else { 
                                 y += getLineDrop(layout);
                         }
-
-                        maxX = Math.max(maxX, bounds.getMaxX());
+                        
+                        int minWidth = getAbsoluteMinWidth();
+
                         minX = Math.min(minX, bounds.getMinX());
+                        maxX = minWidth < Integer.MAX_VALUE 
+                                        ? Math.max(minX + minWidth, bounds.getMaxX()) 
+                                        : Math.max(maxX, bounds.getMaxX());
+                        minY = Math.min(minY, (int) (bounds.getMinY() + y));
                         maxY = Math.max(maxY, (int) (bounds.getMaxY() + y));
-                        minY = Math.min(minY, (int) (bounds.getMinY() + y));
                 }
 
@@ -1805 +1861 @@
                         //System.err.println(Arrays.toString(_text.toString().toCharArray()));
                 }
+                
                 invalidateBounds();
-
         }
 
@@ -1933 +1989 @@
 
                 // if there is no text to paint, do nothing.
-                if (_text == null || _text.length() == 0) {
+                if (_text == null) {
+                        return;
+                }
+                
+                // if the text to paint is empty string and there is no min width, do nothing.
+                if ((_text.length() == 0 && getMinWidth() == null)) {
                         return;
                 }
@@ -2001 +2062 @@
                                 fill = null;
                         }
-//                      System.err.println("Top left: " + getBoundingBox().getTopLeft() + ", " + "Bottom right: " + getBoundingBox().getBottomRight());
                         g.drawRectangle(bounds, 0.0, fill, getPaintHighlightColor(), highlightStroke, null);
                 }
@@ -2032 +2092 @@
                                 }
 
+                                if (layout.getCharacterCount() == 0) { continue; }
                                 int ldx = 1 + getX() + getJustOffset(layout); // Layout draw x
-
-                                g.drawTextLayout(layout, new Point(ldx, (int) y), paintColour);
+                                if (_mask == null) {
+                                        g.drawTextLayout(layout, new Point(ldx, (int) y), paintColour);
+                                } else {
+                                        String mask = "";
+                                        for(int o = 0; o < layout.getCharacterCount(); o++) { mask += (char) getMask().intValue(); }
+                                        g.drawString(mask, new Point(ldx, (int) y), layout.getFont(), paintColour);
+                                }
 
                                 y += getLineDrop(layout);
                         }
                 }
-
+                
                 paintLink();
         }
@@ -2076 +2142 @@
                 copy.setWidth(getWidthToSave());
                 copy.setFont(getFont().clone());
+                copy.setMinWidth(getMinWidthToSave());
+                copy.setMask(_mask);
                 if (hasFormula()) {
                         copy.calculate(getFormula());
@@ -2168 +2236 @@
 
                 if (_text.length() == 0) {
+                        if (this.getMinWidth() != null) {
+//                              final TextLayout base = _textLayouts.get(0);
+//                              _textLayouts.set(0, TextLayout.get(" ", base.getFont(), 0, 1));
+                                _textLayouts.clear();
+                        }
                         if (this.isLineEnd()) {
                                 // Remove and replace with a dot
@@ -2496 +2569 @@
                 String text = getText();
                 assert (text != null);
-                return text.trim().length() == 0 || super.dontSave();
+                return super.dontSave() || (text.trim().length() == 0 && this.getMinWidth() == null);
         }
 
@@ -2713 +2786 @@
         @Override
         public void setAnchorTop(Integer anchor) {
-                if (!isLineEnd()) {
+                if (!isLineEnd()) {                     
                         super.setAnchorTop(anchor);
                         if (anchor != null) {
-                                setY(anchor + _textLayouts.get(0).getAscent());
+                                if (!_textLayouts.isEmpty()) {
+                                        final float ascent = _textLayouts.get(0).getAscent();
+                                        setY(anchor + ascent);
+                                } else if (this.getFont() != null) {            
+                                        // p could be any character
+                                        final TextLayout fakeLayout = TextLayout.getManager().layoutStringSimple("p", this.getFont());
+                                        final float ascent = fakeLayout.getAscent();
+                                        EcosystemManager.getTextLayoutManager().releaseLayout(fakeLayout);
+                                        setY(anchor + ascent);
+                                } 
                         }
                         return;
@@ -2740 +2822 @@
                         super.setAnchorBottom(anchor);
                         if (anchor != null) {
-                                setY(DisplayController.getFramePaintArea().getHeight() - (anchor + this.getBoundsHeight() - _textLayouts.get(0).getAscent() - _textLayouts.get(0).getDescent()));
+                                if (!_textLayouts.isEmpty()) {
+                                        final float ascent = _textLayouts.get(0).getAscent();
+                                        final float descent = _textLayouts.get(0).getDescent();
+                                        setY(DisplayController.getFramePaintArea().getHeight() - (anchor + this.getBoundsHeight() - ascent - descent));
+                                } else if (this.getFont() != null) {
+                                        // p could be any character
+                                        final TextLayout fakeLayout = TextLayout.getManager().layoutStringSimple("p", this.getFont());
+                                        final float ascent = fakeLayout.getAscent();
+                                        final float descent = fakeLayout.getDescent();
+                                        setY(DisplayController.getFramePaintArea().getHeight() - (anchor + this.getBoundsHeight() - ascent - descent));
+                                }
+                                
                         }
                         return;
@@ -3055 +3148 @@
                         DisplayController.setCursorPosition(newText.getParagraphEndPosition());
                 }
-
-        }
+        }
+        
+        public Integer getMask() { 
+                if (_mask == null) { return null; }
+                else { return _mask; }
+        }
+        
+        public void setMask(final Integer c) { _mask = c; }
 }