[Libreoffice-commits] core.git: reportbuilder/java
rbuj
robert.buj at gmail.com
Tue Sep 2 00:14:15 PDT 2014
reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java | 3 -
reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java | 4 +-
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java | 6 +--
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java | 6 +--
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java | 6 +--
reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java | 4 +-
reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java | 18 ++++-----
reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java | 20 +++++-----
reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java | 6 +--
reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper.java | 6 +--
10 files changed, 39 insertions(+), 40 deletions(-)
New commits:
commit 18d72e76f1d20d613ab05a4f40e4505279a989ca
Author: rbuj <robert.buj at gmail.com>
Date: Mon Sep 1 18:35:40 2014 +0200
reportbuilder: fix javadoc error: self-closing element not allowed
Change-Id: Iabfa4dd2c1018b982b50798bf09347e0b11901a4
Reviewed-on: https://gerrit.libreoffice.org/11240
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
index b9a0c2d..4a66046 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java
@@ -384,8 +384,7 @@ public class SOReportJobFactory
}
/**
- * Gives a factory for creating the service. This method is called by the <code>JavaLoader</code>
- * <p/>
+ * Gives a factory for creating the service. This method is called by the <code>JavaLoader</code>.
*
* @param sImplName the name of the implementation for which a service is desired
* @return returns a <code>XSingleComponentFactory</code> for creating the component
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
index 4b9d7f9..0c78d4a 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/StarReportDataFactory.java
@@ -41,8 +41,8 @@ public class StarReportDataFactory implements ReportDataFactory, Cloneable
/**
* Queries a datasource. The string 'query' defines the name of the query. The
* Parameterset given here may contain more data than actually needed.
- * <p/>
- * The dataset may change between two calls, do not assume anything!
+ *
+ * <p>The dataset may change between two calls, do not assume anything!</p>
*/
public ReportData queryData(final String query, final DataSet parameters)
throws ReportDataFactoryException
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
index 659417c..37a514c 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeDetailLayoutController.java
@@ -47,9 +47,9 @@ public class OfficeDetailLayoutController extends SectionLayoutController
/**
* Initializes the layout controller. This method is called exactly once. It
* is the creators responsibility to call this method.
- * <p/>
- * Calling initialize after the first advance must result in a
- * IllegalStateException.
+ *
+ * <p>Calling initialize after the first advance must result in a
+ * IllegalStateException.</p>
*
* @param node the currently processed object or layout node.
* @param flowController the current flow controller.
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index 17b488e..8933adf 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -54,9 +54,9 @@ public class OfficeGroupLayoutController extends SectionLayoutController
/**
* Initializes the layout controller. This method is called exactly once. It
* is the creators responsibility to call this method.
- * <p/>
- * Calling initialize after the first advance must result in a
- * IllegalStateException.
+ *
+ * <p>Calling initialize after the first advance must result in a
+ * IllegalStateException.</p>
*
* @param node the currently processed object or layout node.
* @param flowController the current flow controller.
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
index dbd63d2..4f7abe3 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeReportLayoutController.java
@@ -59,9 +59,9 @@ public class OfficeReportLayoutController extends ElementLayoutController
/**
* Initializes the layout controller. This method is called exactly once. It
* is the creators responsibility to call this method.
- * <p/>
- * Calling initialize after the first advance must result in a
- * IllegalStateException.
+ *
+ * <p>Calling initialize after the first advance must result in a
+ * IllegalStateException.</p>
*
* @param node the currently processed object or layout node.
* @param flowController the current flow controller.
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
index e31375e..2b095a4 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeTableTemplateLayoutController.java
@@ -48,8 +48,8 @@ public class OfficeTableTemplateLayoutController extends SectionLayoutController
/**
* Initializes the layout controller. This method is called exactly once. It is the creators responsibility to call
* this method.
- * <p/>
- * Calling initialize after the first advance must result in a IllegalStateException.
+ *
+ * <p>Calling initialize after the first advance must result in a IllegalStateException.</p>
*
* @param node the currently processed object or layout node.
* @param flowController the current flow controller.
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
index f760bcf..71562ca 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/model/OfficeStylesCollection.java
@@ -24,17 +24,17 @@ import org.jfree.report.structure.Element;
/**
* Holds all style-definitions and provides some simplified lookup methods to
* grab them by their type and name.
- * <p/>
- * For now, we are only interested in 'style:style' nodes. Each of these nodes
+ *
+ * <p>For now, we are only interested in 'style:style' nodes. Each of these nodes
* has a style-name and a style-family. Each style declaration can have a parent
- * style, from which properties are inherited.
- * <p/>
- * Style names are unique within the family, no matter whether the style is an
- * automatic style, an common style or a master style.
- * <p/>
- * The contents of this element are the union of the 'styles.xml' file (if it
+ * style, from which properties are inherited.</p>
+ *
+ * <p>Style names are unique within the family, no matter whether the style is an
+ * automatic style, an common style or a master style.</p>
+ *
+ * <p>The contents of this element are the union of the 'styles.xml' file (if it
* exists), the font-declarations and auto-styles of the document-content.xml
- * and the styles declared in the main document.
+ * and the styles declared in the main document.</p>
*
* @since 06.03.2007
*/
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
index 53b51f0..e072459 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java
@@ -54,11 +54,11 @@ public class StyleUtilities
}
/**
- * Copies the specififed style (keyed by its family and name) into the current styles collection. This copies the
+ * Copies the specified style (keyed by its family and name) into the current styles collection. This copies the
* style and all inherited styles into the target collection. Inherited common styles will be always be added to the
* common collection (which will be written into the 'styles.xml' later).
- * <p/>
- * This method does nothing if the specified style already exists in the styles collection.
+ *
+ * <p>This method does nothing if the specified style already exists in the styles collection.</p>
*
* @param styleFamily the family of the style to copy
* @param styleName the unique name of the style.
@@ -79,11 +79,11 @@ public class StyleUtilities
}
/**
- * Copies the specififed style (keyed by its family and name) into the current styles collection. This copies the
+ * Copies the specified style (keyed by its family and name) into the current styles collection. This copies the
* style and all inherited styles into the target collection. Inherited common styles will be always be added to the
* common collection (which will be written into the 'styles.xml' later).
- * <p/>
- * This method does nothing if the specified style already exists in the styles collection.
+ *
+ * <p>This method does nothing if the specified style already exists in the styles collection.</p>
*
* @param styleFamily the family of the style to copy
* @param styleName the unique name of the style.
@@ -327,10 +327,10 @@ public class StyleUtilities
* Derives the named style. If the style is a common style, a new automatic style is generated and inserted into the
* given stylesCollection. If the named style is an automatic style, the style is copied and inserted as new automatic
* style.
- * <p/>
- * After the style has been created, the style's inheritance hierarchy will be copied as well.
- * <p/>
- * If there is no style with the given name and family, a new empty automatic style will be created.
+ *
+ * <p>After the style has been created, the style's inheritance hierarchy will be copied as well.</p>
+ *
+ * <p>If there is no style with the given name and family, a new empty automatic style will be created.</p>
*
* @param styleFamily the family of the style to copy
* @param styleName the unique name of the style.
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java
index 3af24d3..6d36eb6 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java
@@ -42,9 +42,9 @@ import org.xml.sax.SAXException;
* This is the root handler for the document context. The
* 'office:document-context' element is encountered, if the document is split
* into separate files.
- * <p/>
- * Alternativly, there is the option to keep everything in one file. The root
- * element for that format is 'office:document'.
+ *
+ * <p>Alternatively, there is the option to keep everything in one file. The root
+ * element for that format is 'office:document'.</p>
*/
public class DocumentContentReadHandler extends AbstractXmlReadHandler
{
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper.java b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper.java
index 9335309..d65e851 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/styles/StyleMapper.java
@@ -31,10 +31,10 @@ import org.pentaho.reporting.libraries.resourceloader.ResourceManager;
* has a style-family assigned. The style family is determined by the element
* referencing the style, and there is no easily accessible information
* available on that.
- * <p/>
- * Therefore this mapper acts as gatekeeper for this information. The style
+ *
+ * <p>Therefore this mapper acts as gatekeeper for this information. The style
* mapping information is read from an external definition file and can be
- * maintained externally.
+ * maintained externally.</p>
*
* @since 11.03.2007
*/
More information about the Libreoffice-commits
mailing list