Changeset 1415 for trunk/src/org/expeditee/io

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/io

Files:

• Conversion.java (modified) (1 diff)
• DefaultFrameReader.java (modified) (1 diff)
• DefaultFrameWriter.java (modified) (3 diffs)
• DefaultTreeWriter.java (modified) (1 diff)
• JavaWriter.java (modified) (1 diff)
• PDF2Writer.java (modified) (3 diffs)
• TXTWriter.java (modified) (3 diffs)
• WebParser.java (modified) (1 diff)
• flowlayout/DimensionExtent.java (modified) (2 diffs)
• flowlayout/XGroupItem.java (modified) (1 diff)

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

@@ -691 +691 @@
                         return getExpediteeColorCode((Colour) output);
 
-                // covert points
+                // convert points
                 if (output instanceof Point)
                         return ((Point) output).getX() + " " + ((Point) output).getY();
 
-                if (output instanceof Boolean)
-                        if ((Boolean) output)
-                                return null;
-                        else
-                                return "F";
+                if (output instanceof Boolean) {
+                        try {
+                                Class<?> parentClass = method.getDeclaringClass();
+                                Field defaultValueField = parentClass.getField(method.getName() + "Default");
+                                boolean defaultValue = defaultValueField.getBoolean(null);
+                                if (defaultValue == (boolean) output) {
+                                        return null;
+                                }
+                        } catch (IllegalArgumentException e) {
+                                e.printStackTrace();
+                        } catch (SecurityException e) {
+                                e.printStackTrace();
+                        } catch (NoSuchFieldException e) {
+                                // true is the default for boolean values when no other default is provided
+                                if ((boolean) output) {
+                                        return null;
+                                } else {
+                                        return "F";
+                                }
+                        } catch (IllegalAccessException e) {
+                                e.printStackTrace();
+                        }
+                        return output;
+                }
 
                 if (output instanceof int[]) {

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

@@ -181 +181 @@
                         _DelayedItemTags.add('/');
                         
-                        _ItemTagsExt.put(DefaultFrameWriter.ENCRYPTION_LABEL_STR, Item.class.getMethod("setEncryptionLabel", pString));
+                        _ItemTagsExt.put(DefaultFrameWriter.ENCRYPTION_LABEL_STR, Item.class.getMethod("setEncryptionLabelOnLoad", pString));
                         
                         _ItemTagsExt.put(DefaultFrameWriter.PLACEHOLDER_STR, Text.class.getMethod("setPlaceholder", pString));
                         _ItemTagsExt.put(DefaultFrameWriter.SINGLE_LINE_ONLY_STR, Text.class.getMethod("setSingleLineOnly", pBool));
                         _ItemTagsExt.put(DefaultFrameWriter.TAB_INDEX_STR, Text.class.getMethod("setTabIndex", pInt));
+                        _ItemTagsExt.put(DefaultFrameWriter.ACCEPTS_ENTER, Item.class.getMethod("setAcceptsEnter", pBool));
                 } catch (Exception e) {
                         e.printStackTrace();

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

@@ -99 +99 @@
         public static final String PLACEHOLDER_STR = "_ph";
         public static final String ENCRYPTION_LABEL_STR = "_el";
+        public static final String ACCEPTS_ENTER = "_ae";
         public static final String MAGNETIZED_ITEM_BOTTOM_STR = MAGNETIZED_ITEM_BOTTOM + "";
         public static final String MAGNETIZED_ITEM_TOP_STR = MAGNETIZED_ITEM_TOP + "";
@@ -263 +264 @@
                         _ItemTagsExt.put(DefaultFrameWriter.SINGLE_LINE_ONLY_STR, Text.class.getMethod("isSingleLineOnly"));
                         _ItemTagsExt.put(DefaultFrameWriter.TAB_INDEX_STR, Text.class.getMethod("getTabIndex"));
+                        _ItemTagsExt.put(DefaultFrameWriter.ACCEPTS_ENTER, Item.class.getMethod("acceptsKeyboardEnter"));
                 } catch (Exception e) {
                         e.printStackTrace();
@@ -308 +310 @@
                                 this.writeAnnotationTitle(starting.getTitleItem());
                         else
-                                this.writeTitle(starting.getTitleItem(), starting.getItems());
+                                this.writeTitle(starting.getTitleItem(), starting.getSortedItems());
                 }
         }

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

