Changeset 906 for trunk/src

Timestamp:

04/15/14 12:56:30 (10 years ago)

Author:

bln4

Message:

Added Magnetic Constraints

Magnetic Constraints are a new type of constraint between items; particularly text. Items can have their neighbours set (for example: who is to my right) and then have custom actions run when a item and its neighbour interact in a defined way. For example: one text item grows enough for hits its right neighbour; so its right neighbour moves over to compensate.
Files changed: org.expeditee.{ gui.DisplayIO, io.DefaultFrameReader, io.DefaultFrameWriter, items.Item, items.Text }

Added ability to have 'delayed' properties on items. With the invention of Magnetic Constraints it was found that the saving and loading of properties now required (greatly benifited from) a way to set a property after all items have been loaded in; rather than as the perticular item was being loaded in. This is that ability.

Files changed: org.expeditee.io.{ DefaultFrameReader, ExpReader }

Let through some non letter characters as names of properties. The tokens ',', '^{', and '_' have been used as property names to describe neighbors. In order to do this the isValidLine(String) method was altered to let these through. This is not the ideal solution, and should be looked at later.}

Files changed: org.expeditee.io.ExpReader

Bug fix: setting a custom title support was added previously. If a custom title had been set the title was: [Your Custom Title] ~ [Expeditee Title]. However the tildas where showing up even without a custom title set. This is now fixed.

Location:

trunk/src/org/expeditee

Files:

• gui/DisplayIO.java (modified) (3 diffs)
• gui/FrameUtils.java (modified) (2 diffs)
• io/DefaultFrameReader.java (modified) (4 diffs)
• io/DefaultFrameWriter.java (modified) (1 diff)
• io/ExpReader.java (modified) (7 diffs)
• io/flowlayout/XGroupItem.java (modified) (1 diff)
• items/Item.java (modified) (1 diff)
• items/MagneticConstraint (added)
• items/MagneticConstraint/AttractTextAction.java (added)
• items/MagneticConstraint/MagneticConstraintAction.java (added)
• items/MagneticConstraint/MagneticConstraintActionWithArguments.java (added)
• items/MagneticConstraint/MagneticConstraints.java (added)
• items/MagneticConstraint/NextItemDownAction.java (added)
• items/MagneticConstraint/NextItemToLeftAction.java (added)
• items/MagneticConstraint/NextItemToRightAction.java (added)
• items/MagneticConstraint/NextItemUpAction.java (added)
• items/MagneticConstraint/RepelTextAction.java (added)
• items/Text.java (modified) (5 diffs)

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

@@ -26 +26 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.MagneticConstraint.MagneticConstraints;
 import org.expeditee.settings.UserSettings;
 import org.expeditee.stats.SessionStats;
@@ -157 +158 @@
                                 .getFloatMouseX(), FrameMouseActions.MouseY, isShiftDown,
                                 isCtrlDown);
+                                
+                if(isCtrlDown || DisplayIO.getFloatMouseX() + 1 >= newMouse.x && DisplayIO.getFloatMouseX() <= newMouse.x) {
+                        if(cursorMovement == Text.RIGHT && !MagneticConstraints.getInstance().rightBorderHit(text)) {
+                                MagneticConstraints.getInstance().endOfLineHit(text);
+                        } else {
+                                if(cursorMovement == Text.LEFT && !MagneticConstraints.getInstance().leftBorderHit(text)) {
+                                        MagneticConstraints.getInstance().startOfLineHit(text);
+                                }
+                        }
+                        newMouse.x = DisplayIO.getFloatMouseX();
+                        newMouse.y = DisplayIO.getFloatMouseY();
+                }               
 
                 if (!newSize && cursorType == Item.TEXT_CURSOR) {
@@ -577 +590 @@
                         title.append(" [").append(SessionStats.getShortStats()).append(']');
 
-                _Browser.setTitle(DisplayIO.title + " ~~~ " + title.toString());
+                if(DisplayIO.title != "") 
+                        _Browser.setTitle(DisplayIO.title + " ~~~ " + title.toString());
+                else _Browser.setTitle(title.toString());
         }
         

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

@@ -1795 +1795 @@
                                 final java.lang.reflect.Method toInvoke = c.getMethod("getFileURL");
                                 final URL fileURL = (URL)toInvoke.invoke(urlConnection);
