Tag: mws_bea300 User: obo Date: 2008-04-28 15:25:39+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java
Log: INTEGRATION: CWS dba30beta_BEA300 (1.4.6); FILE MERGED 2008/04/22 10:30:28 oj 1.4.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/text/ ========================================================================== File [changed]: MasterPageFactory.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/text/MasterPageFactory.java?r1=1.4&r2=1.4.4.1 Delta lines: +34 -35 --------------------- --- MasterPageFactory.java 2008-04-10 17:39:03+0000 1.4 +++ MasterPageFactory.java 2008-04-28 15:25:36+0000 1.4.4.1 @@ -37,6 +37,7 @@ import com.sun.star.report.pentaho.model.RawText; import com.sun.star.report.pentaho.model.OfficeStyles; import com.sun.star.report.pentaho.model.PageLayout; +import java.util.Map; import org.jfree.report.structure.Section; import org.jfree.report.structure.Element; import org.jfree.report.util.AttributeNameGenerator; @@ -55,9 +56,9 @@ private static class MasterPageFactoryKey { - private String template; - private String pageHeader; - private String pageFooter; + private final String template; + private final String pageHeader; + private final String pageFooter; public MasterPageFactoryKey(final String template, final String pageHeader, @@ -70,10 +71,8 @@ public boolean equals(final Object o) { - if (this == o) + if (this != o) { - return true; - } if (o == null || getClass() != o.getClass()) { return false; @@ -96,6 +95,7 @@ { return false; } + } return true; } @@ -127,9 +127,9 @@ private static class PageLayoutKey { - private String templateName; - private CSSNumericValue headerHeight; - private CSSNumericValue footerHeight; + private final String templateName; + private final CSSNumericValue headerHeight; + private final CSSNumericValue footerHeight; public PageLayoutKey(final String templateName, final CSSNumericValue headerHeight, @@ -199,11 +199,11 @@ // todo: Patch the page-layout ... private static final String DEFAULT_PAGE_NAME = "Default"; - private OfficeMasterStyles predefinedStyles; - private AttributeNameGenerator masterPageNameGenerator; - private HashMap masterPages; - private AttributeNameGenerator pageLayoutNameGenerator; - private HashMap pageLayouts; + private final OfficeMasterStyles predefinedStyles; + private final AttributeNameGenerator masterPageNameGenerator; + private final Map masterPages; + private final AttributeNameGenerator pageLayoutNameGenerator; + private final Map pageLayouts; public MasterPageFactory(final OfficeMasterStyles predefinedStyles) { @@ -418,7 +418,6 @@ headerFooterProps.setType("header-footer-properties"); headerFooterStyle.addNode(headerFooterProps); } - headerFooterProps.setAttribute(OfficeNamespaces.SVG_NS, "height", String.valueOf(style.getValue()) + - style.getType().getType()); + headerFooterProps.setAttribute(OfficeNamespaces.SVG_NS, "height", style.getValue() + style.getType().getType()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
