foray-commit Mailing List for FOray (Page 282)

Modular XSL-FO Implementation for Java.

Status: Alpha

Brought to you by: victormote

foray-commit — FOray repository commit log messages

You can subscribe to this list here.

2006	Jan	Feb	Mar (139)	Apr (98)	May (250)	Jun (394)	Jul (84)	Aug (13)	Sep (420)	Oct (186)	Nov (1)	Dec (3)
2007	Jan (108)	Feb (202)	Mar (291)	Apr (247)	May (374)	Jun (227)	Jul (231)	Aug (60)	Sep (31)	Oct (45)	Nov (18)	Dec
2008	Jan (38)	Feb (71)	Mar (142)	Apr	May (59)	Jun (6)	Jul (10)	Aug	Sep	Oct	Nov	Dec
2009	Jan (12)	Feb (4)	Mar (88)	Apr (121)	May (17)	Jun (30)	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec
2010	Jan (11)	Feb (76)	Mar (11)	Apr	May (11)	Jun	Jul	Aug (44)	Sep (14)	Oct (7)	Nov	Dec
2011	Jan	Feb	Mar	Apr	May (9)	Jun	Jul	Aug	Sep	Oct (10)	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (4)	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (168)
2017	Jan (77)	Feb (11)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr (6)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb (88)	Mar (118)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2020	Jan	Feb	Mar	Apr	May (6)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (141)
2021	Jan (170)	Feb (20)	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct (62)	Nov (189)	Dec (162)
2022	Jan (201)	Feb (118)	Mar (8)	Apr	May (2)	Jun (47)	Jul (19)	Aug (14)	Sep (3)	Oct	Nov (28)	Dec (235)
2023	Jan (112)	Feb (23)	Mar (2)	Apr (2)	May	Jun (1)	Jul	Aug (70)	Sep (92)	Oct (20)	Nov (1)	Dec (1)
2024	Jan	Feb	Mar (1)	Apr (1)	May (14)	Jun (11)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2025	Jan (10)	Feb (29)	Mar	Apr (162)	May (245)	Jun (83)	Jul	Aug (1)	Sep	Oct	Nov (4)	Dec (23)
2026	Jan (119)	Feb (335)	Mar (103)	Apr (43)	May (154)	Jun (107)	Jul (187)	Aug (4)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 280 281 282 283 284 .. 323 > >> (Page 282 of 323)

[FOray-commit] SF.net SVN: foray: [7915] trunk/foray/foray-pioneer/src/java/org/foray/ pioneer/FONodePL.java

From: <vic...@us...> - 2006-09-05 22:56:27

Revision: 7915
          http://svn.sourceforge.net/foray/?rev=7915&view=rev
Author:   victormote
Date:     2006-09-05 15:56:23 -0700 (Tue, 05 Sep 2006)

Log Message:
-----------
Conform to standard class-ordering scheme, as reported by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java

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 22:55:26 UTC (rev 7914)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-09-05 22:56:23 UTC (rev 7915)
@@ -55,9 +55,6 @@
     /** value of progress after break-after. */
     public static final int BREAK_AFTER = -1001;
 