-                                BryceSaysPleaseNameMe(new File(fileURL.getPath()));
+                                extractResourcesFromFolder(new File(fileURL.getPath()));
                         } else {
                                 File folder = new File(docURL.toURI().getPath());
-                                BryceSaysPleaseNameMe(folder);
+                                extractResourcesFromFolder(folder);
                         }
                 }
@@ -1806 +1806 @@
         }
 
-    private static void BryceSaysPleaseNameMe(File folder) throws IOException {
+    private static void extractResourcesFromFolder(File folder) throws IOException {
         LinkedList<File> items = new LinkedList<File>();
         items.addAll(Arrays.asList(folder.listFiles()));

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

@@ -12 +12 @@
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.LinkedList;
 
 import org.expeditee.gui.Frame;
@@ -24 +25 @@
 public abstract class DefaultFrameReader implements FrameReader {
         protected static LinkedHashMap<Character, Method> _ItemTags = null;
+        
+        protected static List<Character> _DelayedItemTags = null;
 
         protected static LinkedHashMap<Character, Method> _FrameTags = null;
@@ -49 +52 @@
                 _ItemTags = new LinkedHashMap<Character, Method>();
                 _FrameTags = new LinkedHashMap<Character, Method>();
+                _DelayedItemTags = new LinkedList<Character>();
 
                 try {
@@ -139 +143 @@
                         _ItemTags.put('L', Line.class.getMethod("setStartItem", pItem));
                         _ItemTags.put('C', Constraint.class.getMethod("getID", (Class[]) null));
+                        
+                        _ItemTags.put('[', Item.class.getMethod("setMagnetizedItemLeft", pInt));
+                        _DelayedItemTags.add('[');
+                        _ItemTags.put(']', Item.class.getMethod("setMagnetizedItemRight", pInt));
+                        _DelayedItemTags.add(']');
+                        _ItemTags.put('^', Item.class.getMethod("setMagnetizedItemTop", pInt));
+                        _DelayedItemTags.add('^');
+                        _ItemTags.put('_', Item.class.getMethod("setMagnetizedItemBottom", pInt));
+                        _DelayedItemTags.add('_');
                 } catch (Exception e) {
                         e.printStackTrace();

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

@@ -123 +123 @@
                         _ItemTags.put('p', Item.class.getMethod("getPermission"));
 
+                        _ItemTags.put('[', Item.class.getMethod("getMagnetizedItemLeft"));
+                        _ItemTags.put(']', Item.class.getMethod("getMagnetizedItemRight"));
+                        _ItemTags.put('^', Item.class.getMethod("getMagnetizedItemTop"));
+                        _ItemTags.put('_', Item.class.getMethod("getMagnetizedItemBottom"));
                 } catch (Exception e) {
                         e.printStackTrace();

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

@@ -6 +6 @@
 import java.lang.reflect.Method;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 
 import org.expeditee.gui.Frame;
@@ -48 +50 @@
         protected static boolean isValidLine(String s) {
                 return s.length() >= 2 && s.charAt(1) == ' '
-                                && Character.isLetter(s.charAt(0));
+                                && (Character.isLetter(s.charAt(0)) || s.charAt(0) == '[' || s.charAt(0) == ']' || s.charAt(0) == '^' || s.charAt(0) == '_');
         }
 
@@ -69 +71 @@
                         newFrame.setName(_frameName);
 
+                        final List<DelayedAction> delayedActions = new LinkedList<DelayedAction>();
+                        
                         // First read all the header lines
                         while (_reader.ready() && !(next = _reader.readLine()).equals("Z")) {
@@ -95 +99 @@
                                                 _linePoints.put(currentItem.getID(), currentItem);
                                                 newFrame.addItem(currentItem);
+                                        } else if (currentItem != null && actionShouldBeDelayed(getTag(next))) { 
+                                                delayedActions.add(new DelayedAction(currentItem, next));
                                         } else if (currentItem != null) {
                                                 processBodyLine(currentItem, next);
+                                        } else {
+                                                System.err.println("Error while reading in frame (ExpReader): Found body line but no current item to apply it to.");
                                         }
                                 }
@@ -140 +148 @@
                                 }
                         }
+                        
+                        for(DelayedAction action: delayedActions) 
+                                action.exec();
 
                         // Read the stats
@@ -173 +184 @@
         }
 
