Changeset 1415 for trunk/src/org/expeditee/gui/FrameIO.java

Timestamp:

07/24/19 11:23:45 (5 years ago)

Author:

bln4

Message:

Renamed Frame.getItems() to Frame.getSortedItems() to better represent its functionality.

-> org.apollo.ApolloGestureActions
-> org.apollo.ApolloSystem
-> org.expeditee.actions.Actions
-> org.expeditee.actions.Debug
-> org.expeditee.actions.ExploratorySearchActions
-> org.expeditee.actions.JfxBrowserActions
-> org.expeditee.actions.Misc
-> org.expeditee.actions.Navigation
-> org.expeditee.actions.ScriptBase
-> org.expeditee.actions.Simple
-> org.expeditee.agents.ComputeTree
-> org.expeditee.agents.CopyTree
-> org.expeditee.agents.DisplayComet
-> org.expeditee.agents.DisplayTree
-> org.expeditee.agents.DisplayTreeLeaves
-> org.expeditee.agents.GraphFramesetLinks
-> org.expeditee.agents.TreeProcessor
-> org.expeditee.gio.gesture.StandardGestureActions
-> org.expeditee.gui.DisplayController
-> org.expeditee.gui.FrameCreator
-> org.expeditee.gui.FrameIO
-> org.expeditee.io.DefaultTreeWriter
-> org.expeditee.io.JavaWriter
-> org.expeditee.io.PDF2Writer
-> org.expeditee.io.TXTWriter
-> org.expeditee.io.WebParser
-> org.expeditee.io.flowlayout.XGroupItem
-> org.expeditee.items.Dot
-> org.expeditee.items.Item
-> org.expeditee.items.ItemUtils
-> org.expeditee.network.FrameShare
-> org.expeditee.stats.TreeStats

Created ItemsList class to wrap ArrayList<Item>. Frames now use this new class to store its body list (used for display) as well as its primaryBody and surrogateBody.

-> org.expeditee.agents.Format
-> org.expeditee.agents.HFormat
-> org.expeditee.gio.gesture.StandardGestureActions
-> org.expeditee.gui.Frame
-> org.expeditee.gui.FrameUtils

Refactorted Frame.setResort(bool) to Frame.invalidateSorted() to better function how it is intended to with a more accurate name.

-> org.expeditee.agents.Sort

When writing out .exp files and getting attributes to respond to LEFT + RIGHT click, boolean items are by default true. This has always been the case. An ammendment to this is that defaults can now be established.
Also added 'EnterClick' functionality. If cursored over a item with this property and you press enter, it acts as if you have clicked on it instead.

-> org.expeditee.assets.resources-public.framesets.authentication.1.exp to 6.exp
-> org.expeditee.gio.gesture.StandardGestureActions
-> org.expeditee.gio.input.KBMInputEvent
-> org.expeditee.gio.javafx.JavaFXConversions
-> org.expeditee.gio.swing.SwingConversions
-> org.expeditee.gui.AttributeUtils
-> org.expeditee.io.Conversion
-> org.expeditee.io.DefaultFrameWriter
-> org.expeditee.items.Item

Fixed a bug caused by calling Math.abs on Integer.MIN_VALUE returning unexpected result. Due to zero being a thing, you cannot represent Math.abs(Integer.MIN_VALUE) in a Integer object. The solution is to use Integer.MIN_VALUE + 1 instead of Integer.MIN_VALUE.

-> org.expeditee.core.bounds.CombinationBounds
-> org.expeditee.io.flowlayout.DimensionExtent

Recoded the contains function in EllipticalBounds so that intersection tests containing circles work correctly.

-> org.expeditee.core.bounds.EllipticalBounds

Added toString() to PolygonBounds to allow for useful printing during debugging.

-> org.expeditee.core.bounds.PolygonBounds

Implemented Surrogate Mode!

-> org.expeditee.encryption.io.EncryptedExpReader
-> org.expeditee.encryption.io.EncryptedExpWriter
-> org.expeditee.encryption.items.surrogates.EncryptionDetail
-> org.expeditee.encryption.items.surrogates.Label
-> org.expeditee.gui.FrameUtils
-> org.expeditee.gui.ItemsList
-> org.expeditee.items.Item
-> org.expeditee.items.Text

???? Use Integer.MAX_VALUE cast to a float instead of Float.MAX_VALUE. This fixed some bug which I cannot remember.

-> org.expeditee.gio.TextLayoutManager
-> org.expeditee.gio.swing.SwingTextLayoutManager

Improved solution for dealing with the F10 key taking focus away from Expeditee due to it being a assessibility key.

