Changeset 915

Timestamp:

05/20/14 14:09:51 (10 years ago)

Author:

bln4

Message:

Added useful toString method to XRawItem to help with debugging
Added new functionality to XGroupItem. A sibling method to getRawTextItemList named getRawTextLines which returns a List<Text[]> in order to reintroduce the separation of lines in XGroupItem objects.

Location:

trunk/src/org/expeditee/io/flowlayout

Files:

• XGroupItem.java (modified) (2 diffs)
• XRawItem.java (modified) (1 diff)

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

@@ -206 +206 @@
         }
         
+        public List<Text[]> getRawTextLines() {
+                final List<Text> rawText = getRawTextItemList();
+                final List<Text> lineStarts = new LinkedList<Text>();
+                for(final YOverlappingItemsSpan span : this.yitems_span_array) {
+                        if(span instanceof YOverlappingItemsTopEdge) {
+                                final YOverlappingItemsTopEdge topEdge = (YOverlappingItemsTopEdge) span;
+                                final List<XItem> xLine = topEdge.getXOrderedLine().getXItemList();
+                                for(final XItem xitem : xLine) {
+                                        if(xitem instanceof XRawItem) {
+                                                final Text item = (Text)((XRawItem) xitem).getItem();
+                                                lineStarts.add(item);
+                                                break;
+                                        }
+                                }
+                        }
+                }
+                final List<Integer> indexes = new LinkedList<Integer>();
+                for(final Text lineStart : lineStarts)
+                        indexes.add(rawText.indexOf(lineStart));
+                final List<Text[]> ret = new LinkedList<Text[]>();
+                int rangeEnd = indexes.get(0);
+                int last = rangeEnd;
+                for(int i = 1; i < indexes.size(); i++) {
+                        rangeEnd = indexes.get(i);
+                        final List<Text> part = new LinkedList<Text>(rawText.subList(0, rangeEnd - last));
+                        last = rangeEnd;
+                        rawText.removeAll(part);
+                        part.toArray(new Text[]{});
+                        ret.add(part.toArray(new Text[]{}));
+                }
+                ret.add(rawText.toArray(new Text[]{}));
+                return ret;
+        }
+        
         public List<XGroupItem> getGroupedItemList()
         {
@@ -1234 +1268 @@
                 return getYXOverlappingItemList(false);
         }
+        
+        public String toString() {
+                return "XGroupItem";
+        }
 }
 

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

@@ -31 +31 @@
         }
         
+        public String toString() {
+                return "XRawItem For " + item.toString();
+        }
+        
 }