+        private class DelayedAction {
+                private Item theItem;
+                private String theLine;
+
+                DelayedAction(final Item theItem, final String theLine) {
+                        this.theItem = theItem;
+                        this.theLine = theLine; 
+                }
+                
+                void exec() {
+                        processBodyLine(theItem, theLine);
+                }
+        }
+        
         // Stores points used when constructing lines
         private HashMap<Integer, Item> _linePoints = new HashMap<Integer, Item>();
@@ -213 +238 @@
                 else
                         return "";
+        }
+        
+        protected static boolean actionShouldBeDelayed(Character c) {
+                return _DelayedItemTags.contains(c);
         }
 

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

@@ -213 +213 @@
         }
         
+        public int getItemSpanLength() {
+                return yitems_span_array.length;
+        }
+        
         public YOverlappingItemsSpan getYOverlappingItemsSpan(int y) 
         {

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

@@ -3197 +3197 @@
                 return _filled;
         }
+                
+        private Item _magnetizedItemLeft = null;
+        private Item _magnetizedItemRight = null;
+        private Item _magnetizedItemTop = null;
+        private Item _magnetizedItemBottom = null;
+        
+        public int getMagnetizedItemLeft() {
+                if(_magnetizedItemLeft != null) return _magnetizedItemLeft.getID();
+                else return -1;
+        }
+        
+        public void setMagnetizedItemLeft(final Item item) {
+                _magnetizedItemLeft = item;
+        }
+        
+        public void setMagnetizedItemLeft(final int id) {
+                setMagnetizedItemLeft(this.getParent().getItemWithID(id));
+        }
+        
+        public int getMagnetizedItemRight() {
+                if(_magnetizedItemRight != null) return _magnetizedItemRight.getID();
+                else return -1;
+        }
+        
+        public void setMagnetizedItemRight(final Item item) {
+                _magnetizedItemRight = item;
+        }
+        
+        public void setMagnetizedItemRight(final int id) {
+                setMagnetizedItemRight(this.getParent().getItemWithID(id));
+        }
+        
+        public int getMagnetizedItemTop() {
+                if(_magnetizedItemTop != null) return _magnetizedItemTop.getID();
+                else return -1;
+        }
+        
+        public void setMagnetizedItemTop(final Item item) {
+                _magnetizedItemTop = item;
+        }
+        
+        public void setMagnetizedItemTop(final int id) {
+                setMagnetizedItemTop(this.getParent().getItemWithID(id));
+        }
+        
+        public int getMagnetizedItemBottom() {
+                if(_magnetizedItemBottom != null) return _magnetizedItemBottom.getID();
+                else return -1;
+        }
+        
+        public void setMagnetizedItemBottom(final Item item) {
+                _magnetizedItemBottom = item;
+        }
+        
+        public void setMagnetizedItemBottom(final int id) {
+                setMagnetizedItemBottom(this.getParent().getItemWithID(id));
+        }
 }

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

@@ -24 +24 @@
 import java.awt.geom.Rectangle2D;
 import java.io.File;
-import java.io.IOException;
+
 import java.text.AttributedString;
 import java.util.Collection;
@@ -41 +41 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.FreeItems;
+import org.expeditee.items.MagneticConstraint.MagneticConstraints;
 import org.expeditee.math.ExpediteeJEP;
 import org.expeditee.settings.experimental.ExperimentalFeatures;
@@ -691 +692 @@
          */
         public Point2D.Float insertText(String text, float mouseX, float mouseY) {
-                return insertText(text, mouseX, mouseY, -1);
+                final Point2D.Float newPos = insertText(text, mouseX, mouseY, -1);
+                return newPos;
         }
 
@@ -1409 +1411 @@
                         return;
 
+                int preChangeWidth = 0;
+                if (_poly != null)
+                        preChangeWidth = _poly.getBounds().width;
+
                 _poly = new Polygon();
 
@@ -1457 +1463 @@
 
                 _poly.translate(getX(), getY());
+                                                
+                if(preChangeWidth != 0 && preChangeWidth != _poly.getBounds().width) 
+                        if(_poly.getBounds().width > preChangeWidth) MagneticConstraints.getInstance().textGrown(this, _poly.getBounds().width - preChangeWidth);
+                        else MagneticConstraints.getInstance().textShrunk(this, preChangeWidth - _poly.getBounds().width);
         }