Get to a consistent indent

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

diff --git a/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java b/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
index 2c604b60e4cb196208503b531d254b6d2d6abdfd..4047344a6a80dc52b1c899f390e418da10201e7c 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
@@ -76,75 +76,73 @@ public class XWPFWordExtractor extends POIXMLTextExtractor {
                XWPFHeaderFooterPolicy hfPolicy = document.getHeaderFooterPolicy();
 
                // Start out with all headers
-                extractHeaders(text, hfPolicy);
+               extractHeaders(text, hfPolicy);
                
                // First up, all our paragraph based text
                Iterator<XWPFParagraph> i = document.getParagraphsIterator();
                while(i.hasNext()) {
-                        XWPFParagraph paragraph = i.next();
-
-
-                        try {
-                                CTSectPr ctSectPr = null;
-                                if (paragraph.getCTP().getPPr()!=null) {
-                                        ctSectPr = paragraph.getCTP().getPPr().getSectPr();
-                                }
-
-                                XWPFHeaderFooterPolicy headerFooterPolicy = null;
-
-                                if (ctSectPr!=null) {
-                                        headerFooterPolicy = new XWPFHeaderFooterPolicy(document, ctSectPr);
-
-                                        extractHeaders(text, headerFooterPolicy);
-                                }
-
-                                XWPFParagraphDecorator decorator = new XWPFCommentsDecorator(
-                                                new XWPFHyperlinkDecorator(paragraph, null, fetchHyperlinks));
-                                text.append(decorator.getText()).append('\n');
-
-                                if (ctSectPr!=null) {
-                                        extractFooters(text, headerFooterPolicy);
-                                }
-                        } catch (IOException e) {
-                                throw new POIXMLException(e);
-                        } catch (XmlException e) {
-                                throw new POIXMLException(e);
-                        }
-                }
+                       XWPFParagraph paragraph = i.next();
+
+                       try {
+                               CTSectPr ctSectPr = null;
+                               if (paragraph.getCTP().getPPr()!=null) {
+                                       ctSectPr = paragraph.getCTP().getPPr().getSectPr();
+                               }
+
+                               XWPFHeaderFooterPolicy headerFooterPolicy = null;
+
+                               if (ctSectPr!=null) {
+                                       headerFooterPolicy = new XWPFHeaderFooterPolicy(document, ctSectPr);
+                                       extractHeaders(text, headerFooterPolicy);
+                               }
+
+                               XWPFParagraphDecorator decorator = new XWPFCommentsDecorator(
+                                               new XWPFHyperlinkDecorator(paragraph, null, fetchHyperlinks));
+                               text.append(decorator.getText()).append('\n');
+
+                               if (ctSectPr!=null) {
+                                       extractFooters(text, headerFooterPolicy);
+                               }
+                       } catch (IOException e) {
+                               throw new POIXMLException(e);
+                       } catch (XmlException e) {
+                               throw new POIXMLException(e);
+                       }
+               }
 
                // Then our table based text
                Iterator<XWPFTable> j = document.getTablesIterator();
                while(j.hasNext()) {
-                        text.append(j.next().getText()).append('\n');
+                       text.append(j.next().getText()).append('\n');
                }
                
                // Finish up with all the footers
-                extractFooters(text, hfPolicy);
+               extractFooters(text, hfPolicy);
                
                return text.toString();
        }
 
-        private void extractFooters(StringBuffer text, XWPFHeaderFooterPolicy hfPolicy) {
-                if(hfPolicy.getFirstPageFooter() != null) {
-                        text.append( hfPolicy.getFirstPageFooter().getText() );
-                }
-                if(hfPolicy.getEvenPageFooter() != null) {
-                        text.append( hfPolicy.getEvenPageFooter().getText() );
-                }
-                if(hfPolicy.getDefaultFooter() != null) {
-                        text.append( hfPolicy.getDefaultFooter().getText() );
-                }
-        }
+       private void extractFooters(StringBuffer text, XWPFHeaderFooterPolicy hfPolicy) {
+               if(hfPolicy.getFirstPageFooter() != null) {
+                       text.append( hfPolicy.getFirstPageFooter().getText() );
+               }
+               if(hfPolicy.getEvenPageFooter() != null) {
+                       text.append( hfPolicy.getEvenPageFooter().getText() );
+               }
+               if(hfPolicy.getDefaultFooter() != null) {
+                       text.append( hfPolicy.getDefaultFooter().getText() );
+               }
+       }
 
-        private void extractHeaders(StringBuffer text, XWPFHeaderFooterPolicy hfPolicy) {
-                if(hfPolicy.getFirstPageHeader() != null) {
-                        text.append( hfPolicy.getFirstPageHeader().getText() );
-                }
-                if(hfPolicy.getEvenPageHeader() != null) {
-                        text.append( hfPolicy.getEvenPageHeader().getText() );
-                }
-                if(hfPolicy.getDefaultHeader() != null) {
-                        text.append( hfPolicy.getDefaultHeader().getText() );
-                }
-        }
+       private void extractHeaders(StringBuffer text, XWPFHeaderFooterPolicy hfPolicy) {
+               if(hfPolicy.getFirstPageHeader() != null) {
+                       text.append( hfPolicy.getFirstPageHeader().getText() );
+               }
+               if(hfPolicy.getEvenPageHeader() != null) {
+                       text.append( hfPolicy.getEvenPageHeader().getText() );
+               }
+               if(hfPolicy.getDefaultHeader() != null) {
+                       text.append( hfPolicy.getDefaultHeader().getText() );
+               }
+       }
 }