summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-08 11:36:04 +0200
committerNoel Grandin <noel@peralex.com>2014-08-13 08:49:22 +0200
commitda677dfd59c2b551f3335ee0a5d5dfb33f9869c5 (patch)
tree9aa09066c95935117bf405b119ed9f89f448a54d /xmerge
parent14d1a11ec4a7ed0deeac522403248536e8d23f57 (diff)
java: reduce scope, make fields private
found by UCDetector Change-Id: I7f97e15667159cf8ee776e8f32fdcdec8ec00ed6
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java12
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java6
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java2
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java8
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java12
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java6
7 files changed, 24 insertions, 24 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
index df9ccfb065b6..fc8303111557 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/palm/PdbHeader.java
@@ -60,19 +60,19 @@ final class PdbHeader {
long modificationDate = 0;
/** Date last backup. Palm UInt32. */
- long lastBackupDate = 0;
+ private long lastBackupDate = 0;
/**
* Incremented every time a <code>Record</code> is
* added, deleted or modified. Palm UInt32.
*/
- long modificationNumber = 0;
+ private long modificationNumber = 0;
/** Optional field. Palm UInt32. Unsignedness should be irrelevant. */
- int appInfoID = 0;
+ private int appInfoID = 0;
/** Optional field. Palm UInt32. Unsignedness should be irrelevant. */
- int sortInfoID = 0;
+ private int sortInfoID = 0;
/** Database type ID. Palm UInt32. Unsignedness should be irrelevant. */
int typeID = 0;
@@ -81,10 +81,10 @@ final class PdbHeader {
int creatorID = 0;
/** ??? */
- int uniqueIDSeed = 0;
+ private int uniqueIDSeed = 0;
/** See numRecords. 4 bytes. */
- int nextRecordListID = 0;
+ private int nextRecordListID = 0;
/**
* Number of Records stored in the database header.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
index 18635b275814..d3b10bf256f9 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedBinaryObject.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
public class EmbeddedBinaryObject extends EmbeddedObject {
/** The object's binary representation. */
- protected byte[] objData = null;
+ private byte[] objData = null;
/**
* Constructor for an embedded object stored using an XML representation.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
index 7711879006cb..42c6df4fd5ee 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/EmbeddedXMLObject.java
@@ -49,9 +49,9 @@ import org.xml.sax.SAXException;
public class EmbeddedXMLObject extends EmbeddedObject {
// Entries for the subdocuments that constitute this object;
- protected Document contentDOM = null;
- protected Document settingsDOM = null;
- protected Document stylesDOM = null;
+ private Document contentDOM = null;
+ private Document settingsDOM = null;
+ private Document stylesDOM = null;
private DocumentBuilder builder = null;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
index 78575d6e27ad..815c2b4a8b50 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeDocumentException.java
@@ -33,7 +33,7 @@ import org.openoffice.xmerge.util.Resources;
public final class OfficeDocumentException extends IOException {
- StringBuffer message = null;
+ private StringBuffer message = null;
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
index 529b1cf93dd3..b8527d0332db 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/ParaStyle.java
@@ -164,11 +164,11 @@ public class ParaStyle extends Style implements Cloneable {
* Array of flags indicating which attributes are set for this
* paragraph <code>Style</code>.
*/
- protected boolean isSet[] = new boolean[NR_PROPERTIES];
+ private boolean isSet[] = new boolean[NR_PROPERTIES];
/** Array of attribute values for this paragraph <code>tyle</code>. */
- protected int value[] = new int[NR_PROPERTIES];
+ private int value[] = new int[NR_PROPERTIES];
/** Array of attribute names for this paragraph <code>Style</code>. */
- protected String attrName[] = {
+ private String attrName[] = {
"fo:margin-left",
"fo:margin-right",
"fo:margin-top",
@@ -179,7 +179,7 @@ public class ParaStyle extends Style implements Cloneable {
};
/** Array of attribute structures for this paragraph <code>Style</code>. */
- protected Class<?> algor[] = {
+ private Class<?> algor[] = {
horizSize.class,
horizSize.class,
horizSize.class,
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 5024d8ffd827..26b923a4980e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -52,18 +52,18 @@ public class TextStyle extends Style implements Cloneable {
final protected static int LAST_ATTR = 0x20;
/** Values of text attributes. */
- protected int values = 0;
+ private int values = 0;
/** Bitwise mask of text attributes. */
- protected int mask = 0;
+ private int mask = 0;
/** Font size in points. */
- protected int sizeInPoints = 0;
+ private int sizeInPoints = 0;
/** Font name. */
- protected String fontName = null;
+ private String fontName = null;
/** Font <code>Color</code>. */
- protected Color fontColor = null;
+ private Color fontColor = null;
/** Background <code>Color</code>. */
- protected Color bgColor = null;
+ private Color bgColor = null;
/**
* Constructor for use when going from DOM to client device format.
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
index 44e025204485..eb50897291ed 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
@@ -67,14 +67,14 @@ public class Format implements Cloneable {
/** Font name. */
private String fontName;
/** Font size in points. */
- protected int sizeInPoints;
+ private int sizeInPoints;
private Color foreground, background;
/** Values of text attributes. */
- protected int attributes = 0;
+ private int attributes = 0;
/** Bitwise mask of text attributes. */
- protected int mask = 0;
+ private int mask = 0;
/**
* Constructor for creating a new <code>Format</code>.