From dcfd4beb213c551f6ef6ba379651bf303bd9017a Mon Sep 17 00:00:00 2001 From: "Michael T. Whiteley" Date: Wed, 7 Dec 2011 02:33:51 -0800 Subject: childs -> children --- .../layoutprocessor/TableCellLayoutController.java | 2 +- .../star/report/pentaho/model/OfficeStyles.java | 8 ++--- .../star/report/pentaho/output/StylesWriter.java | 8 ++--- .../parser/style/OfficeStyleReadHandler.java | 10 +++--- .../parser/style/OfficeStylesReadHandler.java | 40 +++++++++++----------- .../parser/style/PageLayoutReadHandler.java | 10 +++--- .../parser/style/StyleDefinitionReadHandler.java | 12 +++---- 7 files changed, 45 insertions(+), 45 deletions(-) (limited to 'reportbuilder/java/com') diff --git a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java index e575831ebf2a..faf23ad1410d 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java @@ -47,7 +47,7 @@ import org.jfree.report.structure.Section; import org.pentaho.reporting.libraries.base.util.ObjectUtilities; /** - * Before writing the table cell, we have to evaluate the childs of the cell. The cell itself can either be empty or it + * Before writing the table cell, we have to evaluate the children of the cell. The cell itself can either be empty or it * has a one ore more paragraphs inside. The paragraph contains a single report element, but may contain additional * other content. * diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java index 0af1062505c7..22c3b77ecd73 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java @@ -108,14 +108,14 @@ public class OfficeStyles extends Element private final Map pageStyles; private final Map dataStyles; private final Map styles; - private final List otherChilds; + private final List otherChildren; public OfficeStyles() { this.styles = new HashMap(); this.dataStyles = new HashMap(); this.pageStyles = new HashMap(); - this.otherChilds = new ArrayList(); + this.otherChildren = new ArrayList(); } public OfficeStyle getStyle(final String family, final String name) @@ -163,7 +163,7 @@ public class OfficeStyles extends Element public void addOtherNode(final Element node) { - otherChilds.add(node); + otherChildren.add(node); } public DataStyle[] getAllDataStyles() @@ -183,7 +183,7 @@ public class OfficeStyles extends Element public Element[] getOtherStyles() { - return (Element[]) otherChilds.toArray(new Element[otherChilds.size()]); + return (Element[]) otherChildren.toArray(new Element[otherChildren.size()]); } public boolean containsStyle(final String family, final String name) diff --git a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java index 54b7d0d0159c..d80058dafe5d 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/output/StylesWriter.java @@ -151,7 +151,7 @@ public class StylesWriter writeSection(masterPage); } - writeSectionChilds(officeStyles.getOtherNodes().getNodeArray()); + writeSectionChildren(officeStyles.getOtherNodes().getNodeArray()); } xmlWriter.writeCloseTag(); @@ -238,7 +238,7 @@ public class StylesWriter writeSection(style); } - writeSectionChilds(styles.getOtherStyles()); + writeSectionChildren(styles.getOtherStyles()); } private void writeElement(final Element element) @@ -263,12 +263,12 @@ public class StylesWriter } xmlWriter.writeTag(namespace, type, attrList, XmlWriterSupport.OPEN); - writeSectionChilds(section.getNodeArray()); + writeSectionChildren(section.getNodeArray()); xmlWriter.writeCloseTag(); } - private void writeSectionChilds(final Node[] nodes) + private void writeSectionChildren(final Node[] nodes) throws IOException { for (int i = 0; i < nodes.length; i++) diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java index 2433a7dfa2c1..5c91c93e67eb 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStyleReadHandler.java @@ -48,12 +48,12 @@ public class OfficeStyleReadHandler extends ElementReadHandler { private final OfficeStyle officeStyle; - private final List childs; + private final List children; public OfficeStyleReadHandler() { this.officeStyle = new OfficeStyle(); - this.childs = new ArrayList(); + this.children = new ArrayList(); } /** @@ -75,7 +75,7 @@ public class OfficeStyleReadHandler extends ElementReadHandler // } final StyleDefinitionReadHandler readHandler = new StyleDefinitionReadHandler(); - childs.add(readHandler); + children.add(readHandler); return readHandler; } @@ -86,9 +86,9 @@ public class OfficeStyleReadHandler extends ElementReadHandler */ protected void doneParsing() throws SAXException { - for (int i = 0; i < childs.size(); i++) + for (int i = 0; i < children.size(); i++) { - final ElementReadHandler handler = (ElementReadHandler) childs.get(i); + final ElementReadHandler handler = (ElementReadHandler) children.get(i); officeStyle.addNode(handler.getElement()); } } diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java index d679c1c0f412..b453bd116e38 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/OfficeStylesReadHandler.java @@ -45,19 +45,19 @@ import org.xml.sax.SAXException; public class OfficeStylesReadHandler extends ElementReadHandler { - private final List textStyleChilds; - private final List dataStyleChilds; - private final List otherStyleChilds; - private final List pageLayoutChilds; + private final List textStyleChildren; + private final List dataStyleChildren; + private final List otherStyleChildren; + private final List pageLayoutChildren; private final OfficeStyles officeStyles; public OfficeStylesReadHandler(final OfficeStyles officeStyles) { this.officeStyles = officeStyles; - this.pageLayoutChilds = new ArrayList(); - this.dataStyleChilds = new ArrayList(); - this.textStyleChilds = new ArrayList(); - this.otherStyleChilds = new ArrayList(); + this.pageLayoutChildren = new ArrayList(); + this.dataStyleChildren = new ArrayList(); + this.textStyleChildren = new ArrayList(); + this.otherStyleChildren = new ArrayList(); } /** @@ -78,25 +78,25 @@ public class OfficeStylesReadHandler extends ElementReadHandler if ("style".equals(tagName)) { final OfficeStyleReadHandler xrh = new OfficeStyleReadHandler(); - textStyleChilds.add(xrh); + textStyleChildren.add(xrh); return xrh; } else if ("page-layout".equals(tagName)) { final PageLayoutReadHandler prh = new PageLayoutReadHandler(); - pageLayoutChilds.add(prh); + pageLayoutChildren.add(prh); return prh; } } else if (OfficeNamespaces.DATASTYLE_NS.equals(uri)) { final DataStyleReadHandler xrh = new DataStyleReadHandler(false); - dataStyleChilds.add(xrh); + dataStyleChildren.add(xrh); return xrh; } final SectionReadHandler genericReadHander = new SectionReadHandler(); - otherStyleChilds.add(genericReadHander); + otherStyleChildren.add(genericReadHander); return genericReadHander; } @@ -107,31 +107,31 @@ public class OfficeStylesReadHandler extends ElementReadHandler */ protected void doneParsing() throws SAXException { - for (int i = 0; i < textStyleChilds.size(); i++) + for (int i = 0; i < textStyleChildren.size(); i++) { final OfficeStyleReadHandler handler = - (OfficeStyleReadHandler) textStyleChilds.get(i); + (OfficeStyleReadHandler) textStyleChildren.get(i); officeStyles.addStyle(handler.getOfficeStyle()); } - for (int i = 0; i < pageLayoutChilds.size(); i++) + for (int i = 0; i < pageLayoutChildren.size(); i++) { final PageLayoutReadHandler handler = - (PageLayoutReadHandler) pageLayoutChilds.get(i); + (PageLayoutReadHandler) pageLayoutChildren.get(i); officeStyles.addPageStyle(handler.getPageLayout()); } - for (int i = 0; i < dataStyleChilds.size(); i++) + for (int i = 0; i < dataStyleChildren.size(); i++) { final DataStyleReadHandler handler = - (DataStyleReadHandler) dataStyleChilds.get(i); + (DataStyleReadHandler) dataStyleChildren.get(i); officeStyles.addDataStyle(handler.getDataStyle()); } - for (int i = 0; i < otherStyleChilds.size(); i++) + for (int i = 0; i < otherStyleChildren.size(); i++) { final SectionReadHandler handler = - (SectionReadHandler) otherStyleChilds.get(i); + (SectionReadHandler) otherStyleChildren.get(i); officeStyles.addOtherNode((Element) handler.getNode()); } } diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java index d781a05305f7..a973236466dd 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/PageLayoutReadHandler.java @@ -50,12 +50,12 @@ public class PageLayoutReadHandler extends ElementReadHandler { private final PageLayout pageLayout; - private final List childs; + private final List children; public PageLayoutReadHandler() { this.pageLayout = new PageLayout(); - this.childs = new ArrayList(); + this.children = new ArrayList(); } /** @@ -74,7 +74,7 @@ public class PageLayoutReadHandler extends ElementReadHandler { final StyleDefinitionReadHandler readHandler = new StyleDefinitionReadHandler(); - childs.add(readHandler); + children.add(readHandler); return readHandler; } @@ -85,9 +85,9 @@ public class PageLayoutReadHandler extends ElementReadHandler */ protected void doneParsing() throws SAXException { - for (int i = 0; i < childs.size(); i++) + for (int i = 0; i < children.size(); i++) { - final ElementReadHandler handler = (ElementReadHandler) childs.get(i); + final ElementReadHandler handler = (ElementReadHandler) children.get(i); pageLayout.addNode(handler.getElement()); } } diff --git a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java index 5dcd52d04782..0c94e6c70fe6 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/parser/style/StyleDefinitionReadHandler.java @@ -41,7 +41,7 @@ import org.xml.sax.SAXException; /** - * Reads all childs of a style-definition. This simply copies everything that + * Reads all children of a style-definition. This simply copies everything that * is contained in the source-file into a generic structure that can be * written out later. */ @@ -49,12 +49,12 @@ public class StyleDefinitionReadHandler extends ElementReadHandler { private final Section rawSection; - private final List childs; + private final List children; public StyleDefinitionReadHandler() { this.rawSection = new Section(); - this.childs = new ArrayList(); + this.children = new ArrayList(); } /** @@ -73,7 +73,7 @@ public class StyleDefinitionReadHandler extends ElementReadHandler { final StyleDefinitionReadHandler readHandler = new StyleDefinitionReadHandler(); - childs.add(readHandler); + children.add(readHandler); return readHandler; } @@ -85,9 +85,9 @@ public class StyleDefinitionReadHandler extends ElementReadHandler protected void doneParsing() throws SAXException { - for (int i = 0; i < childs.size(); i++) + for (int i = 0; i < children.size(); i++) { - final ElementReadHandler handler = (ElementReadHandler) childs.get(i); + final ElementReadHandler handler = (ElementReadHandler) children.get(i); rawSection.addNode(handler.getElement()); } } -- cgit