rename fileManager variable of type PicturesManager to picturesManager

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1151770 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
index d27b867151b443bb0640c21cd81006aee4ba6c94..45e29a4a8a59c7e31350ba039bb2d9bb619a9f78 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
@@ -95,10 +95,10 @@ public abstract class AbstractWordConverter
 
     private final Set<Bookmark> bookmarkStack = new LinkedHashSet<Bookmark>();
 
-    private PicturesManager fileManager;
-
     private FontReplacer fontReplacer = new DefaultFontReplacer();
 
+    private PicturesManager picturesManager;
+
     protected Triplet getCharacterRunTriplet( CharacterRun characterRun )
     {
         Triplet original = new Triplet();
@@ -111,11 +111,6 @@ public abstract class AbstractWordConverter
 
     public abstract Document getDocument();
 
-    public PicturesManager getFileManager()
-    {
-        return fileManager;
-    }
-
     public FontReplacer getFontReplacer()
     {
         return fontReplacer;
@@ -158,6 +153,11 @@ public abstract class AbstractWordConverter
         return count;
     }
 
+    public PicturesManager getPicturesManager()
+    {
+        return picturesManager;
+    }
+
     protected int getTableCellEdgesIndexSkipCount( Table table, int r,
             int[] tableCellEdges, int currentEdgeIndex, int c,
             TableCell tableCell )
@@ -774,14 +774,14 @@ public abstract class AbstractWordConverter
     protected abstract void processTable( HWPFDocumentCore wordDocument,
             Element flow, Table table );
 
-    public void setFileManager( PicturesManager fileManager )
+    public void setFontReplacer( FontReplacer fontReplacer )
     {
-        this.fileManager = fileManager;
+        this.fontReplacer = fontReplacer;
     }
 
-    public void setFontReplacer( FontReplacer fontReplacer )
+    public void setPicturesManager( PicturesManager fileManager )
     {
-        this.fontReplacer = fontReplacer;
+        this.picturesManager = fileManager;
     }
 
     protected int tryDeadField( HWPFDocumentCore wordDocument, Range range,

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
index d566e9aff8f2c3a2228b25d53de6cb29621bde32..8121e2cd9cc2d8e0f3f6e5ce7ca07c388a8e2796 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
@@ -359,8 +359,9 @@ public class WordToFoConverter extends AbstractWordConverter
      *            HWPF object, contained picture data and properties
      */
     protected void processImage( Element currentBlock, boolean inlined,
-            Picture picture ) {
-        PicturesManager fileManager = getFileManager();
+            Picture picture )
+    {
+        PicturesManager fileManager = getPicturesManager();
         if ( fileManager != null )
         {
             String url = fileManager.savePicture( picture );

diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java b/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
index ebc1a673fb5cc411585751917ff2f75de8f1c457..f17a76c13082731d26cfd5068c237c3ee41822ba 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
@@ -61,22 +61,6 @@ import static org.apache.poi.hwpf.converter.AbstractWordUtils.TWIPS_PER_INCH;
 public class WordToHtmlConverter extends AbstractWordConverter
 {
 
-    /**
-     * Holds properties values, applied to current <tt>p</tt> element. Those
-     * properties shall not be doubled in children <tt>span</tt> elements.
-     */
-    private static class BlockProperies
-    {
-        final String pFontName;
-        final int pFontSize;
-
-        public BlockProperies( String pFontName, int pFontSize )
-        {
-            this.pFontName = pFontName;
-            this.pFontSize = pFontSize;
-        }
-    }
-
     private static final POILogger logger = POILogFactory
             .getLogger( WordToHtmlConverter.class );
 
@@ -315,7 +299,7 @@ public class WordToHtmlConverter extends AbstractWordConverter
     protected void processImage( Element currentBlock, boolean inlined,
             Picture picture )
     {
-        PicturesManager fileManager = getFileManager();
+        PicturesManager fileManager = getPicturesManager();
         if ( fileManager != null )
         {
             String url = fileManager.savePicture( picture );
@@ -707,4 +691,20 @@ public class WordToHtmlConverter extends AbstractWordConverter
         }
     }
 
+    /**
+     * Holds properties values, applied to current <tt>p</tt> element. Those
+     * properties shall not be doubled in children <tt>span</tt> elements.
+     */
+    private static class BlockProperies
+    {
+        final String pFontName;
+        final int pFontSize;
+
+        public BlockProperies( String pFontName, int pFontSize )
+        {
+            this.pFontName = pFontName;
+            this.pFontSize = pFontSize;
+        }
+    }
+
 }