-    /** The real FONode which this proxy represents. */
-    private FONode realFONode;
-
     /**
      * where the layout was up to.
      * for FObjs it is the child number
@@ -67,6 +64,9 @@
 
     protected PioneerLS layout;
 
+    /** The real FONode which this proxy represents. */
+    private FONode realFONode;
+
     public FONodePL(final FONode realFObj, final PioneerLS layout) {
         this.realFONode = realFObj;
         realFObj.setProxy(this);


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

[FOray-commit] SF.net SVN: foray: [7914] trunk/foray/foray-pretty/src/java/org/foray/ pretty

From: <vic...@us...> - 2006-09-05 22:55:34

Revision: 7914
          http://svn.sourceforge.net/foray/?rev=7914&view=rev
Author:   victormote
Date:     2006-09-05 15:55:26 -0700 (Tue, 05 Sep 2006)

Log Message:
-----------
Conform to standard class-ordering scheme, as reported by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
    trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDElement.java
    trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/ElementStack.java

Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java	2006-09-05 03:20:00 UTC (rev 7913)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java	2006-09-05 22:55:26 UTC (rev 7914)
@@ -60,7 +60,7 @@
 
     /* Begin configurable parameters. */
     /** Ignores character items that are all whitespace. */
-    boolean ignoreCharacterWhitespace = true;
+    private boolean ignoreCharacterWhitespace = true;
 
     /* End configurable parameters. */
 

Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDElement.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDElement.java	2006-09-05 03:20:00 UTC (rev 7913)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/DTDElement.java	2006-09-05 22:55:26 UTC (rev 7914)
@@ -32,9 +32,9 @@
 
     private String elementName;
 
-    boolean hasPCDATA = false;
-    boolean isEmpty = false;
-    boolean hasElementChildren = false;
+    private boolean hasPCDATA = false;
+    private boolean isEmpty = false;
+    private boolean hasElementChildren = false;
 
     public DTDElement(final String elementName, final String contentModel) {
         this.elementName = elementName;

Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/ElementStack.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/ElementStack.java	2006-09-05 03:20:00 UTC (rev 7913)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/dtd/ElementStack.java	2006-09-05 22:55:26 UTC (rev 7914)
@@ -109,7 +109,7 @@
             if (element == null) {
                 return false;
             }
-            if (element.hasPCDATA) {
+            if (element.hasPCDATA()) {
                 return true;
             }
         }


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

[FOray-commit] SF.net SVN: foray: [7913] trunk/foray/foray-ps/src/java/org/foray/ps

From: <vic...@us...> - 2006-09-05 03:20:07

Revision: 7913
          http://svn.sourceforge.net/foray/?rev=7913&view=rev
Author:   victormote
Date:     2006-09-04 20:20:00 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Conform to standard class-ordering scheme, as reported by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-ps/src/java/org/foray/ps/PSGraphicsState.java
    trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java
    trunk/foray/foray-ps/src/java/org/foray/ps/filter/EncryptFilter.java
    trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoFrame.java

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSGraphicsState.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSGraphicsState.java	2006-09-05 03:08:00 UTC (rev 7912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSGraphicsState.java	2006-09-05 03:20:00 UTC (rev 7913)
@@ -54,10 +54,10 @@
     private PSMatrix ctm = PSMatrix.identMatrix(this.interpreter, null);
     private Color color;
     private PSColorSpace colorSpace;
-    double positionX = -1;
-    double positionY = -1;
-    byte path;                          // Bogus datatype.
-    byte clippingPath;                  // Bogus datatype.
+    private double positionX = -1;
+    private double positionY = -1;
+    private byte path;                          // Bogus datatype.
+    private byte clippingPath;                  // Bogus datatype.
     private PSDictionary font;
     private PSNumber lineWidth;
     private PSInteger lineCap;
@@ -69,7 +69,7 @@
     /** See setdash operator doc. */
     private float dashOffset;
 
-    boolean strokeAdjust;
+    private boolean strokeAdjust;
 
     /*
      * Device-dependent parameters. See PLRM2, Section 4.1. Items that we
@@ -78,16 +78,16 @@
      *
      */
 
-    PSDictionary colorRendering;
-    boolean overprint = false;
-    PSArray blackGeneration;
-    PSArray undercolorRemoval;
-    PSArray transfer;
-    byte halftone;                      // Bogus datatype.
-    int halftonePhase1 = 0;
-    int halftonePhase2 = 0;
+    private PSDictionary colorRendering;
+    private boolean overprint = false;
+    private PSArray blackGeneration;
+    private PSArray undercolorRemoval;
+    private PSArray transfer;
+    private byte halftone;                      // Bogus datatype.
+    private int halftonePhase1 = 0;
+    private int halftonePhase2 = 0;
     private float flatness = 1.0f;
-    byte device;                        // Bogus datatype.
+    private byte device;                        // Bogus datatype.
 
     public PSGraphicsState(final PSInterpreter interpreter) {
         super(interpreter);

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java	2006-09-05 03:08:00 UTC (rev 7912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/PSStack.java	2006-09-05 03:20:00 UTC (rev 7913)
@@ -37,11 +37,11 @@
     public static final byte STACK_EXECUTION        = 4;
     public static final byte STACK_GRAPHICS_STATE   = 5;
 
-    private PSInterpreter interpreter;
-
     /** The Collection object that actually stores the stack data.*/
     protected ArrayList list = null;
 
+    private PSInterpreter interpreter;
+
     private byte stackType = -1;
 
     PSStack(final PSInterpreter interpreter, final int initialSize,

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java	2006-09-05 03:08:00 UTC (rev 7912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/EncodingZapfDingbats.java	2006-09-05 03:20:00 UTC (rev 7913)
@@ -465,7 +465,7 @@
     };
 */
 
-    public static final char[] codePoints = {
+    private static final char[] codePoints = {
         0x0020,  // [0]    glyph: 0x0020 \0040
         0x2192,  // [1]    glyph: 0x00d5 \0325
         0x2194,  // [2]    glyph: 0x00d6 \0326
@@ -670,7 +670,7 @@
         0x27be   // [201]   glyph: 0x00fe \0376
     };
 
-    public static final char[] codePointIndexes = {
+    private static final char[] codePointIndexes = {
         0x0020,  // [0]
         0x00d5,  // [1]
         0x00d6,  // [2]

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java	2006-09-05 03:08:00 UTC (rev 7912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/GlyphList.java	2006-09-05 03:20:00 UTC (rev 7913)
@@ -38,15 +38,15 @@
  */
 public class GlyphList {
 
+    public static final GlyphList[] standardSourceGlyphLists = {
+        GlyphList.getGlyphList("AGL")
+    };
+
     /** Map of GlyphList instances that have already been registered. The key
      * is a String with the GlyphList name, and the value is the GlyphList
      * instance. */
     private static HashMap glyphListMap = new HashMap();
 
-    public static final GlyphList[] standardSourceGlyphLists = {
-            GlyphList.getGlyphList("AGL")
-    };
-
     /** A unique, descriptive name for this GlyphList. */
     private String name;
 

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/filter/EncryptFilter.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/filter/EncryptFilter.java	2006-09-05 03:08:00 UTC (rev 7912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/filter/EncryptFilter.java	2006-09-05 03:20:00 UTC (rev 7913)
@@ -65,14 +65,11 @@
  */
 public class EncryptFilter extends PSFilter {
 
-    private static final int ENCRYPTION_CONSTANT_1 = 52845;
-    private static final int ENCRYPTION_CONSTANT_2 = 22719;
-
     public static final int EEXEC_INITIAL_KEY = 55665;
     public static final byte EEXEC_RANDOM_BYTES = 4;
 
-    public static final char CHARSTRING_INITIAL_KEY = 4330;
-    public static final byte CHARSTRING_DEFAULT_RANDOM_BYTES = 4;
+    private static final int ENCRYPTION_CONSTANT_1 = 52845;
+    private static final int ENCRYPTION_CONSTANT_2 = 22719;
 
     /**
      * This is the variable "R" described in the spec. The spec calls for an

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoFrame.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoFrame.java	2006-09-05 03:08:00 UTC (rev 7912)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/java2d/demo/DemoFrame.java	2006-09-05 03:20:00 UTC (rev 7913)
@@ -35,7 +35,7 @@
 public class DemoFrame extends Frame {
     static final long serialVersionUID = 160698642002357180L;
 
-    public static final String TITLE = "PostScript Playground";
+    private static final String TITLE = "PostScript Playground";
 
     /** File containing the PostScript code to be displayed. */
     private String fileName;


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

[FOray-commit] SF.net SVN: foray: [7912] trunk/foray/scripts/checkstyle-config.xml

From: <vic...@us...> - 2006-09-05 03:08:04

Revision: 7912
          http://svn.sourceforge.net/foray/?rev=7912&view=rev
Author:   victormote
Date:     2006-09-04 20:08:00 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Add more checkstyle wish-list items.

Modified Paths:
--------------
    trunk/foray/scripts/checkstyle-config.xml

Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml	2006-09-05 03:07:09 UTC (rev 7911)
+++ trunk/foray/scripts/checkstyle-config.xml	2006-09-05 03:08:00 UTC (rev 7912)
@@ -91,6 +91,17 @@
     <module name="ModifierOrder"/>
     <module name="RedundantModifier"/>
 
+    <!--Check for standard ordering of type declarations.-->
+    <module name="DeclarationOrder">
+      <property name="severity" value="ignore"/>
+    </module>
+
+    <!--Require "this" identifier for all instance variables.-->
+    <module name="RequireThis">
+      <property name="checkMethods" value="false"/>
+      <property name="severity" value="ignore"/>
+    </module>
+
   </module>
 
   <!-- Make sure each package has javadoc package.html -->


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

[FOray-commit] SF.net SVN: foray: [7911] trunk/foray/resource/fo-examples/basic/images.fo

From: <vic...@us...> - 2006-09-05 03:07:13

Revision: 7911
          http://svn.sourceforge.net/foray/?rev=7911&view=rev
Author:   victormote
Date:     2006-09-04 20:07:09 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Fix FO error.

Modified Paths:
--------------
    trunk/foray/resource/fo-examples/basic/images.fo

Modified: trunk/foray/resource/fo-examples/basic/images.fo
===================================================================
--- trunk/foray/resource/fo-examples/basic/images.fo	2006-09-05 03:06:00 UTC (rev 7910)
+++ trunk/foray/resource/fo-examples/basic/images.fo	2006-09-05 03:07:09 UTC (rev 7911)
@@ -38,8 +38,6 @@
     <fo:conditional-page-master-reference
         master-reference="right"
         odd-or-even="odd" />
-    <!-- recommended fallback procedure -->
-    <fo:conditional-page-master-reference master-reference="rest" />
   </fo:repeatable-page-master-alternatives>
 </fo:page-sequence-master>
 


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

[FOray-commit] SF.net SVN: foray: [7910] trunk/foray/foray-render/src/java/org/foray/ render

From: <vic...@us...> - 2006-09-05 03:06:10

Revision: 7910
          http://svn.sourceforge.net/foray/?rev=7910&view=rev
Author:   victormote
Date:     2006-09-04 20:06:00 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
1. Conform to standard class-ordering scheme, as reported by checkstyle.
2. Removed some unused instance variables.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -114,39 +114,26 @@
      * object that is contained withing the Image Object.
      */
     private BufferedImage pageImage = null;
-    protected Graphics2D graphics = null;
+    private Graphics2D graphics = null;
 
     /**
      * The current Font instance
      */
-    protected FontUse currentFont;
+    private FontUse currentFont;
 
     /**
      * The current font size in millipoints
      */
-    protected int currentFontSize;
+    private int currentFontSize;
 
     /**
      * The current colour's red, green and blue component
      */
-    protected float currentRed = 0;
-    protected float currentGreen = 0;
-    protected float currentBlue = 0;
+    private float currentRed = 0;
+    private float currentGreen = 0;
+    private float currentBlue = 0;
 
-    /**
-     * Used to make the last font and color available to
-     * renderInlineSpace() to render text decorations.
-     */
-    protected java.awt.Font lastFont = null;
-    protected Color lastColor = null;
 
-    /**
-     * The parent component, used to set up the font.
-     * This is needed as FontSetup needs a live AWT component
-     * in order to generate valid font measures.
-     */
-    protected Component parent;
-
     public AWTRenderer(final Log logger, final OutputConfig renderConfig) {
         super(logger, renderConfig);
     }
@@ -158,7 +145,6 @@
      * @param parent the live AWT component reference
      */
     public void setComponent(final Component parent) {
-        this.parent = parent;
     }
 
     public int getPageNumber() {
@@ -630,11 +616,6 @@
                 area.traitOverlineScore(),
                 area.traitThroughScore());
 
-        // remember last font and color for possible inline spaces
-        // (especially for text decorations)
-        this.lastFont = graphics.getFont();
-        this.lastColor = graphics.getColor();
-
         graphics.setFont(oldFont);
         graphics.setColor(oldColor);
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -53,7 +53,7 @@
 public class Command extends AbstractAction {
     static final long serialVersionUID = 369419499522888726L;
 
-    public static final String IMAGE_DIR =
+    private static final String IMAGE_DIR =
             "/org/foray/render/awt/viewer/images/";
     PreviewDialog parent;
 

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/GoToPageDialog.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -55,14 +55,14 @@
 
     private Translator res;
 
-    JPanel panel1 = new JPanel();
-    GridBagLayout gridBagLayout1 = new GridBagLayout();
-    JLabel pgNbLabel = new JLabel();
-    JTextField pgNbField = new JTextField();
-    JButton okButton = new JButton();
-    JButton cancelButton = new JButton();
+    private JPanel panel1 = new JPanel();
+    private GridBagLayout gridBagLayout1 = new GridBagLayout();
+    private JLabel pgNbLabel = new JLabel();
+    private JTextField pgNbField = new JTextField();
+    private JButton okButton = new JButton();
+    private JButton cancelButton = new JButton();
 
-    int pageNumber = -1;
+    private int pageNumber = -1;
 
     public GoToPageDialog(final Frame frame, final String title,
             final boolean modal, final Translator resource, final Log logger) {

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/MessagesDialog.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -50,12 +50,6 @@
 
     static Translator res;
 
-    public static void setTranslator(final Translator aRes) {
-        res = aRes;
-        iniConstants();
-    }
-
-
     static String DETAIL_OPTION;
     static String YES_STRING;
     static String NO_STRING;
@@ -72,8 +66,22 @@
     static String[] yesNoCancelOption;
     static String[] okCancelOption;
 
+    protected String detailInformation = null;
+    protected JDialog dialog = null;
+    protected boolean showsDetails = false;
 
+    public MessagesDialog(final Object message, final int messageType,
+            final int optionType, final Icon icon, final Object[] options,
+            final Object initialValue) {
+        super(message, messageType, optionType, icon, options, initialValue);
+        setMinimumSize(new Dimension(240, 96));
+    }
 
+    public static void setTranslator(final Translator aRes) {
+        res = aRes;
+        iniConstants();
+    }
+
     private static void iniConstants() {
         DETAIL_OPTION = res.getString("Details");
         YES_STRING = res.getString("Yes");
@@ -108,21 +116,6 @@
         };
     }
 
-
-    protected String detailInformation = null;
-    protected JDialog dialog = null;
-    protected boolean showsDetails = false;
-
-    // MessagesDialog.showConfirmDialog(null,preparedMes,title,
-    // optionTypeIndex,messageTypeIndex);
-
-    public MessagesDialog(final Object message, final int messageType,
-            final int optionType, final Icon icon, final Object[] options,
-            final Object initialValue) {
-        super(message, messageType, optionType, icon, options, initialValue);
-        setMinimumSize(new Dimension(240, 96));
-    }
-
     public static int showConfirmDialog(final Component parentComponent,
             final Object message, final String title, final int optionType,
             final int messageType) {

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/SecureResourceBundle.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -51,9 +51,6 @@
 
     private boolean isSourceFound = true;
 
-    public void setMissingEmphasized(final boolean flag) {
-        isMissingEmphasized = flag;
-    }
     private Log logger;
 
     /**
@@ -70,8 +67,10 @@
         }
     }
 
+    public void setMissingEmphasized(final boolean flag) {
+        isMissingEmphasized = flag;
+    }
 
-
     public Enumeration getKeys() {
         return lookup.keys();
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/UserMessage.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -37,24 +37,6 @@
  */
 public class UserMessage {
 
-    private Translator res = null;
-    private Log logger;
-
-    public UserMessage(final Log logger) {
-        this.logger = logger;
-    }
-
-    public void setTranslator(final Translator aRes) {
-        res = aRes;
-        if (res == null) {
-            logger.info("UserMessage: setTranslator(null) !");
-            res = new SecureResourceBundle(null, this.logger);
-        }
-
-        MessagesDialog.setTranslator(res);
-    }
-
-
     // Zulässige Werte für Dialogart:
 
     /**
@@ -92,24 +74,24 @@
     /**
      * Wert für Setzten keines Buttons
      */
-    public static final int STYLE_NOBUTTON = -2;
+    private static final int STYLE_NOBUTTON = -2;
 
     /**
      * Wert für Setzten von nur Ja-Button.
      */
-    public static final int STYLE_Y = JOptionPane.DEFAULT_OPTION;
+    private static final int STYLE_Y = JOptionPane.DEFAULT_OPTION;
     // ButtonDialog.YES;            // = 1
 
     /**
      * Wert für Setzten von Ja- und Nein-Buttons.
      */
-    public static final int STYLE_Y_N = JOptionPane.YES_NO_OPTION;
+    private static final int STYLE_Y_N = JOptionPane.YES_NO_OPTION;
     // ButtonDialog.YES_NO;         // = 2;
 
     /**
      * Wert für Setzten von Ja-, Nein-und Abbruch Buttons.
      */
-    public static final int STYLE_Y_N_C = JOptionPane.YES_NO_CANCEL_OPTION;
+    private static final int STYLE_Y_N_C = JOptionPane.YES_NO_CANCEL_OPTION;
     // ButtonDialog.YES_NO_CANCEL;  // = 3;
 
 
@@ -122,30 +104,27 @@
      * Constanten der ButtonDialog-Klasse
      */
 
-    /**
-     * Möglicher Rückgabewert @see ButtonDialog
-     */
-    public static final int YES = JOptionPane.YES_OPTION;
-    // ButtonDialog.YES;            // = 2
-
-    /**
-     * Möglicher Rückgabewert @see ButtonDialog
-     */
-    public static final int NO = JOptionPane.NO_OPTION;
-    // ButtonDialog.NO;            // = 4;
-
-    /**
-     * Möglicher Rückgabewert @see ButtonDialog
-     */
-    public static final int CANCEL = JOptionPane.CANCEL_OPTION;
-    // ButtonDialog.CANCEL;        // = 8;
-
-
     // Default-Values
     private static String actMessId = null;
     // private static MessagesDialog nobuttonDialog = null;
 
+    private Translator res = null;
+    private Log logger;
 
+    public UserMessage(final Log logger) {
+        this.logger = logger;
+    }
+
+    public void setTranslator(final Translator aRes) {
+        res = aRes;
+        if (res == null) {
+            logger.info("UserMessage: setTranslator(null) !");
+            res = new SecureResourceBundle(null, this.logger);
+        }
+
+        MessagesDialog.setTranslator(res);
+    }
+
     /**
      * Ersetzt die eventuellen Platzhalter durch die übergebenen Parameter
      */

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSGraphics2D.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -28,7 +28,6 @@
 import org.foray.ps.PSReal;
 import org.foray.render.TempImage;
 
-import org.axsl.fontR.FontServer;
 import org.axsl.graphicR.Graphic;
 
 import org.apache.batik.ext.awt.g2d.AbstractGraphics2D;
@@ -78,36 +77,23 @@
  * @see org.apache.batik.ext.awt.g2d.AbstractGraphics2D
  */
 public class PSGraphics2D extends AbstractGraphics2D {
-    boolean standalone = false;
 
     /**
      * the PDF Document being created
      */
-    protected PSRenderer psRenderer;
+    private PSRenderer psRenderer;
 
     /**
-     * the current (internal) font name
+     * Used to create proper font metrics
      */
-    protected String currentFontName;
+    private Graphics2D fmg;
+    {
+        final BufferedImage bi = new BufferedImage(1, 1,
+                BufferedImage.TYPE_INT_ARGB);
+        fmg = bi.createGraphics();
+    }
 
     /**
-     * the current font size in millipoints
-     */
-    protected int currentFontSize;
-
-    /**
-     * the current vertical position in millipoints from bottom
-     */
-    protected int currentYPosition = 0;
-
-    /**
-     * the current horizontal position in millipoints from left
-     */
-    protected int currentXPosition = 0;
-
-    FontServer fontInfo;
-
-    /**
      * Create a new PDFGraphics2D with the given pdf document info.
      * This is used to create a Graphics object for use inside an already
      * existing document.
@@ -116,20 +102,12 @@
             final String font, final int size, final int xpos, final int ypos) {
         super(textAsShapes);
         psRenderer = ren;
-        currentFontName = font;
-        currentFontSize = size;
-        currentYPosition = ypos;
-        currentXPosition = xpos;
     }
 
     public PSGraphics2D(final boolean textAsShapes) {
         super(textAsShapes);
     }
 
-    public void setGraphicContext(final GraphicContext c) {
-        gc = c;
-    }
-
     /**
      * This constructor supports the create method
      */
@@ -137,6 +115,10 @@
         super(g);
     }
 
+    public void setGraphicContext(final GraphicContext c) {
+        gc = c;
+    }
+
     /**
      * Creates a new <code>Graphics</code> object that is
      * a copy of this <code>Graphics</code> object.
@@ -318,8 +300,6 @@
      */
     public void dispose() {
         psRenderer = null;
-        currentFontName = null;
-        fontInfo = null;
     }
 
     /**
@@ -787,17 +767,6 @@
     }
 
     /**
-     * Used to create proper font metrics
-     */
-    private Graphics2D fmg;
-
-    {
-        final BufferedImage bi = new BufferedImage(1, 1,
-                BufferedImage.TYPE_INT_ARGB);
-        fmg = bi.createGraphics();
-    }
-
-    /**
      * Gets the font metrics for the specified font.
      * @return    the font metrics for the specified font.
      * @param     f the specified font

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -111,21 +111,13 @@
  */
 public class PSRenderer extends PrintRenderer {
 
-    /**
-     * the application producing the PostScript
-     */
-//    protected String producer;
+    private int pagecount = 0;
 
-    int imagecount = 0;    // DEBUG
-    int pagecount = 0;
-
     private boolean enableComments = true;
     private boolean autoRotateLandscape = false;
 
-    /**
-     * the stream used to output the PostScript
-     */
-    protected PSStream out;
+    /** The stream used to output the PostScript. */
+    private PSStream out;
     private boolean ioTrouble = false;
 
     private PSFont currentPSFont;

Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -65,8 +65,6 @@
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * A {@link Renderer} implementation that writes the document as SVG.
@@ -81,31 +79,10 @@
     float totalWidth = 0;
     float totalHeight = 0;
 
-    protected int pageWidth = 0;
-    protected int pageHeight = 0;
-    protected int pageNumber = 0;
+    private int pageWidth = 0;
+    private int pageHeight = 0;
+    private int pageNumber = 0;
 
-    protected Map fontNames = new HashMap();
-    protected Map fontStyles = new HashMap();
-    protected Color saveColor = null;
-
-    /**
-     * The current (internal) font name
-     */
-    protected String currentFontName;
-
-    /**
-     * The current font size in millipoints
-     */
-    protected int currentFontSize;
-
-    /**
-     * The current colour's red, green and blue component
-     */
-    protected float currentRed = 0;
-    protected float currentGreen = 0;
-    protected float currentBlue = 0;
-
     public SVGRenderer(final Log logger, final OutputConfig renderConfig) {
         super(logger, renderConfig);
     }
@@ -256,8 +233,6 @@
 
         drawFrame();
 
-        this.currentFontName = "";
-        this.currentFontSize = 0;
         renderRegions(page);
 
         currentPageG.setAttributeNS(null, "transform", "translate(0,"

Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-09-05 02:58:22 UTC (rev 7909)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-09-05 03:06:00 UTC (rev 7910)
@@ -58,12 +58,11 @@
  */
 public class TXTRenderer extends PrintRenderer {
 
-    /**
-     * the current stream to add Text commands to
-     */
-    TXTStream currentStream;
     private static final String DEFAULT_ENCODING = "UTF-8";
 
+    /** Tthe current stream to add Text commands to. */
+    private TXTStream currentStream;
+
     private int pageHeight = 7920;
 
     // These variables control the virtual paggination functionality.
@@ -71,17 +70,17 @@
     /** Paper height in decipoints? */
     private int paperheight = -1;
 
-    final boolean debug = false;
+    private final boolean debug = false;
 
     // Variables for rendering text.
-    StringBuffer charData[];
-    StringBuffer decoData[];
+    private StringBuffer charData[];
+    private StringBuffer decoData[];
     private float textCPI = 16.67f;
     private float textLPI = 8;
-    int maxX = (int)(8.5f * textCPI + 1);
-    int maxY = (int)(11f * textLPI + 1);
-    float xFactor;
-    float yFactor;
+    private int maxX = (int)(8.5f * textCPI + 1);
+    private int maxY = (int)(11f * textLPI + 1);
+    private float xFactor;
+    private float yFactor;
 
     /** Every line except the last line on a page (which will end with
      * pageEnding) will be terminated with this string.*/
@@ -92,7 +91,7 @@
 
     /** If true then graphics/decorations will not be rendered - text only. */
     private boolean suppressGraphics = false;
-    boolean firstPage = false;
+    private boolean firstPage = false;
 
     public TXTRenderer(final Log logger, final OutputConfig renderConfig) {
         super(logger, renderConfig);


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

[FOray-commit] SF.net SVN: foray: [7909] trunk/foray/foray-text/src/java/org/foray/text/ line

From: <vic...@us...> - 2006-09-05 02:58:26

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

Log Message:
-----------
Conform to standard class-ordering scheme, as reported by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java
    trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java

Modified: trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java	2006-09-05 02:18:48 UTC (rev 7908)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java	2006-09-05 02:58:22 UTC (rev 7909)
@@ -67,7 +67,7 @@
      * Provides the line-breaking system with the FontConsumer instance that
      * should be used for interfacing with the Font subsystem.
      */
-    FontConsumer fontConsumer;
+    protected FontConsumer fontConsumer;
 
     protected LineOutput currentOutput;
 
@@ -88,13 +88,13 @@
      * application is responsible to provide these values, but they are stored
      * here for reference.
      */
-    LineOutput[] outputLines = new LineOutput[LINE_COUNT_INCREMENT];
+    protected LineOutput[] outputLines = new LineOutput[LINE_COUNT_INCREMENT];
 
     /**
      * Index into {@link #outputLines} indicating which one was last requested
      * and filled.
      */
-    int lastLineRequested = -1;
+    protected int lastLineRequested = -1;
 
     /**
      * Index into {@link #outputLines} indicating which line is currently being

Modified: trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2006-09-05 02:18:48 UTC (rev 7908)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/solitary/SolitaryLineBreaker.java	2006-09-05 02:58:22 UTC (rev 7909)
@@ -64,18 +64,18 @@
     protected static final byte TEXT = 2;
 
     /**
+     * The width, in millipoints, of the content that has definitely made it
+     * onto the line.
+     */
+    protected int finalWidth = 0;
+
+    /**
      * One of {@link #NOTHING}, {@link #CONNECTOR}, or {@link #TEXT},
      * indicating the class of the previous character.
      */
     private byte previousCharacter = NOTHING;
 
     /**
-     * The width, in millipoints, of the content that has definitely made it
-     * onto the line.
-     */
-    protected int finalWidth = 0;
-
-    /**
      * The accumulated width, in millipoints, of whitespace before the current
      * word.
      */


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

[FOray-commit] SF.net SVN: foray: [7908] trunk/foray/scripts/checkstyle-config.xml

From: <vic...@us...> - 2006-09-05 02:18:51

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

Log Message:
-----------
Get checkstyle wish-list items added, with severity = "ignore" for now.

Modified Paths:
--------------
    trunk/foray/scripts/checkstyle-config.xml

Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml	2006-09-05 02:09:16 UTC (rev 7907)
+++ trunk/foray/scripts/checkstyle-config.xml	2006-09-05 02:18:48 UTC (rev 7908)
@@ -49,6 +49,26 @@
     <!-- Make sure each Type has javadoc, regardless of visibility -->
     <module name="JavadocType"/>
 
+    <!-- Make sure each method has javadoc -->
+    <module name="JavadocMethod">
+      <property name="scope" value="private"/>
+      <property name="severity" value="ignore"/>
+    </module>
+
+    <!-- Make sure each variable has javadoc -->
+    <module name="JavadocVariable">
+      <property name="scope" value="private"/>
+      <property name="severity" value="ignore"/>
+    </module>
+
+    <!-- Check the javadoc style. If there is a javadoc comment, it must be
+    well-formed, even if it is private. -->
+    <module name="JavadocStyle">
+      <property name="scope" value="private"/>
+      <property name="checkEmptyJavadoc" value="true"/>
+      <property name="severity" value="ignore"/>
+    </module>
+
     <!-- Avoid magic numbers. -->
     <module name="MagicNumber">
       <property name="severity" value="ignore"/>
@@ -65,7 +85,6 @@
     <module name="VisibilityModifier">
       <property name="packageAllowed" value="true"/>
       <property name="protectedAllowed" value="true"/>
-      <property name="severity" value="error"/>
     </module>
 
     <!-- Check the order and redundancy of modifiers. -->


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

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

From: <vic...@us...> - 2006-09-05 02:09:44

Revision: 7907
          http://svn.sourceforge.net/foray/?rev=7907&view=rev
Author:   victormote
Date:     2006-09-04 19:09:16 -0700 (Mon, 04 Sep 2006)

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

Modified Paths:
--------------
    trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java
    trunk/foray/foray-app/src/java/org/foray/app/FOray.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
    trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileCollection.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WritingMode.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java
    trunk/foray/scripts/checkstyle-config.xml

Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineOptions.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -68,7 +68,7 @@
     URL xmlInput = null;
 
     /** The output file. */
-    public File outfile = null;
+    private File outfile = null;
 
     /** The input mode. */
     int inputmode = INPUT_NOT_SET;

Modified: trunk/foray/foray-app/src/java/org/foray/app/FOray.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/FOray.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-app/src/java/org/foray/app/FOray.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -51,8 +51,8 @@
                 if (sessionConfig.optionVerbosity().equals("debug")) {
                     e.printStackTrace();
                 }
-                if (options.outfile != null) {
-                    options.outfile.delete();
+                if (options.getOutputFile() != null) {
+                    options.getOutputFile().delete();
                 }
             }
             System.exit(2);
@@ -63,8 +63,8 @@
                 if (sessionConfig.optionVerbosity().equals("debug")) {
                     e.printStackTrace();
                 }
-                if (options.outfile != null) {
-                    options.outfile.delete();
+                if (options.getOutputFile() != null) {
+                    options.getOutputFile().delete();
                 }
             }
             System.exit(1);

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaTree.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -61,7 +61,7 @@
      * PageSequence, it can also be used to get an ordered list of PageSequence
      * objects.
      */
-    public ArrayList pageCollectionsProcessed = new ArrayList();
+    private ArrayList pageCollectionsProcessed = new ArrayList();
 
     /**
      * Collection of objects that have registered to be notified about
@@ -248,4 +248,11 @@
         visitor.render(this);
     }
 
+    /**
+     * @return Returns the pageCollectionsProcessed.
+     */
+    public ArrayList getPageCollectionsProcessed() {
+        return this.pageCollectionsProcessed;
+    }
+
 }

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageCollection.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -103,7 +103,7 @@
      * -1 if this PageCollection is not found.
      */
     public int sequence() {
-        return getAreaTree().pageCollectionsProcessed.indexOf(this);
+        return getAreaTree().getPageCollectionsProcessed().indexOf(this);
     }
 
     /**
@@ -114,8 +114,8 @@
     public PageCollection previousPageCollection() {
         final int sequence = sequence();
         if (sequence > 0) {
-            return (PageCollection) getAreaTree().pageCollectionsProcessed.get
-                    (sequence - 1);
+            return (PageCollection) getAreaTree().getPageCollectionsProcessed()
+                    .get(sequence - 1);
         }
         return null;
     }

Modified: trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileCollection.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileCollection.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-font/src/java/org/foray/font/format/TTFFileCollection.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -36,7 +36,7 @@
     /**
      * The TTCHeader instance that represents this files TTC Header table.
      */
-    public TTCTableHeader ttcHeader = null;
+    private TTCTableHeader ttcHeader = null;
 
     /** Collection of TTFTableDirectory entries. There should be one entry for
      * each logical font in the TTC file. */

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -54,7 +54,7 @@
      * then convert to array when parsing is complete.)*/
     protected ArrayList children = new ArrayList();
 
-    public PropertyList propertyList;
+    private PropertyList propertyList;
     protected String systemId;
     protected int line;
     protected int column;
@@ -2566,4 +2566,11 @@
                 viewportWidth);
     }
 
+    /**
+     * @return Returns the propertyList.
+     */
+    public PropertyList getPropertyList() {
+        return this.propertyList;
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -147,7 +147,7 @@
      * {@inheritDoc}
      */
     public double traitColumnWidthTableUnits() {
-        return propertyList.getColumnWidthTableUnits();
+        return getPropertyList().getColumnWidthTableUnits();
     }
 
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AlignmentAdjust.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -121,7 +121,7 @@
             if (fobj instanceof Character) {
                 base = fobj.traitFontSize(context);
             }
-            base = fobj.propertyList.getLineHeight(context, OPTIMUM);
+            base = fobj.getPropertyList().getLineHeight(context, OPTIMUM);
             return (int) ((DtPercentage) this.value).getValue() * base;
         }
         return traitValueAmountNoInstance();

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BaselineShift.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -108,7 +108,7 @@
         if (this.value instanceof DtPercentage) {
             /* TODO: This base value is almost certainly wrong. */
             final int base = fobj.effectiveParent(context)
-                    .propertyList.getLineHeight(context, OPTIMUM);
+                    .getPropertyList().getLineHeight(context, OPTIMUM);
             return Math.round(((DtPercentage) this.value).getValue() * base);
         }
         return traitValueNoInstance();

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Enumerated.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -167,7 +167,7 @@
         }
         case Constants.FOPROP_WHITE_SPACE: {
             if (parent != null) {
-                return parent.propertyList.traitWhiteSpace(context);
+                return parent.getPropertyList().traitWhiteSpace(context);
             }
             return Constants.FOVAL_NORMAL;
         }
@@ -191,7 +191,7 @@
         }
         case Constants.FOPROP_PAGE_BREAK_INSIDE: {
             if (parent != null) {
-                return parent.propertyList.traitPageBreakInside(context);
+                return parent.getPropertyList().traitPageBreakInside(context);
             }
             return Constants.FOVAL_AUTO;
         }
@@ -399,10 +399,10 @@
             return fobj.traitOverflow(context);
         }
         case Constants.FOPROP_PAGE_POSITION: {
-            return fobj.propertyList.getPagePosition();
+            return fobj.getPropertyList().getPagePosition();
         }
         case Constants.FOPROP_POSITION: {
-            return fobj.propertyList.getPosition(context);
+            return fobj.getPropertyList().getPosition(context);
         }
         case Constants.FOPROP_RELATIVE_ALIGN: {
             return fobj.traitRelativeAlign(context);
@@ -429,7 +429,7 @@
             return fobj.traitUnicodeBidi(context);
         }
         case Constants.FOPROP_WHITE_SPACE: {
-            return fobj.propertyList.traitWhiteSpace(context);
+            return fobj.getPropertyList().traitWhiteSpace(context);
         }
         case Constants.FOPROP_WHITE_SPACE_TREATMENT: {
             return fobj.traitWhiteSpaceTreatment(context);
@@ -447,13 +447,13 @@
             return fobj.traitFloat(context);
         }
         case Constants.FOPROP_PAGE_BREAK_AFTER: {
-            return fobj.propertyList.traitPageBreakAfter(context);
+            return fobj.getPropertyList().traitPageBreakAfter(context);
         }
         case Constants.FOPROP_PAGE_BREAK_BEFORE: {
-            return fobj.propertyList.traitPageBreakBefore(context);
+            return fobj.getPropertyList().traitPageBreakBefore(context);
         }
         case Constants.FOPROP_PAGE_BREAK_INSIDE: {
-            return fobj.propertyList.traitPageBreakInside(context);
+            return fobj.getPropertyList().traitPageBreakInside(context);
         }
         case Constants.FOPROP_REFERENCE_ORIENTATION: {
             return fobj.traitReferenceOrientation(context);

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -103,7 +103,7 @@
     }
 
     private int computeBase(final FOContext context, final FObj fobj) {
-        final DtWritingMode writingMode = fobj.propertyList.getWritingMode(
+        final DtWritingMode writingMode = fobj.getPropertyList().getWritingMode(
                 context);
         byte absoluteAxis = -1;
         if (fobj instanceof RegionBefore || fobj instanceof RegionAfter) {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Indent.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -128,8 +128,8 @@
         if (parent == null) {
             return 0;
         }
-        return fobj.effectiveParent(context).propertyList.getIndent(context,
-                direction, ipdContainingRA);
+        return fobj.effectiveParent(context).getPropertyList().getIndent(
+                context, direction, ipdContainingRA);
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/InitialPageNumber.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -77,7 +77,7 @@
                 final FObj parent = fobj.effectiveParent(context);
                 if (parent != null) {
                     final InitialPageNumber property = (InitialPageNumber)
-                            parent.propertyList.getProperty
+                            parent.getPropertyList().getProperty
                                     (Constants.FOPROP_INITIAL_PAGE_NUMBER);
                     return property.getValue(context, parent,
                             lastPageNumberUsed);
@@ -113,7 +113,7 @@
             if (keyword == Constants.FOVAL_INHERIT) {
                 final FObj parent = fobj.realParent();
                 if (parent != null) {
-                    final PropertyList propertyList = parent.propertyList;
+                    final PropertyList propertyList = parent.getPropertyList();
                     return propertyList.getRawInitialPageNumber();
                 }
                 return getRawValueNoInstance();

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -124,7 +124,7 @@
             }
             case Constants.FOVAL_INHERIT: {
                 final float multiplier =
-                    fobj.effectiveParent(context).propertyList
+                    fobj.effectiveParent(context).getPropertyList()
                         .getLineHeightMultiplier(context);
                 return Math.round(multiplier * fobj.traitFontSize(context));
             }
@@ -169,7 +169,7 @@
                 return getValueMultiplierNoInstance(context, fobj);
             }
             case Constants.FOVAL_INHERIT: {
-                return fobj.effectiveParent(context).propertyList
+                return fobj.effectiveParent(context).getPropertyList()
                         .getLineHeightMultiplier(context);
             }
             }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/TextDecoration.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -152,7 +152,7 @@
             if (nearestBlock == null) {
                 return null;
             }
-            return nearestBlock.propertyList.getTextDecoration(context);
+            return nearestBlock.getPropertyList().getTextDecoration(context);
         }
         return null;
     }
@@ -165,7 +165,7 @@
                 if (fobjParent == null) {
                     return null;
                 }
-                return fobjParent.propertyList.getTextDecoration(context);
+                return fobjParent.getPropertyList().getTextDecoration(context);
             }
         }
         if (this.value instanceof DtTextDeco) {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WritingMode.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WritingMode.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/WritingMode.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -62,7 +62,7 @@
         if (fobj instanceof Root) {
             return DtWritingMode.obtainWritingMode("lr-tb");
         }
-        return fobj.effectiveParent(context).propertyList.getWritingMode(
+        return fobj.effectiveParent(context).getPropertyList().getWritingMode(
                 context);
     }
 

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnFromParent.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -93,7 +93,7 @@
          * TODO: This is not right. It needs to return the PropertyValue
          * regardless of whether the Property was explicitly set or not.
          */
-        final Property ps = parent.propertyList.getProperty(propertyType);
+        final Property ps = parent.getPropertyList().getProperty(propertyType);
         if (ps == null) {
             throw new PropertyException("Invalid operand: 'from-parent' "
                     + "function");

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnInheritedProp.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -84,7 +84,7 @@
          * TODO: This is not right. It needs to return the inherited value
          * regardless of whether the Property was explicitly set or not.
          */
-        final Property ps = parent.propertyList.getProperty(propertyType);
+        final Property ps = parent.getPropertyList().getProperty(propertyType);
         if (ps == null) {
             throw new PropertyException("Invalid operand: "
                     + "'inherited-property-value' function");

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/value/FnNearestSpecProp.java	2006-09-05 02:09:16 UTC (rev 7907)
@@ -82,7 +82,7 @@
         while (parent != null && ps == null) {
             final short propertyType = PropertyMakerFO.enumeratePropertyName
                     (propertySought);
-            ps = parent.propertyList.getProperty(propertyType);
+            ps = parent.getPropertyList().getProperty(propertyType);
             /* TODO: Provide the right context. */
             parent = fobj.effectiveParent(null);
         }

Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml	2006-09-05 01:53:58 UTC (rev 7906)
+++ trunk/foray/scripts/checkstyle-config.xml	2006-09-05 02:09:16 UTC (rev 7907)
@@ -50,14 +50,23 @@
     <module name="JavadocType"/>
 
     <!-- Avoid magic numbers. -->
-    <!--<module name="MagicNumber"/>-->
+    <module name="MagicNumber">
+      <property name="severity" value="ignore"/>
+    </module>
 
     <!-- Avoid redundant and unused imports. -->
     <module name="RedundantImport"/>
-    <!--<module name="UnusedImports"/>-->
+    <module name="UnusedImports">
+      <!--Ignore this for now because it doesn't handle javadoc correctly.-->
+      <property name="severity" value="ignore"/>
+    </module>
 
-    <!-- Don't allow non-private instance variables. -->
-    <!--<module name="VisibilityModifier"/>-->
+    <!-- Don't allow public instance variables. -->
+    <module name="VisibilityModifier">
+      <property name="packageAllowed" value="true"/>
+      <property name="protectedAllowed" value="true"/>
+      <property name="severity" value="error"/>
+    </module>
 
     <!-- Check the order and redundancy of modifiers. -->
     <module name="ModifierOrder"/>


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

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

From: <vic...@us...> - 2006-09-05 01:54:13

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.

[FOray-commit] SF.net SVN: foray: [7905] trunk/foray/foray-ps/src/java/org/foray/ps/encode

From: <vic...@us...> - 2006-09-05 01:42:12

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

Log Message:
-----------
Clean up variable visibility problems caught by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java
    trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java	2006-09-05 01:41:50 UTC (rev 7904)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap04Entry.java	2006-09-05 01:42:08 UTC (rev 7905)
@@ -29,14 +29,14 @@
  * 16-bit Unicode codepoint ranges.
  */
 public class CMap04Entry {
-    public char unicodeStart;
-    public char unicodeEnd;
-    public char glyphStartIndex;
+    private char unicodeStart;
+    private char unicodeEnd;
+    private char glyphStartIndex;
 
     /* For contiguous entries, this will be null. For non-contiguous entries,
      * this array contains the glyph Indexes for the range of Unicode
      * characters. */
-    public char[] glyphIndexes;
+    private char[] glyphIndexes;
 
     public CMap04Entry(final char unicodeStart, final char unicodeEnd,
             final char glyphStartIndex) {

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java	2006-09-05 01:41:50 UTC (rev 7904)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/encode/CMap12Entry.java	2006-09-05 01:42:08 UTC (rev 7905)
@@ -29,9 +29,9 @@
  * 32-bit Unicode codepoint ranges.
  */
 public class CMap12Entry {
-    public int unicodeStart;
-    public int unicodeEnd;
-    public int glyphStartIndex;
+    private int unicodeStart;
+    private int unicodeEnd;
+    private int glyphStartIndex;
 
     public CMap12Entry(final int unicodeStart, final int unicodeEnd,
             final int glyphStartIndex) {


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

[FOray-commit] SF.net SVN: foray: [7904] trunk/foray/foray-render/src/java/org/foray/ render

From: <vic...@us...> - 2006-09-05 01:41:54

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

Log Message:
-----------
Clean up variable visibility problems caught by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java
    trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java

Modified: trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java	2006-09-05 01:36:13 UTC (rev 7903)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/viewer/Command.java	2006-09-05 01:41:50 UTC (rev 7904)
@@ -53,7 +53,8 @@
 public class Command extends AbstractAction {
     static final long serialVersionUID = 369419499522888726L;
 
-    public static String IMAGE_DIR = "/org/foray/render/awt/viewer/images/";
+    public static final String IMAGE_DIR =
+            "/org/foray/render/awt/viewer/images/";
     PreviewDialog parent;
 
     public Command(final PreviewDialog dialog, final String name) {

Modified: trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2006-09-05 01:36:13 UTC (rev 7903)
+++ trunk/foray/foray-render/src/java/org/foray/render/pcl/PCLRenderer.java	2006-09-05 01:41:50 UTC (rev 7904)
@@ -64,17 +64,17 @@
     /**
      * the current stream to add PCL commands to
      */
-    public PCLStream currentStream;
+    private PCLStream currentStream;
 
     private int pageHeight = 7920;
 
     // These variables control the virtual paggination functionality.
-    public int curdiv = 0;
+    private int curdiv = 0;
     private int divisions = -1;
-    public int paperheight = -1;    // Paper height in decipoints?
-    public int orientation = 0;     // 0=default/portrait, 1=landscape.
-    public int topmargin = -1;      // Top margin in decipoints?
-    public int leftmargin = -1;     // Left margin in decipoints?
+    private int paperheight = -1;    // Paper height in decipoints?
+    private int orientation = 0;     // 0=default/portrait, 1=landscape.
+    private int topmargin = -1;      // Top margin in decipoints?
+    private int leftmargin = -1;     // Left margin in decipoints?
     private int fullmargin = 0;
 
     /* X Offset to allow for PCL implicit 1/4" left margin. */


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

[FOray-commit] SF.net SVN: foray: [7903] trunk/foray/foray-render/src/java/org/foray/ render/txt/TXTRenderer.java

From: <vic...@us...> - 2006-09-05 01:36:16

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

Log Message:
-----------
Clean up unused variables and variable visibility problems caught by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java

Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-09-05 01:14:34 UTC (rev 7902)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-09-05 01:36:13 UTC (rev 7903)
@@ -67,21 +67,17 @@
     private int pageHeight = 7920;
 
     // These variables control the virtual paggination functionality.
-    public int curdiv = 0;
+
     /** Paper height in decipoints? */
     private int paperheight = -1;
 
-    /** -1=default/unknown, 0=portrait, 1=landscape. */
-    public int orientation = -1;
-    public int topmargin = -1;       // Top margin in decipoints?
-    public int leftmargin = -1;      // Left margin in decipoints?
     final boolean debug = false;
 
     // Variables for rendering text.
     StringBuffer charData[];
     StringBuffer decoData[];
-    public float textCPI = 16.67f;
-    public float textLPI = 8;
+    private float textCPI = 16.67f;
+    private float textLPI = 8;
     int maxX = (int)(8.5f * textCPI + 1);
     int maxY = (int)(11f * textLPI + 1);
     float xFactor;
@@ -89,13 +85,13 @@
 
     /** Every line except the last line on a page (which will end with
      * pageEnding) will be terminated with this string.*/
-    public String lineEnding = "\r\n";
+    private String lineEnding = "\r\n";
 
     /** Every page except the last one will end with this string. */
-    public String pageEnding = "\f";
+    private String pageEnding = "\f";
 
     /** If true then graphics/decorations will not be rendered - text only. */
-    public boolean suppressGraphics = false;
+    private boolean suppressGraphics = false;
     boolean firstPage = false;
 
     public TXTRenderer(final Log logger, final OutputConfig renderConfig) {


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

[FOray-commit] SF.net SVN: foray: [7902] trunk/foray/scripts/checkstyle-config.xml

From: <vic...@us...> - 2006-09-05 01:14:37

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

Log Message:
-----------
Add new checkstyle checks.

Modified Paths:
--------------
    trunk/foray/scripts/checkstyle-config.xml

Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml	2006-09-05 01:14:15 UTC (rev 7901)
+++ trunk/foray/scripts/checkstyle-config.xml	2006-09-05 01:14:34 UTC (rev 7902)
@@ -44,10 +44,25 @@
     <module name="FinalLocalVariable">
       <property name="tokens" value="VARIABLE_DEF,PARAMETER_DEF"/>
     </module>
+    <module name="StringLiteralEquality"/>
 
     <!-- Make sure each Type has javadoc, regardless of visibility -->
     <module name="JavadocType"/>
 
+    <!-- Avoid magic numbers. -->
+    <!--<module name="MagicNumber"/>-->
+
+    <!-- Avoid redundant and unused imports. -->
+    <module name="RedundantImport"/>
+    <!--<module name="UnusedImports"/>-->
+
+    <!-- Don't allow non-private instance variables. -->
+    <!--<module name="VisibilityModifier"/>-->
+
+    <!-- Check the order and redundancy of modifiers. -->
+    <module name="ModifierOrder"/>
+    <module name="RedundantModifier"/>
+
   </module>
 
   <!-- Make sure each package has javadoc package.html -->


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

[FOray-commit] SF.net SVN: foray: [7901] trunk/foray/foray-common/src/java/org/foray/ common/sax/DocumentReader.java

From: <vic...@us...> - 2006-09-05 01:14:19

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

Log Message:
-----------
Clean up some checkstyle issues.

Modified Paths:
--------------
    trunk/foray/foray-common/src/java/org/foray/common/sax/DocumentReader.java

Modified: trunk/foray/foray-common/src/java/org/foray/common/sax/DocumentReader.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/sax/DocumentReader.java	2006-09-05 01:12:52 UTC (rev 7900)
+++ trunk/foray/foray-common/src/java/org/foray/common/sax/DocumentReader.java	2006-09-05 01:14:15 UTC (rev 7901)
@@ -24,9 +24,6 @@
 
 package org.foray.common.sax;
 
-
-import org.foray.common.sax.DocumentInputSource;
-
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;


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

[FOray-commit] SF.net SVN: foray: [7900] trunk/foray/foray-font/src/java/org/foray/font/ FontSelectorFactory.java

From: <vic...@us...> - 2006-09-05 01:12:56

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

Log Message:
-----------
Clean up some checkstyle issues.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java	2006-09-05 01:12:36 UTC (rev 7899)
+++ trunk/foray/foray-font/src/java/org/foray/font/FontSelectorFactory.java	2006-09-05 01:12:52 UTC (rev 7900)
@@ -34,6 +34,6 @@
      * @param consumer The FontConsumer that owns the new FontSelector.
      * @return The newly-created FontSelector instance.
      */
-    public abstract FontSelector makeFontSelector(FOrayFontConsumer consumer);
+    FontSelector makeFontSelector(FOrayFontConsumer consumer);
 
 }


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

[FOray-commit] SF.net SVN: foray: [7899] trunk/foray/foray-font/src/java/org/foray/font/ FSType1Font.java

From: <vic...@us...> - 2006-09-05 01:12:39

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

Log Message:
-----------
Fix likely bug caught by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java	2006-09-05 01:11:06 UTC (rev 7898)
+++ trunk/foray/foray-font/src/java/org/foray/font/FSType1Font.java	2006-09-05 01:12:36 UTC (rev 7899)
@@ -128,7 +128,7 @@
                 encoding = EncodingVector.getPredefinedEncoding(
                         "WinAnsiEncoding");
             }
-            if (getRegisteredFont().getConfiguredFontName() == "Symbol") {
+            if (getRegisteredFont().getConfiguredFontName().equals("Symbol")) {
                 encoding = EncodingVector.getPredefinedEncoding("Symbol");
             }
             this.internalEncoding = encoding;


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

[FOray-commit] SF.net SVN: foray: [7898] trunk/foray/foray-fotree/src/java/org/foray/ fotree/parse

From: <vic...@us...> - 2006-09-05 01:11:09

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

Log Message:
-----------
Clean up some checkstyle issues.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java	2006-09-05 01:09:23 UTC (rev 7897)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyParser.java	2006-09-05 01:11:06 UTC (rev 7898)
@@ -178,7 +178,7 @@
      * Checks that the current token is a right parenthesis
      * and throws an exception if this isn't the case.
      */
-    private final void expectRpar() throws PropertyException {
+    private void expectRpar() throws PropertyException {
         if (currentToken != TOK_RPAR) {
             throw new PropertyException("expected )");
         }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java	2006-09-05 01:09:23 UTC (rev 7897)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/parse/PropertyTokenizer.java	2006-09-05 01:11:06 UTC (rev 7898)
@@ -325,7 +325,7 @@
      * decimal digit (0-9).
      * @param c The character to check
      */
-    private static final boolean isDigit(final char c) {
+    private static boolean isDigit(final char c) {
         return c > 0 && c < 128 && (charMap[ c] & digits) != 0;
     }
 
@@ -334,7 +334,7 @@
      * hexadecimal digit (0-9, A-F, a-f).
      * @param c The character to check
      */
-    private static final boolean isHexDigit(final char c) {
+    private static boolean isHexDigit(final char c) {
         return c > 0 && c < 128 && (charMap[ c] & hexchars) != 0;
         //return hexchars.indexOf(c) >= 0;
     }
@@ -344,7 +344,7 @@
      * start character, ie. can start a NAME as defined by XSL.
      * @param c The character to check
      */
-    private static final boolean isNameStartChar(final char c) {
+    private static boolean isNameStartChar(final char c) {
         return c >= 0x80 || c < 0 || (charMap[ c] & nameStartChars) != 0;
         //return nameStartChars.indexOf(c) >= 0 || c >= 0x80;
     }
@@ -354,7 +354,7 @@
      * character, ie. can occur in a NAME as defined by XSL.
      * @param c The character to check
      */
-    private static final boolean isNameChar(final char c) {
+    private static boolean isNameChar(final char c) {
         return c > 0x80 || c < 0 || (charMap[ c] & C_CS) != 0;
         //return nameStartChars.indexOf(c) >= 0
         //        || nameChars.indexOf(c) >= 0


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

[FOray-commit] SF.net SVN: foray: [7897] trunk/foray/foray-mif/src/java/org/foray/mif/ MIFDocument.java

From: <vic...@us...> - 2006-09-05 01:09:27

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

Log Message:
-----------
Fix some likely bugs caught by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java

Modified: trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java
===================================================================
--- trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java	2006-09-05 01:07:17 UTC (rev 7896)
+++ trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java	2006-09-05 01:09:23 UTC (rev 7897)
@@ -565,7 +565,7 @@
                 final Object elem = content.get(i);
                 if (elem instanceof String) {
                     // Output newlines as char hard return
-                    if (elem == "\n") {
+                    if (elem.equals("\n")) {
                         mif = "\n<Char HardReturn>";
                     } else {
                         mif = "\n\t<String `" + MIFEncode((String)elem) + "'>";
@@ -790,11 +790,11 @@
 
         public void setCurrent(final String current) {
 
-            if (current == "fo:table-body") {
+            if (current.equals("fo:table-body")) {
                 this.current = this.tblBody;
-            } else if (current == "tablehead") {
+            } else if (current.equals("tablehead")) {
                 this.current = this.tblHead;
-            } else if (current == "tablefoot") {
+            } else if (current.equals("tablefoot")) {
                 this.current = this.tblFoot;
             }
         }


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

[FOray-commit] SF.net SVN: foray: [7896] trunk/foray/foray-render/src/java/org/foray/ render

From: <vic...@us...> - 2006-09-05 01:07:26

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

Log Message:
-----------
Cleanup magic numbers and other style issues.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
    trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java

Modified: trunk/foray/foray-render/src/java/org/foray/render/Renderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-09-05 00:51:27 UTC (rev 7895)
+++ trunk/foray/foray-render/src/java/org/foray/render/Renderer.java	2006-09-05 01:07:17 UTC (rev 7896)
@@ -87,6 +87,15 @@
 public abstract class Renderer extends OutputTarget
         implements org.axsl.output.Renderer, org.axsl.areaR.RenderVisitor {
 
+    /** The number of millipoints in a point. */
+    public static final float MILLIPOINT_CONVERSION_FACTOR = 1000f;
+
+    /** The number of pixels in an inch. */
+    public static final byte PIXELS_PER_INCH = 96;
+
+    /** */
+    public static final int MAXIMUM_INTEGRAL_COLOR_VALUE = 255;
+
     AreaTree areaTree;
 
     /**
@@ -135,7 +144,7 @@
         }
 
         final Color backgroundColor = area.traitBackgroundColor();
-        if (backgroundColor.getAlpha() == 255) {
+        if (backgroundColor.getAlpha() == MAXIMUM_INTEGRAL_COLOR_VALUE) {
             this.drawRectangle(x, y, w, -h, false, null, true, backgroundColor);
         }
     }
@@ -248,7 +257,7 @@
      * @return The pixel density, per inch.
      */
     public int getPixelsPerInch() {
-        return 96;
+        return PIXELS_PER_INCH;
     }
 
     /**
@@ -571,10 +580,32 @@
             return null;
         }
         return new Rectangle2D.Float(
-                input.x / 1000f,
-                input.y / 1000,
-                input.width / 1000f,
-                input.height / 1000f);
+                toPoints(input.x),
+                toPoints(input.y),
+                toPoints(input.width),
+                toPoints(input.height));
     }
 
+    /**
+     * Converts millipoints to points.
+     * @param millipoints The millipoint value to be converted to points.
+     * @return The converted value in points.
+     */
+    protected static float toPoints(final int millipoints) {
+        return millipoints / MILLIPOINT_CONVERSION_FACTOR;
+    }
+
+    /**
+     * Converts a color value in the range 0 - 255 to its floating-point
+     * equivelant, that is, a value in the range 0 - 1.
+     * @param integralColor The integral color value to be converted, a
+     * value in the range 0 - 255.
+     * @return The floating point value, a value in the range 0 - 1.
+     */
+    protected static float colorToFloat(final int integralColor) {
+        int colorValue = Math.max(integralColor, 0);
+        colorValue = Math.min(integralColor, MAXIMUM_INTEGRAL_COLOR_VALUE);
+        return colorValue / MAXIMUM_INTEGRAL_COLOR_VALUE;
+    }
+
 }

Modified: trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2006-09-05 00:51:27 UTC (rev 7895)
+++ trunk/foray/foray-render/src/java/org/foray/render/svg/SVGRenderer.java	2006-09-05 01:07:17 UTC (rev 7896)
@@ -232,8 +232,8 @@
         final int lastWidth = pageWidth;
         final int lastHeight = pageHeight;
 
-        pageWidth = (int)(page.getWidth() / 1000f + .5);
-        pageHeight = (int)(page.getHeight() / 1000f + .5);
+        pageWidth = (int) Math.ceil(toPoints(page.getWidth()));
+        pageHeight = (int) Math.ceil(toPoints(page.getHeight()));
 
         if(lastLink != null && currentPageG != null) {
             lastLink.setAttributeNS(null, "xlink:href", "#svgView(viewBox(0, "
@@ -372,7 +372,8 @@
             if (img instanceof SVGGraphic) {
                 try {
                     final SVGDocument svg = ((SVGGraphic) img).getSVGDocument();
-                    renderSVGDocument(svg, x / 1000f, pageHeight - y / 1000f);
+                    renderSVGDocument(svg, toPoints(x),
+                            pageHeight - toPoints(y));
                 } catch (final GraphicException e) {}
 
 //            } else {
@@ -512,8 +513,8 @@
     }
 
     public void render(final SVGArea area) {
-        final float x = area.rrOriginX() / 1000f;
-        final float y = pageHeight - area.rrOriginY() / 1000f;
+        final float x = toPoints(area.rrOriginX());
+        final float y = pageHeight - toPoints(area.rrOriginY());
         final Document doc = area.getSVGDocument();
         renderSVGDocument(doc, x, y);
     }


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

[FOray-commit] SF.net SVN: foray: [7895] trunk/foray/foray-text/src/java/org/foray/text/ line/LineBreaker.java

From: <vic...@us...> - 2006-09-05 00:51:30

Revision: 7895
          http://svn.sourceforge.net/foray/?rev=7895&view=rev
Author:   victormote
Date:     2006-09-04 17:51:27 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Cleanup magic numbers and other style issues.

Modified Paths:
--------------
    trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java

Modified: trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java
===================================================================
--- trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java	2006-09-05 00:12:08 UTC (rev 7894)
+++ trunk/foray/foray-text/src/java/org/foray/text/line/LineBreaker.java	2006-09-05 00:51:27 UTC (rev 7895)
@@ -45,6 +45,8 @@
  */
 public abstract class LineBreaker implements org.axsl.text.line.LineBreaker {
 
+    private static final int LINE_COUNT_INCREMENT = 20;
+
     /** The "parent" TextServer. */
     protected TextServer server;
 
@@ -86,7 +88,7 @@
      * application is responsible to provide these values, but they are stored
      * here for reference.
      */
-    LineOutput[] outputLines = new LineOutput[20];
+    LineOutput[] outputLines = new LineOutput[LINE_COUNT_INCREMENT];
 
     /**
      * Index into {@link #outputLines} indicating which one was last requested
@@ -387,7 +389,7 @@
             return;
         }
         // Make a new array.
-        final int newSize = this.outputLines.length + 20;
+        final int newSize = this.outputLines.length + LINE_COUNT_INCREMENT;
         final LineOutput[] newArray = new LineOutput[newSize];
         // Copy the old to the new.
         System.arraycopy(this.outputLines, 0, newArray, 0,


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

[FOray-commit] SF.net SVN: foray: [7894] trunk/foray/foray-pioneer/src/java/org/foray/ pioneer/FONodePL.java

From: <vic...@us...> - 2006-09-05 00:12:11

Revision: 7894
          http://svn.sourceforge.net/foray/?rev=7894&view=rev
Author:   victormote
Date:     2006-09-04 17:12:08 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Use the more generic FOContext instead of RetrieveMarker.

Modified Paths:
--------------
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java

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 00:11:03 UTC (rev 7893)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/FONodePL.java	2006-09-05 00:12:08 UTC (rev 7894)
@@ -30,6 +30,7 @@
 import org.axsl.areaW.NormalBlockArea;
 import org.axsl.areaW.TableCellArea;
 import org.axsl.areaW.TableRowContainer;
+import org.axsl.foR.FOContext;
 import org.axsl.foR.FOLineNonText;
 import org.axsl.foR.FOLineText;
 import org.axsl.foR.FONode;
@@ -156,7 +157,7 @@
      */
     protected int addTextItemToLine(final LineArea lineArea,
             final FOLineText lineText, final int start, final int end,
-            final RetrieveMarker retrieveMarker) throws AreaWException {
+            final FOContext foContext) throws AreaWException {
         EagerLineBreaker lb = layout.getLineBreaker();
         if (lb == null) {
             lb = lineArea.getTextServer().provideEagerLineBreaker(null, layout,
@@ -164,7 +165,7 @@
         }
         int status = 0;
         final FOLineText contextAware = lineText.getContextWrapper(
-                retrieveMarker);
+                foContext);
         try {
             status = lb.processLineContent(contextAware, start, end,
                     lineArea.asLineOutput());
@@ -185,7 +186,7 @@
      * not fit onto the current line.
      */
     protected int addNonTextItemToLine(final LineArea lineArea,
-            final FOLineNonText nonText, final RetrieveMarker retrieveMarker)
+            final FOLineNonText nonText, final FOContext foContext)
             throws AreaWException {
         EagerLineBreaker lb = layout.getLineBreaker();
         if (lb == null) {
@@ -194,7 +195,7 @@
         }
         int status = 0;
         final FOLineNonText contextAware = nonText.getContextWrapper(
-                retrieveMarker);
+                foContext);
         try {
             status = lb.processLineContent(contextAware, -1, -1,
                     lineArea.asLineOutput());
@@ -208,7 +209,7 @@
     }
 
     protected int layoutInlineContent(final FObj node, LineArea lineArea,
-            final RetrieveMarker retrieveMarker) throws AreaWException {
+            final FOContext foContext) throws AreaWException {
         if (! (node instanceof FOLineNonText)) {
             return -1000;
         }
@@ -217,7 +218,7 @@
         if (lineArea == null) {
             return Status.AREA_FULL_SOME;
         }
-        if (addNonTextItemToLine(lineArea, nonText, retrieveMarker) == 1) {
+        if (addNonTextItemToLine(lineArea, nonText, foContext) == 1) {
             // It fit on the line.
             return Status.OK;
         }
@@ -231,7 +232,7 @@
         if (lineArea == null) {
             return Status.AREA_FULL_SOME;
         }
-        if (addNonTextItemToLine(lineArea, nonText, retrieveMarker) == 1) {
+        if (addNonTextItemToLine(lineArea, nonText, foContext) == 1) {
             return Status.OK;
         }
         getLogger().error(node.getName() + " does not fit on line:\n"


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

[FOray-commit] SF.net SVN: foray: [7893] trunk/foray/foray-fotree/src/java/org/foray/ fotree/fo/obj

From: <vic...@us...> - 2006-09-05 00:11:08

Revision: 7893
          http://svn.sourceforge.net/foray/?rev=7893&view=rev
Author:   victormote
Date:     2006-09-04 17:11:03 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Only test for ability to layout out flow for Flow objects as StaticContent objects are not required to be laid out on each page.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java	2006-09-05 00:03:05 UTC (rev 7892)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java	2006-09-05 00:11:03 UTC (rev 7893)
@@ -58,15 +58,6 @@
         if (name == null || name.equals("")) {
             throwException(getFullName() + "requires a 'flow-name'.");
         }
-        /* Make sure that this flow name can be laid out on every page that can
-         * be created in the page-sequence. */
-        final AbstractPageMaster problemPage = getPageSequence().flowValid(
-                this);
-        if (problemPage != null) {
-            throwException(this.getFullName() + " '" + traitFlowName()
-                    + "' cannot flow into page-master '"
-                    + problemPage.traitMasterName() + "'");
-        }
     }
 
     public boolean isRAGenerator() {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java	2006-09-05 00:03:05 UTC (rev 7892)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java	2006-09-05 00:11:03 UTC (rev 7893)
@@ -45,6 +45,22 @@
     /**
      * {@inheritDoc}
      */
+    public void validateProperties() throws FOTreeException {
+        super.validateProperties();
+        /* Make sure that this flow name can be laid out on every page that can
+         * be created in the page-sequence. */
+        final AbstractPageMaster problemPage = getPageSequence().flowValid(
+                this);
+        if (problemPage != null) {
+            throwException(this.getFullName() + " '" + traitFlowName()
+                    + "' cannot flow into page-master '"
+                    + problemPage.traitMasterName() + "'");
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
     public void setup() throws FOTreeException {
         getPageSequence().addFlow(this);
     }


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

[FOray-commit] SF.net SVN: foray: [7892] trunk/foray/foray-fotree/src/java/org/foray/ fotree/FObj.java

From: <vic...@us...> - 2006-09-05 00:03:09

Revision: 7892
          http://svn.sourceforge.net/foray/?rev=7892&view=rev
Author:   victormote
Date:     2006-09-04 17:03:05 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Fix bug in test.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-04 22:47:46 UTC (rev 7891)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-05 00:03:05 UTC (rev 7892)
@@ -197,7 +197,7 @@
     }
 
     public void validateAtLeastOneChild() throws FOTreeException {
-        if (this.getChildCount() > 1) {
+        if (this.getChildCount() < 1) {
             throwException(this.getFullName() + " must have at least one "
                     + "child.");
         }


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

[FOray-commit] SF.net SVN: foray: [7891] trunk/foray/foray-fotree/src/java/org/foray/ fotree

From: <vic...@us...> - 2006-09-04 22:47:50

Revision: 7891
          http://svn.sourceforge.net/foray/?rev=7891&view=rev
Author:   victormote
Date:     2006-09-04 15:47:46 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Conform to axsl change: Remove unneeded method.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-04 22:42:36 UTC (rev 7890)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-04 22:47:46 UTC (rev 7891)
@@ -1668,13 +1668,6 @@
     /**
      * {@inheritDoc}
      */
-    public byte traitShiftDirection(final FOContext context) {
-        return propertyList.traitShiftDirection(context);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public short traitAlignmentBaseline(final FOContext context) {
         return propertyList.traitAlignmentBaseline(context);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-09-04 22:42:36 UTC (rev 7890)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-09-04 22:47:46 UTC (rev 7891)
@@ -2172,15 +2172,6 @@
         return getWritingMode(context).getShiftEven();
     }
 
-    /**
-     * @return One of DIRECTION_TOP_TO_BOTTOM, DIRECTION_BOTTOM_TO_TOP,
-     * DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, depending on
-     * the writing-mode.
-     */
-    public byte traitShiftDirection(final FOContext context) {
-        return getWritingMode(context).getShiftOdd();
-    }
-
     public short traitAlignmentBaseline(final FOContext context) {
         AlignmentBaseline property = (AlignmentBaseline)
                 getProperty(Constants.FOPROP_ALIGNMENT_BASELINE);


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

10 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 280 281 282 283 284 .. 323 > >> (Page 282 of 323)