Tag: mws_bea300 User: obo Date: 2008-04-28 15:22:39+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/model/OfficeStyles.java
Log: INTEGRATION: CWS dba30beta_BEA300 (1.3.6); FILE MERGED 2008/04/22 10:30:27 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/model/ ==================================================================== File [changed]: OfficeStyles.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/model/OfficeStyles.java?r1=1.3&r2=1.3.4.1 Delta lines: +116 -125 ----------------------- --- OfficeStyles.java 2008-04-10 17:33:06+0000 1.3 +++ OfficeStyles.java 2008-04-28 15:22:36+0000 1.3.4.1 @@ -27,14 +27,14 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - - package com.sun.star.report.pentaho.model; import java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.jfree.report.structure.Element; /** @@ -52,11 +52,13 @@ */ public class OfficeStyles extends Element { + public static class StyleKey implements Serializable { + private static final long serialVersionUID = 4931878927362887477L; - private String family; - private String name; + private final String family; + private final String name; public StyleKey(final String family, final String name) { @@ -68,7 +70,6 @@ this.name = name; } - public String getFamily() { return family; @@ -81,10 +82,8 @@ public boolean equals(final Object obj) { - if (this == obj) + if (this != obj) { - return true; - } if (obj == null || getClass() != obj.getClass()) { return false; @@ -92,15 +91,11 @@ final StyleKey styleKey = (StyleKey) obj; - if (!family.equals(styleKey.family)) + if (!family.equals(styleKey.family) || ( name != null ? !name.equals(styleKey.name) : styleKey.name != null) ) { return false; } - if (name != null ? !name.equals(styleKey.name) : styleKey.name != null) - { - return false; } - return true; } @@ -111,11 +106,10 @@ return result; } } - - private HashMap pageStyles; - private HashMap dataStyles; - private HashMap styles; - private ArrayList otherChilds; + private final Map pageStyles; + private final Map dataStyles; + private final Map styles; + private final List otherChilds; public OfficeStyles() { @@ -130,7 +124,7 @@ return (OfficeStyle) styles.get(new StyleKey(family, name)); } - public void addStyle (final OfficeStyle style) + public void addStyle(final OfficeStyle style) { if (style == null) { @@ -148,47 +142,44 @@ styles.put(new StyleKey(styleFamily, style.getStyleName()), style); } - public void addPageStyle (final PageLayout style) + public void addPageStyle(final PageLayout style) { pageStyles.put(style.getStyleName(), style); } - public PageLayout getPageStyle (final String name) + public PageLayout getPageStyle(final String name) { - return (PageLayout) pageStyles.get (name); + return (PageLayout) pageStyles.get(name); } public void addDataStyle(final DataStyle style) { - dataStyles.put (style.getStyleName(), style); + dataStyles.put(style.getStyleName(), style); } - public DataStyle getDataStyle (final String name) + public DataStyle getDataStyle(final String name) { return (DataStyle) dataStyles.get(name); } - public void addOtherNode (final Element node) + public void addOtherNode(final Element node) { otherChilds.add(node); } public DataStyle[] getAllDataStyles() { - return (DataStyle[]) dataStyles.values().toArray - (new DataStyle[dataStyles.size()]); + return (DataStyle[]) dataStyles.values().toArray(new DataStyle[dataStyles.size()]); } public PageLayout[] getAllPageStyles() { - return (PageLayout[]) pageStyles.values().toArray - (new PageLayout[pageStyles.size()]); + return (PageLayout[]) pageStyles.values().toArray(new PageLayout[pageStyles.size()]); } public OfficeStyle[] getAllStyles() { - return (OfficeStyle[]) styles.values().toArray - (new OfficeStyle[styles.size()]); + return (OfficeStyle[]) styles.values().toArray(new OfficeStyle[styles.size()]); } public Element[] getOtherStyles() --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
