diff options
Diffstat (limited to 'reportbuilder/java/com/sun/star/report/pentaho/model')
5 files changed, 36 insertions, 36 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java index a3248a09e11a..22cd6ea1511d 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/model/FontFaceDeclsSection.java @@ -34,11 +34,11 @@ import org.jfree.report.structure.Element; public class FontFaceDeclsSection extends Element { - private final Map fontFaces; + private final Map<String,FontFaceElement> fontFaces; public FontFaceDeclsSection() { - fontFaces = new HashMap(); + fontFaces = new HashMap<String,FontFaceElement>(); setType("font-face-decls"); setNamespace(OfficeNamespaces.OFFICE_NS); } @@ -50,12 +50,12 @@ public class FontFaceDeclsSection extends Element public FontFaceElement getFontFace(final String name) { - return (FontFaceElement) fontFaces.get(name); + return fontFaces.get(name); } public FontFaceElement[] getAllFontFaces() { - return (FontFaceElement[]) fontFaces.values().toArray(new FontFaceElement[fontFaces.size()]); + return fontFaces.values().toArray(new FontFaceElement[fontFaces.size()]); } public boolean containsFont(final String fontName) diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java index eba65f11c712..0379c43cfd6f 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ObjectOleElement.java @@ -28,31 +28,31 @@ public class ObjectOleElement extends ReportElement { private String url; - private final List masterfields; - private final List detailfields; + private final List<String> masterfields; + private final List<String> detailfields; private String classid; + public ObjectOleElement() + { + masterfields = new ArrayList<String>(); + detailfields = new ArrayList<String>(); + } + public String getClassid() { return classid; } - public List getDetailfields() + public List<String> getDetailfields() { return detailfields; } - public List getMasterfields() + public List<String> getMasterfields() { return masterfields; } - public ObjectOleElement() - { - masterfields = new ArrayList(); - detailfields = new ArrayList(); - } - public String getUrl() { return url; diff --git a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java index 1305ed00cdfb..41b045d3c2d1 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeMasterStyles.java @@ -39,12 +39,12 @@ import org.jfree.report.structure.Section; public class OfficeMasterStyles extends Element { - private final Map masterPages; + private final Map<String,OfficeMasterPage> masterPages; private final Section otherNodes; public OfficeMasterStyles() { - masterPages = new HashMap(); + masterPages = new HashMap<String,OfficeMasterPage>(); otherNodes = new Section(); } @@ -59,12 +59,12 @@ public class OfficeMasterStyles extends Element public OfficeMasterPage getMasterPage(final String name) { - return (OfficeMasterPage) masterPages.get(name); + return masterPages.get(name); } public OfficeMasterPage[] getAllMasterPages() { - return (OfficeMasterPage[]) masterPages.values().toArray(new OfficeMasterPage[masterPages.size()]); + return masterPages.values().toArray(new OfficeMasterPage[masterPages.size()]); } public Section getOtherNodes() 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 2c6e6adb12f6..9d00b1ef9d2a 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/model/OfficeStyles.java @@ -96,22 +96,22 @@ public class OfficeStyles extends Element return result; } } - private final Map pageStyles; - private final Map dataStyles; - private final Map styles; - private final List otherChildren; + private final Map<String,PageLayout> pageStyles; + private final Map<String,DataStyle> dataStyles; + private final Map<StyleKey,OfficeStyle> styles; + private final List<Element> otherChildren; public OfficeStyles() { - this.styles = new HashMap(); - this.dataStyles = new HashMap(); - this.pageStyles = new HashMap(); - this.otherChildren = new ArrayList(); + this.styles = new HashMap<StyleKey,OfficeStyle>(); + this.dataStyles = new HashMap<String,DataStyle>(); + this.pageStyles = new HashMap<String,PageLayout>(); + this.otherChildren = new ArrayList<Element>(); } public OfficeStyle getStyle(final String family, final String name) { - return (OfficeStyle) styles.get(new StyleKey(family, name)); + return styles.get(new StyleKey(family, name)); } public void addStyle(final OfficeStyle style) @@ -139,7 +139,7 @@ public class OfficeStyles extends Element public PageLayout getPageStyle(final String name) { - return (PageLayout) pageStyles.get(name); + return pageStyles.get(name); } public void addDataStyle(final DataStyle style) @@ -149,7 +149,7 @@ public class OfficeStyles extends Element public DataStyle getDataStyle(final String name) { - return (DataStyle) dataStyles.get(name); + return dataStyles.get(name); } public void addOtherNode(final Element node) @@ -159,22 +159,22 @@ public class OfficeStyles extends Element public DataStyle[] getAllDataStyles() { - return (DataStyle[]) dataStyles.values().toArray(new DataStyle[dataStyles.size()]); + return dataStyles.values().toArray(new DataStyle[dataStyles.size()]); } public PageLayout[] getAllPageStyles() { - return (PageLayout[]) pageStyles.values().toArray(new PageLayout[pageStyles.size()]); + return pageStyles.values().toArray(new PageLayout[pageStyles.size()]); } public OfficeStyle[] getAllStyles() { - return (OfficeStyle[]) styles.values().toArray(new OfficeStyle[styles.size()]); + return styles.values().toArray(new OfficeStyle[styles.size()]); } public Element[] getOtherStyles() { - return (Element[]) otherChildren.toArray(new Element[otherChildren.size()]); + return 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/model/ReportElement.java b/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java index 24926845e61a..9f707ebb801f 100644 --- a/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java +++ b/reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java @@ -36,11 +36,11 @@ import org.jfree.report.structure.Element; public abstract class ReportElement extends Element { - private final List formatConditions; + private final List<FormatCondition> formatConditions; protected ReportElement() { - formatConditions = new ArrayList(); + formatConditions = new ArrayList<FormatCondition>(); } /** @@ -91,7 +91,7 @@ public abstract class ReportElement extends Element public FormatCondition[] getFormatConditions() { - return (FormatCondition[]) this.formatConditions.toArray(new FormatCondition[this.formatConditions.size()]); + return this.formatConditions.toArray(new FormatCondition[this.formatConditions.size()]); } public int getFormatConditionCount() |