Changeset 575 for trunk/src/org/expeditee/actions

Timestamp:

12/05/13 17:20:17 (11 years ago)

Author:

jts21

Message:

Make js parser no longer try to evaluate the frame name

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (3 diffs)

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

@@ -36 +36 @@
 import org.expeditee.importer.FrameDNDTransferHandler;
 import org.expeditee.io.JavaWriter;
+import org.expeditee.io.flowlayout.XGroupItem;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -1237 +1238 @@
         
         private static String getScript(Frame frame) throws Exception {
-                Writer writer = new StringWriter();
-                JavaWriter jw = new JavaWriter();
-                jw.writeFrame(frame, writer);
-                writer.flush();
-                String script = writer.toString();
-                writer.close();
-                return script;
+                
+                StringBuffer sb = new StringBuffer();
+                
+                List<Item> y_ordered_items = (List<Item>)frame.getNonAnnotationItems(true);
+                XGroupItem toplevel_xgroup = new XGroupItem(frame,y_ordered_items);
+                
+                // ... following on from Steps 1 and 2 in the Constructor in XGroupItem ...
+                
+                // Step 3: Reposition any 'out-of-flow' XGroupItems
+                toplevel_xgroup.repositionOutOfFlowGroups(toplevel_xgroup);
+                
+                // Step 4: Now add in the remaining (nested) XGroupItems
+                List<XGroupItem> grouped_item_list = toplevel_xgroup.getGroupedItemList();
+                toplevel_xgroup.mapInXGroupItemsRecursive(grouped_item_list);
+        
+                // Finally, retrieve linear list of all Items, (ordered, Y by X, allowing for overlap, nested-boxing, and arrow flow)
+                
+                List<Item> overlapping_y_ordered_items = toplevel_xgroup.getYXOverlappingItemList();    
+                
+                for(Item i : overlapping_y_ordered_items) {
+                        if(i instanceof Text) {
+                                sb.append(((Text)i).getText() + "\n");
+                        }
+                }
+                
+                System.out.println("*****\n" + sb.toString() + "\n*****");
+                return sb.toString();
         }
         
@@ -1258 +1279 @@
                                 }
                         }
-                        
+                        item.getParent().getNonAnnotationText(true);
                         // Check if there is an arrow pointing from the action to a link
                         // Seemed like a cool idea before I made it, but the arrows kind of get in the way when trying to click on the action