-> org.expeditee.gio.swing.SwingInputManager

Renamed variable visibleItems in FrameGraphics.paintFrame to itemsToPaintCanditates to better represent functional intent.

-> org.expeditee.gui.FrameGraphics

Improved checking for if personal resources exist before recreating them

-> org.expeditee.gui.FrameIO

Repeated messages to message bay now have a visual feedback instead of just a beep. This visual feedback is in the form of a count of the amount of times it has repeated.

-> org.expeditee.gui.MessageBay

Updated comment on the Vector class to explain what vectors are.

-> org.expeditee.gui.Vector

Added constants to represent all of the property keys in DefaultFrameReader and DefaultFrameWriter.

-> org.expeditee.io.DefaultFrameReader
-> org.expeditee.io.DefaultFrameWriter

Updated the KeyList setting to be more heirarcial with how users will store their Secrets.

-> org.expeditee.settings.identity.secrets.KeyList

File:

• trunk/src/org/expeditee/gui/FrameIO.java (modified) (8 diffs)

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

@@ -88 +88 @@
  */
 
-
 public class FrameIO {
 
@@ -214 +213 @@
         }
         
-//      public static void changeParentAndSubFolders(String newFolder) {
-//              // Partial Paths.
-//              PARENT_FOLDER = newFolder;      
-//              String resourcesPublicPath = PARENT_FOLDER + "resources-public" + File.separator;
-//              String resourcesPrivateIndividualPath = PARENT_FOLDER + "resources-" + UserSettings.UserName.get() + File.separator;
-//
-//              // Standard paths.
-//              PUBLIC_PATH = PARENT_FOLDER + "public" + File.separator;
-//              TRASH_PATH = PARENT_FOLDER + "trash" + File.separator;
-//              HELP_PATH = PARENT_FOLDER + "documentation" + File.separator;
-//              PROFILE_PATH = PARENT_FOLDER + "profiles" + File.separator;
-//              EXPORTS_PATH = PARENT_FOLDER + "exports" + File.separator;
-//              STATISTICS_PATH = PARENT_FOLDER + "statistics" + File.separator;
-//              LOGS_PATH = PARENT_FOLDER + "logs" + File.separator;
-//                              
-//              
-//              // Conditional paths
-//              if (UserSettings.PublicAndPrivateResources) {
-//                      // Work with a system of public and private folders
-//                      
-//                      FONT_PATH = resourcesPublicPath + "fonts" + File.separator;
-//                      DICT_PATH = resourcesPublicPath + "dict" + File.separator;
-//                      IMAGES_PATH = resourcesPublicPath + "images" + File.separator;
-//                      AUDIO_PATH = resourcesPublicPath + "audio" + File.separator;
-//                      FRAME_PATH = resourcesPublicPath + "framesets" + File.separator;
-//              } else {
-//                      FONT_PATH = PARENT_FOLDER + "fonts" + File.separator;
-//                      DICT_PATH = PARENT_FOLDER + "dict" + File.separator;
-//                      IMAGES_PATH = PARENT_FOLDER + "images" + File.separator;
-//                      AUDIO_PATH = PARENT_FOLDER + "audio" + File.separator;
-//                      FRAME_PATH = PARENT_FOLDER + "framesets" + File.separator;
-//                      DEAD_DROPS_PATH = PARENT_FOLDER + "deaddrops" + File.separator;
-//              }
-//              
-//              if (!UserSettings.PublicAndPrivateResources || (AuthenticatorBrowser.isAuthenticationRequired() && !AuthenticatorBrowser.isAuthenticated())) {
-//                      
-//                      if (UserSettings.UserName.get().equals(AuthenticatorBrowser.USER_NOBODY)) {
-//                              System.err.println("**** FrameIO::changeParentAndSubFolders(): Not setting subfolders for user '"+AuthenticatorBrowser.USER_NOBODY+"'");
-//                      }
-//                      
-//                      // If we are using the old regime, or user.name set to Browser.USER_NOBODY
-//                      // => then these paths should not be used.
-//                      RESOURCES_PATH = null;
-//                      SHARED_FRAMESETS_PATH = null;
-//                      RESOURCES_PRIVATE_PATH = null;          
-//                      FRAME_PRIVATE_PATH = null;
-//                      IMAGES_PRIVATE_PATH = null;
-//                      AUDIO_PRIVATE_PATH = null;
-//                      CONTACTS_PATH = null;
-//                      HELP_PRIVATE_PATH = null;
-//                      
-//                      if (!UserSettings.PublicAndPrivateResources) {
-//                              MESSAGES_PATH = PARENT_FOLDER + "messages" + File.separator;
-//                      } else {
-//                              MESSAGES_PATH = resourcesPrivateIndividualPath + "messages" + File.separator;
-//                      }
-//                      
-//              } else {
-//                      RESOURCES_PATH = resourcesPublicPath + "documentation" + File.separator;
-//                      SHARED_FRAMESETS_PATH = resourcesPrivateIndividualPath + "framesets-shared" + File.separator;
-//                      
-//                      RESOURCES_PRIVATE_PATH = PARENT_FOLDER + "resources-private" + File.separator;
-//                      FRAME_PRIVATE_PATH = resourcesPrivateIndividualPath + "framesets" + File.separator;
-//                      IMAGES_PRIVATE_PATH = resourcesPrivateIndividualPath + "images" + File.separator;
-//                      AUDIO_PRIVATE_PATH = resourcesPrivateIndividualPath + "audio" + File.separator;
-//                      CONTACTS_PATH = resourcesPrivateIndividualPath + "contacts" + File.separator;
-//                      HELP_PRIVATE_PATH = resourcesPrivateIndividualPath + "documentation" + File.separator;
-//                      MESSAGES_PATH = resourcesPrivateIndividualPath + "messages" + File.separator;
-//                      MAIL_PATH = resourcesPrivateIndividualPath + "mail" + File.separator;
-//                      DEAD_DROPS_PATH = resourcesPrivateIndividualPath + "deaddrops" + File.separator;
-//              } 
-//                      
-//              
-//              System.err.println("**** FrameIO::changeParentAndSubFolder(): Calling AudioPathManger.changeParentAndSubFolder()");
-//              AudioPathManager.changeParentAndSubFolders(newFolder);
-//      }
-        
         // All methods are static, this should not be instantiated
         private FrameIO() {
@@ -1001 +923 @@
                 template.resetDateCreated();
 
-                for (Item i : template.getItems()) {
+                for (Item i : template.getSortedItems()) {
                         if (ItemUtils.startsWithTag(i, ItemUtils.TAG_PARENT)) {
                                 i.setLink(null);
@@ -1009 +931 @@
                 // do auto shrinking of the title IF not in twin frames mode and the title is not centred
                 Item titleItem = template.getTitleItem();
-
-                if (!DisplayController.isTwinFramesOn() && !Justification.center.equals(((Text)titleItem).getJustification())) {
+                if (titleItem == null) {
+                        return template; 
+                }
+                
+                boolean titleItemJustified = titleItem == null || !Justification.center.equals(((Text)titleItem).getJustification());
+                if (!DisplayController.isTwinFramesOn() && titleItemJustified) {
                         if ((titleItem.getX() + 1) < template.getNameItem().getX()) {
                                 int title_item_xr = titleItem.getX() + titleItem.getBoundsWidth(); // should really be '... -1'
@@ -1307 +1233 @@
                                 EcosystemManager.getMiscManager().beep();
                         } else if (checkBackup
-                                        && ItemUtils.ContainsExactTag(toSave.getItems(),
+                                        && ItemUtils.ContainsExactTag(toSave.getSortedItems(),
                                                         ItemUtils.TAG_BACKUP)) {
                                 SuspendCache();
@@ -1338 +1264 @@
                                 }
 
-                                Item i = ItemUtils.FindExactTag(toSave.getItems(),
+                                Item i = ItemUtils.FindExactTag(toSave.getSortedItems(),
                                                 ItemUtils.TAG_BACKUP);
                                 i.setLink(original.getName());
@@ -1480 +1406 @@
         }
 
-        public static Frame CreateNewProfile(String username, Map<String, Setting> initialSettings, Map<String, Consumer<Frame>> toNotifyOnSet) throws InvalidFramesetNameException, ExistingFramesetException  {
+        public static Frame CreateNewProfile(String username, Map<String, Setting> initialSettings, Map<String, Consumer<Frame>> toNotifyOnSet) throws InvalidFramesetNameException, ExistingFramesetException {
                 Frame profile = CreateFrameset(username, PROFILE_PATH, true);
                 if (profile != null) {
@@ -2110 +2036 @@
         }
         
+        public static boolean personalResourcesExist(String username) {
+                Path personalResources = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-" + username);
+                File personalResourcesFile = personalResources.toFile();
+                boolean directoryExists = personalResourcesFile.exists() && personalResourcesFile.isDirectory();
+                return directoryExists;
+        }
+        
         public static Path setupPersonalResources(String username) {
                 Path personalResources = Paths.get(FrameIO.PARENT_FOLDER).resolve("resources-" + username);