summaryrefslogtreecommitdiff
path: root/reportbuilder
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-08 11:14:08 +0200
committerNoel Grandin <noel@peralex.com>2014-08-12 12:16:37 +0200
commite701b3f732fa7f70cb273183e9ae8dbfd840f5e4 (patch)
tree8bcf687f10ccd70be0882360d2155378993cef26 /reportbuilder
parentcc4d76145f7b92992b885cdc58b4534e8c024ac5 (diff)
java: reduce scope, make constants private
found by UCDetector Change-Id: Ide9975e361ed17ac8cdcbe67ba74c563a9392d57
Diffstat (limited to 'reportbuilder')
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java2
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java2
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java2
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java4
-rw-r--r--reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java18
5 files changed, 14 insertions, 14 deletions
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
index 2976adfacdd2..e73c263cca83 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportEngineMetaData.java
@@ -41,7 +41,7 @@ public class PentahoReportEngineMetaData
public static final String OPENDOCUMENT_TEXT = "application/vnd.oasis.opendocument.text";
public static final String OPENDOCUMENT_SPREADSHEET = "application/vnd.oasis.opendocument.spreadsheet";
public static final String OPENDOCUMENT_CHART = "application/vnd.oasis.opendocument.chart";
- public final static String CONTENT_TYPE = "content-type";
+ private final static String CONTENT_TYPE = "content-type";
public static final String DEBUG = "raw/text+xml";
private final Set<String> mandatoryParameters;
private final Map<String,Class<?>> parameterTypes;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
index 679421cf57ad..f15f381231b0 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java
@@ -38,7 +38,7 @@ public abstract class AbstractReportElementLayoutController
extends AbstractLayoutController
{
- public static final int NOT_STARTED = 0;
+ private static final int NOT_STARTED = 0;
public static final int FINISHED = 2;
private int state;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
index e775c118cd43..8eecd85dbd9a 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java
@@ -58,7 +58,7 @@ public class FormatValueUtility
private static final String BOOLEAN_VALUE = "boolean-value";
private static final String STRING_VALUE = "string-value";
public static final String VALUE_TYPE = "value-type";
- public static final String VALUE = "value";
+ private static final String VALUE = "value";
private static SimpleDateFormat dateFormat;
private static SimpleDateFormat timeFormat;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
index bfe50b844aa4..ca877c3a8768 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/OfficeGroupLayoutController.java
@@ -42,8 +42,8 @@ public class OfficeGroupLayoutController extends SectionLayoutController
implements OfficeRepeatingStructureLayoutController
{
- public static final int STATE_PROCESS_REPEATING_HEADER = 0;
- public static final int STATE_PROCESS_REPEATING_FOOTER = 1;
+ private static final int STATE_PROCESS_REPEATING_HEADER = 0;
+ private static final int STATE_PROCESS_REPEATING_FOOTER = 1;
public static final int STATE_PROCESS_NORMAL_FLOW = 3;
private boolean waitForJoin;
private int state;
diff --git a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 0c012a5d5ee4..3adb42dd35c2 100644
--- a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++ b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -116,7 +116,7 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
protected static final Log LOGGER = LogFactory.getLog(OfficeDocumentReportTarget.class);
public static final String HORIZONTAL_POS = "horizontal-pos";
public static final String TAG_DEF_PREFIX = "org.libreoffice.report.pentaho.output.";
- public static final int ROLE_NONE = 0;
+ private static final int ROLE_NONE = 0;
public static final int ROLE_REPORT_HEADER = 1;
public static final int ROLE_REPORT_FOOTER = 2;
public static final int ROLE_GROUP_HEADER = 3;
@@ -130,14 +130,14 @@ public abstract class OfficeDocumentReportTarget extends AbstractReportTarget
public static final int ROLE_TEMPLATE = 11;
public static final int ROLE_SPREADSHEET_PAGE_HEADER = 12;
public static final int ROLE_SPREADSHEET_PAGE_FOOTER = 13;
- public static final int STATE_IN_DOCUMENT = 0;
- public static final int STATE_IN_BODY = 1;
- public static final int STATE_IN_CONTENT = 2;
- public static final int STATE_IN_GROUP = 3;
- public static final int STATE_IN_GROUP_BODY = 4;
- public static final int STATE_IN_SECTION = 5;
- public static final int STATE_IN_OTHER = 6;
- public static final int STATE_IN_GROUP_INSTANCE = 7;
+ private static final int STATE_IN_DOCUMENT = 0;
+ private static final int STATE_IN_BODY = 1;
+ private static final int STATE_IN_CONTENT = 2;
+ private static final int STATE_IN_GROUP = 3;
+ private static final int STATE_IN_GROUP_BODY = 4;
+ private static final int STATE_IN_SECTION = 5;
+ private static final int STATE_IN_OTHER = 6;
+ private static final int STATE_IN_GROUP_INSTANCE = 7;
public static final String FAILED = "Failed";
public static final String VERTICAL_POS = "vertical-pos";
private static final String ZERO_CM = "0cm";