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

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

Revision: 7935
          http://svn.sourceforge.net/foray/?rev=7935&view=rev
Author:   victormote
Date:     2006-09-06 08:42:56 -0700 (Wed, 06 Sep 2006)

Log Message:
-----------
Conform to axsl changes regarding standardized naming.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
    trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VoiceFamily.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
    trunk/foray/scripts/checkstyle-config.xml

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -194,8 +194,8 @@
         }
         final RegionBody regionBody = simplePageMaster.getRegionBody();
         final RegionRABody area = new RegionRABody(regionBody, this,
-                regionBody.getXPositionVP_CR(this),
-                regionBody.getYPositionVP_CR(this));
+                regionBody.getXPositionVPContent(this),
+                regionBody.getYPositionVPContent(this));
         this.body = area;
     }
 

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/RegionRA.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -44,11 +44,11 @@
     }
 
     public int getYPosition() {
-        return ((Region) traitGeneratedBy()).getYPositionVP_CR(this);
+        return ((Region) traitGeneratedBy()).getYPositionVPContent(this);
     }
 
     public int getXPosition() {
-        return ((Region) traitGeneratedBy()).getXPositionVP_CR(this);
+        return ((Region) traitGeneratedBy()).getXPositionVPContent(this);
     }
 
     public int crBPD() {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -104,7 +104,8 @@
      * @return The enumerated value of the object name.
      */
     public static byte enumerateObjectName(final String objectName) {
-        return (byte) Arrays.binarySearch(Constants.objectNameList, objectName);
+        return (byte) Arrays.binarySearch(Constants.OBJECT_NAME_LIST,
+                objectName);
     }
 
     public static FObj makeObject(final String objectName, final FObj parent,

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/PropertyMakerFO.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -155,7 +155,7 @@
     public static short enumeratePropertyName(String propertyName) {
         propertyName = Property.getBasePropertyName(propertyName);
         final short enumerated = (short) Arrays.binarySearch(
-                Constants.propertyNameList, propertyName);
+                Constants.PROPERTY_NAME_LIST, propertyName);
         return enumerated;
     }
 

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -155,28 +155,28 @@
      * @return The X coordinate of the upper left corner of the region's
      * viewport's content rectangle, in millipoints.
      */
-    public abstract int getXPositionVP_CR(FOContext context) ;
+    public abstract int getXPositionVPContent(FOContext context) ;
 
     /**
      * <p>Convenience method reporting the region's vertical position.</p>
      * @return The Y coordinate of the upper left corner of the region's
      * viewport's content rectangle, in millipoints.
      */
-    public abstract int getYPositionVP_CR(FOContext context) ;
+    public abstract int getYPositionVPContent(FOContext context) ;
 
     /**
      * <p>Convenience method reporting the region's width.</p>
      * @return The width of the region's viewport's content rectangle, in
      * millipoints.
      */
-    public abstract int getWidthVP_CR(FOContext context) ;
+    public abstract int getWidthVPContent(FOContext context) ;
 
     /**
      * <p>Convenience method reporting the region's height.</p>
      * @return The height of the region's viewport's content rectangle, in
      * millipoints.
      */
-    public abstract int getHeightVP_CR(FOContext context) ;
+    public abstract int getHeightVPContent(FOContext context) ;
 
     public Namespace getNamespace() {
         return this.getFOTreeBuilder().getFONamespace();

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -69,7 +69,7 @@
     /**
      * {@inheritDoc}
      */
-    public int getXPositionVP_CR(final FOContext context) {
+    public int getXPositionVPContent(final FOContext context) {
         int xPosition = getPageMaster().getXPositionRA_CR();
         if (traitPrecedence() == false) {
             xPosition += getPageMaster().getStartExtent();
@@ -80,7 +80,7 @@
     /**
      * {@inheritDoc}
      */
-    public int getYPositionVP_CR(final FOContext context) {
+    public int getYPositionVPContent(final FOContext context) {
         return getPageMaster().getYPositionRA_CR()
                 - getPageMaster().getHeightRA_CR()
                 + traitExtent();
@@ -89,7 +89,7 @@
     /**
      * {@inheritDoc}
      */
-    public int getWidthVP_CR(final FOContext context) {
+    public int getWidthVPContent(final FOContext context) {
         int width = getPageMaster().getWidthRA_CR();
         if (traitPrecedence() == false) {
             width -= getPageMaster().getStartExtent()
@@ -101,7 +101,7 @@
     /**
      * {@inheritDoc}
      */
-    public int getHeightVP_CR(final FOContext context) {
+    public int getHeightVPContent(final FOContext context) {
         return traitExtent();
     }
 

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -69,7 +69,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getXPositionVP_CR(final FOContext context) {
+    public int getXPositionVPContent(final FOContext context) {
         final int pageWidth = getPageMaster().traitPageWidth();
         int xPosition = getPageMaster().getMarginLeft(context, pageWidth);
         if (traitPrecedence() == false) {
@@ -81,7 +81,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getYPositionVP_CR(final FOContext context) {
+    public int getYPositionVPContent(final FOContext context) {
         final int pageWidth = getPageMaster().traitPageWidth();
         return getPageMaster().traitPageHeight()
                 - getPageMaster().getMarginTop(context, pageWidth);
@@ -90,7 +90,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getWidthVP_CR(final FOContext context) {
+    public int getWidthVPContent(final FOContext context) {
         final int pageWidth = getPageMaster().traitPageWidth();
         int width = getPageMaster().traitPageWidth()
                 - getPageMaster().getMarginLeft(context, pageWidth)
@@ -105,7 +105,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getHeightVP_CR(final FOContext context) {
+    public int getHeightVPContent(final FOContext context) {
         return traitExtent();
     }
 

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -69,7 +69,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getXPositionVP_CR(final FOContext context) {
+    public int getXPositionVPContent(final FOContext context) {
         final int pageWidth = getPageMaster().traitPageWidth();
         final int pageMarginLeft = getPageMaster().getMarginLeft(context,
                 pageWidth);
@@ -80,7 +80,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getYPositionVP_CR(final FOContext context) {
+    public int getYPositionVPContent(final FOContext context) {
         final int pageWidth = getPageMaster().traitPageWidth();
         final int pageHeight = getPageMaster().traitPageHeight();
         final int pageMarginTop = getPageMaster().getMarginTop(context,
@@ -92,7 +92,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getWidthVP_CR(final FOContext context) {
+    public int getWidthVPContent(final FOContext context) {
         final int pageWidth = getPageMaster().traitPageWidth();
         return getPageMaster().traitPageWidth()
                 - getPageMaster().getMarginLeft(context, pageWidth)
@@ -104,7 +104,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getHeightVP_CR(final FOContext context) {
+    public int getHeightVPContent(final FOContext context) {
         final int pageWidth = getPageMaster().traitPageWidth();
         return getPageMaster().traitPageHeight()
                 - getPageMaster().getMarginTop(context, pageWidth)

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -68,7 +68,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getXPositionVP_CR(final FOContext context) {
+    public int getXPositionVPContent(final FOContext context) {
         return getPageMaster().getXPositionRA_CR()
                 + getPageMaster().getWidthRA_CR()
                 - traitExtent();
@@ -77,7 +77,7 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getYPositionVP_CR(final FOContext context) {
+    public int getYPositionVPContent(final FOContext context) {
         int yPosition = getPageMaster().getYPositionRA_CR();
         if (getPageMaster().getBeforePrecedence()) {
             yPosition -= getPageMaster().getBeforeExtent();
@@ -88,14 +88,14 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getWidthVP_CR(final FOContext context) {
+    public int getWidthVPContent(final FOContext context) {
         return traitExtent();
     }
 
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getHeightVP_CR(final FOContext context) {
+    public int getHeightVPContent(final FOContext context) {
         int height = getPageMaster().getHeightRA_CR();
         if (getPageMaster().getBeforePrecedence()) {
             height -= getPageMaster().getBeforeExtent();

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -69,14 +69,14 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getXPositionVP_CR(final FOContext context) {
+    public int getXPositionVPContent(final FOContext context) {
         return getPageMaster().getXPositionRA_CR();
     }
 
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getYPositionVP_CR(final FOContext context) {
+    public int getYPositionVPContent(final FOContext context) {
         int yPosition = getPageMaster().getYPositionRA_CR();
         if (getPageMaster().getBeforePrecedence()) {
             yPosition -= getPageMaster().getBeforeExtent();
@@ -87,14 +87,14 @@
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getWidthVP_CR(final FOContext context) {
+    public int getWidthVPContent(final FOContext context) {
         return traitExtent();
     }
 
     /**
      * Inherited documentation: @inheritDoc
      */
-    public int getHeightVP_CR(final FOContext context) {
+    public int getHeightVPContent(final FOContext context) {
         int height = getPageMaster().getHeightRA_CR();
         if (getPageMaster().getBeforePrecedence()) {
             height -= getPageMaster().getBeforeExtent();

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -90,7 +90,7 @@
             int base = 0;
             if (fobj instanceof RegionBody) {
                 final RegionBody rb = (RegionBody) fobj;
-                base = rb.getWidthVP_CR(context);
+                base = rb.getWidthVPContent(context);
             }
             final DtPercentage percentageDT = (DtPercentage) this.value;
             final float percentage = percentageDT.getValue();

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/FontFamily.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -89,7 +89,7 @@
             case Constants.FOVAL_FANTASY:
             case Constants.FOVAL_MONOSPACE: {
                 final String[] returnArray
-                        = {Constants.propertyKeywordValues[keyword]};
+                        = {Constants.PROPERTY_KEYWORD_VALUES[keyword]};
                 return returnArray;
             }
             }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VoiceFamily.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VoiceFamily.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/VoiceFamily.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -78,7 +78,7 @@
             case Constants.FOVAL_FEMALE:
             case Constants.FOVAL_CHILD: {
                 final String[] returnArray
-                        = {Constants.propertyKeywordValues[keyword]};
+                        = {Constants.PROPERTY_KEYWORD_VALUES[keyword]};
                 return returnArray;
             }
             }

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDocument.java	2006-09-06 15:42:56 UTC (rev 7935)
@@ -221,7 +221,7 @@
      * If not set, the default value is PDF_VERSION_1_6.
      */
     public void setVersion(final int newVersion) throws PDFException {
-        if (newVersion >= 0 && newVersion < validVersions.length) {
+        if (newVersion >= 0 && newVersion < VALID_VERSIONS.length) {
             this.pdfVersion = newVersion;
             return;
         }
@@ -314,7 +314,7 @@
         this.position = 0;
         final StringBuffer buffer = new StringBuffer();
         // The PDF identifier comment.
-        buffer.append("%PDF-" + versionStrings[pdfVersion] + PDFObject.EOL);
+        buffer.append("%PDF-" + VERSION_STRINGS[pdfVersion] + PDFObject.EOL);
         // A binary comment as recommended by the PDF spec (3.4.1)
         buffer.append("%" + (char) 0xAA + (char) 0xAB + (char) 0xAC
                 + (char) 0xAD + PDFObject.EOL);

Modified: trunk/foray/scripts/checkstyle-config.xml
===================================================================
--- trunk/foray/scripts/checkstyle-config.xml	2006-09-06 14:43:32 UTC (rev 7934)
+++ trunk/foray/scripts/checkstyle-config.xml	2006-09-06 15:42:56 UTC (rev 7935)
@@ -39,7 +39,7 @@
         SUPER_CTOR_CALL"/>
     </module>
     <module name="TabCharacter">
-      <property name="severity" value="error"/>
+      <property name="severity" value="warning"/>
     </module>
     <module name="FinalLocalVariable">
       <property name="tokens" value="VARIABLE_DEF,PARAMETER_DEF"/>


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