java: remove modifiers implied by the context

found by PMD

Change-Id: I04cbf986ddbcffff987784f381b8a9f52f1b3f31

15 files changed, 102 insertions, 112 deletions

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
index ac9d4559731c..c1a5d7ba64d8 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/Document.java
@@ -51,7 +51,7 @@ public interface Document {
      *
      *  @throws  IOException  If any I/O error occurs.
      */
-    public void write(OutputStream os) throws IOException;
+    void write(OutputStream os) throws IOException;
 
 
     /**
@@ -68,7 +68,7 @@ public interface Document {
      *
      *  @throws  IOException  If any I/O error occurs.
      */
-     public void read(InputStream is) throws IOException;
+    void read(InputStream is) throws IOException;
 
 
     /**
@@ -76,7 +76,7 @@ public interface Document {
      *
      *  @return  The <code>Document</code> name with no file extension.
      */
-    public String getName();
+    String getName();
 
 
     /**
@@ -84,6 +84,6 @@ public interface Document {
      *
      *  @return  The <code>Document</code> name with file extension.
      */
-    public String getFileName();
+    String getFileName();
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
index b5438cdbda60..5429a16a34bd 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer.java
@@ -50,6 +50,6 @@ public interface DocumentDeserializer {
      *  @throws  ConvertException  If any Convert error occurs.
      *  @throws  IOException       If any I/O error occurs.
      */
-    public Document deserialize() throws ConvertException, IOException;
+    Document deserialize() throws ConvertException, IOException;
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
index 54e4667a4eb9..a866f8237dc5 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializer2.java
@@ -55,7 +55,7 @@ public interface DocumentDeserializer2 extends DocumentSerializer {
      *  @throws  ConvertException  If any Convert error occurs.
      *  @throws  IOException       If any I/O error occurs.
      */
-    public Document deserialize(String deviceURL, String officeURL) throws
+    Document deserialize(String deviceURL, String officeURL) throws
         ConvertException, IOException;
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
index 6f0d96aa01c4..1eccfded7a67 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentDeserializerFactory.java
@@ -51,6 +51,6 @@ public interface DocumentDeserializerFactory {
      *  @return  A <code>DocumentDeserializer</code> object.
      */
 
-    public DocumentDeserializer createDocumentDeserializer(ConvertData cd);
+    DocumentDeserializer createDocumentDeserializer(ConvertData cd);
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
index eae5e40026bb..c575ef892550 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMerger.java
@@ -78,6 +78,6 @@ public interface DocumentMerger {
      *
      *  @throws  MergeException  If any merge error occurs.
      */
-    public void merge(Document modifiedDoc) throws MergeException;
+    void merge(Document modifiedDoc) throws MergeException;
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java
index 06662ac4dcc6..3ddbc56569c7 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentMergerFactory.java
@@ -49,6 +49,6 @@ public interface DocumentMergerFactory {
      *  @return  A <code>DocumentMerger</code> object or null if none
      *           exists.
      */
-    public DocumentMerger createDocumentMerger(Document doc);
+    DocumentMerger createDocumentMerger(Document doc);
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
index b3f6af69f757..6937fc4f28b0 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer.java
@@ -51,6 +51,6 @@ public interface DocumentSerializer {
      *  @throws  ConvertException  If any conversion error occurs.
      *  @throws  IOException       If any I/O error occurs.
      */
-    public ConvertData serialize() throws ConvertException, IOException;
+    ConvertData serialize() throws ConvertException, IOException;
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java
index 6a22ad90acf7..e2aee8488d4a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializer2.java
@@ -57,7 +57,7 @@ public interface DocumentSerializer2 extends DocumentSerializer {
      *  @throws  ConvertException  If any conversion error occurs.
      *  @throws  IOException       If any I/O error occurs.
      */
-    public ConvertData serialize(String officeURL, String deviceURL) throws
+    ConvertData serialize(String officeURL, String deviceURL) throws
         ConvertException, IOException;
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java
index 0765792fc058..262256610c0e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/DocumentSerializerFactory.java
@@ -49,6 +49,6 @@ public interface DocumentSerializerFactory {
      *
      *  @return  A <code>DocumentSerializer</code> object.
      */
-    public DocumentSerializer createDocumentSerializer(Document doc);
+    DocumentSerializer createDocumentSerializer(Document doc);
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java
index 94c1f35d018f..452869ce3cef 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/OfficeConstants.java
@@ -26,321 +26,321 @@ package org.openoffice.xmerge.converter.xml;
 public interface OfficeConstants {
 
     /** Element tag for <i>office:document</i>, this is the root tag. */
-    public final static String TAG_OFFICE_DOCUMENT = "office:document";
+    String TAG_OFFICE_DOCUMENT = "office:document";
 
     /**
      *  Element tag for <i>office:document-content</i>, this is the root
      *  tag in content.xml.
      */
-    public final static String TAG_OFFICE_DOCUMENT_CONTENT = "office:document-content";
+    String TAG_OFFICE_DOCUMENT_CONTENT = "office:document-content";
 
     /**
      *  Element tag for <i>office:document-settings</i>, this is the root
      *  tag in content.xml.
      */
-    public final static String TAG_OFFICE_DOCUMENT_SETTINGS= "office:document-settings";
+    String TAG_OFFICE_DOCUMENT_SETTINGS= "office:document-settings";
 
      /**
      *  Element tag for <i>office:document-meta</i>, this is the root
      *  tag in content.xml.
      */
-    public final static String TAG_OFFICE_DOCUMENT_META= "office:document-meta";
+    String TAG_OFFICE_DOCUMENT_META= "office:document-meta";
 
     /**
      *  Element tag for <i>office:document-styles</i>, this is the root tag
      *  in styles.xml.
      */
-    public final static String TAG_OFFICE_DOCUMENT_STYLES = "office:document-styles";
+    String TAG_OFFICE_DOCUMENT_STYLES = "office:document-styles";
 
 
 
     /** Element tag for <i>office:styles</i>. */
-    public final static String TAG_OFFICE_STYLES = "office:styles";
+    String TAG_OFFICE_STYLES = "office:styles";
 
     /** Element tag for <i>office:meta</i>. */
-    public final static String TAG_OFFICE_META = "office:meta";
+    String TAG_OFFICE_META = "office:meta";
 
     /** Element tag for <i>office:automatic-styles</i>. */
-    public final static String TAG_OFFICE_AUTOMATIC_STYLES = "office:automatic-styles";
+    String TAG_OFFICE_AUTOMATIC_STYLES = "office:automatic-styles";
 
     /** Element tag for <i>office:master-styles</i>. */
-    public final static String TAG_OFFICE_MASTER_STYLES = "office:master-styles";
+    String TAG_OFFICE_MASTER_STYLES = "office:master-styles";
 
     /** Element tag for <i>office:body</i>. */
-    public final static String TAG_OFFICE_BODY = "office:body";
+    String TAG_OFFICE_BODY = "office:body";
 
     /** Element tag for <i>office:settings</i>. */
-    public final static String TAG_OFFICE_SETTINGS = "office:settings";
+    String TAG_OFFICE_SETTINGS = "office:settings";
 
     /** Element tag for <i>office:font-decls</i>. */
-    public final static String TAG_OFFICE_FONT_DECLS = "office:font-decls";
+    String TAG_OFFICE_FONT_DECLS = "office:font-decls";
 
     /** Element tag for <i>style:font-decl</i>. */
-    public final static String TAG_STYLE_FONT_DECL = "style:font-decl";
+    String TAG_STYLE_FONT_DECL = "style:font-decl";
 
     /** Attribute tag for <i>style:name</i> of element <i>style:name</i>. */
-    public final static String ATTRIBUTE_STYLE_NAME = "style:name";
+    String ATTRIBUTE_STYLE_NAME = "style:name";
 
     /**
      *  Attribute tag for <i>style:font-pitch</i> of element
      *  <i>style:font-pitch</i>.
      */
-    public final static String ATTRIBUTE_STYLE_FONT_PITCH = "style:font-pitch";
+    String ATTRIBUTE_STYLE_FONT_PITCH = "style:font-pitch";
 
     /**
      *  Attribute tag for <i>fo:font-family</i> of element
      *  <i>fo:font-family</i>.
      */
-    public final static String ATTRIBUTE_FO_FONT_FAMILY = "fo:font-family";
+    String ATTRIBUTE_FO_FONT_FAMILY = "fo:font-family";
 
     /**
      *  Attribute tag for <i>fo:font-family</i> of element
      *  <i>fo:font-family</i>.
      */
-    public final static String ATTRIBUTE_FO_FONT_FAMILY_GENERIC = "fo:font-family-generic";
+    String ATTRIBUTE_FO_FONT_FAMILY_GENERIC = "fo:font-family-generic";
 
     /** Element tag for <i>text:p</i>. */
-    public final static String TAG_PARAGRAPH = "text:p";
+    String TAG_PARAGRAPH = "text:p";
 
     /** Element tag for <i>text:h</i>. */
-    public final static String TAG_HEADING = "text:h";
+    String TAG_HEADING = "text:h";
 
     /** Element tag for <i>text:s</i>. */
-    public final static String TAG_SPACE = "text:s";
+    String TAG_SPACE = "text:s";
 
     /** Element tag for <i>text:tab-stop</i>. */
-    public final static String TAG_TAB_STOP = "text:tab-stop";
+    String TAG_TAB_STOP = "text:tab-stop";
 
     /** Element tag for <i>text:line-break</i>. */
-    public final static String TAG_LINE_BREAK = "text:line-break";
+    String TAG_LINE_BREAK = "text:line-break";
 
     /** Element tag for <i>text:span</i>. */
-    public final static String TAG_SPAN = "text:span";
+    String TAG_SPAN = "text:span";
 
     /** Element tag for <i>text:a</i>. */
-    public final static String TAG_HYPERLINK = "text:a";
+    String TAG_HYPERLINK = "text:a";
 
     /** Element tag for <i>text:unordered-list</i>. */
-    public final static String TAG_UNORDERED_LIST = "text:unordered-list";
+    String TAG_UNORDERED_LIST = "text:unordered-list";
 
     /** Element tag for <i>text:ordered-list</i>. */
-    public final static String TAG_ORDERED_LIST = "text:ordered-list";
+    String TAG_ORDERED_LIST = "text:ordered-list";
 
     /** Element tag for <i>text:list-header</i>. */
-    public final static String TAG_LIST_HEADER = "text:list-header";
+    String TAG_LIST_HEADER = "text:list-header";
 
     /** Element tag for <i>text:list-item</i>. */
-    public final static String TAG_LIST_ITEM = "text:list-item";
+    String TAG_LIST_ITEM = "text:list-item";
 
     /** Attribute tag for <i>text:c</i> of element <i>text:s</i>. */
-    public final static String ATTRIBUTE_SPACE_COUNT = "text:c";
+    String ATTRIBUTE_SPACE_COUNT = "text:c";
 
     /** Element tag for <i>table:table</i>. */
-    public final static String TAG_TABLE = "table:table";
+    String TAG_TABLE = "table:table";
 
     /** Element tag for <i>table:named-expression</i>. */
-    public final static String TAG_NAMED_EXPRESSIONS = "table:named-expressions";
+    String TAG_NAMED_EXPRESSIONS = "table:named-expressions";
 
     /** Element tag for <i>table:named-range</i>. */
-    public final static String TAG_TABLE_NAMED_RANGE= "table:named-range";
+    String TAG_TABLE_NAMED_RANGE= "table:named-range";
 
     /** Element tag for <i>table:named-expression</i>. */
-    public final static String TAG_TABLE_NAMED_EXPRESSION= "table:named-expression";
+    String TAG_TABLE_NAMED_EXPRESSION= "table:named-expression";
 
     /**
      *  Attribute tag for <i>table:name</i> of element
      *  <i>table:table</i>.
      */
-    public final static String ATTRIBUTE_TABLE_NAME = "table:name";
+    String ATTRIBUTE_TABLE_NAME = "table:name";
 
     /**
      *  Attribute tag for <i>table:expression</i> of element
      *  <i>table:named-range</i>.
      */
-    public final static String ATTRIBUTE_TABLE_EXPRESSION = "table:expression";
+    String ATTRIBUTE_TABLE_EXPRESSION = "table:expression";
 
     /**
      *  Attribute tag for <i>table:base-cell-address</i> of element
      *  <i>table:named-range</i>.
      */
-    public final static String ATTRIBUTE_TABLE_BASE_CELL_ADDRESS = "table:base-cell-address";
+    String ATTRIBUTE_TABLE_BASE_CELL_ADDRESS = "table:base-cell-address";
 
     /**
      *  Attribute tag for <i>table:cell-range-address</i> of element
      *  <i>table:named-range</i>.
      */
-    public final static String ATTRIBUTE_TABLE_CELL_RANGE_ADDRESS = "table:cell-range-address";
+    String ATTRIBUTE_TABLE_CELL_RANGE_ADDRESS = "table:cell-range-address";
 
     /** Element tag for <i>table:table-row</i>. */
-    public final static String TAG_TABLE_ROW = "table:table-row";
+    String TAG_TABLE_ROW = "table:table-row";
 
     /** Element tag for <i>table:table-column</i>. */
-    public final static String TAG_TABLE_COLUMN = "table:table-column";
+    String TAG_TABLE_COLUMN = "table:table-column";
 
     /**
     *  Attribute tag for <i>table:default-cell-style-name</i>
     *  of element <i>table:table-column</i>.
     */
-    public final static String ATTRIBUTE_DEFAULT_CELL_STYLE = "table:default-cell-style-name";
+    String ATTRIBUTE_DEFAULT_CELL_STYLE = "table:default-cell-style-name";
 
     /** Element tag for <i>table:scenario</i>. */
-    public final static String TAG_TABLE_SCENARIO = "table:scenario";
+    String TAG_TABLE_SCENARIO = "table:scenario";
 
     /** Element tag for <i>table:table-cell</i>. */
-    public final static String TAG_TABLE_CELL = "table:table-cell";
+    String TAG_TABLE_CELL = "table:table-cell";
 
     /**
      *  Attribute tag for <i>table:value-type</i> of element
      *  <i>table:table-cell</i>.
      */
-    public final static String ATTRIBUTE_TABLE_VALUE_TYPE = "table:value-type";
+    String ATTRIBUTE_TABLE_VALUE_TYPE = "table:value-type";
 
     /**
      *  Attribute tag for <i>table:number-columns-repeated</i>
      *  of element <i>table:table-cell</i>.
      */
-    public final static String ATTRIBUTE_TABLE_NUM_COLUMNS_REPEATED =
+    String ATTRIBUTE_TABLE_NUM_COLUMNS_REPEATED =
         "table:number-columns-repeated";
 
     /**
      *  Attribute tag for <i>table:number-rows-repeated</i>
      *  of element <i>table:table-row</i>.
      */
-    public final static String ATTRIBUTE_TABLE_NUM_ROWS_REPEATED =
+    String ATTRIBUTE_TABLE_NUM_ROWS_REPEATED =
         "table:number-rows-repeated";
 
     /**
      *  Attribute tag for <i>table:formula</i> of element
      *  <i>table:table-cell</i>.
      */
-    public final static String ATTRIBUTE_TABLE_FORMULA = "table:formula";
+    String ATTRIBUTE_TABLE_FORMULA = "table:formula";
 
     /**
      *  Attribute tag for <i>table:value</i> of element
      *  <i>table:table-cell</i>.
      */
-    public final static String ATTRIBUTE_TABLE_VALUE = "table:value";
+    String ATTRIBUTE_TABLE_VALUE = "table:value";
 
     /**
      *  Attribute tag for <i>table:date-value</i> of element
      *  <i>table:table-cell</i>.
      */
-    public final static String ATTRIBUTE_TABLE_DATE_VALUE = "table:date-value";
+    String ATTRIBUTE_TABLE_DATE_VALUE = "table:date-value";
 
     /**
      *  Attribute tag for <i>table:time-value</i> of element
      *  <i>table:table-cell</i>.
      */
-    public final static String ATTRIBUTE_TABLE_TIME_VALUE = "table:time-value";
+    String ATTRIBUTE_TABLE_TIME_VALUE = "table:time-value";
 
     /**
      *  Attribute tag for <i>table:string-value</i> of element
      *  <i>table:table-cell</i>.
      */
-    public final static String ATTRIBUTE_TABLE_STRING_VALUE =
+    String ATTRIBUTE_TABLE_STRING_VALUE =
         "table:string-value";
 
     /**
      *  Attribute tag for <i>table:time-boolean-value</i> of element
      *  <i>table:table-cell</i>.
      */
-    public final static String ATTRIBUTE_TABLE_BOOLEAN_VALUE =
+    String ATTRIBUTE_TABLE_BOOLEAN_VALUE =
         "table:boolean-value";
 
     /** Attribute tag for <i>table:style-name</i> of table elements. */
-    public final static String ATTRIBUTE_TABLE_STYLE_NAME = "table:style-name";
+    String ATTRIBUTE_TABLE_STYLE_NAME = "table:style-name";
 
     /**
      *  Attribute tag for <i>table:currency</i> of element
      *  <i>table:table-cell</i>.
      */
-    public final static String ATTRIBUTE_TABLE_CURRENCY = "table:currency";
+    String ATTRIBUTE_TABLE_CURRENCY = "table:currency";
 
     /** The cell contains data of type <i>string</i>. */
-    public final static String CELLTYPE_STRING = "string";
+    String CELLTYPE_STRING = "string";
 
     /** The cell contains data of type <i>float</i>. */
-    public final static String CELLTYPE_FLOAT = "float";
+    String CELLTYPE_FLOAT = "float";
 
     /** The cell contains data of type <i>time</i>. */
-    public final static String CELLTYPE_TIME = "time";
+    String CELLTYPE_TIME = "time";
 
     /** The cell contains data of type <i>date</i>. */
-    public final static String CELLTYPE_DATE = "date";
+    String CELLTYPE_DATE = "date";
 
     /** The cell contains data of type <i>currency</i>. */
-    public final static String CELLTYPE_CURRENCY = "currency";
+    String CELLTYPE_CURRENCY = "currency";
 
     /** The cell contains data of type <i>boolean</i>. */
-    public final static String CELLTYPE_BOOLEAN = "boolean";
+    String CELLTYPE_BOOLEAN = "boolean";
 
     /** The cell contains data of type <i>percent</i>. */
-    public final static String CELLTYPE_PERCENT = "percentage";
+    String CELLTYPE_PERCENT = "percentage";
 
     /** StarWriter XML file extension. */
-    public final static String SXW_FILE_EXTENSION = ".sxw";
+    String SXW_FILE_EXTENSION = ".sxw";
 
     /** StarWriter XML <i>office:class</i> value. */
-    public final static String SXW_TYPE = "text";
+    String SXW_TYPE = "text";
 
     /** StarCalc XML file extension. */
-    public final static String SXC_FILE_EXTENSION = ".sxc";
+    String SXC_FILE_EXTENSION = ".sxc";
 
     /** StarCalc XML <i>office:class</i> value. */
-    public final static String SXC_TYPE = "spreadsheet";
+    String SXC_TYPE = "spreadsheet";
 
     /** Element tag for <i>manifest:manifest</i>entry in Manifest XML */
-    public final static String TAG_MANIFEST_ROOT = "manifest:manifest";
+    String TAG_MANIFEST_ROOT = "manifest:manifest";
 
     /** Element tag for <i>manifest:file-entry</i> entry in Manifest XML. */
-    public final static String TAG_MANIFEST_FILE = "manifest:file-entry";
+    String TAG_MANIFEST_FILE = "manifest:file-entry";
 
     /**
      * Attribute tag for <i>manifest:media-type</i> of element
      * <i>manifest:file-entry</i>.
      */
-    public final static String ATTRIBUTE_MANIFEST_FILE_TYPE = "manifest:media-type";
+    String ATTRIBUTE_MANIFEST_FILE_TYPE = "manifest:media-type";
 
     /**
      * Attribute tag for <i>manifest:full-path</i> of element
      * <i>manifest:file-entry</i>.
      */
-    public final static String ATTRIBUTE_MANIFEST_FILE_PATH = "manifest:full-path";
+    String ATTRIBUTE_MANIFEST_FILE_PATH = "manifest:full-path";
 
     // Tags and Elements for the settings.xml
 
     /** Element tag for <i>config:config-item</i>. */
-    public final static String TAG_CONFIG_ITEM = "config:config-item";
+    String TAG_CONFIG_ITEM = "config:config-item";
 
     /** Element tag for <i>config:config-item-set</i>. */
-    public final static String TAG_CONFIG_ITEM_SET = "config:config-item-set";
+    String TAG_CONFIG_ITEM_SET = "config:config-item-set";
 
     /** Element tag for <i>config:config-item-map-indexed</i>. */
-    public final static String TAG_CONFIG_ITEM_MAP_INDEXED = "config:config-item-map-indexed";
+    String TAG_CONFIG_ITEM_MAP_INDEXED = "config:config-item-map-indexed";
 
     /** Element tag for <i>config:config-item-map-named</i>. */
-    public final static String TAG_CONFIG_ITEM_MAP_NAMED = "config:config-item-map-named";
+    String TAG_CONFIG_ITEM_MAP_NAMED = "config:config-item-map-named";
 
     /** Element tag for <i>config:config-item-map-entry</i>. */
-    public final static String TAG_CONFIG_ITEM_MAP_ENTRY= "config:config-item-map-entry";
+    String TAG_CONFIG_ITEM_MAP_ENTRY= "config:config-item-map-entry";
 
     /**
      *  Attribute tag for <i>config:name</i> of element
      *  <i>config:config-item</i>.
      */
-    public final static String ATTRIBUTE_CONFIG_NAME = "config:name";
+    String ATTRIBUTE_CONFIG_NAME = "config:name";
 
     /**
      *  Attribute tag for <i>config:type</i> of element
      *  <i>config:config-item</i>.
      */
-    public final static String ATTRIBUTE_CONFIG_TYPE = "config:type";
+    String ATTRIBUTE_CONFIG_TYPE = "config:type";
 
 
     /** StarWriter XML MIME type. */
-    public final static String SXW_MIME_TYPE = "application/vnd.sun.xml.writer";
+    String SXW_MIME_TYPE = "application/vnd.sun.xml.writer";
 
     /** StarCalc XML MIME type. */
-    public final static String SXC_MIME_TYPE = "application/vnd.sun.xml.calc";
+    String SXC_MIME_TYPE = "application/vnd.sun.xml.calc";
 
 }
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java
index 2ff98cbf69ab..dbf26291296d 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcConstants.java
@@ -26,14 +26,14 @@ package org.openoffice.xmerge.converter.xml.sxc;
 public interface SxcConstants {
 
     /** Family name for column styles. */
-    public static final String COLUMN_STYLE_FAMILY = "table-column";
+    String COLUMN_STYLE_FAMILY = "table-column";
 
     /** Family name for row styles. */
-    public static final String ROW_STYLE_FAMILY = "table-row";
+    String ROW_STYLE_FAMILY = "table-row";
 
     /** Family name for table-cell styles. */
-    public static final String TABLE_CELL_STYLE_FAMILY = "table-cell";
+    String TABLE_CELL_STYLE_FAMILY = "table-cell";
 
     /** Name of the default style. */
-    public static final String DEFAULT_STYLE = "Default";
+    String DEFAULT_STYLE = "Default";
 }
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java
index 0a2cc052b919..00969b038e1d 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/DiffAlgorithm.java
@@ -37,6 +37,6 @@ public interface DiffAlgorithm {
      *
      *  @return  A <code>Difference</code> array.
      */
-    public Difference[] computeDiffs(Iterator orgSeq, Iterator modSeq);
+    Difference[] computeDiffs(Iterator orgSeq, Iterator modSeq);
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java
index ae4988676052..a2f05f7e37df 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/Iterator.java
@@ -34,11 +34,7 @@ public interface Iterator {
      *  @return  The <code>Object</code> of the next element in the sequence.
      *           If there is no next element, then return null.
      */
-    public Object next();
-
-
-
-
+    Object next();
 
     /**
      * Move to the beginning of the sequence.
@@ -46,27 +42,21 @@ public interface Iterator {
      * @return  The <code>Object</code> of the first element in the sequence.
      *          If it is empty, then return null.
      */
-    public Object start();
-
-
-
-
+    Object start();
 
     /**
      * Return the current element <code>Object</code> content.
      *
      * @return  The <code>Object</code> at current position.
      */
-    public Object currentElement();
-
+    Object currentElement();
 
     /**
      * Return the total element count in the sequence.
      *
      * @return  The total element count.
      */
-    public int elementCount();
-
+    int elementCount();
 
     /**
      *  A method to allow the difference algorithm to test whether the
@@ -84,7 +74,7 @@ public interface Iterator {
      *
      *  @return  true if equal, false otherwise.
      */
-    public boolean equivalent(Object obj1, Object obj2);
+    boolean equivalent(Object obj1, Object obj2);
 
 
     /**
@@ -95,6 +85,6 @@ public interface Iterator {
      *  shot instead of dynamically transversing the tree.  The current
      *  position will be set to the beginning.</p>
      */
-    public void refresh();
+    void refresh();
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
index 3e7360a665c3..e4164da4b611 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/MergeAlgorithm.java
@@ -41,7 +41,7 @@ public interface MergeAlgorithm {
      *
      *  @throws  MergeException  If an error occurs during the merge.
      */
-    public void applyDifference(Iterator orgSeq, Iterator modSeq,
+    void applyDifference(Iterator orgSeq, Iterator modSeq,
                                 Difference[] differences) throws MergeException;
 }
 
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
index eed70495c21a..0cf32b2a9e2a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
@@ -36,6 +36,6 @@ public interface NodeMergeAlgorithm {
      *  @param  modifyNode    The <code>Node</code> to be merged.  It may
      *                        be modified.
      */
-    public void merge(Node originalNode, Node modifyNode);
+    void merge(Node originalNode, Node modifyNode);
 }