Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664219,664221-664489,664494-664514,664516-668013,668015-668142,668144-668152,668154,668156-668256,668258,668260-669139,669141-669455,669457-669657,669659-669808,669810-670189,670191-671321,671323-672229,672231-672549,672551-672552,672554-672561,672563-672566,672568,672571-673049,673051-673852,673854-673862,673864-673986,673988-673996,673998-674347,674349-674890,674892-674910,674912-674936,674938-674952,674954-675078,675080-675085,675087-675217,675219-675660,675662-675670,675672-675716,675718-675726,675728-675733,675735-675775,675777-675782,675784,675786-675791,675794-675852,675854-676200,676202,676204,676206-676220,676222-676309,676311-676456,676458-676994,676996-677027,677030-677040,677042-677056,677058-677375,677377-677968,677970-677971,677973,677975-677994,677996-678286,678288-678538,678540-680393,680395-680469,680471-680529,680531-680852,680854-681529,681531-681571,681573-682224,682226,682228,682231-682281,682283-682335,682337-682507,682509,682512-682517,682519-682532,682534-682619,682622-682777,682779-682998,683000-683019,683021-683022,683024-683080,683082-683092,683094-683095,683097-683127,683129-683131,683133-683166,683168-683698,683700-683705,683707-683757,683759-683787,683789-683870,683872-683879,683881-683900,683902-684066,684068-684074,684076-684222,684224-684254,684257-684281,684283-684286,684288-684292,684294-684298,684300-684301,684303-684308,684310-684317,684320,684323-684335,684337-684348,684350-684354,684356-684361,684363-684369,684371-684453,684455-684883,684885-684937,684940-684958,684960-684970,684972-684985,684987-685053,685055-685063,685065-685259,685261-685262,685264-685266,685268-685282,685285-686035,686037-686045,686047-686052,686054-687331 via svnmerge from

https://svn.apache.org/repos/asf/poi/trunk

........
  r686207 | nick | 2008-08-15 13:43:02 +0100 (Fri, 15 Aug 2008) | 1 line
  
  Add sample publisher files from bug #45602 to svn
........
  r686216 | nick | 2008-08-15 15:05:30 +0100 (Fri, 15 Aug 2008) | 1 line
  
  Add a few more source package excludes
........
  r686278 | nick | 2008-08-15 17:57:30 +0100 (Fri, 15 Aug 2008) | 1 line
  
  More sample hpbf docs, with a description
........
  r686290 | nick | 2008-08-15 18:42:25 +0100 (Fri, 15 Aug 2008) | 1 line
  
  Start on a HPBF dumper
........
  r686621 | nick | 2008-08-17 17:36:40 +0100 (Sun, 17 Aug 2008) | 1 line
  
  Few little tweaks to dev helpers
........
  r686624 | nick | 2008-08-17 18:39:10 +0100 (Sun, 17 Aug 2008) | 1 line
  
  More work understanding hpbf
........
  r686625 | nick | 2008-08-17 19:02:31 +0100 (Sun, 17 Aug 2008) | 1 line
  
  More work understanding hpbf
........
  r686628 | nick | 2008-08-17 19:21:34 +0100 (Sun, 17 Aug 2008) | 1 line
  
  More work understanding hpbf
........
  r686640 | nick | 2008-08-17 21:15:51 +0100 (Sun, 17 Aug 2008) | 1 line
  
  Further HPBF documentation, and some more sample files used
........
  r686844 | yegor | 2008-08-18 19:33:58 +0100 (Mon, 18 Aug 2008) | 1 line
  
  fixed bug #45645: Fix for HSSFSheet.autoSizeColumn() for widths exceeding Short.MAX_VALUE
........
  r686977 | josh | 2008-08-19 08:44:57 +0100 (Tue, 19 Aug 2008) | 1 line
  
  Fix for bug 45640 - avoid creating multiple GUTS records
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@687333 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 25 insertions, 8 deletions

diff --git a/src/java/org/apache/poi/poifs/dev/POIFSLister.java b/src/java/org/apache/poi/poifs/dev/POIFSLister.java
index c9fa349d66..cdd9902c40 100644
--- a/src/java/org/apache/poi/poifs/dev/POIFSLister.java
+++ b/src/java/org/apache/poi/poifs/dev/POIFSLister.java
@@ -45,37 +45,54 @@ public class POIFSLister {
             System.exit(1);
         }
 
-        for (int j = 0; j < args.length; j++)
-        {
-            viewFile(args[ j ]);
+        boolean withSizes = false;
+        for (int j = 0; j < args.length; j++) {
+        	if(args[j].equalsIgnoreCase("-size") || 
+        			args[j].equalsIgnoreCase("-sizes")) {
+        		withSizes = true;
+        	} else {
+        		viewFile(args[j], withSizes);
+        	}
         }
     }
 
-    public static void viewFile(final String filename) throws IOException
+    public static void viewFile(final String filename, boolean withSizes) throws IOException
     {
     	POIFSFileSystem fs = new POIFSFileSystem(
     			new FileInputStream(filename)
     	);
-    	displayDirectory(fs.getRoot(), "");
+    	displayDirectory(fs.getRoot(), "", withSizes);
     }
     
-    public static void displayDirectory(DirectoryNode dir, String indent) {
+    public static void displayDirectory(DirectoryNode dir, String indent, boolean withSizes) {
     	System.out.println(indent + dir.getName() + " -");
     	String newIndent = indent + "  ";
     	
+    	boolean hadChildren = false;
     	for(Iterator it = dir.getEntries(); it.hasNext(); ) {
+    		hadChildren = true;
     		Object entry = it.next();
     		if(entry instanceof DirectoryNode) {
-    			displayDirectory((DirectoryNode)entry, newIndent);
+    			displayDirectory((DirectoryNode)entry, newIndent, withSizes);
     		} else {
     			DocumentNode doc = (DocumentNode)entry;
     			String name = doc.getName();
+    			String size = "";
     			if(name.charAt(0) < 10) {
     				String altname = "(0x0" + (int)name.charAt(0) + ")" + name.substring(1);
     				name = name.substring(1) + " <" + altname + ">";
     			}
-    			System.out.println(newIndent + name);
+    			if(withSizes) {
+    				size = " [" +
+    					doc.getSize() + " / 0x" +
+    					Integer.toHexString(doc.getSize()) +
+    					"]";
+    			}
+    			System.out.println(newIndent + name + size);
     		}
     	}
+    	if(!hadChildren) {
+    		System.out.println(newIndent + "(no children)");
+    	}
     }
 }
\ No newline at end of file