@@ -88 +88 @@
         protected List<Item> getSortedItems(Frame frame) 
         {
-                List<Item> items = frame.getItems();
+                List<Item> items = frame.getSortedItems();
                 return items;
         }

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

@@ -61 +61 @@
         protected List<Item> getSortedItems(Frame frame) 
         {
-                List<Item> y_ordered_items = frame.getItems();
+                List<Item> y_ordered_items = frame.getSortedItems();
                 
                 for (Item item: y_ordered_items) {

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

@@ -186 +186 @@
                 
                 Frame child;
-                for(Item i : current.getItems()) {
+                for(Item i : current.getSortedItems()) {
                         if(i.isAnnotation())
                                 continue;
@@ -209 +209 @@
                         writeStartFrame(f);
                 Text title = f.getTitleItem();
-                for(Item i : f.getItems()) {
+                for(Item i : f.getSortedItems()) {
                         if(i != title) {
                                 this.writeItem(i);
@@ -220 +220 @@
                                 this.writeAnnotationTitle(title);
                         else
-                                this.writeTitle(title, f.getItems());
+                                this.writeTitle(title, f.getSortedItems());
                 }
                 }

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

@@ -42 +42 @@
         @Override
         protected void writeStartFrame(Frame toParse) throws IOException {
-                if (ItemUtils.ContainsTag(toParse.getItems(), "@join"))
+                if (ItemUtils.ContainsTag(toParse.getSortedItems(), "@join"))
                         _join = !_join;
 
-                if (ItemUtils.ContainsTag(toParse.getItems(), "@indent"))
+                if (ItemUtils.ContainsTag(toParse.getSortedItems(), "@indent"))
                         _indent++;
 
@@ -73 +73 @@
         @Override
         protected void writeEndFrame(Frame toParse) throws IOException {
-                if (ItemUtils.ContainsTag(toParse.getItems(), "@indent"))
+                if (ItemUtils.ContainsTag(toParse.getSortedItems(), "@indent"))
                         if (_indent > 0)
                                 _indent--;
 
-                if (ItemUtils.ContainsTag(toParse.getItems(), "@join"))
+                if (ItemUtils.ContainsTag(toParse.getSortedItems(), "@join"))
                         _join = !_join;
 
@@ -85 +85 @@
         @Override
         protected void resumeFrame(Frame resuming) {
-                _join = ItemUtils.ContainsTag(resuming.getItems(), "@join");
+                _join = ItemUtils.ContainsTag(resuming.getSortedItems(), "@join");
         }
 

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

@@ -366 +366 @@
 
                                                 frameToAddTo = FrameIO.CreateFrame(frameToAddTo.getFramesetName(), pageTitle, null);
-                                                frameToAddTo.removeAllItems(frameToAddTo.getItems());
+                                                frameToAddTo.removeAllItems(frameToAddTo.getSortedItems());
 
                                                 try {

trunk/src/org/expeditee/io/flowlayout/DimensionExtent.java

@@ -38 +38 @@
         public static DimensionExtent calcMinMaxXExtent(List<Item>items)
         {
-
                 int min_x = Integer.MAX_VALUE;
-                int max_x = Integer.MIN_VALUE;
+                int max_x = Integer.MIN_VALUE + 1; // +1 makes it safe to do math.abs on
                 
                 for (Item item : items) {
@@ -59 +58 @@
         public static DimensionExtent calcMinMaxYExtent(List<Item>items)
         {
-
                 int min_y = Integer.MAX_VALUE;
-                int max_y = Integer.MIN_VALUE;
+                int max_y = Integer.MIN_VALUE + 1; // +1 makes it safe to do math.abs on
                 
                 for (Item item : items) {

trunk/src/org/expeditee/io/flowlayout/XGroupItem.java

@@ -635 +635 @@
                 double enclosureArea = 0.0;
 
-                for (Item i : frame.getItems()) {
+                for (Item i : frame.getSortedItems()) {
 
                         // Go through all the enclosures ...