Ignore:
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

Location:
trunk/src/org/expeditee/actions
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/expeditee/actions/Actions.java

    r1286 r1415  
    413413
    414414                // Check for protection on frame.
    415                 if (ItemUtils.ContainsTag(source.getItems(), "@No" + actionName)) {
     415                if (ItemUtils.ContainsTag(source.getSortedItems(), "@No" + actionName)) {
    416416                        final String errorMsg = "Frame is protected by @No" + actionName
    417417                                        + " tag.";
    … …  
    501501
    502502                // Check for protection on frame.
    503                 if (ItemUtils.ContainsTag(source.getItems(), "@No" + actionName)) {
     503                if (ItemUtils.ContainsTag(source.getSortedItems(), "@No" + actionName)) {
    504504                        final String errorMsg = "Frame is protected by @No" + actionName
    505505                                        + " tag.";

  • trunk/src/org/expeditee/actions/Debug.java

    r1304 r1415  
    5353         */
    5454        public static void ShowConstraints() {
    55                 List<Item> items = DisplayController.getCurrentFrame().getItems();
     55                List<Item> items = DisplayController.getCurrentFrame().getSortedItems();
    5656
    5757                for (Item i : items)
    … …  
    127127       
    128128        public static void HowManyMinWidths() {
    129                 MessageBay.displayMessage(DisplayController.getCurrentFrame().getItems().stream().filter(t -> t.getMinWidth() != null).collect(Collectors.toList()).size() + "");
     129                MessageBay.displayMessage(DisplayController.getCurrentFrame().getSortedItems().stream().filter(t -> t.getMinWidth() != null).collect(Collectors.toList()).size() + "");
    130130        }
    131131       

  • trunk/src/org/expeditee/actions/ExploratorySearchActions.java

    r1102 r1415  
    7272                       
    7373                        // Remove everything from new frame
    74                         frame.removeAllItems(frame.getItems());
     74                        frame.removeAllItems(frame.getSortedItems());
    7575                       
    7676                        // Add web browser active overlay and @old
    … …  
    132132               
    133133                // Clear new frame and add active overlay and @old
    134                 frame.removeAllItems(frame.getItems());
     134                frame.removeAllItems(frame.getSortedItems());
    135135                Text t = (Text) frame.addText(-150, 50, "@ao: 2", null, "overlayset3");
    136136                t.setAnchorLeft(-150);
    … …  
    182182                       
    183183                        // Remove everything from new frame
    184                         frame.removeAllItems(frame.getItems());
     184                        frame.removeAllItems(frame.getSortedItems());
    185185                       
    186186                        // Add web browser active overlay and @old

  • trunk/src/org/expeditee/actions/JfxBrowserActions.java

    r1258 r1415  
    112112                // Create JfxBrowser widget on a new frame
    113113                Frame frame = FrameIO.CreateNewFrame(text);                     // create new frame for browser
    114                 frame.removeAllItems(frame.getItems());
     114                frame.removeAllItems(frame.getSortedItems());
    115115                text.setLink("" + frame.getNumber());                           // link this text item to new frame
    116116               
    … …  
    168168        public static void createFrameWithBrowser(Item link, String url) throws Exception {
    169169                Frame frame = FrameIO.CreateNewFrame(link);
    170                 frame.removeAllItems(frame.getItems());
     170                frame.removeAllItems(frame.getSortedItems());
    171171
    172172                link.setLink("" + frame.getNumber());

  • trunk/src/org/expeditee/actions/Misc.java

    r1293 r1415  
    104104        {
    105105                Frame current = f;
    106                 List<Item> allItems = current.getItems();
     106                List<Item> allItems = current.getSortedItems();
    107107               
    108108                for(Item i : allItems)
    … …  
    126126                Frame current = f;
    127127               
    128                 List<Item> allItems = current.getItems();
     128                List<Item> allItems = current.getSortedItems();
    129129               
    130130               
    … …  
    242242                                // deleted
    243243                                Frame current = DisplayController.getCurrentFrame();
    244                                 for (Item i : current.getItems())
     244                                for (Item i : current.getSortedItems())
    245245                                        if (i.getLink() != null
    246246                                                        && i.getAbsoluteLink().toLowerCase().equals(
    … …  
    507507                charList.append(String.format("Unicode block 0x%x - 0x%x", start,
    508508                                finish));
    509                 System.out.println();
     509                System.out.println(); // Is this println needed?
    510510                // charList.append("Unicode block: ").append(String.format(format,
    511511                // args))
    … …  
    706706        public static void MigrateImages(Frame frame) {
    707707                //Collect the images on frame
    708                 final Collection<Item> items = frame.getItems();
     708                final Collection<Item> items = frame.getSortedItems();
    709709                final Collection<Item> imagesTextItems = new LinkedList<Item>();
    710710                items.forEach(i -> { if(i.getText().startsWith("@i")) imagesTextItems.add(i); });
    … …  
    931931                        body.addAll(child.getBodyTextItems(false));
    932932                else
    933                         body.addAll(child.getItems());
     933                        body.addAll(child.getSortedItems());
    934934                Item item = null;
    935935
    … …  
    970970                        body.addAll(child.getBodyTextItems(false));
    971971                else
    972                         body.addAll(child.getItems());
     972                        body.addAll(child.getSortedItems());
    973973
    974974                return body;
    … …  
    13321332        public static void resetHomeFrame() {
    13331333                Frame homeFrame = FrameIO.LoadFrame(UserSettings.HomeFrame.get());
    1334                 homeFrame.removeAllItems(homeFrame.getItems());
     1334                homeFrame.removeAllItems(homeFrame.getSortedItems());
    13351335                homeFrame.addText(0, 0, "title", null);
    13361336                FrameUtils.CreateDefaultProfile(UserSettings.UserName.get(), homeFrame, null, null);

  • trunk/src/org/expeditee/actions/Navigation.java

    r1102 r1415  
    211211
    212212                // find the next item to visit
    213                 List<Item> items = parent.getItems(); // getItems method gets us the
     213                List<Item> items = parent.getSortedItems(); // getItems method gets us the
    214214                // FirstItem on the frame
    215215                int parentItemLinkedToSource = 0; // ByMike: Will be set to the

  • trunk/src/org/expeditee/actions/ScriptBase.java

    r1102 r1415  
    135135       
    136136        // get all items on the frame
    137         List<Item> y_ordered_items = (List<Item>)frame.getItems();
     137        List<Item> y_ordered_items = (List<Item>)frame.getSortedItems();
    138138        // remove the title item
    139139        y_ordered_items.remove(frame.getTitleItem());

  • trunk/src/org/expeditee/actions/Simple.java

    r1197 r1415  
    14631463                                        Frame frame = (Frame) context.getPointers().getVariable(
    14641464                                                        frameVar).getValue();
    1465                                         Integer count = frame.getItems(true).size();
     1465                                        Integer count = frame.getSortedItems(true).size();
    14661466                                        context.getPrimitives().setValue(countVar,
    14671467                                                        new SInteger(count));
    … …  
    23912391                                        double thisFramesPause = pause;
    23922392                                        // check for change in delay for this frame only
    2393                                         Item pauseItem = ItemUtils.FindTag(frame.getItems(),
     2393                                        Item pauseItem = ItemUtils.FindTag(frame.getSortedItems(),
    23942394                                                        "@DisplayFramePause:");
    23952395                                        if (pauseItem != null) {
    … …  
    24892489                                                frameVar).getValue();
    24902490                                frameToClear.clear(false);
    2491                                 assert (frameToClear.getItems().size() <= 1);
     2491                                assert (frameToClear.getSortedItems().size() <= 1);
    24922492                        } catch (Exception e) {
    24932493                                success = false;
Note: See TracChangeset for help on using the changeset viewer.