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

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

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.