Changeset 1415 for trunk/src/org/expeditee/settings/Settings.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/settings/Settings.java (modified) (8 diffs)

trunk/src/org/expeditee/settings/Settings.java

@@ -21 +21 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30 +31 @@
 import org.expeditee.gui.FrameCreator;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.items.Item;
+import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.Text;
 import org.expeditee.items.widgets.Password;
@@ -194 +197 @@
                                                 }
 
-                                                if(s == null) continue;
+                                                if(s == null) {
+                                                        continue;
+                                                }
                                                 
                                                 if(validPages.size() > 1) {
@@ -226 +231 @@
         }
                 
+                // Having parsed this page, we must alter all the items on the frame that they are no longer being shown.
+                // For things such as WidgetCorners, this means that they will be removed from live consideration.
+                Collection<Item> allItems = child.getAllItems();
+                for (Item i: allItems) {
+                        i.onParentStateChanged(new ItemParentStateChangedEvent(child, ItemParentStateChangedEvent.EVENT_TYPE_HIDDEN));
+                }
+                
                 // if the page was a settings page, check if it has any subpages
                 for(Text t : child.getTextItems()) {
@@ -275 +287 @@
                         int x = 0, y = 0;
                         
+                        Frame currentFrame = frames.getCurrentFrame();
                         if (key.toLowerCase().equals("pass")) {
                                 // Special case for Password widgets
@@ -280 +293 @@
                                 Password pw = new Password(passwordWidgetText, null);
                                 pw.setPassword("");
-                                frames.getCurrentFrame().removeItem(passwordWidgetText);
-                                frames.getCurrentFrame().addAllItems(pw.getItems());
+                                currentFrame.removeItem(passwordWidgetText);
+                                currentFrame.addAllItems(pw.getItems());
                                 x = passwordWidgetText.getX() + passwordWidgetText.getBoundsWidth();
                                 y = passwordWidgetText.getY();
@@ -291 +304 @@
                                 // Construct and add text representation for setting.  
                                 // If a setting has no initialised value then it is not included.
-                                Text settingRepresentation = setting.generateRepresentation(key, frames.getCurrentFrame().getFramesetName()).copy();
-                                if (settingRepresentation.getBounds() == null) {
+                                String framesetName = currentFrame.getFramesetName();
+                                Text template = setting.generateRepresentation(key, framesetName);
+                                if (template == null) {
                                         continue;
                                 }
-                                settingRepresentation.setID(frames.getCurrentFrame().getNextItemID());
+                                Text settingRepresentation = template.copy();
+                                if (settingRepresentation == null || settingRepresentation.getBounds() == null) {
+                                        continue;
+                                }
+                                settingRepresentation.setID(currentFrame.getNextItemID());
                                 frames.addItem(settingRepresentation, false);                           
                                 x = settingRepresentation.getX() + settingRepresentation.getBoundsWidth();
@@ -303 +321 @@
                         x = Math.max(250, x + 20);
                         // Add tooltip for setting
-                        Text tooltip = frames.getCurrentFrame().addText(x, y, "// " + setting.getTooltip(), null);
+                        Text tooltip = currentFrame.addText(x, y, "// " + setting.getTooltip(), null);
                         tooltip.rebuild(true);
                         if (tooltip.getY() + tooltip.getBoundsHeight() > frames.getLastY()) {