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

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

Revision: 7984
          http://svn.sourceforge.net/foray/?rev=7984&view=rev
Author:   victormote
Date:     2006-09-07 18:11:56 -0700 (Thu, 07 Sep 2006)

Log Message:
-----------
Style changes only.

Modified Paths:
--------------
    trunk/foray/foray-common/src/java/org/foray/common/url/URLFactory.java
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/SerializeHyphPattern.java
    trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTranscoder.java
    trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
    trunk/foray/scripts/checkstyle-config.xml

Modified: trunk/foray/foray-common/src/java/org/foray/common/url/URLFactory.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/url/URLFactory.java	2006-09-08 01:01:57 UTC (rev 7983)
+++ trunk/foray/foray-common/src/java/org/foray/common/url/URLFactory.java	2006-09-08 01:11:56 UTC (rev 7984)
@@ -136,7 +136,9 @@
      * from which this code is derived.
      */
     public static String parseProtocol(final String spec) {
-        int i, limit, c;
+        int i;
+        int limit;
+        int c;
         int start = 0;
         String newProtocol = null;
         boolean aRef=false;

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java	2006-09-08 01:01:57 UTC (rev 7983)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationTree.java	2006-09-08 01:11:56 UTC (rev 7984)
@@ -222,7 +222,8 @@
             final byte[] il) {
         byte[] values;
         int i = index;
-        char p, q;
+        char p;
+        char q;
         char sp = word[i];
         p = root;
 

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/SerializeHyphPattern.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/SerializeHyphPattern.java	2006-09-08 01:01:57 UTC (rev 7983)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/SerializeHyphPattern.java	2006-09-08 01:11:56 UTC (rev 7984)
@@ -46,7 +46,8 @@
  * SerializeHyphPattern
  */
 public class SerializeHyphPattern extends MatchingTask {
-    private File sourceDir, targetDir;
+    private File sourceDir;
+    private File targetDir;
     private boolean errorDump = false;
     private Log logger;
 

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-08 01:01:57 UTC (rev 7983)
+++ trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java	2006-09-08 01:11:56 UTC (rev 7984)
@@ -182,7 +182,10 @@
     class ImportObject {
 
         private String url;
-        private int x, y, w, h;
+        private int x;
+        private int y;
+        private int w;
+        private int h;
 
         public ImportObject(final String url, final int x, final int y,
                 final int w, final int h) {
@@ -234,7 +237,10 @@
     class Frame {
 
         private int id;
-        private int x, y, w, h;
+        private int x;
+        private int y;
+        private int w;
+        private int h;
         private ArrayList content = new ArrayList();
 
         public Frame(final int x, final int y, final int w, final int h) {
@@ -299,7 +305,10 @@
      * A MIF Text Rectangle.
      */
     class TextRect {
-        private int rx, ry, w, h;
+        private int rx;
+        private int ry;
+        private int w;
+        private int h;
         private int numCols;
         private int curCol = 0;    // Current column being processed
         private int colGap = 0;
@@ -714,7 +723,9 @@
 
         private int id;
         private ArrayList tblColumns = new ArrayList();
-        private ArrayList tblBody, tblHead, tblFoot;
+        private ArrayList tblBody;
+        private ArrayList tblHead;
+        private ArrayList tblFoot;
         /* is a reference to one of tblHead,tblBody or tblFoot */
         private ArrayList current;
 

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java	2006-09-08 01:01:57 UTC (rev 7983)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFGraphics2D.java	2006-09-08 01:11:56 UTC (rev 7984)
@@ -341,7 +341,12 @@
 
         int count = 0;
         int[] iarray;
-        int i, j, val, alpha, add, mult;
+        int i;
+        int j;
+        int val;
+        int alpha;
+        int add;
+        int mult;
         switch (bd.getDataType()) {
         case DataBuffer.TYPE_INT:
             final int[][] idata = ((DataBufferInt)bd).getBankData();

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTranscoder.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTranscoder.java	2006-09-08 01:01:57 UTC (rev 7983)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/svg/batik/PDFTranscoder.java	2006-09-08 01:11:56 UTC (rev 7984)
@@ -190,7 +190,8 @@
             imgHeight =
                 ((Float)hints.get(ImageTranscoder.KEY_HEIGHT)).floatValue();
         }
-        float width, height;
+        float width;
+        float height;
         if (imgWidth > 0 && imgHeight > 0) {
             width = imgWidth;
             height = imgHeight;

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-08 01:01:57 UTC (rev 7983)
+++ trunk/foray/foray-render/src/java/org/foray/render/awt/AWTRenderer.java	2006-09-08 01:11:56 UTC (rev 7984)
@@ -180,7 +180,8 @@
         graphics.setColor(strokeColor);
         int x = x1;
         int y = y1;
-        int height, width;
+        int height;
+        int width;
         if (x1 == x2) {
             /* vertical line */
             height = y2 - y1;

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-08 01:01:57 UTC (rev 7983)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2006-09-08 01:11:56 UTC (rev 7984)
@@ -484,8 +484,10 @@
         ctx = null;
         builder = null;
 
-        final float sx = 1, sy = -1;
-        final int xOffset = x, yOffset = y;
+        final float sx = 1;
+        final float sy = -1;
+        final int xOffset = x;
+        final int yOffset = y;
 
         comment("% --- SVG Area");
         write("gsave");

Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml	2006-09-08 01:01:57 UTC (rev 7983)
+++ trunk/foray/scripts/checkstyle-config.xml	2006-09-08 01:11:56 UTC (rev 7984)
@@ -148,9 +148,7 @@
     <module name="MultipleStringLiterals">
       <property name="severity" value="ignore"/>
     </module>
-    <module name="MultipleVariableDeclarations">
-      <property name="severity" value="ignore"/>
-    </module>
+    <module name="MultipleVariableDeclarations"/>
     <module name="NeedBraces">
       <property name="severity" value="ignore"/>
     </module>


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