[FOray-commit] SF.net SVN: foray: [7906] trunk/foray

[<vic...@us...>]

Revision: 7906
          http://svn.sourceforge.net/foray/?rev=7906&view=rev
Author:   victormote
Date:     2006-09-04 18:53:58 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Fix variable visibility problems caught by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphen.java
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java
    trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphen.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphen.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/Hyphen.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -42,9 +42,9 @@
 public class Hyphen implements Serializable {
     static final long serialVersionUID = 990405609314441965L;
 
-    public String preBreak;
-    public String noBreak;
-    public String postBreak;
+    private String preBreak;
+    private String noBreak;
+    private String postBreak;
 
     Hyphen(final String pre, final String no, final String post) {
         preBreak = pre;
@@ -75,4 +75,11 @@
         return res.toString();
     }
 
+    /**
+     * @return Returns the noBreak.
+     */
+    public String getNoBreak() {
+        return this.noBreak;
+    }
+
 }

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -245,8 +245,9 @@
             if (item instanceof String) {
                 res.append((String)item);
             } else {
-                if (((Hyphen)item).noBreak != null) {
-                    res.append(((Hyphen)item).noBreak);
+                final Hyphen hyphen = (Hyphen) item;
+                if (hyphen.getNoBreak() != null) {
+                    res.append(hyphen.getNoBreak());
                 }
             }
         }

Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java
===================================================================
--- trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -36,10 +36,10 @@
 public abstract class OutputTarget implements org.axsl.output.OutputTarget {
 
     OutputStream outputStream;
-    public String applicationName;
-    public String applicationNameShort;
-    public String applicationVersion;
-    public String developerURLShort;
+    private String applicationName;
+    private String applicationNameShort;
+    private String applicationVersion;
+    private String developerURLShort;
     boolean strokeSVGText;
     Log logger;
     FontConsumer fontConsumer;

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -52,10 +52,10 @@
 public abstract class AbstractTableBodyPL extends FObjPL {
 
     // public AreaContainer areaContainer;
-    public WeakReference areaContainerRef;
+    private WeakReference areaContainerRef;
 
     // manage information about spanning rows
-    public RowSpanMgr rowSpanMgr;
+    private RowSpanMgr rowSpanMgr;
 
     public AbstractTableBodyPL(final AbstractTableBody tableBody,
             final PioneerLS layout) {
@@ -216,7 +216,7 @@
                     bRowStartsArea = true;
                 }
             }
-            rowPL.bIgnoreKeepTogether = (bRowStartsArea && startsAC(area));
+            rowPL.setBIgnoreKeepTogether(bRowStartsArea && startsAC(area));
             int status = rowPL.layout(areaContainer, retrieveMarker);
             if (Status.isIncomplete(status)) {
                 // BUG!!! don't distinguish between break-before and after!

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/BlockPL.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -40,14 +40,14 @@
 public class BlockPL extends FObjMixedPL {
 
     // this may be helpful on other FOs too
-    public boolean anythingLaidOut = false;
+    private boolean anythingLaidOut = false;
     //Added to see how long it's been since nothing was laid out.
-    public int noLayoutCount = 0;
+    private int noLayoutCount = 0;
 
-    public int infLoopThreshhold = 50;
-    public boolean breakStatusBeforeChecked = false;
+    private int infLoopThreshhold = 50;
+    private boolean breakStatusBeforeChecked = false;
 
-    public LineArea currentLineArea;
+    private LineArea currentLineArea;
 
     public BlockPL(final FObj realFObj, final PioneerLS layout) {
         super(realFObj, layout);
@@ -177,4 +177,11 @@
         this.currentLineArea = null;
     }
 
+    /**
+     * @param currentLineArea The currentLineArea to set.
+     */
+    public void setCurrentLineArea(final LineArea currentLineArea) {
+        this.currentLineArea = currentLineArea;
+    }
+
 }

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -227,7 +227,7 @@
                 = (NormalBlockArea) lineArea.getWritableParentArea();
         lineArea = blockArea.createNextLineArea(false);
         final BlockPL blockPL = this.layout.getBlockPL(blockArea);
-        blockPL.currentLineArea = lineArea;
+        blockPL.setCurrentLineArea(lineArea);
 
         if (lineArea == null) {
             return Status.AREA_FULL_SOME;

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FOTextPL.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -83,7 +83,7 @@
         while (start != -1) {
             final BlockPL blockPL = this.layout.getBlockPL(ba);
             la = ba.createNextLineArea(false);
-            blockPL.currentLineArea = la;
+            blockPL.setCurrentLineArea(la);
 
             if (la == null) {
                 return start;

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/InstreamForeignObjectPL.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -25,7 +25,6 @@
 package org.foray.pioneer;
 
 import org.axsl.areaW.Area;
-import org.axsl.areaW.ForeignObjectArea;
 import org.axsl.areaW.LineArea;
 
 import org.axsl.areaW.AreaWException;
@@ -37,8 +36,6 @@
  */
 public class InstreamForeignObjectPL extends FObjPL {
 
-    public ForeignObjectArea areaCurrent;
-
     public InstreamForeignObjectPL(final InstreamForeignObject foreignObject,
             final PioneerLS layout) {
         super(foreignObject, layout);

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -39,12 +39,12 @@
  */
 public class TableCellPL extends FObjPL {
 
-    public TableCellArea areaContainer;
+    private TableCellArea areaContainer;
 
     /**
      * Set to true if all content completely laid out.
      */
-    public boolean bDone=false;
+    private boolean bDone=false;
 
     public TableCellPL(final TableCell cell, final PioneerLS layout) {
         super(cell, layout);

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -44,7 +44,7 @@
  */
 public class TablePL extends BlockPL {
 
-    public int bodyCount = 0;
+    private int bodyCount = 0;
 
     public TablePL(final Table table, final PioneerLS layout) {
         super(table, layout);

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java	2006-09-05 01:42:08 UTC (rev 7905)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableRowPL.java	2006-09-05 01:53:58 UTC (rev 7906)
@@ -44,9 +44,9 @@
     private RowSpanMgr rowSpanMgr = null;
     private RowCellArray cellArray = null;
 
-    public boolean bIgnoreKeepTogether = false;
+    private boolean bIgnoreKeepTogether = false;
 
-    public int largestCellHeight = 0;
+    private int largestCellHeight = 0;
 
     public TableRowPL(final TableRow row, final PioneerLS layout) {
         super(row, layout);
@@ -283,4 +283,11 @@
         return Status.OK;
     }
 
+    /**
+     * @param ignoreKeepTogether The bIgnoreKeepTogether to set.
+     */
+    public void setBIgnoreKeepTogether(final boolean ignoreKeepTogether) {
+        this.bIgnoreKeepTogether = ignoreKeepTogether;
+    }
+
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.